fix: Add import statements even if only pointer types exist (#2046)

Author: zaneli

internal/cmd/shim.go

@@ -86,7 +86,7 @@ func pluginGoCode(s config.SQLGo) *plugin.GoCode {
 		EmitResultStructPointers:    s.EmitResultStructPointers,
 		EmitParamsStructPointers:    s.EmitParamsStructPointers,
 		EmitMethodsWithDbArgument:   s.EmitMethodsWithDBArgument,
-    EmitPointersForNullTypes:  s.EmitPointersForNullTypes,
+		EmitPointersForNullTypes:    s.EmitPointersForNullTypes,
 		EmitEnumValidMethod:         s.EmitEnumValidMethod,
 		EmitAllEnumValues:           s.EmitAllEnumValues,
 		JsonTagsCaseStyle:           s.JSONTagsCaseStyle,

internal/codegen/golang/imports.go

@@ -67,7 +67,7 @@ type importer struct {
 func (i *importer) usesType(typ string) bool {
 	for _, strct := range i.Structs {
 		for _, f := range strct.Fields {
-			fType := strings.TrimPrefix(f.Type, "[]")
+			fType := trimSliceAndPointerPrefix(f.Type)
 			if strings.HasPrefix(fType, typ) {
 				return true
 			}
@@ -241,7 +241,7 @@ func (i *importer) interfaceImports() fileImports {
 				}
 			}
 			if !q.Arg.isEmpty() {
-				argType := strings.TrimPrefix(q.Arg.Type(), "[]")
+				argType := trimSliceAndPointerPrefix(q.Arg.Type())
 				if strings.HasPrefix(argType, name) {
 					return true
 				}
@@ -302,27 +302,27 @@ func (i *importer) queryImports(filename string) fileImports {
 			if q.hasRetType() {
 				if q.Ret.EmitStruct() {
 					for _, f := range q.Ret.Struct.Fields {
-						fType := strings.TrimPrefix(f.Type, "[]")
+						fType := trimSliceAndPointerPrefix(f.Type)
 						if strings.HasPrefix(fType, name) {
 							return true
 						}
 					}
 				}
-				retType := strings.TrimPrefix(q.Ret.Type(), "[]")
+				retType := trimSliceAndPointerPrefix(q.Ret.Type())
 				if strings.HasPrefix(retType, name) {
 					return true
 				}
 			}
 			if !q.Arg.isEmpty() {
 				if q.Arg.EmitStruct() {
 					for _, f := range q.Arg.Struct.Fields {
-						fType := strings.TrimPrefix(f.Type, "[]")
+						fType := trimSliceAndPointerPrefix(f.Type)
 						if strings.HasPrefix(fType, name) {
 							return true
 						}
 					}
 				}
-				argType := strings.TrimPrefix(q.Arg.Type(), "[]")
+				argType := trimSliceAndPointerPrefix(q.Arg.Type())
 				if strings.HasPrefix(argType, name) {
 					return true
 				}
@@ -415,27 +415,27 @@ func (i *importer) batchImports() fileImports {
 			if q.hasRetType() {
 				if q.Ret.EmitStruct() {
 					for _, f := range q.Ret.Struct.Fields {
-						fType := strings.TrimPrefix(f.Type, "[]")
+						fType := trimSliceAndPointerPrefix(f.Type)
 						if strings.HasPrefix(fType, name) {
 							return true
 						}
 					}
 				}
-				retType := strings.TrimPrefix(q.Ret.Type(), "[]")
+				retType := trimSliceAndPointerPrefix(q.Ret.Type())
 				if strings.HasPrefix(retType, name) {
 					return true
 				}
 			}
 			if !q.Arg.isEmpty() {
 				if q.Arg.EmitStruct() {
 					for _, f := range q.Arg.Struct.Fields {
-						fType := strings.TrimPrefix(f.Type, "[]")
+						fType := trimSliceAndPointerPrefix(f.Type)
 						if strings.HasPrefix(fType, name) {
 							return true
 						}
 					}
 				}
-				argType := strings.TrimPrefix(q.Arg.Type(), "[]")
+				argType := trimSliceAndPointerPrefix(q.Arg.Type())
 				if strings.HasPrefix(argType, name) {
 					return true
 				}
@@ -456,3 +456,9 @@ func (i *importer) batchImports() fileImports {
 
 	return sortedImports(std, pkg)
 }
+
+func trimSliceAndPointerPrefix(v string) string {
+	v = strings.TrimPrefix(v, "[]")
+	v = strings.TrimPrefix(v, "*")
+	return v
+}

internal/endtoend/testdata/pointer_type_import/postgresql/pgx/v4/go/db.go

@@ -0,0 +1,7 @@
+CREATE TABLE foo (bar date, baz uuid);
+
+-- name: List :many
+SELECT * FROM foo;
+
+-- name: Find :one
+SELECT bar FROM foo WHERE baz = $1;

internal/endtoend/testdata/pointer_type_import/postgresql/pgx/v4/go/models.go

@@ -0,0 +1,14 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "go",
+      "engine": "postgresql",
+      "sql_package": "pgx/v4",
+      "name": "datatype",
+      "schema": "query.sql",
+      "queries": "query.sql",
+      "emit_pointers_for_null_types": true
+    }
+  ]
+}

internal/endtoend/testdata/pointer_type_import/postgresql/pgx/v4/go/query.sql.go

@@ -0,0 +1,7 @@
+CREATE TABLE foo (bar inet, baz cidr);
+
+-- name: List :many
+SELECT * FROM foo;
+
+-- name: Find :one
+SELECT bar FROM foo WHERE baz = $1;

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

@@ -0,0 +1,13 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "go",
+      "engine": "postgresql",
+      "sql_package": "pgx/v5",
+      "name": "datatype",
+      "schema": "query.sql",
+      "queries": "query.sql"
+    }
+  ]
+}