feat(generate): Avoid generating empty Go imports (sqlc-dev#3135)

* Avoid generating empty Go imports statement Maybe fixes sqlc-dev#3134 * Remove `import ()` from `testdata` golden files
lisitsky · Jun 21, 2024 · ab033b6 · ab033b6
1 parent a8f9dbf
commit ab033b6
Show file tree

Hide file tree

Showing 382 changed files with 19 additions and 758 deletions.
diff --git a/examples/jets/postgresql/models.go b/examples/jets/postgresql/models.go
diff --git a/internal/codegen/golang/gen.go b/internal/codegen/golang/gen.go
@@ -209,6 +209,7 @@ func generate(req *plugin.GenerateRequest, options *opts.Options, enums []Enum,
 		"comment":    sdk.DoubleSlashComment,
 		"escape":     sdk.EscapeBacktick,
 		"imports":    i.Imports,
+		"hasImports": i.HasImports,
 		"hasPrefix":  strings.HasPrefix,
 
 		// These methods are Go specific, they do not belong in the codegen package

diff --git a/internal/codegen/golang/imports.go b/internal/codegen/golang/imports.go
@@ -75,6 +75,11 @@ func (i *importer) usesType(typ string) bool {
 	return false
 }
 
+func (i *importer) HasImports(filename string) bool {
+	imports := i.Imports(filename)
+	return len(imports[0]) != 0 || len(imports[1]) != 0
+}
+
 func (i *importer) Imports(filename string) [][]ImportSpec {
 	dbFileName := "db.go"
 	if i.Options.OutputDbFileName != "" {

diff --git a/internal/codegen/golang/templates/template.tmpl b/internal/codegen/golang/templates/template.tmpl
@@ -9,12 +9,14 @@
 
 package {{.Package}}
 
+{{ if hasImports .SourceName }}
 import (
 	{{range imports .SourceName}}
 	{{range .}}{{.}}
 	{{end}}
 	{{end}}
 )
+{{end}}
 
 {{template "dbCode" . }}
 {{end}}
@@ -40,12 +42,14 @@ import (
 
 package {{.Package}}
 
+{{ if hasImports .SourceName }}
 import (
 	{{range imports .SourceName}}
 	{{range .}}{{.}}
 	{{end}}
 	{{end}}
 )
+{{end}}
 
 {{template "interfaceCode" . }}
 {{end}}
@@ -69,12 +73,14 @@ import (
 
 package {{.Package}}
 
+{{ if hasImports .SourceName }}
 import (
 	{{range imports .SourceName}}
 	{{range .}}{{.}}
 	{{end}}
 	{{end}}
 )
+{{end}}
 
 {{template "modelsCode" . }}
 {{end}}
@@ -167,12 +173,14 @@ type {{.Name}} struct { {{- range .Fields}}
 
 package {{.Package}}
 
+{{ if hasImports .SourceName }}
 import (
 	{{range imports .SourceName}}
 	{{range .}}{{.}}
 	{{end}}
 	{{end}}
 )
+{{end}}
 
 {{template "queryCode" . }}
 {{end}}
@@ -196,12 +204,14 @@ import (
 
 package {{.Package}}
 
+{{ if hasImports .SourceName }}
 import (
 	{{range imports .SourceName}}
 	{{range .}}{{.}}
 	{{end}}
 	{{end}}
 )
+{{end}}
 
 {{template "copyfromCode" . }}
 {{end}}
@@ -225,12 +235,15 @@ import (
 
 package {{.Package}}
 
+{{ if hasImports .SourceName }}
 import (
 	{{range imports .SourceName}}
 	{{range .}}{{.}}
 	{{end}}
 	{{end}}
 )
+{{end}}
+
 {{template "batchCode" . }}
 {{end}}
 

diff --git a/internal/endtoend/testdata/alias/mysql/go/models.go b/internal/endtoend/testdata/alias/mysql/go/models.go
diff --git a/internal/endtoend/testdata/alias/postgresql/pgx/v4/go/models.go b/internal/endtoend/testdata/alias/postgresql/pgx/v4/go/models.go
diff --git a/internal/endtoend/testdata/alias/postgresql/pgx/v5/go/models.go b/internal/endtoend/testdata/alias/postgresql/pgx/v5/go/models.go
diff --git a/internal/endtoend/testdata/alias/postgresql/stdlib/go/models.go b/internal/endtoend/testdata/alias/postgresql/stdlib/go/models.go
diff --git a/internal/endtoend/testdata/alias/sqlite/go/models.go b/internal/endtoend/testdata/alias/sqlite/go/models.go
diff --git a/internal/endtoend/testdata/any/pgx/v4/go/models.go b/internal/endtoend/testdata/any/pgx/v4/go/models.go
diff --git a/internal/endtoend/testdata/any/pgx/v5/go/models.go b/internal/endtoend/testdata/any/pgx/v5/go/models.go
diff --git a/internal/endtoend/testdata/any/stdlib/go/models.go b/internal/endtoend/testdata/any/stdlib/go/models.go
diff --git a/internal/endtoend/testdata/array_in/pgx/v4/go/models.go b/internal/endtoend/testdata/array_in/pgx/v4/go/models.go
diff --git a/internal/endtoend/testdata/array_in/pgx/v5/go/models.go b/internal/endtoend/testdata/array_in/pgx/v5/go/models.go
diff --git a/internal/endtoend/testdata/array_in/stdlib/go/models.go b/internal/endtoend/testdata/array_in/stdlib/go/models.go
diff --git a/internal/endtoend/testdata/array_text/pgx/v4/go/models.go b/internal/endtoend/testdata/array_text/pgx/v4/go/models.go
diff --git a/internal/endtoend/testdata/array_text/pgx/v5/go/models.go b/internal/endtoend/testdata/array_text/pgx/v5/go/models.go
diff --git a/internal/endtoend/testdata/array_text/stdlib/go/models.go b/internal/endtoend/testdata/array_text/stdlib/go/models.go
diff --git a/internal/endtoend/testdata/array_text_join/pgx/v4/go/models.go b/internal/endtoend/testdata/array_text_join/pgx/v4/go/models.go
diff --git a/internal/endtoend/testdata/array_text_join/pgx/v5/go/models.go b/internal/endtoend/testdata/array_text_join/pgx/v5/go/models.go
diff --git a/internal/endtoend/testdata/array_text_join/stdlib/go/models.go b/internal/endtoend/testdata/array_text_join/stdlib/go/models.go
diff --git a/internal/endtoend/testdata/batch/postgresql/pgx/v4/go/query.sql.go b/internal/endtoend/testdata/batch/postgresql/pgx/v4/go/query.sql.go
diff --git a/internal/endtoend/testdata/batch/postgresql/pgx/v5/go/query.sql.go b/internal/endtoend/testdata/batch/postgresql/pgx/v5/go/query.sql.go
diff --git a/internal/endtoend/testdata/batch_parameter_type/postgresql/pgx/go/query.sql.go b/internal/endtoend/testdata/batch_parameter_type/postgresql/pgx/go/query.sql.go
diff --git a/internal/endtoend/testdata/between_args/mysql/go/models.go b/internal/endtoend/testdata/between_args/mysql/go/models.go
diff --git a/internal/endtoend/testdata/between_args/sqlite/go/models.go b/internal/endtoend/testdata/between_args/sqlite/go/models.go
diff --git a/internal/endtoend/testdata/builtins/postgresql/go/models.go b/internal/endtoend/testdata/builtins/postgresql/go/models.go
diff --git a/internal/endtoend/testdata/builtins/sqlite/go/models.go b/internal/endtoend/testdata/builtins/sqlite/go/models.go
diff --git a/internal/endtoend/testdata/case_stmt_bool/pgx/v4/go/models.go b/internal/endtoend/testdata/case_stmt_bool/pgx/v4/go/models.go
diff --git a/internal/endtoend/testdata/case_stmt_bool/pgx/v5/go/models.go b/internal/endtoend/testdata/case_stmt_bool/pgx/v5/go/models.go
diff --git a/internal/endtoend/testdata/case_stmt_bool/stdlib/go/models.go b/internal/endtoend/testdata/case_stmt_bool/stdlib/go/models.go
diff --git a/internal/endtoend/testdata/case_text/pgx/v4/go/models.go b/internal/endtoend/testdata/case_text/pgx/v4/go/models.go
diff --git a/internal/endtoend/testdata/case_text/pgx/v5/go/models.go b/internal/endtoend/testdata/case_text/pgx/v5/go/models.go
diff --git a/internal/endtoend/testdata/case_text/stdlib/go/models.go b/internal/endtoend/testdata/case_text/stdlib/go/models.go
diff --git a/internal/endtoend/testdata/coalesce_join/postgresql/go/models.go b/internal/endtoend/testdata/coalesce_join/postgresql/go/models.go
diff --git a/internal/endtoend/testdata/column_as/mysql/go/models.go b/internal/endtoend/testdata/column_as/mysql/go/models.go
diff --git a/internal/endtoend/testdata/column_as/postgresql/pgx/v4/go/models.go b/internal/endtoend/testdata/column_as/postgresql/pgx/v4/go/models.go