test(endtoend): Split shema and queries (#2803)

* test(endtoend): Split schema and queries

For all end-to-end tests, split the schema from the queries. This change
makes it easier to load the expected schema into a database for
validation and testing.

* Remove workaround from ddl_test.go

* Fix more tests

Author: kyleconroy

internal/endtoend/ddl_test.go

@@ -92,11 +92,8 @@ func TestValidSchema(t *testing.T) {
 					if err != nil {
 						t.Fatalf("%s: %s", f, err)
 					}
-					// TODO: Split schema into separate files
-					before, _, _ := strings.Cut(string(contents), "-- name:")
-					before, _, _ = strings.Cut(before, "/* name:")
 					// Support loading pg_dump SQL files
-					before = strings.ReplaceAll(before, "CREATE SCHEMA public;", "CREATE SCHEMA IF NOT EXISTS public;")
+					before := strings.ReplaceAll(string(contents), "CREATE SCHEMA public;", "CREATE SCHEMA IF NOT EXISTS public;")
 					sqls = append(sqls, migrations.RemoveRollbackStatements(before))
 				}
 

internal/endtoend/testdata/alias/mysql/query.sql

@@ -1,5 +1,3 @@
-CREATE TABLE bar (id serial not null);
-
 -- name: AliasBar :exec
 DELETE FROM bar b
 WHERE b.id = ?;

internal/endtoend/testdata/alias/mysql/schema.sql

@@ -0,0 +1,2 @@
+CREATE TABLE bar (id serial not null);
+

internal/endtoend/testdata/alias/mysql/sqlc.json

@@ -5,7 +5,7 @@
       "path": "go",
       "engine": "mysql",
       "name": "querytest",
-      "schema": "query.sql",
+      "schema": "schema.sql",
       "queries": "query.sql"
     }
   ]

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

@@ -1,5 +1,3 @@
-CREATE TABLE bar (id serial not null);
-
 -- name: AliasBar :exec
 DELETE FROM bar b
 WHERE b.id = $1;

internal/endtoend/testdata/alias/postgresql/pgx/v4/schema.sql

@@ -0,0 +1,2 @@
+CREATE TABLE bar (id serial not null);
+

internal/endtoend/testdata/alias/postgresql/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"
     }
   ]

internal/endtoend/testdata/alias/postgresql/pgx/v5/query.sql

@@ -1,5 +1,3 @@
-CREATE TABLE bar (id serial not null);
-
 -- name: AliasBar :exec
 DELETE FROM bar b
 WHERE b.id = $1;

internal/endtoend/testdata/alias/postgresql/pgx/v5/schema.sql

@@ -0,0 +1,2 @@
+CREATE TABLE bar (id serial not null);
+

internal/endtoend/testdata/alias/postgresql/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"
     }
   ]