params order

Author: nikolayk812

internal/compiler/analyze.go

@@ -142,12 +142,16 @@ func (c *Compiler) _analyzeQuery(raw *ast.RawStmt, query string, failfast bool)
 	raw, namedParams, edits := rewrite.NamedParameters(c.conf.Engine, raw, numbers, dollar)
 
 	var table *ast.TableName
-	if n, ok := raw.Stmt.(*ast.InsertStmt); ok {
+	switch n := raw.Stmt.(type) {
+	case *ast.InsertStmt:
 		var err error
 		table, err = ParseTableName(n.Relation)
 		if err := check(err); err != nil {
 			return nil, err
 		}
+		if err := check(validate.InsertStmt(c.catalog, table, n)); err != nil {
+			return nil, err
+		}
 	}
 
 	if err := check(validate.FuncCall(c.catalog, c.combo, raw)); err != nil {
@@ -181,11 +185,6 @@ func (c *Compiler) _analyzeQuery(raw *ast.RawStmt, query string, failfast bool)
 	if err := check(err); err != nil {
 		return nil, err
 	}
-	if n, ok := raw.Stmt.(*ast.InsertStmt); ok {
-		if err := check(validate.InsertStmt(n, table, c.catalog)); err != nil {
-			return nil, err
-		}
-	}
 	cols, err := c.outputColumns(qc, raw.Stmt)
 	if err := check(err); err != nil {
 		return nil, err

internal/sql/validate/insert_stmt.go

@@ -8,7 +8,7 @@ import (
 	"github.com/sqlc-dev/sqlc/internal/sql/sqlerr"
 )
 
-func InsertStmt(stmt *ast.InsertStmt, fqn *ast.TableName, c *catalog.Catalog) error {
+func InsertStmt(c *catalog.Catalog, fqn *ast.TableName, stmt *ast.InsertStmt) error {
 	sel, ok := stmt.SelectStmt.(*ast.SelectStmt)
 	if !ok {
 		return nil
@@ -38,15 +38,15 @@ func InsertStmt(stmt *ast.InsertStmt, fqn *ast.TableName, c *catalog.Catalog) er
 			Message: "INSERT has more expressions than target columns",
 		}
 	}
-	return onConflictClause(stmt, fqn, c)
+	return onConflictClause(c, fqn, stmt)
 }
 
 // onConflictClause validates an ON CONFLICT DO UPDATE clause against the target
 // table. It checks:
 //   - ON CONFLICT (col, ...) conflict target columns exist
 //   - DO UPDATE SET col = ... assignment target columns exist
 //   - EXCLUDED.col references exist
-func onConflictClause(n *ast.InsertStmt, fqn *ast.TableName, c *catalog.Catalog) error {
+func onConflictClause(c *catalog.Catalog, fqn *ast.TableName, n *ast.InsertStmt) error {
 	if n.OnConflictClause == nil || n.OnConflictClause.Action != ast.OnConflictActionUpdate {
 		return nil
 	}