fix (engine/sqlite): normalize table names (#3162) (#3657)

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

Hide file tree

Showing 8 changed files with 101 additions and 4 deletions.
diff --git a/internal/endtoend/testdata/quoted_tablename/sqlite/go/db.go b/internal/endtoend/testdata/quoted_tablename/sqlite/go/db.go
diff --git a/internal/endtoend/testdata/quoted_tablename/sqlite/go/models.go b/internal/endtoend/testdata/quoted_tablename/sqlite/go/models.go
diff --git a/internal/endtoend/testdata/quoted_tablename/sqlite/go/query.sql.go b/internal/endtoend/testdata/quoted_tablename/sqlite/go/query.sql.go
diff --git a/internal/endtoend/testdata/quoted_tablename/sqlite/query.sql b/internal/endtoend/testdata/quoted_tablename/sqlite/query.sql
@@ -0,0 +1,2 @@
+-- name: TestList :many
+SELECT * FROM users;
diff --git a/internal/endtoend/testdata/quoted_tablename/sqlite/schema.sql b/internal/endtoend/testdata/quoted_tablename/sqlite/schema.sql
@@ -0,0 +1,6 @@
+-- Example queries for sqlc
+CREATE TABLE "users"
+(
+    id TEXT NOT NULL
+);
+
diff --git a/internal/endtoend/testdata/quoted_tablename/sqlite/sqlc.json b/internal/endtoend/testdata/quoted_tablename/sqlite/sqlc.json
@@ -0,0 +1,12 @@
+{
+    "version": "1",
+    "packages": [
+        {
+            "path": "go",
+            "engine": "sqlite",
+            "schema": "schema.sql",
+            "queries": "query.sql",
+            "name": "querytest"
+        }
+    ]
+}
diff --git a/internal/engine/sqlite/convert.go b/internal/engine/sqlite/convert.go
@@ -203,7 +203,7 @@ type Delete_stmt interface {
 func (c *cc) convertDelete_stmtContext(n Delete_stmt) ast.Node {
 	if qualifiedName, ok := n.Qualified_table_name().(*parser.Qualified_table_nameContext); ok {
 
-		tableName := qualifiedName.Table_name().GetText()
+		tableName := identifier(qualifiedName.Table_name().GetText())
 		relation := &ast.RangeVar{
 			Relname: &tableName,
 		}
@@ -854,7 +854,7 @@ func (c *cc) convertReturning_caluseContext(n parser.IReturning_clauseContext) *
 }
 
 func (c *cc) convertInsert_stmtContext(n *parser.Insert_stmtContext) ast.Node {
-	tableName := n.Table_name().GetText()
+	tableName := identifier(n.Table_name().GetText())
 	rel := &ast.RangeVar{
 		Relname: &tableName,
 	}
@@ -936,7 +936,7 @@ func (c *cc) convertTablesOrSubquery(n []parser.ITable_or_subqueryContext) []ast
 		}
 
 		if from.Table_name() != nil {
-			rel := from.Table_name().GetText()
+			rel := identifier(from.Table_name().GetText())
 			rv := &ast.RangeVar{
 				Relname:  &rel,
 				Location: from.GetStart().GetStart(),

diff --git a/internal/engine/sqlite/utils.go b/internal/engine/sqlite/utils.go
@@ -12,7 +12,7 @@ type tableNamer interface {
 
 func parseTableName(c tableNamer) *ast.TableName {
 	name := ast.TableName{
-		Name: c.Table_name().GetText(),
+		Name: identifier(c.Table_name().GetText()),
 	}
 	if c.Schema_name() != nil {
 		name.Schema = c.Schema_name().GetText()