wip

Author: kyleconroy

internal/compiler/analyze.go

@@ -96,14 +96,6 @@ func (c *Compiler) inferQuery(raw *ast.RawStmt, query string) (*analysis, error)
 }
 
 func (c *Compiler) _analyzeQuery(raw *ast.RawStmt, query string, failfast bool) (*analysis, error) {
-	numbers, dollar, err := validate.ParamRef(raw)
-	// TODO: This might be the wrong thing
-	if err != nil {
-		return nil, err
-	}
-
-	raw, namedParams, edits := rewrite.NamedParameters(c.conf.Engine, raw, numbers, dollar)
-
 	errors := make([]error, 0)
 	check := func(err error) error {
 		if failfast {
@@ -115,6 +107,13 @@ func (c *Compiler) _analyzeQuery(raw *ast.RawStmt, query string, failfast bool)
 		return nil
 	}
 
+	numbers, dollar, err := validate.ParamRef(raw)
+	if err := check(err); err != nil {
+		return nil, err
+	}
+
+	raw, namedParams, edits := rewrite.NamedParameters(c.conf.Engine, raw, numbers, dollar)
+
 	var table *ast.TableName
 	switch n := raw.Stmt.(type) {
 	case *ast.CallStmt:

internal/endtoend/testdata/operator_string_concat/postgresql/pgx/v4/go/query.sql.go

@@ -1,11 +1,7 @@
--- name: Test :one
-select * from Demo
-where txt ~~ '%' || sqlc.arg('val') || '%';
-
 -- name: Test2 :one
 select * from Demo
-where txt like '%' || sqlc.arg('val') || '%';
+where txt like '%' || sqlc.arg('val')::text || '%';
 
 -- name: Test3 :one
 select * from Demo
-where txt like concat('%', sqlc.arg('val'), '%');
+where txt like concat('%', sqlc.arg('val')::text, '%');

internal/endtoend/testdata/operator_string_concat/postgresql/pgx/v4/query.sql

@@ -1,11 +1,7 @@
--- name: Test :one
-select * from Demo
-where txt ~~ '%' || sqlc.arg('val') || '%';
-
 -- name: Test2 :one
 select * from Demo
-where txt like '%' || sqlc.arg('val') || '%';
+where txt like '%' || sqlc.arg('val')::text || '%';
 
 -- name: Test3 :one
 select * from Demo
-where txt like concat('%', sqlc.arg('val'), '%');
+where txt like concat('%', sqlc.arg('val')::text, '%');

internal/endtoend/testdata/operator_string_concat/postgresql/pgx/v5/go/query.sql.go

@@ -1,11 +1,7 @@
--- name: Test :one
-select * from Demo
-where txt ~~ '%' || sqlc.arg('val') || '%';
-
 -- name: Test2 :one
 select * from Demo
-where txt like '%' || sqlc.arg('val') || '%';
+where txt like '%' || sqlc.arg('val')::text || '%';
 
 -- name: Test3 :one
 select * from Demo
-where txt like concat('%', sqlc.arg('val'), '%');
+where txt like concat('%', sqlc.arg('val')::text, '%');