golang: Generate correct types for int2 and int8 (#579)

kyleconroy · web-flow · commit 749d8757abfc · 2020-07-06T16:31:23.000-07:00
* golang: Generate correct types for int2 and int8
* endtoend: Update generated code for datatype test
diff --git a/internal/codegen/golang/postgresql_type.go b/internal/codegen/golang/postgresql_type.go
@@ -34,13 +34,13 @@ func postgresType(r *compiler.Result, col *compiler.Column, settings config.Comb
 		}
 		return "sql.NullInt32"
 
-	case "bigint", "pg_catalog.int8":
+	case "bigint", "int8", "pg_catalog.int8":
 		if notNull {
 			return "int64"
 		}
 		return "sql.NullInt64"
 
-	case "smallint", "pg_catalog.int2":
+	case "smallint", "int2", "pg_catalog.int2":
 		return "int16"
 
 	case "float", "double precision", "pg_catalog.float8":
diff --git a/internal/endtoend/testdata/datatype/go/models.go b/internal/endtoend/testdata/datatype/go/models.go
diff --git a/internal/endtoend/testdata/datatype/sql/numeric.sql b/internal/endtoend/testdata/datatype/sql/numeric.sql
@@ -12,7 +12,11 @@ CREATE TABLE dt_numeric (
     -- TODO: this maps incorrectly to int16, not NullInt16
     h smallserial,
     i serial,
-    j bigserial
+    j bigserial,
+    -- TODO: this maps incorrectly to int16, not NullInt16
+    k int2,
+    l int4,
+    m int8
 );
 
 CREATE TABLE dt_numeric_not_null (
@@ -25,5 +29,8 @@ CREATE TABLE dt_numeric_not_null (
     g double precision NOT NULL,
     h smallserial NOT NULL,
     i serial NOT NULL,
-    j bigserial NOT NULL
+    j bigserial NOT NULL,
+    k int2 NOT NULL,
+    l int4 NOT NULL,
+    m int8 NOT NULL
 );

Original file line number	Diff line number	Diff line change
`@@ -34,13 +34,13 @@ func postgresType(r compiler.Result, col compiler.Column, settings config.Comb`
`34`	`34`	`}`
`35`	`35`	`return "sql.NullInt32"`
`36`	`36`
`37`		`- case "bigint", "pg_catalog.int8":`
	`37`	`+ case "bigint", "int8", "pg_catalog.int8":`
`38`	`38`	`if notNull {`
`39`	`39`	`return "int64"`
`40`	`40`	`}`
`41`	`41`	`return "sql.NullInt64"`
`42`	`42`
`43`		`- case "smallint", "pg_catalog.int2":`
	`43`	`+ case "smallint", "int2", "pg_catalog.int2":`
`44`	`44`	`return "int16"`
`45`	`45`
`46`	`46`	`case "float", "double precision", "pg_catalog.float8":`