Fix search queries

Signed-off-by: Sacha Al Himdani <sacha@getprobo.com>

pkg/coredata/control_filter.go

@@ -41,5 +41,10 @@ func (f *ControlFilter) SQLFragment() string {
 		return "TRUE"
 	}
 
-	return "search_vector @@ websearch_to_tsquery('simple', @query)"
+	return `
+		search_vector @@ (
+			SELECT to_tsquery('simple', string_agg(lexeme || ':*', ' & '))
+			FROM unnest(regexp_split_to_array(trim(@query), '\s+')) AS lexeme
+		)
+	`
 }

pkg/coredata/document.go

@@ -333,6 +333,7 @@ WITH plcs AS (
 	SELECT
 		p.id,
 		p.tenant_id,
+		p.search_vector,
 		p.organization_id,
 		p.owner_id,
 		p.title,

pkg/coredata/document_filter.go

@@ -41,5 +41,10 @@ func (f *DocumentFilter) SQLFragment() string {
 		return "TRUE"
 	}
 
-	return "search_vector @@ websearch_to_tsquery('simple', @query)"
+	return `
+		search_vector @@ (
+			SELECT to_tsquery('simple', string_agg(lexeme || ':*', ' & '))
+			FROM unnest(regexp_split_to_array(trim(@query), '\s+')) AS lexeme
+		)
+	`
 }

pkg/coredata/measure.go

@@ -219,6 +219,7 @@ WITH mtgtns AS (
 		m.description,
 		m.state,
 		m.reference_id,
+		m.search_vector,
 		m.created_at,
 		m.updated_at
 	FROM

pkg/coredata/measure_filter.go

@@ -41,5 +41,10 @@ func (f *MeasureFilter) SQLFragment() string {
 		return "TRUE"
 	}
 
-	return "search_vector @@ websearch_to_tsquery('simple', @query)"
+	return `
+		search_vector @@ (
+			SELECT to_tsquery('simple', string_agg(lexeme || ':*', ' & '))
+			FROM unnest(regexp_split_to_array(trim(@query), '\s+')) AS lexeme
+		)
+	`
 }

pkg/coredata/risk.go

@@ -135,6 +135,7 @@ WITH rsks AS (
 		r.residual_likelihood,
 		r.residual_impact,
 		r.residual_risk_score,
+		r.search_vector,
 		r.created_at,
 		r.updated_at
 	FROM

pkg/coredata/risk_filter.go

@@ -41,5 +41,10 @@ func (f *RiskFilter) SQLFragment() string {
 		return "TRUE"
 	}
 
-	return "search_vector @@ websearch_to_tsquery('simple', @query)"
+	return `
+		search_vector @@ (
+			SELECT to_tsquery('simple', string_agg(lexeme || ':*', ' & '))
+			FROM unnest(regexp_split_to_array(trim(@query), '\s+')) AS lexeme
+		)
+	`
 }