core: move catalog SQL into a catalogdef package, export Schema

Extract schema.sql and query.sql from internal/core (and catalogdb) into
a dedicated internal/core/catalogdef package that owns the SQL defining
sqlc's catalog and embeds the schema (catalogdef.Schema). sqlc reads its
schema and queries from catalogdef and still generates the querier into
catalogdb, keeping SQL sources separate from generated code.

core/catalog.go now builds its in-memory catalog from catalogdef.Schema
instead of embedding schema.sql itself, so the DDL used at runtime and the
schema fed to codegen are one source of truth.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01XTGxNHW6v1S1YyC9FDSgrK

Author: kyleconroy

internal/core/catalog.go

@@ -8,30 +8,26 @@ package core
 
 import (
 	"database/sql"
-	_ "embed"
 	"fmt"
 
 	"github.com/sqlc-dev/sqlc/internal/core/catalogdb"
+	"github.com/sqlc-dev/sqlc/internal/core/catalogdef"
 
 	_ "modernc.org/sqlite"
 )
 
-// The catalogdb package is generated by running sqlc against this
-// package's own schema.sql and catalogdb/query.sql — sqlc analyzing
-// sqlc's catalog. Regenerate with `go generate ./internal/core/...`.
+// The catalogdb package is generated by running sqlc against the SQL in
+// catalogdef (schema.sql + query.sql) — sqlc analyzing sqlc's catalog.
+// Regenerate with `go generate ./internal/core/...`.
 //
 //go:generate go run github.com/sqlc-dev/sqlc/cmd/sqlc generate
 
-//go:embed schema.sql
-var ddl string
-
 // Catalog is an in-memory SQLite database that stores schema metadata in
 // sql_* tables modeled after PostgreSQL's system catalogs.
 //
-// Queries against the sql_* tables are increasingly served by the
-// sqlc-generated catalogdb.Queries (see catalogdb/query.sql) rather than
-// hand-written SQL — sqlc analyzing sqlc's own catalog. Methods not yet
-// migrated fall back to the raw db handle.
+// Queries against the sql_* tables are served by the sqlc-generated
+// catalogdb.Queries (compiled from catalogdef/query.sql) — sqlc analyzing
+// sqlc's own catalog.
 type Catalog struct {
 	db *sql.DB
 	q  *catalogdb.Queries
@@ -55,7 +51,7 @@ func New(opts ...Option) (*Catalog, error) {
 	if err != nil {
 		return nil, fmt.Errorf("core: open catalog: %w", err)
 	}
-	if _, err := db.Exec(ddl); err != nil {
+	if _, err := db.Exec(catalogdef.Schema); err != nil {
 		db.Close()
 		return nil, fmt.Errorf("core: init schema: %w", err)
 	}

internal/core/catalogdef/embed.go

@@ -0,0 +1,14 @@
+// Package catalogdef holds the SQL that defines sqlc's internal catalog:
+// schema.sql (the sql_* table definitions) and query.sql (the queries
+// against them). Both are the input to sqlc's own code generation — sqlc
+// analyzing sqlc's catalog — and schema.sql is embedded here so the core
+// package builds its in-memory catalog from the same source of truth that
+// codegen reads.
+package catalogdef
+
+import _ "embed"
+
+// Schema is the DDL that creates the sql_* catalog tables.
+//
+//go:embed schema.sql
+var Schema string

internal/core/catalogdb/query.sql internal/core/catalogdef/query.sqlinternal/core/catalogdb/query.sql renamed to internal/core/catalogdef/query.sql

@@ -3,8 +3,8 @@
   "sql": [
     {
       "engine": "sqlite",
-      "schema": "schema.sql",
-      "queries": "catalogdb/query.sql",
+      "schema": "catalogdef/schema.sql",
+      "queries": "catalogdef/query.sql",
       "gen": {
         "go": {
           "package": "catalogdb",