core: address review — move shim/DDL apply out of engine and compiler

Move pluginCatalogFromCore into a new internal/core/shim package as
PluginCatalog. Move the engine-neutral DDL apply into a new
internal/core/schema package and have the compiler call it directly, so
no clickhouse-specific code remains in the schema loading loop. Push the
ClickHouse type unwrapping into the engine's column conversion so the
core schema apply only sees canonical scalar types. Rename the core
compile path file to parse_core.go. Remove the unit tests in favor of
end-to-end coverage.

Author: kyleconroy

internal/cmd/shim.go

@@ -4,7 +4,7 @@ import (
 	"github.com/sqlc-dev/sqlc/internal/compiler"
 	"github.com/sqlc-dev/sqlc/internal/config"
 	"github.com/sqlc-dev/sqlc/internal/config/convert"
-	"github.com/sqlc-dev/sqlc/internal/core"
+	coreshim "github.com/sqlc-dev/sqlc/internal/core/shim"
 	"github.com/sqlc-dev/sqlc/internal/info"
 	"github.com/sqlc-dev/sqlc/internal/plugin"
 	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
@@ -227,7 +227,7 @@ func pluginQueryParam(p compiler.Parameter) *plugin.Parameter {
 func codeGenRequest(r *compiler.Result, settings config.CombinedSettings) *plugin.GenerateRequest {
 	var cat *plugin.Catalog
 	if r.CoreCatalog != nil {
-		cat = pluginCatalogFromCore(r.CoreCatalog)
+		cat = coreshim.PluginCatalog(r.CoreCatalog)
 	} else {
 		cat = pluginCatalog(r.Catalog)
 	}
@@ -238,42 +238,3 @@ func codeGenRequest(r *compiler.Result, settings config.CombinedSettings) *plugi
 		SqlcVersion: info.Version,
 	}
 }
-
-func pluginCatalogFromCore(cc *core.Catalog) *plugin.Catalog {
-	var schemas []*plugin.Schema
-
-	namespaces, err := cc.Namespaces()
-	if err != nil {
-		return &plugin.Catalog{DefaultSchema: "public"}
-	}
-	for _, ns := range namespaces {
-		tables, err := cc.TablesInNamespace(ns.OID)
-		if err != nil {
-			continue
-		}
-		var ptables []*plugin.Table
-		for _, cl := range tables {
-			rel := &plugin.Identifier{Schema: ns.Name, Name: cl.Name}
-			cols, err := cc.ClassCodegenColumns(cl.OID)
-			if err != nil {
-				continue
-			}
-			var columns []*plugin.Column
-			for _, col := range cols {
-				columns = append(columns, &plugin.Column{
-					Name:    col.Name,
-					Type:    &plugin.Identifier{Name: col.TypeName},
-					NotNull: col.NotNull,
-					Table:   rel,
-				})
-			}
-			ptables = append(ptables, &plugin.Table{Rel: rel, Columns: columns})
-		}
-		schemas = append(schemas, &plugin.Schema{Name: ns.Name, Tables: ptables})
-	}
-
-	return &plugin.Catalog{
-		DefaultSchema: "public",
-		Schemas:       schemas,
-	}
-}

internal/compiler/compile.go

@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/sqlc-dev/sqlc/internal/engine/clickhouse"
+	coreschema "github.com/sqlc-dev/sqlc/internal/core/schema"
 	"github.com/sqlc-dev/sqlc/internal/migrations"
 	"github.com/sqlc-dev/sqlc/internal/multierr"
 	"github.com/sqlc-dev/sqlc/internal/opts"
@@ -58,7 +58,7 @@ func (c *Compiler) parseCatalog(schemas []string) error {
 
 		if c.coreCatalog != nil {
 			for i := range stmts {
-				if err := clickhouse.Apply(c.coreCatalog, stmts[i].Raw); err != nil {
+				if err := coreschema.Apply(c.coreCatalog, stmts[i].Raw); err != nil {
 					merr.Add(filename, contents, stmts[i].Pos(), err)
 					continue
 				}