Fix more tests

Author: kyleconroy

internal/compiler/expand.go

@@ -2,6 +2,7 @@ package compiler
 
 import (
 	"fmt"
+	"regexp"
 	"strings"
 
 	"github.com/sqlc-dev/sqlc/internal/config"
@@ -44,14 +45,25 @@ func (c *Compiler) expand(qc *QueryCatalog, raw *ast.RawStmt) ([]source.Edit, er
 	return edits, nil
 }
 
+var validPostgresIdent = regexp.MustCompile(`^[a-z_][a-z0-9_$]*$`)
+
 func (c *Compiler) quoteIdent(ident string) string {
 	if c.parser.IsReservedKeyword(ident) {
 		return c.quote(ident)
 	}
+	// SQL identifiers and key words must begin with a letter (a-z, but also
+	// letters with diacritical marks and non-Latin letters) or an underscore
+	// (_). Subsequent characters in an identifier or key word can be letters,
+	// underscores, digits (0-9), or dollar signs ($).
+	//
+	// https://www.postgresql.org/docs/current/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS
 	if c.conf.Engine == config.EnginePostgreSQL {
 		// camelCase means the column is also camelCase
 		if strings.ToLower(ident) != ident {
-			return "\"" + ident + "\""
+			return c.quote(ident)
+		}
+		if !validPostgresIdent.MatchString(strings.ToLower(ident)) {
+			return c.quote(ident)
 		}
 	}
 	return ident
@@ -154,7 +166,11 @@ func (c *Compiler) expandStmt(qc *QueryCatalog, raw *ast.RawStmt, node ast.Node)
 		}
 		var old []string
 		for _, p := range parts {
-			old = append(old, c.quoteIdent(p))
+			if p == "*" {
+				old = append(old, p)
+			} else {
+				old = append(old, c.quoteIdent(p))
+			}
 		}
 
 		var oldString string
@@ -189,5 +205,6 @@ func (c *Compiler) expandStmt(qc *QueryCatalog, raw *ast.RawStmt, node ast.Node)
 			New:      strings.Join(cols, ", "),
 		})
 	}
+
 	return edits, nil
 }

internal/compiler/parse.go

@@ -87,6 +87,7 @@ func (c *Compiler) parseQuery(stmt ast.Node, src string, o opts.Parser) (*Query,
 	// If the query string was edited, make sure the syntax is valid
 	if expanded != rawSQL {
 		if _, err := c.parser.Parse(strings.NewReader(expanded)); err != nil {
+			fmt.Println(expanded)
 			return nil, fmt.Errorf("edited query syntax is invalid: %w", err)
 		}
 	}

internal/endtoend/testdata/codegen_struct_field_names/stdlib/go/query.sql.go

@@ -2,4 +2,4 @@
 query.sql:4:10: column reference "invalid_reference" not found
 ---
 # package querytest
-query.sql:4:11: column "invalid_reference" does not exist
+query.sql:4:22: column "invalid_reference" does not exist

internal/endtoend/testdata/invalid_group_by_reference/postgresql/stderr.txt

@@ -2,4 +2,10 @@
 query.sql:1:1: could not determine data type of parameter $1
 query.sql:5:1: could not determine data type of parameter $2
 query.sql:8:8: column "foo" does not exist
-query.sql:11:1: could not determine data type of parameter $2
+query.sql:11:1: could not determine data type of parameter $2
+---
+# package querytest
+query.sql:2:8: column "foo" does not exist
+query.sql:5:8: column "foo" does not exist
+query.sql:8:8: column "foo" does not exist
+query.sql:11:47: column "named" does not exist

internal/endtoend/testdata/invalid_params/pgx/v4/stderr.txt

@@ -2,4 +2,10 @@
 query.sql:1:1: could not determine data type of parameter $1
 query.sql:5:1: could not determine data type of parameter $2
 query.sql:8:8: column "foo" does not exist
-query.sql:11:1: could not determine data type of parameter $2
+query.sql:11:1: could not determine data type of parameter $2
+---
+# package querytest
+query.sql:2:8: column "foo" does not exist
+query.sql:5:8: column "foo" does not exist
+query.sql:8:8: column "foo" does not exist
+query.sql:11:47: column "named" does not exist

internal/endtoend/testdata/invalid_params/pgx/v5/stderr.txt

@@ -2,4 +2,10 @@
 query.sql:1:1: could not determine data type of parameter $1
 query.sql:5:1: could not determine data type of parameter $2
 query.sql:8:8: column "foo" does not exist
-query.sql:11:1: could not determine data type of parameter $2
+query.sql:11:1: could not determine data type of parameter $2
+---
+# package querytest
+query.sql:2:8: column "foo" does not exist
+query.sql:5:8: column "foo" does not exist
+query.sql:8:8: column "foo" does not exist
+query.sql:11:47: column "named" does not exist

internal/endtoend/testdata/invalid_params/stdlib/stderr.txt

@@ -1,10 +1,3 @@
--- https://github.com/sqlc-dev/sqlc/issues/437
-CREATE TABLE authors (
-  id   BIGSERIAL PRIMARY KEY,
-  name text      NOT NULL,
-  bio  text
-);
-
 -- name: GetAuthor :one
 SELECT  *
 FROM    authors a

internal/endtoend/testdata/invalid_table_alias/postgresql/query.sql

@@ -0,0 +1,6 @@
+-- https://github.com/sqlc-dev/sqlc/issues/437
+CREATE TABLE authors (
+  id   BIGSERIAL PRIMARY KEY,
+  name text      NOT NULL,
+  bio  text
+);

internal/endtoend/testdata/invalid_table_alias/postgresql/schema.sql

@@ -5,7 +5,7 @@
 			"path": "go",
 			"engine": "postgresql",
 			"name": "querytest",
-			"schema": "query.sql",
+			"schema": "schema.sql",
 			"queries": "query.sql"
 		}
 	]