specify a search analyzer for name so it doesn't need to be specified…

… at query time
nyaruka · Apr 13, 2018 · f5244a5 · f5244a5
1 parent d7557cf
commit f5244a5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/indexer.go b/indexer.go
@@ -501,6 +501,7 @@ const indexSettings = `
 				"name": {
 					"type": "text",
 					"analyzer": "prefix",
+					"search_analyzer": "standard",
 					"fields": {
 						"keyword": {
 							"type": "keyword",

diff --git a/indexer_test.go b/indexer_test.go
@@ -69,10 +69,10 @@ func TestIndexing(t *testing.T) {
 
 	time.Sleep(2 * time.Second)
 
-	assertQuery(t, client, physicalName, elastic.NewMatchQuery("name", "JOHn").Analyzer("standard"), []int64{5})
+	assertQuery(t, client, physicalName, elastic.NewMatchQuery("name", "JOHn"), []int64{5})
 
 	// prefix on name matches both john and joanne, but no ajodi
-	assertQuery(t, client, physicalName, elastic.NewMatchQuery("name", "JO").Analyzer("standard"), []int64{5, 7})
+	assertQuery(t, client, physicalName, elastic.NewMatchQuery("name", "JO"), []int64{5, 7})
 	assertQuery(t, client, physicalName, elastic.NewTermQuery("name.keyword", "JOHN DOE"), []int64{5})
 
 	assertQuery(t, client, physicalName, elastic.NewMatchQuery("language", "eng"), []int64{1})
@@ -210,7 +210,7 @@ func TestIndexing(t *testing.T) {
 	time.Sleep(5 * time.Second)
 
 	// try a test query to check it worked
-	assertQuery(t, client, indexName, elastic.NewMatchQuery("name", "john").Analyzer("standard"), []int64{5})
+	assertQuery(t, client, indexName, elastic.NewMatchQuery("name", "john"), []int64{5})
 
 	// look up our mapping
 	physical := FindPhysicalIndexes(elasticURL, indexName)
@@ -231,7 +231,7 @@ func TestIndexing(t *testing.T) {
 
 	time.Sleep(5 * time.Second)
 
-	assertQuery(t, client, newIndex, elastic.NewMatchQuery("name", "john").Analyzer("standard"), []int64{5})
+	assertQuery(t, client, newIndex, elastic.NewMatchQuery("name", "john"), []int64{5})
 
 	// update our database, removing one contact, updating another
 	dbUpdate, err := ioutil.ReadFile("testdb_update.sql")
@@ -247,7 +247,7 @@ func TestIndexing(t *testing.T) {
 	time.Sleep(5 * time.Second)
 
 	// should only match new john, old john is gone
-	assertQuery(t, client, indexName, elastic.NewMatchQuery("name", "john").Analyzer("standard"), []int64{3})
+	assertQuery(t, client, indexName, elastic.NewMatchQuery("name", "john"), []int64{3})
 
 	// 3 is no longer in our group
 	assertQuery(t, client, indexName, elastic.NewMatchQuery("groups", "529bac39-550a-4d6f-817c-1833f3449007"), []int64{1})