Fix more tests

kyleconroy · kyleconroy · commit df65f643640b · 2023-10-09T18:15:14.000-07:00
diff --git a/internal/compiler/analyze.go b/internal/compiler/analyze.go
@@ -43,7 +43,6 @@ func convertColumn(c analyzer.Column) *Column {
 	}
 }
 
-// TODO: Dry this up
 func combineAnalysis(prev *analysis, a *analyzer.Analysis) *analysis {
 	var cols []*Column
 	for _, c := range a.Columns {
diff --git a/internal/compiler/parse.go b/internal/compiler/parse.go
@@ -57,7 +57,7 @@ func (c *Compiler) parseQuery(stmt ast.Node, src string, o opts.Parser) (*Query,
 		// We expect inference to fail sometimes
 		inference, _ := c.inferQuery(raw, rawSQL)
 
-		var query string
+		query := rawSQL
 		var ps *named.ParamSet
 		if inference != nil {
 			if inference.Query != "" {
diff --git a/internal/endtoend/testdata/pg_generate_series/postgresql/pgx/v4/exec.json b/internal/endtoend/testdata/pg_generate_series/postgresql/pgx/v4/exec.json
@@ -0,0 +1,3 @@
+{
+  "contexts": ["base"]
+}
diff --git a/internal/endtoend/testdata/pg_generate_series/postgresql/pgx/v4/go/query.sql.go b/internal/endtoend/testdata/pg_generate_series/postgresql/pgx/v4/go/query.sql.go
diff --git a/internal/endtoend/testdata/pg_generate_series/postgresql/pgx/v4/query.sql b/internal/endtoend/testdata/pg_generate_series/postgresql/pgx/v4/query.sql
@@ -1,2 +1,2 @@
 -- name: GenerateSeries :many
-SELECT generate_series($1::timestamp, $2::timestamp);
+SELECT generate_series($1::timestamp, $2::timestamp, '10 hours');
diff --git a/internal/endtoend/testdata/pg_generate_series/postgresql/pgx/v5/exec.json b/internal/endtoend/testdata/pg_generate_series/postgresql/pgx/v5/exec.json
@@ -0,0 +1,3 @@
+{
+  "contexts": ["base"]
+}
diff --git a/internal/endtoend/testdata/pg_generate_series/postgresql/pgx/v5/go/query.sql.go b/internal/endtoend/testdata/pg_generate_series/postgresql/pgx/v5/go/query.sql.go
diff --git a/internal/endtoend/testdata/pg_generate_series/postgresql/pgx/v5/query.sql b/internal/endtoend/testdata/pg_generate_series/postgresql/pgx/v5/query.sql
@@ -1,2 +1,2 @@
 -- name: GenerateSeries :many
-SELECT generate_series($1::timestamp, $2::timestamp);
+SELECT generate_series($1::timestamp, $2::timestamp, '10 hours');
diff --git a/internal/endtoend/testdata/pg_generate_series/postgresql/stdlib/exec.json b/internal/endtoend/testdata/pg_generate_series/postgresql/stdlib/exec.json
@@ -0,0 +1,3 @@
+{
+  "contexts": ["base"]
+}
diff --git a/internal/endtoend/testdata/pg_generate_series/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/pg_generate_series/postgresql/stdlib/go/query.sql.go
diff --git a/internal/endtoend/testdata/pg_generate_series/postgresql/stdlib/query.sql b/internal/endtoend/testdata/pg_generate_series/postgresql/stdlib/query.sql
@@ -1,2 +1,2 @@
 -- name: GenerateSeries :many
-SELECT generate_series($1::timestamp, $2::timestamp);
+SELECT generate_series($1::timestamp, $2::timestamp, '10 hours');
diff --git a/internal/endtoend/testdata/query_parameter_limit/-1/python_postgresql/query.sql b/internal/endtoend/testdata/query_parameter_limit/-1/python_postgresql/query.sql
@@ -1,5 +1,3 @@
-CREATE TABLE bar (id serial not null, name text not null, primary key (id));
-
 -- name: DeleteBarByID :execrows
 DELETE FROM bar WHERE id = $1;
 
diff --git a/internal/endtoend/testdata/query_parameter_limit/-1/python_postgresql/schema.sql b/internal/endtoend/testdata/query_parameter_limit/-1/python_postgresql/schema.sql
@@ -0,0 +1 @@
+CREATE TABLE bar (id serial not null, name text not null, primary key (id));
diff --git a/internal/endtoend/testdata/query_parameter_limit/-1/python_postgresql/sqlc.json b/internal/endtoend/testdata/query_parameter_limit/-1/python_postgresql/sqlc.json
@@ -11,7 +11,7 @@
   ],
   "sql": [
     {
-      "schema": "query.sql",
+      "schema": "schema.sql",
       "queries": "query.sql",
       "engine": "postgresql",
       "codegen": [
diff --git a/internal/endtoend/testdata/relation_does_not_exist/postgresql/schema.sql b/internal/endtoend/testdata/relation_does_not_exist/postgresql/schema.sql
diff --git a/internal/endtoend/testdata/relation_does_not_exist/postgresql/sqlc.json b/internal/endtoend/testdata/relation_does_not_exist/postgresql/sqlc.json
@@ -4,7 +4,7 @@
     {
       "path": "go",
       "name": "querytest",
-      "schema": "query.sql",
+      "schema": "schema.sql",
       "queries": "query.sql"
     }
   ]
diff --git a/internal/endtoend/testdata/relation_does_not_exist/postgresql/stderr.txt b/internal/endtoend/testdata/relation_does_not_exist/postgresql/stderr.txt
@@ -3,3 +3,9 @@ query.sql:1:1: relation "nonexisting_relation" does not exist
 query.sql:5:1: relation "nonexisting_relation" does not exist
 query.sql:8:1: relation "nonexisting_relation" does not exist
 query.sql:11:1: relation "nonexisting_relation" does not exist
+---
+# package querytest
+query.sql:2:15: relation "nonexisting_relation" does not exist
+query.sql:5:15: relation "nonexisting_relation" does not exist
+query.sql:8:8: relation "nonexisting_relation" does not exist
+query.sql:11:13: relation "nonexisting_relation" does not exist
diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/go/query.sql.go b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/go/query.sql.go
diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/query.sql b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/query.sql
@@ -20,6 +20,6 @@ LIMIT   1;
 
 -- name: SetDefaultName :one
 UPDATE  authors
-SET     name = "Default Name"
+SET     name = 'Default Name'
 WHERE   id = $1
 RETURNING id;
diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/query.sql.go b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/query.sql.go
diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/query.sql b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/query.sql
@@ -20,6 +20,6 @@ LIMIT   1;
 
 -- name: SetDefaultName :one
 UPDATE  authors
-SET     name = "Default Name"
+SET     name = 'Default Name'
 WHERE   id = $1
 RETURNING id;
diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/go/query.sql.go
diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/query.sql b/internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/query.sql
@@ -20,6 +20,6 @@ LIMIT   1;
 
 -- name: SetDefaultName :one
 UPDATE  authors
-SET     name = "Default Name"
+SET     name = 'Default Name'
 WHERE   id = $1
 RETURNING id;
diff --git a/internal/endtoend/testdata/sqlc_arg_invalid/postgresql/query.sql b/internal/endtoend/testdata/sqlc_arg_invalid/postgresql/query.sql
@@ -1,8 +1,3 @@
-CREATE TABLE users (
-    id         serial,
-    first_name text not null
-);
-
 -- name: WrongFunc :one
 select id, first_name from users where id = sqlc.argh(target_id);
 
diff --git a/internal/endtoend/testdata/sqlc_arg_invalid/postgresql/schema.sql b/internal/endtoend/testdata/sqlc_arg_invalid/postgresql/schema.sql
@@ -0,0 +1,4 @@
+CREATE TABLE users (
+    id         serial,
+    first_name text not null
+);
diff --git a/internal/endtoend/testdata/sqlc_arg_invalid/postgresql/sqlc.json b/internal/endtoend/testdata/sqlc_arg_invalid/postgresql/sqlc.json
@@ -4,7 +4,7 @@
     {
       "name": "querytest",
       "path": "go",
-      "schema": "query.sql",
+      "schema": "schema.sql",
       "queries": "query.sql",
       "engine": "postgresql"
     }
diff --git a/internal/endtoend/testdata/sqlc_arg_invalid/postgresql/stderr.txt b/internal/endtoend/testdata/sqlc_arg_invalid/postgresql/stderr.txt
@@ -4,3 +4,10 @@ query.sql:10:45: expected 1 parameter to sqlc.arg; got 2
 query.sql:13:45: expected 1 parameter to sqlc.arg; got 0
 query.sql:16:45: expected parameter to sqlc.arg to be string or reference; got *ast.FuncCall
 query.sql:19:45: expected parameter to sqlc.arg to be string or reference; got *ast.ParamRef
+---
+# package querytest
+query.sql:1:1: function "sqlc.argh" does not exist
+query.sql:5:45: expected 1 parameter to sqlc.arg; got 2
+query.sql:8:45: expected 1 parameter to sqlc.arg; got 0
+query.sql:11:45: expected parameter to sqlc.arg to be string or reference; got *ast.FuncCall
+query.sql:14:45: expected parameter to sqlc.arg to be string or reference; got *ast.ParamRef

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,6 @@ func convertColumn(c analyzer.Column) *Column {`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
`46`		`-// TODO: Dry this up`
`47`	`46`	`func combineAnalysis(prev analysis, a analyzer.Analysis) *analysis {`
`48`	`47`	`var cols []*Column`
`49`	`48`	`for _, c := range a.Columns {`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`-- name: GenerateSeries :many`
`2`		`-SELECT generate_series($1::timestamp, $2::timestamp);`
	`2`	`+SELECT generate_series($1::timestamp, $2::timestamp, '10 hours');`