test(endtoend): Split shema and queries

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"
     }
   ]

internal/endtoend/testdata/alias/postgresql/stdlib/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/stdlib/schema.sql

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

internal/endtoend/testdata/alias/postgresql/stdlib/sqlc.json

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

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

@@ -1,5 +1,3 @@
-CREATE TABLE bar (id integer NOT NULL PRIMARY KEY AUTOINCREMENT);
-
 -- name: AliasBar :exec
 DELETE FROM bar AS b
 WHERE b.id = ?;

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

@@ -0,0 +1,2 @@
+CREATE TABLE bar (id integer NOT NULL PRIMARY KEY AUTOINCREMENT);
+

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

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

internal/endtoend/testdata/any/pgx/v4/query.sql

@@ -1,5 +1,3 @@
-CREATE TABLE bar (id bigserial not null);
-
 -- name: Any :many
 SELECT id
 FROM bar

internal/endtoend/testdata/any/pgx/v4/schema.sql

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

internal/endtoend/testdata/any/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/any/pgx/v5/query.sql

@@ -1,5 +1,3 @@
-CREATE TABLE bar (id bigserial not null);
-
 -- name: Any :many
 SELECT id
 FROM bar

internal/endtoend/testdata/any/pgx/v5/schema.sql

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

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

internal/endtoend/testdata/any/stdlib/query.sql

@@ -1,5 +1,3 @@
-CREATE TABLE bar (id bigserial not null);
-
 -- name: Any :many
 SELECT id
 FROM bar

internal/endtoend/testdata/any/stdlib/schema.sql

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

internal/endtoend/testdata/any/stdlib/sqlc.json

@@ -4,7 +4,7 @@
     {
       "path": "go",
       "name": "querytest",
-      "schema": "query.sql",
+      "schema": "schema.sql",
       "queries": "query.sql"
     }
   ]

internal/endtoend/testdata/array_in/pgx/v4/query.sql

@@ -1,5 +1,3 @@
-CREATE TABLE bar (id serial not null);
-
 -- name: In :many
 SELECT *
 FROM bar

internal/endtoend/testdata/array_in/pgx/v4/schema.sql

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

internal/endtoend/testdata/array_in/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/array_in/pgx/v5/query.sql

@@ -1,5 +1,3 @@
-CREATE TABLE bar (id serial not null);
-
 -- name: In :many
 SELECT *
 FROM bar

internal/endtoend/testdata/array_in/pgx/v5/schema.sql

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

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

internal/endtoend/testdata/array_in/stdlib/query.sql

@@ -1,5 +1,3 @@
-CREATE TABLE bar (id serial not null);
-
 -- name: In :many
 SELECT *
 FROM bar

internal/endtoend/testdata/array_in/stdlib/schema.sql

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

internal/endtoend/testdata/array_in/stdlib/sqlc.json

@@ -4,7 +4,7 @@
     {
       "path": "go",
       "name": "querytest",
-      "schema": "query.sql",
+      "schema": "schema.sql",
       "queries": "query.sql"
     }
   ]

internal/endtoend/testdata/array_text/pgx/v4/query.sql

@@ -1,4 +1,2 @@
-CREATE TABLE bar (tags text[] not null);
-
 -- name: TextArray :many
 SELECT * FROM bar;

internal/endtoend/testdata/array_text/pgx/v4/schema.sql

@@ -0,0 +1,2 @@
+CREATE TABLE bar (tags text[] not null);
+

internal/endtoend/testdata/array_text/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/array_text/pgx/v5/query.sql

@@ -1,4 +1,2 @@
-CREATE TABLE bar (tags text[] not null);
-
 -- name: TextArray :many
 SELECT * FROM bar;

internal/endtoend/testdata/array_text/pgx/v5/schema.sql

@@ -0,0 +1,2 @@
+CREATE TABLE bar (tags text[] not null);
+

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

internal/endtoend/testdata/array_text/stdlib/query.sql

@@ -1,4 +1,2 @@
-CREATE TABLE bar (tags text[] not null);
-
 -- name: TextArray :many
 SELECT * FROM bar;

internal/endtoend/testdata/array_text/stdlib/schema.sql

@@ -0,0 +1,2 @@
+CREATE TABLE bar (tags text[] not null);
+

internal/endtoend/testdata/array_text/stdlib/sqlc.json

@@ -4,7 +4,7 @@
     {
       "path": "go",
       "name": "querytest",
-      "schema": "query.sql",
+      "schema": "schema.sql",
       "queries": "query.sql"
     }
   ]

internal/endtoend/testdata/array_text_join/pgx/v4/query.sql

@@ -1,6 +1,3 @@
-CREATE TABLE foo (id text not null, bar text not null);
-CREATE TABLE bar (id text not null, info text[] not null);
-
 -- name: JoinTextArray :many
 SELECT bar.info
 FROM foo

internal/endtoend/testdata/array_text_join/pgx/v4/schema.sql

@@ -0,0 +1,3 @@
+CREATE TABLE foo (id text not null, bar text not null);
+CREATE TABLE bar (id text not null, info text[] not null);
+

internal/endtoend/testdata/array_text_join/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/array_text_join/pgx/v5/query.sql

@@ -1,6 +1,3 @@
-CREATE TABLE foo (id text not null, bar text not null);
-CREATE TABLE bar (id text not null, info text[] not null);
-
 -- name: JoinTextArray :many
 SELECT bar.info
 FROM foo

internal/endtoend/testdata/array_text_join/pgx/v5/schema.sql

@@ -0,0 +1,3 @@
+CREATE TABLE foo (id text not null, bar text not null);
+CREATE TABLE bar (id text not null, info text[] not null);
+

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

internal/endtoend/testdata/array_text_join/stdlib/query.sql

@@ -1,6 +1,3 @@
-CREATE TABLE foo (id text not null, bar text not null);
-CREATE TABLE bar (id text not null, info text[] not null);
-
 -- name: JoinTextArray :many
 SELECT bar.info
 FROM foo

internal/endtoend/testdata/array_text_join/stdlib/schema.sql

@@ -0,0 +1,3 @@
+CREATE TABLE foo (id text not null, bar text not null);
+CREATE TABLE bar (id text not null, info text[] not null);
+

internal/endtoend/testdata/array_text_join/stdlib/sqlc.json

@@ -4,7 +4,7 @@
     {
       "path": "go",
       "name": "querytest",
-      "schema": "query.sql",
+      "schema": "schema.sql",
       "queries": "query.sql"
     }
   ]

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

@@ -1,6 +1,3 @@
-CREATE SCHEMA myschema;
-CREATE TABLE myschema.foo (a text, b integer);
-
 -- name: InsertValues :batchone
 INSERT INTO myschema.foo (a, b)
 VALUES ($1, $2)

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

@@ -0,0 +1,3 @@
+CREATE SCHEMA myschema;
+CREATE TABLE myschema.foo (a text, b integer);
+

internal/endtoend/testdata/batch/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/batch/postgresql/pgx/v5/query.sql

@@ -1,6 +1,3 @@
-CREATE SCHEMA myschema;
-CREATE TABLE myschema.foo (a text, b integer);
-
 -- name: InsertValues :batchone
 INSERT INTO myschema.foo (a, b)
 VALUES ($1, $2)

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

@@ -0,0 +1,3 @@
+CREATE SCHEMA myschema;
+CREATE TABLE myschema.foo (a text, b integer);
+

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

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

@@ -1,6 +1,3 @@
-CREATE SCHEMA myschema;
-CREATE TABLE myschema.foo (a text, b integer);
-
 -- name: InsertValues :batchone
 INSERT INTO myschema.foo (a, b)
 VALUES ($1, $2)

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

@@ -0,0 +1,3 @@
+CREATE SCHEMA myschema;
+CREATE TABLE myschema.foo (a text, b integer);
+

internal/endtoend/testdata/batch_imports/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/batch_imports/postgresql/pgx/v5/query.sql

@@ -1,6 +1,3 @@
-CREATE SCHEMA myschema;
-CREATE TABLE myschema.foo (a text, b integer);
-
 -- name: InsertValues :batchone
 INSERT INTO myschema.foo (a, b)
 VALUES ($1, $2)

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

@@ -0,0 +1,3 @@
+CREATE SCHEMA myschema;
+CREATE TABLE myschema.foo (a text, b integer);
+