sqlite: fixed sqlite column type override

We should not assume that a table has a default schema name in the override config. Because different sql databases can have different default schemas. Fixes: sqlc-dev#1985 Signed-off-by: David Anderson <[email protected]>
danderson · May 7, 2023 · 6aeafc2 · 6aeafc2
1 parent c13b156
commit 6aeafc2
Show file tree

Hide file tree

Showing 17 changed files with 260 additions and 2 deletions.
diff --git a/internal/cmd/shim.go b/internal/cmd/shim.go
@@ -19,7 +19,7 @@ func pluginOverride(o config.Override) *plugin.Override {
 		colParts := strings.Split(o.Column, ".")
 		switch len(colParts) {
 		case 2:
-			table.Schema = "public"
+			//table.Schema = "public"
 			table.Name = colParts[0]
 			column = colParts[1]
 		case 3:

diff --git a/internal/codegen/sdk/sdk.go b/internal/codegen/sdk/sdk.go
@@ -32,7 +32,7 @@ func Matches(o *plugin.Override, n *plugin.Identifier, defaultSchema string) boo
 	if o.Table.Catalog != "" && !MatchString(o.Table.Catalog, n.Catalog) {
 		return false
 	}
-	if o.Table.Schema == "" && schema != "" {
+	if o.Table.Schema == "" && n.Schema != "" {
 		return false
 	}
 	if o.Table.Schema != "" && !MatchString(o.Table.Schema, schema) {

diff --git a/internal/endtoend/testdata/overrides/sqlite/go/db.go b/internal/endtoend/testdata/overrides/sqlite/go/db.go
diff --git a/internal/endtoend/testdata/overrides/sqlite/go/models.go b/internal/endtoend/testdata/overrides/sqlite/go/models.go
diff --git a/internal/endtoend/testdata/overrides/sqlite/query.sql b/internal/endtoend/testdata/overrides/sqlite/query.sql
@@ -0,0 +1 @@
+SELECT 1;
diff --git a/internal/endtoend/testdata/overrides/sqlite/schema.sql b/internal/endtoend/testdata/overrides/sqlite/schema.sql
@@ -0,0 +1,5 @@
+CREATE TABLE foo (
+    other     text NOT NULL,
+    total     bigint NOT NULL,
+    retyped   text NOT NULL
+);
diff --git a/internal/endtoend/testdata/overrides/sqlite/sqlc.json b/internal/endtoend/testdata/overrides/sqlite/sqlc.json
@@ -0,0 +1,18 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "go",
+      "name": "override",
+      "engine": "sqlite",
+      "schema": "schema.sql",
+      "queries": "query.sql",
+      "overrides": [
+        {
+          "go_type": "github.com/kyleconroy/sqlc-testdata/pkg.CustomType",
+          "column": "foo.retyped"
+        }
+      ]
+    }
+  ]
+}
diff --git a/internal/endtoend/testdata/overrides_go_struct_tags/sqlite/go/db.go b/internal/endtoend/testdata/overrides_go_struct_tags/sqlite/go/db.go
diff --git a/internal/endtoend/testdata/overrides_go_struct_tags/sqlite/go/models.go b/internal/endtoend/testdata/overrides_go_struct_tags/sqlite/go/models.go
diff --git a/internal/endtoend/testdata/overrides_go_struct_tags/sqlite/query.sql b/internal/endtoend/testdata/overrides_go_struct_tags/sqlite/query.sql
@@ -0,0 +1 @@
+SELECT 1;
diff --git a/internal/endtoend/testdata/overrides_go_struct_tags/sqlite/schema.sql b/internal/endtoend/testdata/overrides_go_struct_tags/sqlite/schema.sql
@@ -0,0 +1,14 @@
+CREATE TABLE foo (
+    other     text NOT NULL,
+    tagged    text NOT NULL
+);
+
+CREATE TABLE bar (
+    other          text NOT NULL,
+    also_tagged    text NOT NULL
+);
+
+CREATE TABLE baz (
+    other          text NOT NULL,
+    also_tagged    text NOT NULL
+);
diff --git a/internal/endtoend/testdata/overrides_go_struct_tags/sqlite/sqlc.json b/internal/endtoend/testdata/overrides_go_struct_tags/sqlite/sqlc.json
@@ -0,0 +1,22 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "go",
+      "name": "override",
+      "engine": "sqlite",
+      "schema": "schema.sql",
+      "queries": "query.sql",
+      "overrides": [
+        {
+          "go_struct_tag": "a:\"b\" x:\"y,z\"",
+          "column": "foo.tagged"
+        },
+        {
+          "go_struct_tag": "also:\"tagged\"",
+          "column": "*.also_tagged"
+        }
+      ]
+    }
+  ]
+}
diff --git a/internal/endtoend/testdata/overrides_go_types/sqlite/go/db.go b/internal/endtoend/testdata/overrides_go_types/sqlite/go/db.go
diff --git a/internal/endtoend/testdata/overrides_go_types/sqlite/go/models.go b/internal/endtoend/testdata/overrides_go_types/sqlite/go/models.go
diff --git a/internal/endtoend/testdata/overrides_go_types/sqlite/query.sql b/internal/endtoend/testdata/overrides_go_types/sqlite/query.sql
@@ -0,0 +1 @@
+SELECT 1;
diff --git a/internal/endtoend/testdata/overrides_go_types/sqlite/schema.sql b/internal/endtoend/testdata/overrides_go_types/sqlite/schema.sql
@@ -0,0 +1,17 @@
+CREATE TABLE foo (
+    other     text NOT NULL,
+    total     bigint NOT NULL,
+    retyped   text NOT NULL
+);
+
+CREATE TABLE bar (
+    other          text NOT NULL,
+    total          bigint NOT NULL,
+    also_retyped   text NOT NULL
+);
+
+CREATE TABLE baz (
+    other          text NOT NULL,
+    total          bigint NOT NULL,
+    also_retyped   text NOT NULL
+);
diff --git a/internal/endtoend/testdata/overrides_go_types/sqlite/sqlc.json b/internal/endtoend/testdata/overrides_go_types/sqlite/sqlc.json
@@ -0,0 +1,22 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "go",
+      "name": "override",
+      "engine": "sqlite",
+      "schema": "schema.sql",
+      "queries": "query.sql",
+      "overrides": [
+        {
+          "go_type": "github.com/kyleconroy/sqlc-testdata/pkg.CustomType",
+          "column": "foo.retyped"
+        },
+        {
+          "go_type": "github.com/kyleconroy/sqlc-testdata/pkg.CustomType",
+          "column": "*.also_retyped"
+        }
+      ]
+    }
+  ]
+}