Refactor Args and ArgsWithDefaults methods to separate non-default and default parameters

Author: aabajyan

internal/core/gen.go

@@ -22,18 +22,39 @@ func (v Params) isEmpty() bool {
 	return len(v.ModelClass.Fields) == 0
 }
 
+func splitFieldsByDefault(fields []Field, withDefault func(Field) string, withoutDefault func(Field) string) (nonDefaults, defaults []string) {
+	for _, f := range fields {
+		if f.Default != "" {
+			defaults = append(defaults, withDefault(f))
+			continue
+		}
+
+		nonDefaults = append(nonDefaults, withoutDefault(f))
+	}
+	return
+}
+
+func withoutDefaultCallback(f Field) string {
+	return f.Type.String() + " $" + f.Name
+}
+
+func withDefaultCallback(f Field) string {
+	return withoutDefaultCallback(f) + " = " + f.Default
+}
+
 func (v Params) Args() string {
 	if v.isEmpty() {
 		return ""
 	}
 
-	var out []string
 	fields := v.ModelClass.Fields
-	for _, f := range fields {
-		sig := f.Type.String() + " $" + f.Name
-		out = append(out, sig)
-	}
+	nonDefaults, defaults := splitFieldsByDefault(
+		fields,
+		withoutDefaultCallback,
+		withoutDefaultCallback,
+	)
 
+	out := append(nonDefaults, defaults...)
 	return strings.Join(out, ", ")
 }
 
@@ -42,17 +63,14 @@ func (v Params) ArgsWithDefaults() string {
 		return ""
 	}
 
-	var out []string
 	fields := v.ModelClass.Fields
-	for _, f := range fields {
-		sig := f.Type.String() + " $" + f.Name
-		if f.Default != "" {
-			sig += " = " + f.Default
-		}
-
-		out = append(out, sig)
-	}
+	nonDefaults, defaults := splitFieldsByDefault(
+		fields,
+		withDefaultCallback,
+		withoutDefaultCallback,
+	)
 
+	out := append(nonDefaults, defaults...)
 	return strings.Join(out, ", ")
 }
 

internal/tests/golden_test.go

@@ -63,3 +63,13 @@ func TestBoolTypeBoolMysql(t *testing.T) {
 
 	runGoldenTest(t, testCase)
 }
+
+func TestArgsWithDefaults(t *testing.T) {
+	testCase := TestCase{
+		Name:    "args_with_defaults",
+		Engine:  "sqlite",
+		Package: "Test\\ArgsWithDefaults",
+	}
+
+	runGoldenTest(t, testCase)
+}

internal/tests/testdata/args_with_defaults/expected/Author.php

@@ -0,0 +1,19 @@
+<?php
+// @formatter:off
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.30.0
+
+declare(strict_types=1);
+
+namespace Test\ArgsWithDefaults;
+
+final readonly class Author {
+    public function __construct(
+        public int $id,
+        public string $name,
+        public ?int $age,
+    )
+    {}
+}
+

internal/tests/testdata/args_with_defaults/expected/Queries.php

@@ -0,0 +1,15 @@
+<?php
+// @formatter:off
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.30.0
+
+declare(strict_types=1);
+
+namespace Test\ArgsWithDefaults;
+
+interface Queries {
+  public function insertAuthor(int $id, int $age, string $name): void;
+  
+}
+

internal/tests/testdata/args_with_defaults/expected/QueriesImpl.php

@@ -0,0 +1,34 @@
+<?php
+// @formatter:off
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.30.0
+
+declare(strict_types=1);
+
+namespace Test\ArgsWithDefaults;
+
+const insertAuthor = "-- name: insertAuthor :exec
+INSERT INTO
+    author (id, name, age)
+VALUES
+    (?1, ?2, ?3)
+";
+
+final readonly class QueriesImpl implements Queries {
+    public function __construct(private \PDO $pdo) {}
+
+    /**
+     * @sqlc-param int $id
+     * @sqlc-param string $name='hello'
+     * @sqlc-param int $age
+     * @throws \Exception
+     */
+    public function insertAuthor(int $id, int $age, string $name = 'hello'): void
+    {
+        $stmt = $this->pdo->prepare(insertAuthor);
+        $stmt->execute([$id, $name, $age]);
+    }
+
+}
+

internal/tests/testdata/args_with_defaults/query.sql

@@ -0,0 +1,8 @@
+-- name: InsertAuthor :exec
+-- @sqlc-param int $id
+-- @sqlc-param string $name='hello'
+-- @sqlc-param int $age
+INSERT INTO
+    author (id, name, age)
+VALUES
+    (:id, :name, :age);

internal/tests/testdata/args_with_defaults/schema.sql

@@ -0,0 +1,5 @@
+CREATE TABLE author (
+    id INTEGER PRIMARY KEY,
+    name TEXT NOT NULL,
+    age INTEGER DEFAULT 42
+);