Wrap user's visibility query string in parenthesis (#3956)

rodrigozhou · web-flow · commit 0b698c1a0f69 · 2023-02-14T16:14:59.000-08:00
diff --git a/common/persistence/visibility/store/sql/query_converter_mysql.go b/common/persistence/visibility/store/sql/query_converter_mysql.go
@@ -207,7 +207,7 @@ func (c *mysqlQueryConverter) buildSelectStmt(
 	queryArgs = append(queryArgs, namespaceID.String())
 
 	if len(queryString) > 0 {
-		whereClauses = append(whereClauses, queryString)
+		whereClauses = append(whereClauses, fmt.Sprintf("(%s)", queryString))
 	}
 
 	if token != nil {
diff --git a/common/persistence/visibility/store/sql/query_converter_postgresql.go b/common/persistence/visibility/store/sql/query_converter_postgresql.go
@@ -214,7 +214,7 @@ func (c *pgQueryConverter) buildSelectStmt(
 	queryArgs = append(queryArgs, namespaceID.String())
 
 	if len(queryString) > 0 {
-		whereClauses = append(whereClauses, queryString)
+		whereClauses = append(whereClauses, fmt.Sprintf("(%s)", queryString))
 	}
 
 	if token != nil {
diff --git a/common/persistence/visibility/store/sql/query_converter_sqlite.go b/common/persistence/visibility/store/sql/query_converter_sqlite.go
@@ -234,7 +234,7 @@ func (c *sqliteQueryConverter) buildSelectStmt(
 	queryArgs = append(queryArgs, namespaceID.String())
 
 	if len(queryString) > 0 {
-		whereClauses = append(whereClauses, queryString)
+		whereClauses = append(whereClauses, fmt.Sprintf("(%s)", queryString))
 	}
 
 	if token != nil {

Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ func (c *mysqlQueryConverter) buildSelectStmt(`
`207`	`207`	`queryArgs = append(queryArgs, namespaceID.String())`
`208`	`208`
`209`	`209`	`if len(queryString) > 0 {`
`210`		`- whereClauses = append(whereClauses, queryString)`
	`210`	`+ whereClauses = append(whereClauses, fmt.Sprintf("(%s)", queryString))`
`211`	`211`	`}`
`212`	`212`
`213`	`213`	`if token != nil {`
Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ func (c *pgQueryConverter) buildSelectStmt(`
`214`	`214`	`queryArgs = append(queryArgs, namespaceID.String())`
`215`	`215`
`216`	`216`	`if len(queryString) > 0 {`
`217`		`- whereClauses = append(whereClauses, queryString)`
	`217`	`+ whereClauses = append(whereClauses, fmt.Sprintf("(%s)", queryString))`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	`if token != nil {`
Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ func (c *sqliteQueryConverter) buildSelectStmt(`
`234`	`234`	`queryArgs = append(queryArgs, namespaceID.String())`
`235`	`235`
`236`	`236`	`if len(queryString) > 0 {`
`237`		`- whereClauses = append(whereClauses, queryString)`
	`237`	`+ whereClauses = append(whereClauses, fmt.Sprintf("(%s)", queryString))`
`238`	`238`	`}`
`239`	`239`
`240`	`240`	`if token != nil {`