fix(golang): escape q field name (#3647)

sqlc-dev · Nov 25, 2024 · 10dd388 · 10dd388
1 parent 58b08ae
commit 10dd388
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 1 deletion.
diff --git a/internal/codegen/golang/reserved.go b/internal/codegen/golang/reserved.go
@@ -59,6 +59,8 @@ func IsReserved(s string) bool {
 		return true
 	case "var":
 		return true
+	case "q":
+		return true
 	default:
 		return false
 	}

diff --git a/internal/endtoend/testdata/params_go_keywords/postgresql/go/models.go b/internal/endtoend/testdata/params_go_keywords/postgresql/go/models.go
diff --git a/internal/endtoend/testdata/params_go_keywords/postgresql/go/query.sql.go b/internal/endtoend/testdata/params_go_keywords/postgresql/go/query.sql.go
diff --git a/internal/endtoend/testdata/params_go_keywords/postgresql/query.sql b/internal/endtoend/testdata/params_go_keywords/postgresql/query.sql
@@ -73,6 +73,9 @@ SELECT sqlc.arg('return')::text;
 -- name: KeywordVar :exec
 SELECT sqlc.arg('var')::text;
 
+-- name: KeywordQ :exec
+SELECT sqlc.arg('q')::text;
+
 -- name: SelectBreak :one
 SELECT "break" FROM go_keywords;
 
@@ -147,3 +150,6 @@ SELECT "return" FROM go_keywords;
 
 -- name: SelectVar :one
 SELECT "var" FROM go_keywords;
+
+-- name: SelectQ :one
+SELECT "q" FROM go_keywords;
diff --git a/internal/endtoend/testdata/params_go_keywords/postgresql/schema.sql b/internal/endtoend/testdata/params_go_keywords/postgresql/schema.sql
@@ -23,5 +23,6 @@ CREATE TABLE go_keywords (
     "for" TEXT,
     "import" TEXT,
     "return" TEXT,
-    "var" TEXT
+    "var" TEXT,
+    "q" TEXT
 );