Invalid name generation when using python reserved keywords

examples/src/authors/models.py

@@ -1,6 +1,6 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
-#   sqlc v1.28.0
+#   sqlc v1.29.0
 import dataclasses
 from typing import Optional
 

examples/src/authors/query.py

@@ -1,6 +1,6 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
-#   sqlc v1.28.0
+#   sqlc v1.29.0
 # source: query.sql
 from typing import AsyncIterator, Iterator, Optional
 

examples/src/booktest/models.py

@@ -1,6 +1,6 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
-#   sqlc v1.28.0
+#   sqlc v1.29.0
 import dataclasses
 import datetime
 import enum

examples/src/booktest/query.py

@@ -1,6 +1,6 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
-#   sqlc v1.28.0
+#   sqlc v1.29.0
 # source: query.sql
 import dataclasses
 import datetime

examples/src/jets/models.py

@@ -1,6 +1,6 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
-#   sqlc v1.28.0
+#   sqlc v1.29.0
 import dataclasses
 
 

examples/src/jets/query-building.py

@@ -1,6 +1,6 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
-#   sqlc v1.28.0
+#   sqlc v1.29.0
 # source: query-building.sql
 from typing import AsyncIterator, Optional
 

examples/src/ondeck/city.py

@@ -1,6 +1,6 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
-#   sqlc v1.28.0
+#   sqlc v1.29.0
 # source: city.sql
 from typing import AsyncIterator, Optional
 

examples/src/ondeck/models.py

@@ -1,6 +1,6 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
-#   sqlc v1.28.0
+#   sqlc v1.29.0
 import dataclasses
 import datetime
 import enum

examples/src/ondeck/venue.py

@@ -1,6 +1,6 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
-#   sqlc v1.28.0
+#   sqlc v1.29.0
 # source: venue.sql
 import dataclasses
 from typing import AsyncIterator, List, Optional

internal/endtoend/endtoend_test.go

@@ -101,7 +101,7 @@ func TestGenerate(t *testing.T) {
 			cmd.Dir = dir
 			got, err := cmd.CombinedOutput()
 			if diff := cmp.Diff(string(want), string(got)); diff != "" {
-				t.Errorf("sqlc diff mismatch (-want +got):\n%s", diff)
+				t.Errorf("sqlc diff mismatch (-want +got):\n%s", got)
 			}
 			if len(want) == 0 && err != nil {
 				t.Error(err)

internal/endtoend/testdata/dataclasses_with_reserved_keywords/db/models.py

@@ -0,0 +1,10 @@
+# Code generated by sqlc. DO NOT EDIT.
+# versions:
+#   sqlc v1.29.0
+import dataclasses
+
+
+@dataclasses.dataclass()
+class Author:
+    id: int
+    class_: str

internal/endtoend/testdata/dataclasses_with_reserved_keywords/db/query.py

@@ -0,0 +1,44 @@
+# Code generated by sqlc. DO NOT EDIT.
+# versions:
+#   sqlc v1.29.0
+# source: query.sql
+from typing import Optional
+
+import sqlalchemy
+import sqlalchemy.ext.asyncio
+
+from db import models
+
+
+GET_AUTHOR = """-- name: get_author \\:one
+SELECT id, class FROM authors
+WHERE id = :p1 LIMIT 1
+"""
+
+
+class Querier:
+    def __init__(self, conn: sqlalchemy.engine.Connection):
+        self._conn = conn
+
+    def get_author(self, *, id: int) -> Optional[models.Author]:
+        row = self._conn.execute(sqlalchemy.text(GET_AUTHOR), {"p1": id}).first()
+        if row is None:
+            return None
+        return models.Author(
+            id=row[0],
+            class_=row[1],
+        )
+
+
+class AsyncQuerier:
+    def __init__(self, conn: sqlalchemy.ext.asyncio.AsyncConnection):
+        self._conn = conn
+
+    async def get_author(self, *, id: int) -> Optional[models.Author]:
+        row = (await self._conn.execute(sqlalchemy.text(GET_AUTHOR), {"p1": id})).first()
+        if row is None:
+            return None
+        return models.Author(
+            id=row[0],
+            class_=row[1],
+        )

internal/endtoend/testdata/dataclasses_with_reserved_keywords/query.sql

@@ -0,0 +1,3 @@
+-- name: GetAuthor :one
+SELECT * FROM authors
+WHERE id = $1 LIMIT 1;

internal/endtoend/testdata/dataclasses_with_reserved_keywords/schema.sql

@@ -0,0 +1,4 @@
+CREATE TABLE authors (
+          id    BIGSERIAL PRIMARY KEY,
+          class text      NOT NULL
+);

internal/endtoend/testdata/dataclasses_with_reserved_keywords/sqlc.yaml

@@ -0,0 +1,18 @@
+version: "2"
+plugins:
+  - name: py
+    wasm:
+      url: file://../../../../bin/sqlc-gen-python.wasm
+      sha256: "24b0da217e85c9b952a4c746476aa761e9b293a4a68bef8409d97edc1c003016"
+sql:
+  - schema: schema.sql
+    queries: query.sql
+    engine: postgresql
+    codegen:
+      - plugin: py
+        out: db
+        options:
+          package: db
+          emit_sync_querier: true
+          emit_async_querier: true
+          emit_pydantic_models: false

internal/endtoend/testdata/emit_pydantic_models/db/models.py

@@ -1,11 +1,15 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
-#   sqlc v1.28.0
+#   sqlc v1.29.0
 import pydantic
 from typing import Optional
 
 
 class Author(pydantic.BaseModel):
+    model_config = pydantic.ConfigDict(
+        validate_by_alias=True,
+        validate_by_name=True,
+    )
     id: int
     name: str
     bio: Optional[str]

internal/endtoend/testdata/emit_pydantic_models/db/query.py

@@ -1,6 +1,6 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
-#   sqlc v1.28.0
+#   sqlc v1.29.0
 # source: query.sql
 from typing import AsyncIterator, Iterator, Optional
 

internal/endtoend/testdata/emit_pydantic_models/sqlc.yaml

@@ -3,7 +3,7 @@ plugins:
 - name: py
   wasm:
     url: file://../../../../bin/sqlc-gen-python.wasm
-    sha256: "d6846ffad948181e611e883cedd2d2be66e091edc1273a0abc6c9da18399e0ca"
+    sha256: "24b0da217e85c9b952a4c746476aa761e9b293a4a68bef8409d97edc1c003016"
 sql:
 - schema: schema.sql
   queries: query.sql

internal/endtoend/testdata/emit_pydantic_models_with_reserved_keywords/db/models.py

@@ -0,0 +1,15 @@
+# Code generated by sqlc. DO NOT EDIT.
+# versions:
+#   sqlc v1.29.0
+import pydantic
+
+
+class Author(pydantic.BaseModel):
+    model_config = pydantic.ConfigDict(
+        validate_by_alias=True,
+        validate_by_name=True,
+    )
+    id: int
+    class_: str = pydantic.Field(
+        alias="class",
+    )

internal/endtoend/testdata/emit_pydantic_models_with_reserved_keywords/db/query.py

@@ -0,0 +1,44 @@
+# Code generated by sqlc. DO NOT EDIT.
+# versions:
+#   sqlc v1.29.0
+# source: query.sql
+from typing import Optional
+
+import sqlalchemy
+import sqlalchemy.ext.asyncio
+
+from db import models
+
+
+GET_AUTHOR = """-- name: get_author \\:one
+SELECT id, class FROM authors
+WHERE id = :p1 LIMIT 1
+"""
+
+
+class Querier:
+    def __init__(self, conn: sqlalchemy.engine.Connection):
+        self._conn = conn
+
+    def get_author(self, *, id: int) -> Optional[models.Author]:
+        row = self._conn.execute(sqlalchemy.text(GET_AUTHOR), {"p1": id}).first()
+        if row is None:
+            return None
+        return models.Author(
+            id=row[0],
+            class_=row[1],
+        )
+
+
+class AsyncQuerier:
+    def __init__(self, conn: sqlalchemy.ext.asyncio.AsyncConnection):
+        self._conn = conn
+
+    async def get_author(self, *, id: int) -> Optional[models.Author]:
+        row = (await self._conn.execute(sqlalchemy.text(GET_AUTHOR), {"p1": id})).first()
+        if row is None:
+            return None
+        return models.Author(
+            id=row[0],
+            class_=row[1],
+        )

internal/endtoend/testdata/emit_pydantic_models_with_reserved_keywords/query.sql

@@ -0,0 +1,3 @@
+-- name: GetAuthor :one
+SELECT * FROM authors
+WHERE id = $1 LIMIT 1;

internal/endtoend/testdata/emit_pydantic_models_with_reserved_keywords/schema.sql

@@ -0,0 +1,4 @@
+CREATE TABLE authors (
+          id    BIGSERIAL PRIMARY KEY,
+          class text      NOT NULL
+);

internal/endtoend/testdata/emit_pydantic_models_with_reserved_keywords/sqlc.yaml

@@ -0,0 +1,18 @@
+version: '2'
+plugins:
+- name: py
+  wasm:
+    url: file://../../../../bin/sqlc-gen-python.wasm
+    sha256: "24b0da217e85c9b952a4c746476aa761e9b293a4a68bef8409d97edc1c003016"
+sql:
+- schema: schema.sql
+  queries: query.sql
+  engine: postgresql
+  codegen:
+  - plugin: py
+    out: db
+    options:
+      package: db
+      emit_sync_querier: true
+      emit_async_querier: true
+      emit_pydantic_models: true

internal/endtoend/testdata/emit_str_enum/db/models.py

@@ -1,6 +1,6 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
-#   sqlc v1.28.0
+#   sqlc v1.29.0
 import dataclasses
 import enum
 from typing import Optional

internal/endtoend/testdata/emit_str_enum/db/query.py

@@ -1,6 +1,6 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
-#   sqlc v1.28.0
+#   sqlc v1.29.0
 # source: query.sql
 from typing import AsyncIterator, Iterator, Optional
 

internal/endtoend/testdata/emit_str_enum/sqlc.yaml

@@ -3,7 +3,7 @@ plugins:
   - name: py
     wasm:
       url: file://../../../../bin/sqlc-gen-python.wasm
-      sha256: "d6846ffad948181e611e883cedd2d2be66e091edc1273a0abc6c9da18399e0ca"
+      sha256: "24b0da217e85c9b952a4c746476aa761e9b293a4a68bef8409d97edc1c003016"
 sql:
   - schema: schema.sql
     queries: query.sql

internal/endtoend/testdata/exec_result/python/models.py

@@ -1,6 +1,6 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
-#   sqlc v1.28.0
+#   sqlc v1.29.0
 import dataclasses
 
 

internal/endtoend/testdata/exec_result/python/query.py

@@ -1,6 +1,6 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
-#   sqlc v1.28.0
+#   sqlc v1.29.0
 # source: query.sql
 import sqlalchemy
 import sqlalchemy.ext.asyncio

internal/endtoend/testdata/exec_result/sqlc.yaml

@@ -3,7 +3,7 @@ plugins:
 - name: py
   wasm:
     url: file://../../../../bin/sqlc-gen-python.wasm
-    sha256: "d6846ffad948181e611e883cedd2d2be66e091edc1273a0abc6c9da18399e0ca"
+    sha256: "24b0da217e85c9b952a4c746476aa761e9b293a4a68bef8409d97edc1c003016"
 sql:
 - schema: schema.sql
   queries: query.sql

internal/endtoend/testdata/exec_rows/python/models.py

@@ -1,6 +1,6 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
-#   sqlc v1.28.0
+#   sqlc v1.29.0
 import dataclasses
 
 

internal/endtoend/testdata/exec_rows/python/query.py

@@ -1,6 +1,6 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
-#   sqlc v1.28.0
+#   sqlc v1.29.0
 # source: query.sql
 import sqlalchemy
 import sqlalchemy.ext.asyncio

internal/endtoend/testdata/exec_rows/sqlc.yaml

@@ -3,7 +3,7 @@ plugins:
 - name: py
   wasm:
     url: file://../../../../bin/sqlc-gen-python.wasm
-    sha256: "d6846ffad948181e611e883cedd2d2be66e091edc1273a0abc6c9da18399e0ca"
+    sha256: "24b0da217e85c9b952a4c746476aa761e9b293a4a68bef8409d97edc1c003016"
 sql:
 - schema: schema.sql
   queries: query.sql

internal/endtoend/testdata/inflection_exclude_table_names/python/models.py

@@ -1,6 +1,6 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
-#   sqlc v1.28.0
+#   sqlc v1.29.0
 import dataclasses
 
 

internal/endtoend/testdata/inflection_exclude_table_names/python/query.py

@@ -1,6 +1,6 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
-#   sqlc v1.28.0
+#   sqlc v1.29.0
 # source: query.sql
 from typing import Optional
 

internal/endtoend/testdata/inflection_exclude_table_names/sqlc.yaml

@@ -3,7 +3,7 @@ plugins:
 - name: py
   wasm:
     url: file://../../../../bin/sqlc-gen-python.wasm
-    sha256: "d6846ffad948181e611e883cedd2d2be66e091edc1273a0abc6c9da18399e0ca"
+    sha256: "24b0da217e85c9b952a4c746476aa761e9b293a4a68bef8409d97edc1c003016"
 sql:
 - schema: schema.sql
   queries: query.sql

internal/endtoend/testdata/query_parameter_limit_two/python/models.py

@@ -1,6 +1,6 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
-#   sqlc v1.28.0
+#   sqlc v1.29.0
 import dataclasses