Fix more tests

kyleconroy · kyleconroy · commit 18c7acf3fb35 · 2023-10-09T18:20:45.000-07:00
diff --git a/internal/endtoend/testdata/missing_semicolon/pgx/v4/query.sql b/internal/endtoend/testdata/missing_semicolon/pgx/v4/query.sql
@@ -1,5 +1,3 @@
-CREATE TABLE foo (email text not null);
-
 -- name: FirstQuery :many
 SELECT * FROM foo;
 
diff --git a/internal/endtoend/testdata/missing_semicolon/pgx/v4/schema.sql b/internal/endtoend/testdata/missing_semicolon/pgx/v4/schema.sql
@@ -0,0 +1 @@
+CREATE TABLE foo (email text not null);
diff --git a/internal/endtoend/testdata/missing_semicolon/pgx/v4/sqlc.json b/internal/endtoend/testdata/missing_semicolon/pgx/v4/sqlc.json
@@ -6,7 +6,7 @@
       "engine": "postgresql",
       "sql_package": "pgx/v4",
       "name": "querytest",
-      "schema": "query.sql",
+      "schema": "schema.sql",
       "queries": "query.sql"
     }
   ]
diff --git a/internal/endtoend/testdata/missing_semicolon/pgx/v4/stderr.txt b/internal/endtoend/testdata/missing_semicolon/pgx/v4/stderr.txt
@@ -1,2 +1,2 @@
 # package querytest
-query.sql:7:1: missing semicolon at end of file
+query.sql:5:1: missing semicolon at end of file
diff --git a/internal/endtoend/testdata/missing_semicolon/pgx/v5/query.sql b/internal/endtoend/testdata/missing_semicolon/pgx/v5/query.sql
@@ -1,5 +1,3 @@
-CREATE TABLE foo (email text not null);
-
 -- name: FirstQuery :many
 SELECT * FROM foo;
 
diff --git a/internal/endtoend/testdata/missing_semicolon/pgx/v5/schema.sql b/internal/endtoend/testdata/missing_semicolon/pgx/v5/schema.sql
@@ -0,0 +1 @@
+CREATE TABLE foo (email text not null);
diff --git a/internal/endtoend/testdata/missing_semicolon/pgx/v5/sqlc.json b/internal/endtoend/testdata/missing_semicolon/pgx/v5/sqlc.json
@@ -6,7 +6,7 @@
       "engine": "postgresql",
       "sql_package": "pgx/v5",
       "name": "querytest",
-      "schema": "query.sql",
+      "schema": "schema.sql",
       "queries": "query.sql"
     }
   ]
diff --git a/internal/endtoend/testdata/missing_semicolon/pgx/v5/stderr.txt b/internal/endtoend/testdata/missing_semicolon/pgx/v5/stderr.txt
@@ -1,2 +1,2 @@
 # package querytest
-query.sql:7:1: missing semicolon at end of file
+query.sql:5:1: missing semicolon at end of file
diff --git a/internal/endtoend/testdata/missing_semicolon/stdlib/query.sql b/internal/endtoend/testdata/missing_semicolon/stdlib/query.sql
@@ -1,5 +1,3 @@
-CREATE TABLE foo (email text not null);
-
 -- name: FirstQuery :many
 SELECT * FROM foo;
 
diff --git a/internal/endtoend/testdata/missing_semicolon/stdlib/schema.sql b/internal/endtoend/testdata/missing_semicolon/stdlib/schema.sql
@@ -0,0 +1 @@
+CREATE TABLE foo (email text not null);
diff --git a/internal/endtoend/testdata/missing_semicolon/stdlib/sqlc.json b/internal/endtoend/testdata/missing_semicolon/stdlib/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/missing_semicolon/stdlib/stderr.txt b/internal/endtoend/testdata/missing_semicolon/stdlib/stderr.txt
@@ -1,2 +1,2 @@
 # package querytest
-query.sql:7:1: missing semicolon at end of file
+query.sql:5:1: missing semicolon at end of file
diff --git a/internal/endtoend/testdata/order_by_non_existing_column/mysql/query.sql b/internal/endtoend/testdata/order_by_non_existing_column/mysql/query.sql
@@ -1,8 +1,3 @@
--- Example queries for sqlc
-CREATE TABLE authors (
-  id   INT
-);
-
 -- name: ListAuthors :many
 SELECT id FROM authors
 ORDER BY adfadsf;
diff --git a/internal/endtoend/testdata/order_by_non_existing_column/mysql/schema.sql b/internal/endtoend/testdata/order_by_non_existing_column/mysql/schema.sql
@@ -0,0 +1,5 @@
+-- Example queries for sqlc
+CREATE TABLE authors (
+  id   INT
+);
+
diff --git a/internal/endtoend/testdata/order_by_non_existing_column/mysql/sqlc.yaml b/internal/endtoend/testdata/order_by_non_existing_column/mysql/sqlc.yaml
@@ -3,5 +3,5 @@ packages:
   - path: "go"
     name: "querytest"
     engine: "postgresql"
-    schema: "query.sql"
+    schema: "schema.sql"
     queries: "query.sql"
diff --git a/internal/endtoend/testdata/order_by_non_existing_column/postgresql/query.sql b/internal/endtoend/testdata/order_by_non_existing_column/postgresql/query.sql
@@ -1,8 +1,3 @@
--- Example queries for sqlc
-CREATE TABLE authors (
-  id   INT
-);
-
 -- name: ListAuthors :many
 SELECT id FROM authors
 ORDER BY adfadsf;
diff --git a/internal/endtoend/testdata/order_by_non_existing_column/postgresql/schema.sql b/internal/endtoend/testdata/order_by_non_existing_column/postgresql/schema.sql
@@ -0,0 +1,5 @@
+-- Example queries for sqlc
+CREATE TABLE authors (
+  id   INT
+);
+
diff --git a/internal/endtoend/testdata/order_by_non_existing_column/postgresql/sqlc.yaml b/internal/endtoend/testdata/order_by_non_existing_column/postgresql/sqlc.yaml
@@ -3,5 +3,5 @@ packages:
   - path: "go"
     name: "querytest"
     engine: "postgresql"
-    schema: "query.sql"
+    schema: "schema.sql"
     queries: "query.sql"
diff --git a/internal/endtoend/testdata/pg_dump/exec.json b/internal/endtoend/testdata/pg_dump/exec.json
@@ -0,0 +1,3 @@
+{
+    "contexts": ["base"]
+}

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-CREATE TABLE foo (email text not null);`
`2`		`-`
`3`	`1`	`-- name: FirstQuery :many`
`4`	`2`	`SELECT * FROM foo;`
`5`	`3`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+CREATE TABLE foo (email text not null);`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`"engine": "postgresql",`
`7`	`7`	`"sql_package": "pgx/v4",`
`8`	`8`	`"name": "querytest",`
`9`		`- "schema": "query.sql",`
	`9`	`+ "schema": "schema.sql",`
`10`	`10`	`"queries": "query.sql"`
`11`	`11`	`}`
`12`	`12`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# package querytest`
`2`		`-query.sql:7:1: missing semicolon at end of file`
	`2`	`+query.sql:5:1: missing semicolon at end of file`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`"engine": "postgresql",`
`7`	`7`	`"sql_package": "pgx/v5",`
`8`	`8`	`"name": "querytest",`
`9`		`- "schema": "query.sql",`
	`9`	`+ "schema": "schema.sql",`
`10`	`10`	`"queries": "query.sql"`
`11`	`11`	`}`
`12`	`12`	`]`