codegen/golang: Use pgtype for hstore when using pgx (#1156)

sqlc-dev · Aug 29, 2021 · 14631c8 · 14631c8
1 parent 7d34722
commit 14631c8
Show file tree

Hide file tree

Showing 12 changed files with 256 additions and 0 deletions.
diff --git a/internal/codegen/golang/imports.go b/internal/codegen/golang/imports.go
@@ -140,6 +140,7 @@ var pgtypeTypes = map[string]struct{}{
 	"pgtype.Int8range": {},
 	"pgtype.JSON":      {},
 	"pgtype.JSONB":     {},
+	"pgtype.Hstore":    {},
 	"pgtype.Macaddr":   {},
 	"pgtype.Numeric":   {},
 	"pgtype.Numrange":  {},

diff --git a/internal/codegen/golang/postgresql_type.go b/internal/codegen/golang/postgresql_type.go
@@ -220,6 +220,12 @@ func postgresType(r *compiler.Result, col *compiler.Column, settings config.Comb
 		}
 		return "interface{}"
 
+	case "hstore":
+		if driver == SQLDriverPGXV4 {
+			return "pgtype.Hstore"
+		}
+		return "interface{}"
+
 	case "void":
 		// A void value can only be scanned into an empty interface.
 		return "interface{}"

diff --git a/internal/endtoend/testdata/hstore/pgx/go/db.go b/internal/endtoend/testdata/hstore/pgx/go/db.go
diff --git a/internal/endtoend/testdata/hstore/pgx/go/hstore.sql.go b/internal/endtoend/testdata/hstore/pgx/go/hstore.sql.go
diff --git a/internal/endtoend/testdata/hstore/pgx/go/models.go b/internal/endtoend/testdata/hstore/pgx/go/models.go
diff --git a/internal/endtoend/testdata/hstore/pgx/hstore.sql b/internal/endtoend/testdata/hstore/pgx/hstore.sql
@@ -0,0 +1,12 @@
+CREATE TABLE foo (
+        bar hstore NOT NULL,
+        baz hstore
+);
+
+-- name: ListBar :many
+SELECT bar FROM foo;
+
+-- name: ListBaz :many
+SELECT baz FROM foo;
+
+
diff --git a/internal/endtoend/testdata/hstore/pgx/sqlc.json b/internal/endtoend/testdata/hstore/pgx/sqlc.json
@@ -0,0 +1,13 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "go",
+      "engine": "postgresql",
+      "sql_package": "pgx/v4",
+      "name": "hstore",
+      "schema": "hstore.sql",
+      "queries": "hstore.sql"
+    }
+  ]
+}
diff --git a/internal/endtoend/testdata/hstore/stdlib/go/db.go b/internal/endtoend/testdata/hstore/stdlib/go/db.go
diff --git a/internal/endtoend/testdata/hstore/stdlib/go/hstore.sql.go b/internal/endtoend/testdata/hstore/stdlib/go/hstore.sql.go
diff --git a/internal/endtoend/testdata/hstore/stdlib/go/models.go b/internal/endtoend/testdata/hstore/stdlib/go/models.go
diff --git a/internal/endtoend/testdata/hstore/stdlib/hstore.sql b/internal/endtoend/testdata/hstore/stdlib/hstore.sql
@@ -0,0 +1,12 @@
+CREATE TABLE foo (
+        bar hstore NOT NULL,
+        baz hstore
+);
+
+-- name: ListBar :many
+SELECT bar FROM foo;
+
+-- name: ListBaz :many
+SELECT baz FROM foo;
+
+
diff --git a/internal/endtoend/testdata/hstore/stdlib/sqlc.json b/internal/endtoend/testdata/hstore/stdlib/sqlc.json
@@ -0,0 +1,11 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "go",
+      "name": "hstore",
+      "schema": "hstore.sql",
+      "queries": "hstore.sql"
+    }
+  ]
+}