Skip to content

Commit edc1e5a

Browse files
authored
fix citext resolution issues (#1629)
* fix citext resolution issues * add citext end to end test
1 parent 6dceb87 commit edc1e5a

File tree

11 files changed

+209
-1
lines changed

11 files changed

+209
-1
lines changed

internal/codegen/golang/postgresql_type.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ func postgresType(req *plugin.CodeGenRequest, col *plugin.Column) string {
256256
}
257257
return "sql.NullTime"
258258

259-
case "text", "pg_catalog.varchar", "pg_catalog.bpchar", "string":
259+
case "text", "pg_catalog.varchar", "pg_catalog.bpchar", "string", "citext":
260260
if notNull {
261261
return "string"
262262
}

internal/endtoend/testdata/citext/pgx/go/db.go

Lines changed: 32 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/endtoend/testdata/citext/pgx/go/models.go

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/endtoend/testdata/citext/pgx/go/query.sql.go

Lines changed: 35 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
CREATE TABLE foo (
2+
bar citext,
3+
bat citext not null
4+
);
5+
6+
-- name: GetCitexts :many
7+
SELECT bar, bat
8+
FROM foo;
9+
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"version": "1",
3+
"packages": [
4+
{
5+
"path": "go",
6+
"engine": "postgresql",
7+
"sql_package": "pgx/v4",
8+
"name": "querytest",
9+
"schema": "query.sql",
10+
"queries": "query.sql"
11+
}
12+
]
13+
}

internal/endtoend/testdata/citext/stdlib/go/db.go

Lines changed: 31 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/endtoend/testdata/citext/stdlib/go/models.go

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/endtoend/testdata/citext/stdlib/go/query.sql.go

Lines changed: 38 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
CREATE TABLE foo (
2+
bar citext,
3+
bat citext not null
4+
);
5+
6+
-- name: GetCitexts :many
7+
SELECT bar, bat
8+
FROM foo;
9+
10+
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"version": "1",
3+
"packages": [
4+
{
5+
"path": "go",
6+
"engine": "postgresql",
7+
"name": "querytest",
8+
"schema": "query.sql",
9+
"queries": "query.sql"
10+
}
11+
]
12+
}

0 commit comments

Comments
 (0)