diff --git a/postgres/dialect.go b/postgres/dialect.go index 14929ad..7885cf7 100644 --- a/postgres/dialect.go +++ b/postgres/dialect.go @@ -2,8 +2,9 @@ package postgres import ( "fmt" - "github.com/go-jet/jet/v2/internal/jet" "strconv" + + "github.com/go-jet/jet/v2/internal/jet" ) // Dialect is implementation of postgres dialect for SQL Builder serialisation. @@ -121,17 +122,23 @@ var reservedWords = []string{ "AS", "ASC", "ASYMMETRIC", + "AUTHORIZATION", + "BINARY", "BOTH", "CASE", "CAST", "CHECK", "COLLATE", + "COLLATION", "COLUMN", + "CONCURRENTLY", "CONSTRAINT", "CREATE", + "CROSS", "CURRENT_CATALOG", "CURRENT_DATE", "CURRENT_ROLE", + "CURRENT_SCHEMA", "CURRENT_TIME", "CURRENT_TIMESTAMP", "CURRENT_USER", @@ -147,26 +154,39 @@ var reservedWords = []string{ "FETCH", "FOR", "FOREIGN", + "FREEZE", "FROM", + "FULL", "GRANT", "GROUP", "HAVING", + "ILIKE", "IN", "INITIALLY", + "INNER", "INTERSECT", "INTO", + "IS", + "ISNULL", + "JOIN", "LATERAL", "LEADING", + "LEFT", + "LIKE", "LIMIT", "LOCALTIME", "LOCALTIMESTAMP", + "NATURAL", "NOT", + "NOTNULL", "NULL", "OFFSET", "ON", "ONLY", "OR", "ORDER", + "OUTER", + "OVERLAPS", "PLACING", "PRIMARY", "REFERENCES", @@ -174,9 +194,12 @@ var reservedWords = []string{ "RIGHT", "SELECT", "SESSION_USER", + "SIMILAR", "SOME", "SYMMETRIC", + "SYSTEM_USER", "TABLE", + "TABLESAMPLE", "THEN", "TO", "TRAILING", @@ -186,6 +209,7 @@ var reservedWords = []string{ "USER", "USING", "VARIADIC", + "VERBOSE", "WHEN", "WHERE", "WINDOW", diff --git a/tests/postgres/sample_test.go b/tests/postgres/sample_test.go index 7ac0506..0a252db 100644 --- a/tests/postgres/sample_test.go +++ b/tests/postgres/sample_test.go @@ -1,10 +1,11 @@ package postgres import ( + "testing" + "github.com/go-jet/jet/v2/internal/utils/ptr" "github.com/go-jet/jet/v2/qrm" "github.com/google/uuid" - "testing" "github.com/stretchr/testify/require" @@ -452,8 +453,8 @@ SELECT "User"."column" AS "User.column", "User"."desc" AS "User.desc", "User".empty AS "User.empty", "User".float AS "User.float", - "User".join AS "User.join", - "User".like AS "User.like", + "User"."join" AS "User.join", + "User"."like" AS "User.like", "User".max AS "User.max", "User".rank AS "User.rank" FROM test_sample."User";