Fix Postgre Query Builder Bindinngs

rcalicdan · rcalicdan · commit 4c8d30efa361 · 2025-09-01T13:57:09.000+08:00
diff --git a/src/QueryBuilder/PostgresQueryBuilder.php b/src/QueryBuilder/PostgresQueryBuilder.php
@@ -6,27 +6,14 @@
 use Rcalicdan\FiberAsync\Api\AsyncPostgreSQL;
 use Rcalicdan\FiberAsync\Api\Promise;
 use Rcalicdan\FiberAsync\Promise\Interfaces\PromiseInterface;
-use Rcalicdan\FiberAsync\QueryBuilder\Traits\QueryBuilderCoreTrait;
-use Rcalicdan\FiberAsync\QueryBuilder\Traits\QueryConditionsTrait;
-use Rcalicdan\FiberAsync\QueryBuilder\Traits\QueryJoinTrait;
-use Rcalicdan\FiberAsync\QueryBuilder\Traits\QueryGroupingTrait;
-use Rcalicdan\FiberAsync\QueryBuilder\Traits\QueryAdvancedConditionsTrait;
-use Rcalicdan\FiberAsync\QueryBuilder\Traits\QueryDebugTrait;
-use Rcalicdan\FiberAsync\QueryBuilder\Traits\SqlBuilderTrait;
 
-
-class PostgresQueryBuilder
+/**
+ * PostgreSQL query builder with async execution methods.
+ */
+class PostgresQueryBuilder extends PostgresQueryBuilderBase
 {
-    use QueryBuilderCoreTrait,
-        QueryConditionsTrait,
-        QueryJoinTrait,
-        QueryGroupingTrait,
-        QueryAdvancedConditionsTrait,
-        SqlBuilderTrait,
-        QueryDebugTrait;
-
     /**
-     * Create a new AsyncQueryBuilder instance.
+     * Create a new PostgresQueryBuilder instance.
      *
      * @param  string  $table  The table name to query.
      */
@@ -45,7 +32,6 @@ final public function __construct(string $table = '')
     public function get(): PromiseInterface
     {
         $sql = $this->buildSelectQuery();
-
         return AsyncPostgreSQL::query($sql, $this->getCompiledBindings());
     }
 
@@ -56,10 +42,8 @@ public function get(): PromiseInterface
      */
     public function first(): PromiseInterface
     {
-        // A new instance with a limit is created for this specific query execution
         $instanceWithLimit = $this->limit(1);
         $sql = $instanceWithLimit->buildSelectQuery();
-
         return AsyncPostgreSQL::fetchOne($sql, $instanceWithLimit->getCompiledBindings());
     }
 
@@ -91,10 +75,8 @@ public function findOrFail(mixed $id, string $column = 'id'): PromiseInterface
             $result = await($this->find($id, $column));
             if ($result === null || $result === false) {
                 $idString = is_scalar($id) ? (string) $id : 'complex_type';
-
                 throw new \RuntimeException("Record not found with {$column} = {$idString}");
             }
-
             return $result;
         })();
     }
@@ -110,7 +92,6 @@ public function value(string $column): PromiseInterface
         // @phpstan-ignore-next-line
         return Async::async(function () use ($column): mixed {
             $result = await($this->select($column)->first());
-
             return ($result !== false && isset($result[$column])) ? $result[$column] : null;
         })();
     }
@@ -126,7 +107,6 @@ public function count(string $column = '*'): PromiseInterface
         $sql = $this->buildCountQuery($column);
         /** @var PromiseInterface<int> */
         $promise = AsyncPostgreSQL::fetchValue($sql, $this->getCompiledBindings());
-
         return $promise;
     }
 
@@ -140,7 +120,6 @@ public function exists(): PromiseInterface
         // @phpstan-ignore-next-line
         return Async::async(function (): bool {
             $count = await($this->count());
-
             return $count > 0;
         })();
     }
@@ -157,10 +136,26 @@ public function insert(array $data): PromiseInterface
             return Promise::resolve(0);
         }
         $sql = $this->buildInsertQuery($data);
-
         return AsyncPostgreSQL::execute($sql, array_values($data));
     }
 
+    /**
+     * Insert a single record and return the inserted ID.
+     *
+     * @param  array<string, mixed>  $data  The data to insert as column => value pairs.
+     * @param  string  $idColumn  The name of the ID column to return.
+     * @return PromiseInterface<mixed> A promise that resolves to the inserted ID value.
+     */
+    public function insertGetId(array $data, string $idColumn = 'id'): PromiseInterface
+    {
+        if ($data === []) {
+            return Promise::resolve(null);
+        }
+        
+        $sql = $this->buildInsertReturningQuery($data, $idColumn);
+        return AsyncPostgreSQL::fetchValue($sql, array_values($data));
+    }
+
     /**
      * Insert multiple records in a batch operation.
      *
@@ -221,7 +216,6 @@ public function update(array $data): PromiseInterface
     public function delete(): PromiseInterface
     {
         $sql = $this->buildDeleteQuery();
-
         return AsyncPostgreSQL::execute($sql, $this->getCompiledBindings());
     }
-}
+}
diff --git a/src/QueryBuilder/PostgresQueryBuilderBase.php b/src/QueryBuilder/PostgresQueryBuilderBase.php
@@ -0,0 +1,248 @@
+<?php
+
+namespace Rcalicdan\FiberAsync\QueryBuilder;
+
+use Rcalicdan\FiberAsync\QueryBuilder\Traits\QueryBuilderCoreTrait;
+use Rcalicdan\FiberAsync\QueryBuilder\Traits\QueryConditionsTrait;
+use Rcalicdan\FiberAsync\QueryBuilder\Traits\QueryJoinTrait;
+use Rcalicdan\FiberAsync\QueryBuilder\Traits\QueryGroupingTrait;
+use Rcalicdan\FiberAsync\QueryBuilder\Traits\QueryAdvancedConditionsTrait;
+use Rcalicdan\FiberAsync\QueryBuilder\Traits\QueryDebugTrait;
+use Rcalicdan\FiberAsync\QueryBuilder\Traits\SqlBuilderTrait;
+
+/**
+ * Abstract PostgreSQL query builder base with optimizations.
+ */
+abstract class PostgresQueryBuilderBase
+{
+    use QueryBuilderCoreTrait,
+        QueryConditionsTrait,
+        QueryJoinTrait,
+        QueryGroupingTrait,
+        QueryAdvancedConditionsTrait,
+        SqlBuilderTrait,
+        QueryDebugTrait;
+
+    /**
+     * @var int Parameter counter for PostgreSQL numbered parameters
+     */
+    protected int $parameterCount = 0;
+
+    /**
+     * Generate PostgreSQL parameter placeholder ($1, $2, $3, etc.)
+     */
+    protected function getPlaceholder(): string
+    {
+        return '$' . (++$this->parameterCount);
+    }
+
+    /**
+     * Reset parameter counter for new query
+     */
+    protected function resetParameterCount(): void
+    {
+        $this->parameterCount = 0;
+    }
+
+    /**
+     * PostgreSQL ILIKE for case-insensitive matching
+     */
+    public function ilike(string $column, string $value, string $side = 'both'): static
+    {
+        $instance = clone $this;
+        $placeholder = $instance->getPlaceholder();
+        $instance->where[] = "{$column} ILIKE {$placeholder}";
+
+        $likeValue = match ($side) {
+            'before' => "%{$value}",
+            'after' => "{$value}%",
+            'both' => "%{$value}%",
+            default => $value
+        };
+
+        $instance->bindings['where'][] = $likeValue;
+        return $instance;
+    }
+
+    /**
+     * PostgreSQL JSON field access
+     */
+    public function whereJson(string $column, string $path, mixed $value): static
+    {
+        $instance = clone $this;
+        $placeholder = $instance->getPlaceholder();
+        $instance->where[] = "{$column}->'{$path}' = {$placeholder}";
+        $instance->bindings['where'][] = $value;
+        return $instance;
+    }
+
+    /**
+     * Override buildSelectQuery to reset parameter count and optimize for PostgreSQL
+     */
+    protected function buildSelectQuery(): string
+    {
+        $this->resetParameterCount();
+        
+        $sql = 'SELECT ' . implode(', ', $this->select);
+        $sql .= ' FROM ' . $this->table;
+
+        foreach ($this->joins as $join) {
+            if ($join['type'] === 'CROSS') {
+                $sql .= " CROSS JOIN {$join['table']}";
+            } else {
+                $sql .= " {$join['type']} JOIN {$join['table']} ON {$join['condition']}";
+            }
+        }
+
+        $whereSql = $this->buildWhereClause();
+        if ($whereSql !== '') {
+            $sql .= ' WHERE ' . $whereSql;
+        }
+
+        if ($this->groupBy !== []) {
+            $sql .= ' GROUP BY ' . implode(', ', $this->groupBy);
+        }
+
+        if ($this->having !== []) {
+            $sql .= ' HAVING ' . implode(' AND ', $this->having);
+        }
+
+        if ($this->orderBy !== []) {
+            $sql .= ' ORDER BY ' . implode(', ', $this->orderBy);
+        }
+
+        if ($this->limit !== null) {
+            $sql .= ' LIMIT ' . $this->limit;
+            if ($this->offset !== null) {
+                $sql .= ' OFFSET ' . $this->offset;
+            }
+        }
+
+        return $sql;
+    }
+
+    /**
+     * Override buildCountQuery for PostgreSQL
+     */
+    protected function buildCountQuery(string $column = '*'): string
+    {
+        $this->resetParameterCount();
+        
+        $sql = "SELECT COUNT({$column}) FROM " . $this->table;
+
+        foreach ($this->joins as $join) {
+            if ($join['type'] === 'CROSS') {
+                $sql .= " CROSS JOIN {$join['table']}";
+            } else {
+                $sql .= " {$join['type']} JOIN {$join['table']} ON {$join['condition']}";
+            }
+        }
+
+        $whereSql = $this->buildWhereClause();
+        if ($whereSql !== '') {
+            $sql .= ' WHERE ' . $whereSql;
+        }
+
+        if ($this->groupBy !== []) {
+            $sql .= ' GROUP BY ' . implode(', ', $this->groupBy);
+        }
+
+        if ($this->having !== []) {
+            $sql .= ' HAVING ' . implode(' AND ', $this->having);
+        }
+
+        return $sql;
+    }
+
+    /**
+     * Override buildInsertQuery for PostgreSQL
+     */
+    protected function buildInsertQuery(array $data): string
+    {
+        $this->resetParameterCount();
+        
+        $columns = implode(', ', array_keys($data));
+        $placeholders = [];
+        
+        foreach ($data as $value) {
+            $placeholders[] = $this->getPlaceholder();
+        }
+        
+        $placeholderString = implode(', ', $placeholders);
+        return "INSERT INTO {$this->table} ({$columns}) VALUES ({$placeholderString})";
+    }
+
+    /**
+     * Override buildInsertBatchQuery for PostgreSQL
+     */
+    protected function buildInsertBatchQuery(array $data): string
+    {
+        $this->resetParameterCount();
+        
+        if (empty($data) || !is_array($data[0])) {
+            throw new \InvalidArgumentException('Invalid data format for batch insert');
+        }
+
+        $firstRow = $data[0];
+        $columns = implode(', ', array_keys($firstRow));
+        
+        $valueGroups = [];
+        foreach ($data as $row) {
+            $rowPlaceholders = [];
+            foreach ($row as $value) {
+                $rowPlaceholders[] = $this->getPlaceholder();
+            }
+            $valueGroups[] = '(' . implode(', ', $rowPlaceholders) . ')';
+        }
+        
+        $allPlaceholders = implode(', ', $valueGroups);
+        return "INSERT INTO {$this->table} ({$columns}) VALUES {$allPlaceholders}";
+    }
+
+    /**
+     * Override buildUpdateQuery for PostgreSQL
+     */
+    protected function buildUpdateQuery(array $data): string
+    {
+        $this->resetParameterCount();
+        
+        $setClauses = [];
+        foreach (array_keys($data) as $column) {
+            $setClauses[] = "{$column} = " . $this->getPlaceholder();
+        }
+        
+        $sql = "UPDATE {$this->table} SET " . implode(', ', $setClauses);
+        
+        $whereSql = $this->buildWhereClause();
+        if ($whereSql !== '') {
+            $sql .= ' WHERE ' . $whereSql;
+        }
+
+        return $sql;
+    }
+
+    /**
+     * Override buildDeleteQuery for PostgreSQL
+     */
+    protected function buildDeleteQuery(): string
+    {
+        $this->resetParameterCount();
+        
+        $sql = "DELETE FROM {$this->table}";
+        
+        $whereSql = $this->buildWhereClause();
+        if ($whereSql !== '') {
+            $sql .= ' WHERE ' . $whereSql;
+        }
+
+        return $sql;
+    }
+
+    /**
+     * Build INSERT with RETURNING clause for PostgreSQL
+     */
+    protected function buildInsertReturningQuery(array $data, string $returning = 'id'): string
+    {
+        return $this->buildInsertQuery($data) . " RETURNING {$returning}";
+    }
+}
diff --git a/test.php b/test.php
@@ -7,6 +7,6 @@
 require 'vendor/autoload.php';
 
 run(function (){
-    $results = await(DB::table('users')->first());
+    $results = await(DB::table('users')->where('id', 2)->first());
     print_r($results);
 });
