fix(codegen): use correct Go types for bit strings and cid/oid/tid/xid with pgx/v4 (#2668)

resolves #2667

Author: andrewmbenton

internal/codegen/golang/postgresql_type.go

@@ -343,7 +343,6 @@ func postgresType(req *plugin.CodeGenRequest, col *plugin.Column) string {
 		if driver == SQLDriverPGXV5 {
 			return "pgtype.Interval"
 		}
-
 		if notNull {
 			return "int64"
 		}
@@ -467,25 +466,47 @@ func postgresType(req *plugin.CodeGenRequest, col *plugin.Column) string {
 		return "interface{}"
 
 	case "bit", "varbit", "pg_catalog.bit", "pg_catalog.varbit":
-		if driver.IsPGX() {
+		if driver == SQLDriverPGXV5 {
 			return "pgtype.Bits"
 		}
+		if driver == SQLDriverPGXV4 {
+			return "pgtype.Varbit"
+		}
 
-	case "box":
-		if driver.IsPGX() {
-			return "pgtype.Box"
+	case "cid":
+		if driver == SQLDriverPGXV5 {
+			return "pgtype.Uint32"
+		}
+		if driver == SQLDriverPGXV4 {
+			return "pgtype.CID"
 		}
 
-	case "cid", "oid":
-		if driver.IsPGX() {
+	case "oid":
+		if driver == SQLDriverPGXV5 {
 			return "pgtype.Uint32"
 		}
+		if driver == SQLDriverPGXV4 {
+			return "pgtype.OID"
+		}
 
 	case "tid":
 		if driver.IsPGX() {
 			return "pgtype.TID"
 		}
 
+	case "xid":
+		if driver == SQLDriverPGXV5 {
+			return "pgtype.Uint32"
+		}
+		if driver == SQLDriverPGXV4 {
+			return "pgtype.XID"
+		}
+
+	case "box":
+		if driver.IsPGX() {
+			return "pgtype.Box"
+		}
+
 	case "circle":
 		if driver.IsPGX() {
 			return "pgtype.Circle"

internal/endtoend/testdata/bit_string/pgx/v4/go/db.go

@@ -0,0 +1,11 @@
+CREATE TABLE test_table
+(
+    v_bit_null     bit(3),
+    v_varbit_null  bit varying(3),
+    v_bit          bit(3)             not null,
+    v_varbit       bit varying(3)     not null
+);
+
+-- name: SelectTest :many
+SELECT *
+from test_table;

internal/endtoend/testdata/bit_string/pgx/v4/go/models.go

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

internal/endtoend/testdata/bit_string/pgx/v4/go/query.sql.go

@@ -0,0 +1,11 @@
+CREATE TABLE test_table
+(
+    v_bit_null     bit(3),
+    v_varbit_null  bit varying(3),
+    v_bit          bit(3)             not null,
+    v_varbit       bit varying(3)     not null
+);
+
+-- name: SelectTest :many
+SELECT *
+from test_table;

internal/endtoend/testdata/bit_string/pgx/v4/query.sql

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