fix(codegen): Correct column names in :copyfrom (#2838)

kyleconroy · web-flow · commit 2cd364ca3049 · 2023-10-12T11:44:36.000-07:00
* fix(codegen): Correct column names in :copyfrom

* Disable BuildKite reporting
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -72,7 +72,7 @@ jobs:
       working-directory: internal/endtoend/testdata
 
     - name: report
-      if: ${{ github.ref == 'refs/heads/main' }}
+      if: false
       run: ./scripts/report.sh
       env:
         BUILDKITE_ANALYTICS_TOKEN: ${{ secrets.BUILDKITE_ANALYTICS_TOKEN }}
@@ -87,4 +87,4 @@ jobs:
       with:
         go-version: '1.21.3'
     - run: go install golang.org/x/vuln/cmd/govulncheck@latest
-    - run: govulncheck ./...
+    - run: govulncheck ./...
diff --git a/examples/batch/sqlc.json b/examples/batch/sqlc.json
@@ -13,6 +13,9 @@
       "database": {
         "managed": true
       },
+      "analyzer": {
+        "database": false
+      },
       "rules": [
         "sqlc/db-prepare"
       ],
@@ -22,4 +25,4 @@
       "emit_interface": true
     }
   ]
-}
+}
diff --git a/internal/codegen/golang/query.go b/internal/codegen/golang/query.go
@@ -166,7 +166,11 @@ func (v QueryValue) ColumnNamesAsGoSlice() string {
 	}
 	escapedNames := make([]string, len(v.Struct.Fields))
 	for i, f := range v.Struct.Fields {
-		escapedNames[i] = fmt.Sprintf("%q", f.DBName)
+		if f.Column != nil && f.Column.OriginalName != "" {
+			escapedNames[i] = fmt.Sprintf("%q", f.Column.OriginalName)
+		} else {
+			escapedNames[i] = fmt.Sprintf("%q", f.DBName)
+		}
 	}
 	return "[]string{" + strings.Join(escapedNames, ", ") + "}"
 }
diff --git a/internal/config/v_one.go b/internal/config/v_one.go
@@ -21,7 +21,7 @@ type v1PackageSettings struct {
 	Name                      string     `json:"name" yaml:"name"`
 	Engine                    Engine     `json:"engine,omitempty" yaml:"engine"`
 	Database                  *Database  `json:"database,omitempty" yaml:"database"`
-  Analyzer                  Analyzer   `json:"analyzer" yaml:"analyzer"`
+	Analyzer                  Analyzer   `json:"analyzer" yaml:"analyzer"`
 	Path                      string     `json:"path" yaml:"path"`
 	Schema                    Paths      `json:"schema" yaml:"schema"`
 	Queries                   Paths      `json:"queries" yaml:"queries"`
@@ -148,6 +148,7 @@ func (c *V1GenerateSettings) Translate() Config {
 			Schema:   pkg.Schema,
 			Queries:  pkg.Queries,
 			Rules:    pkg.Rules,
+			Analyzer: pkg.Analyzer,
 			Gen: SQLGen{
 				Go: &SQLGo{
 					EmitInterface:             pkg.EmitInterface,
diff --git a/internal/endtoend/endtoend_test.go b/internal/endtoend/endtoend_test.go
@@ -21,7 +21,7 @@ import (
 )
 
 func TestExamples(t *testing.T) {
-	// t.Parallel()
+	t.Parallel()
 	ctx := context.Background()
 
 	examples, err := filepath.Abs(filepath.Join("..", "..", "examples"))
@@ -40,7 +40,7 @@ func TestExamples(t *testing.T) {
 		}
 		tc := replay.Name()
 		t.Run(tc, func(t *testing.T) {
-			// t.Parallel()
+			t.Parallel()
 			path := filepath.Join(examples, tc)
 			var stderr bytes.Buffer
 			opts := &cmd.Options{
diff --git a/internal/endtoend/testdata/copyfrom_named_params/issue.md b/internal/endtoend/testdata/copyfrom_named_params/issue.md
@@ -0,0 +1 @@
+https://github.com/sqlc-dev/sqlc/issues/2833
diff --git a/internal/endtoend/testdata/copyfrom_named_params/postgresql/pgx/go/copyfrom.go b/internal/endtoend/testdata/copyfrom_named_params/postgresql/pgx/go/copyfrom.go
diff --git a/internal/endtoend/testdata/copyfrom_named_params/postgresql/pgx/go/db.go b/internal/endtoend/testdata/copyfrom_named_params/postgresql/pgx/go/db.go
diff --git a/internal/endtoend/testdata/copyfrom_named_params/postgresql/pgx/go/models.go b/internal/endtoend/testdata/copyfrom_named_params/postgresql/pgx/go/models.go
diff --git a/internal/endtoend/testdata/copyfrom_named_params/postgresql/pgx/go/query.sql.go b/internal/endtoend/testdata/copyfrom_named_params/postgresql/pgx/go/query.sql.go
diff --git a/internal/endtoend/testdata/copyfrom_named_params/postgresql/pgx/query.sql b/internal/endtoend/testdata/copyfrom_named_params/postgresql/pgx/query.sql
@@ -0,0 +1,6 @@
+-- name: StageUserData :copyfrom
+insert into "user_data" ("id", "user")
+values (
+    sqlc.arg('id_param'),
+    sqlc.arg('user_param')
+);
diff --git a/internal/endtoend/testdata/copyfrom_named_params/postgresql/pgx/schema.sql b/internal/endtoend/testdata/copyfrom_named_params/postgresql/pgx/schema.sql
@@ -0,0 +1,5 @@
+create table "user_data" (
+	"id" varchar not null,
+	"user" varchar not null,
+	primary key ("id")
+);
diff --git a/internal/endtoend/testdata/copyfrom_named_params/postgresql/pgx/sqlc.yaml b/internal/endtoend/testdata/copyfrom_named_params/postgresql/pgx/sqlc.yaml
@@ -0,0 +1,10 @@
+version: "2"
+sql:
+  - engine: "postgresql"
+    schema: "schema.sql"
+    queries: "query.sql"
+    gen:
+      go:
+        package: "querytest"
+        out: "go"
+        sql_package: "pgx/v5"
diff --git a/internal/sql/validate/cmd.go b/internal/sql/validate/cmd.go
@@ -39,7 +39,10 @@ func validateCopyfrom(n ast.Node) error {
 		return nil
 	}
 	for _, v := range sublist.Items {
-		if _, ok := v.(*ast.ParamRef); !ok {
+		_, ok := v.(*ast.ParamRef)
+		ok = ok || named.IsParamFunc(v)
+		ok = ok || named.IsParamSign(v)
+		if !ok {
 			return errors.New(":copyfrom doesn't support non-parameter values")
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,11 @@ func (v QueryValue) ColumnNamesAsGoSlice() string {`
`166`	`166`	`}`
`167`	`167`	`escapedNames := make([]string, len(v.Struct.Fields))`
`168`	`168`	`for i, f := range v.Struct.Fields {`
`169`		`- escapedNames[i] = fmt.Sprintf("%q", f.DBName)`
	`169`	`+ if f.Column != nil && f.Column.OriginalName != "" {`
	`170`	`+ escapedNames[i] = fmt.Sprintf("%q", f.Column.OriginalName)`
	`171`	`+ } else {`
	`172`	`+ escapedNames[i] = fmt.Sprintf("%q", f.DBName)`
	`173`	`+ }`
`170`	`174`	`}`
`171`	`175`	`return "[]string{" + strings.Join(escapedNames, ", ") + "}"`
`172`	`176`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+https://github.com/sqlc-dev/sqlc/issues/2833`