Commit8c780dc

committed

search on display_name, default to name if display_name is empty

1 parentcaee61c commit8c780dcCopy full SHA for 8c780dc

File tree

+18

-11

lines changed

+18

-11

lines changed

Lines changed: 8 additions & 2 deletions

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,10 +42,16 @@ WHERE`
`42`	`42`	`lower(t.name) ILIKE'%'\|\|lower(@fuzzy_name)\|\|'%'`
`43`	`43`	`ELSE true`
`44`	`44`	`END`
`45`		`--- Filter by display_name, matching on substring`
	`45`	`+-- Filter by display_name, matching on substring (fallback to name if display_name is empty)`
`46`	`46`	`AND CASE`
`47`	`47`	`WHEN @fuzzy_display_name ::text!='' THEN`
`48`		`-lower(t.display_name) ILIKE'%'\|\|lower(@fuzzy_display_name)\|\|'%'`
	`48`	`+CASE`
	`49`	`+WHENt.display_nameIS NOT NULLANDt.display_name!='' THEN`
	`50`	`+lower(t.display_name) ILIKE'%'\|\|lower(@fuzzy_display_name)\|\|'%'`
	`51`	`+ELSE`
	`52`	`+-- Remove spaces if present since 't.name' cannot have any spaces`
	`53`	`+lower(t.name) ILIKE'%'\|\| REPLACE(lower(@fuzzy_display_name),'','')\|\|'%'`
	`54`	`+END`
`49`	`55`	`ELSE true`
`50`	`56`	`END`
`51`	`57`	`-- Filter by ids`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -268,8 +268,7 @@ func Templates(ctx context.Context, db database.Store, actorID uuid.UUID, query`
`268`	`268`	`// Always lowercase for all searches.`
`269`	`269`	`query=strings.ToLower(query)`
`270`	`270`	`values,errors:=searchTerms(query,func(termstring,values url.Values)error {`
`271`		`-// Default to the template name and display name`
`272`		`-values.Add("name",term)`
	`271`	`+// Default to the display name`
`273`	`272`	`values.Add("display_name",term)`
`274`	`273`	`returnnil`
`275`	`274`	`})`

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -686,7 +686,6 @@ func TestSearchTemplates(t *testing.T) {`
`686`	`686`	`Name:"OnlyName",`
`687`	`687`	`Query:"foobar",`
`688`	`688`	`Expected: database.GetTemplatesWithFilterParams{`
`689`		`-FuzzyName:"foobar",`
`690`	`689`	`FuzzyDisplayName:"foobar",`
`691`	`690`	`},`
`692`	`691`	`},`
`@@ -759,10 +758,9 @@ func TestSearchTemplates(t *testing.T) {`
`759`	`758`	`},`
`760`	`759`	`},`
`761`	`760`	`{`
`762`		`-Name:"SearchOnNameAndDisplayName",`
	`761`	`+Name:"SearchOnDisplayName",`
`763`	`762`	`Query:"test name",`
`764`	`763`	`Expected: database.GetTemplatesWithFilterParams{`
`765`		`-FuzzyName:"test name",`
`766`	`764`	`FuzzyDisplayName:"test name",`
`767`	`765`	`},`
`768`	`766`	`},`
`@@ -785,7 +783,6 @@ func TestSearchTemplates(t *testing.T) {`
`785`	`783`	Query:`foo bar exact_name:"test display name"`,
`786`	`784`	`Expected: database.GetTemplatesWithFilterParams{`
`787`	`785`	`ExactName:"test display name",`
`788`		`-FuzzyName:"foo bar",`
`789`	`786`	`FuzzyDisplayName:"foo bar",`
`790`	`787`	`},`
`791`	`788`	`},`
`@@ -794,7 +791,6 @@ func TestSearchTemplates(t *testing.T) {`
`794`	`791`	`Query:"deprecated:false test template",`
`795`	`792`	`Expected: database.GetTemplatesWithFilterParams{`
`796`	`793`	`Deprecated: sql.NullBool{Bool:false,Valid:true},`
`797`		`-FuzzyName:"test template",`
`798`	`794`	`FuzzyDisplayName:"test template",`
`799`	`795`	`},`
`800`	`796`	`},`

Comments

(0)