Skip to content

Commit c7d3e4b

Browse files
authored
gen: Emit json.RawMessage for JSON columns (#461)
Before this was only emitted for jsonb columns
1 parent f7e5273 commit c7d3e4b

File tree

6 files changed

+79
-1
lines changed

6 files changed

+79
-1
lines changed

internal/dinosql/gen.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,7 @@ func (r Result) goInnerType(col core.Column, settings config.CombinedSettings) s
701701
}
702702
return "sql.NullBool"
703703

704-
case "jsonb":
704+
case "json", "jsonb":
705705
return "json.RawMessage"
706706

707707
case "bytea", "blob", "pg_catalog.bytea":

internal/endtoend/testdata/json/go/db.go

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

internal/endtoend/testdata/json/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/json/go/query.sql.go

Lines changed: 17 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+
a json not null,
3+
b jsonb not null,
4+
c json,
5+
d jsonb
6+
);
7+
8+
-- name: SelectFoo :exec
9+
SELECT * FROM foo;
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"version": "1",
3+
"packages": [{
4+
"path": "go",
5+
"name": "querytest",
6+
"schema": "query.sql",
7+
"queries": "query.sql"
8+
}]
9+
}

0 commit comments

Comments
 (0)