fix: missing import with pointer overrides, solves sqlc-dev#2168 sqlc…

…-dev#2125
ludusrusso · Apr 19, 2023 · 32126cd · 32126cd
1 parent 115c8df
commit 32126cd
Show file tree

Hide file tree

Showing 21 changed files with 324 additions and 1 deletion.
diff --git a/internal/codegen/golang/imports.go b/internal/codegen/golang/imports.go
@@ -68,7 +68,8 @@ func (i *importer) usesType(typ string) bool {
 	for _, strct := range i.Structs {
 		for _, f := range strct.Fields {
 			fType := trimSliceAndPointerPrefix(f.Type)
-			if strings.HasPrefix(fType, typ) {
+			tType := trimSliceAndPointerPrefix(typ)
+			if strings.HasPrefix(fType, tType) {
 				return true
 			}
 		}

diff --git a/internal/endtoend/testdata/overrides_pointers/mysql/go/db.go b/internal/endtoend/testdata/overrides_pointers/mysql/go/db.go
diff --git a/internal/endtoend/testdata/overrides_pointers/mysql/go/models.go b/internal/endtoend/testdata/overrides_pointers/mysql/go/models.go
diff --git a/internal/endtoend/testdata/overrides_pointers/mysql/query.sql b/internal/endtoend/testdata/overrides_pointers/mysql/query.sql
@@ -0,0 +1 @@
+SELECT 1;
diff --git a/internal/endtoend/testdata/overrides_pointers/mysql/schema.sql b/internal/endtoend/testdata/overrides_pointers/mysql/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_pointers/mysql/sqlc.json b/internal/endtoend/testdata/overrides_pointers/mysql/sqlc.json
@@ -0,0 +1,23 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "go",
+      "name": "override",
+      "engine": "mysql",
+      "schema": "schema.sql",
+      "queries": "query.sql",
+      "overrides": [
+        {
+          "go_type": {
+            "import": "test",
+            "type": "Test",
+            "package": "t",
+            "pointer": true
+          },
+          "column": "foo.retyped"
+        }
+      ]
+    }
+  ]
+}
diff --git a/internal/endtoend/testdata/overrides_pointers/postgresql/pgx/v4/go/db.go b/internal/endtoend/testdata/overrides_pointers/postgresql/pgx/v4/go/db.go
diff --git a/internal/endtoend/testdata/overrides_pointers/postgresql/pgx/v4/go/models.go b/internal/endtoend/testdata/overrides_pointers/postgresql/pgx/v4/go/models.go
diff --git a/internal/endtoend/testdata/overrides_pointers/postgresql/pgx/v4/query.sql b/internal/endtoend/testdata/overrides_pointers/postgresql/pgx/v4/query.sql
@@ -0,0 +1 @@
+SELECT 1;
diff --git a/internal/endtoend/testdata/overrides_pointers/postgresql/pgx/v4/schema.sql b/internal/endtoend/testdata/overrides_pointers/postgresql/pgx/v4/schema.sql
@@ -0,0 +1,8 @@
+CREATE TABLE foo (
+    other     text NOT NULL,
+    total     bigint NOT NULL,
+    tags      text[] NOT NULL,
+    byte_seq  bytea NOT NULL,
+    retyped   text NOT NULL,
+    langs     text[]
+);
diff --git a/internal/endtoend/testdata/overrides_pointers/postgresql/pgx/v4/sqlc.json b/internal/endtoend/testdata/overrides_pointers/postgresql/pgx/v4/sqlc.json
@@ -0,0 +1,24 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "go",
+      "engine": "postgresql",
+      "sql_package": "pgx/v4",
+      "name": "override",
+      "schema": "schema.sql",
+      "queries": "query.sql",
+      "overrides": [
+        {
+          "go_type": {
+            "import": "test",
+            "type": "Test",
+            "package": "t",
+            "pointer": true
+          },
+          "column": "foo.langs"
+        }
+      ]
+    }
+  ]
+}
diff --git a/internal/endtoend/testdata/overrides_pointers/postgresql/pgx/v5/go/db.go b/internal/endtoend/testdata/overrides_pointers/postgresql/pgx/v5/go/db.go
diff --git a/internal/endtoend/testdata/overrides_pointers/postgresql/pgx/v5/go/models.go b/internal/endtoend/testdata/overrides_pointers/postgresql/pgx/v5/go/models.go
diff --git a/internal/endtoend/testdata/overrides_pointers/postgresql/pgx/v5/query.sql b/internal/endtoend/testdata/overrides_pointers/postgresql/pgx/v5/query.sql
@@ -0,0 +1 @@
+SELECT 1;
diff --git a/internal/endtoend/testdata/overrides_pointers/postgresql/pgx/v5/schema.sql b/internal/endtoend/testdata/overrides_pointers/postgresql/pgx/v5/schema.sql
@@ -0,0 +1,8 @@
+CREATE TABLE foo (
+    other     text NOT NULL,
+    total     bigint NOT NULL,
+    tags      text[] NOT NULL,
+    byte_seq  bytea NOT NULL,
+    retyped   text NOT NULL,
+    langs     text[]
+);
diff --git a/internal/endtoend/testdata/overrides_pointers/postgresql/pgx/v5/sqlc.json b/internal/endtoend/testdata/overrides_pointers/postgresql/pgx/v5/sqlc.json
@@ -0,0 +1,24 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "go",
+      "engine": "postgresql",
+      "sql_package": "pgx/v5",
+      "name": "override",
+      "schema": "schema.sql",
+      "queries": "query.sql",
+      "overrides": [
+        {
+          "go_type": {
+            "import": "test",
+            "type": "Test",
+            "package": "t",
+            "pointer": true
+          },
+          "column": "foo.langs"
+        }
+      ]
+    }
+  ]
+}
diff --git a/internal/endtoend/testdata/overrides_pointers/postgresql/stdlib/go/db.go b/internal/endtoend/testdata/overrides_pointers/postgresql/stdlib/go/db.go
diff --git a/internal/endtoend/testdata/overrides_pointers/postgresql/stdlib/go/models.go b/internal/endtoend/testdata/overrides_pointers/postgresql/stdlib/go/models.go
diff --git a/internal/endtoend/testdata/overrides_pointers/postgresql/stdlib/query.sql b/internal/endtoend/testdata/overrides_pointers/postgresql/stdlib/query.sql
@@ -0,0 +1 @@
+SELECT 1;
diff --git a/internal/endtoend/testdata/overrides_pointers/postgresql/stdlib/schema.sql b/internal/endtoend/testdata/overrides_pointers/postgresql/stdlib/schema.sql
@@ -0,0 +1,8 @@
+CREATE TABLE foo (
+    other     text NOT NULL,
+    total     bigint NOT NULL,
+    tags      text[] NOT NULL,
+    byte_seq  bytea NOT NULL,
+    retyped   text NOT NULL,
+    langs     text[]
+);
diff --git a/internal/endtoend/testdata/overrides_pointers/postgresql/stdlib/sqlc.json b/internal/endtoend/testdata/overrides_pointers/postgresql/stdlib/sqlc.json
@@ -0,0 +1,23 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "go",
+      "name": "override",
+      "engine": "postgresql",
+      "schema": "schema.sql",
+      "queries": "query.sql",
+      "overrides": [
+        {
+          "go_type": {
+            "import": "test",
+            "type": "Test",
+            "package": "t",
+            "pointer": true
+          },
+          "column": "foo.langs"
+        }
+      ]
+    }
+  ]
+}