Implemented retrieval of query parameters

HarmonyIO · Apr 3, 2019 · b41807c · b41807c
1 parent 9e6db97
commit b41807c
Show file tree

Hide file tree

Showing 14 changed files with 141 additions and 6 deletions.
diff --git a/examples/postgres-pool.php b/examples/postgres-pool.php
@@ -16,10 +16,11 @@
 $connection = new Connection($postgresPool);
 
 $query = $connection
-    ->insert('users')
-    ->value('column1', 1)
-    ->value('column2', 1)
-    ->getQuery()
+    ->select('column1')
+    ->from('table1')
+    ->join('table2', 'table2.id = table1.id')
+    ->where('column1 not in (?)', [1, 2])
 ;
 
-var_dump($query);
+var_dump($query->getQuery());
+var_dump($query->getParameters());
diff --git a/src/QueryBuilder/Column/Value.php b/src/QueryBuilder/Column/Value.php
@@ -16,7 +16,7 @@ class Value implements Column
     private $alias;
 
     /**
-     * @param int|string|mixed[] $value
+     * @param int|string|mixed[]|null $value
      */
     public function __construct(QuoteStyle $quoteStyle, $value, ?string $alias = null)
     {
@@ -31,6 +31,14 @@ public function getTable(): ?string
     }
 
     public function getName(): string
+    {
+        return (string) $this->value;
+    }
+
+    /**
+     * @return int|string|mixed[]|null
+     */
+    public function getValue()
     {
         return $this->value;
     }

diff --git a/src/QueryBuilder/Condition/AndCondition.php b/src/QueryBuilder/Condition/AndCondition.php
@@ -2,6 +2,8 @@
 
 namespace HarmonyIO\Dbal\QueryBuilder\Condition;
 
+use HarmonyIO\Dbal\QueryBuilder\Column\Field;
+
 final class AndCondition implements Condition
 {
     /** @var Condition[] */
@@ -22,4 +24,18 @@ public function toSql(): string
 
         return '(' . implode(' AND ', $conditionsSql) . ')';
     }
+
+    /**
+     * @return mixed[]
+     */
+    public function getParameters(): array
+    {
+        $parameters = [];
+
+        foreach ($this->conditions as $condition) {
+            $parameters = array_merge($parameters, $condition->getParameters());
+        }
+
+        return $parameters;
+    }
 }
diff --git a/src/QueryBuilder/Condition/Collection.php b/src/QueryBuilder/Condition/Collection.php
@@ -50,4 +50,18 @@ public function getConditions(): array
     {
         return $this->conditions;
     }
+
+    /**
+     * @return mixed[]
+     */
+    public function getParameters(): array
+    {
+        $parameters = [];
+
+        foreach ($this->conditions as $condition) {
+            $parameters = array_merge($parameters, $condition->getParameters());
+        }
+
+        return $parameters;
+    }
 }
diff --git a/src/QueryBuilder/Condition/Condition.php b/src/QueryBuilder/Condition/Condition.php
@@ -6,4 +6,8 @@
 
 interface Condition extends QueryPart
 {
+    /**
+     * @return mixed[]
+     */
+    public function getParameters(): array;
 }
diff --git a/src/QueryBuilder/Condition/InCondition.php b/src/QueryBuilder/Condition/InCondition.php
@@ -32,4 +32,12 @@ private function setToSql(): string
 
         return sprintf('(%s)', implode(', ', $placeHolders));
     }
+
+    /**
+     * @return mixed[]
+     */
+    public function getParameters(): array
+    {
+        return array_values($this->set);
+    }
 }
diff --git a/src/QueryBuilder/Condition/MatchingCondition.php b/src/QueryBuilder/Condition/MatchingCondition.php
@@ -3,6 +3,7 @@
 namespace HarmonyIO\Dbal\QueryBuilder\Condition;
 
 use HarmonyIO\Dbal\QueryBuilder\Column\Column;
+use HarmonyIO\Dbal\QueryBuilder\Column\Field;
 use HarmonyIO\Dbal\QueryBuilder\Column\Value;
 
 final class MatchingCondition implements Condition
@@ -42,4 +43,18 @@ private function valueToSql($value): string
 
         return '?';
     }
+
+    /**
+     * @return mixed[]
+     */
+    public function getParameters(): array
+    {
+        if ($this->rightValue instanceof Field) {
+            return [];
+        }
+
+        return [
+            $this->rightValue->getValue(),
+        ];
+    }
 }
diff --git a/src/QueryBuilder/Condition/NotInCondition.php b/src/QueryBuilder/Condition/NotInCondition.php
@@ -32,4 +32,12 @@ private function setToSql(): string
 
         return sprintf('(%s)', implode(', ', $placeHolders));
     }
+
+    /**
+     * @return mixed[]
+     */
+    public function getParameters(): array
+    {
+        return array_values($this->set);
+    }
 }
diff --git a/src/QueryBuilder/Condition/NotNullCondition.php b/src/QueryBuilder/Condition/NotNullCondition.php
@@ -18,4 +18,12 @@ public function toSql(): string
     {
         return $this->field->toSql() . ' IS NOT NULL';
     }
+
+    /**
+     * @return mixed[]
+     */
+    public function getParameters(): array
+    {
+        return [];
+    }
 }
diff --git a/src/QueryBuilder/Condition/NullCondition.php b/src/QueryBuilder/Condition/NullCondition.php
@@ -18,4 +18,12 @@ public function toSql(): string
     {
         return $this->field->toSql() . ' IS NULL';
     }
+
+    /**
+     * @return mixed[]
+     */
+    public function getParameters(): array
+    {
+        return [];
+    }
 }
diff --git a/src/QueryBuilder/Condition/OrCondition.php b/src/QueryBuilder/Condition/OrCondition.php
@@ -22,4 +22,18 @@ public function toSql(): string
 
         return '(' . implode(' OR ', $conditionsSql) . ')';
     }
+
+    /**
+     * @return mixed[]
+     */
+    public function getParameters(): array
+    {
+        $parameters = [];
+
+        foreach ($this->conditions as $condition) {
+            $parameters = array_merge($parameters, $condition->getParameters());
+        }
+
+        return $parameters;
+    }
 }
diff --git a/src/QueryBuilder/Factory/Field.php b/src/QueryBuilder/Factory/Field.php
@@ -18,6 +18,9 @@ public function __construct(QuoteStyle $quoteStyle)
         $this->quoteStyle = $quoteStyle;
     }
 
+    /**
+     * @param int|string|mixed[]|null $parameter
+     */
     public function buildFromString(string $string): Column
     {
         $pattern = '~^(?:(?:(?P<function>[^\s]+)\s*\(\s*(?:(?P<table1>[^\s\(\)]+)(?:\.))?(?P<column1>[^\s\(\)]+)\s*\))|(?:(?P<table2>[^\s\(\)]+)(?:\.))?(?P<column2>[^\s\(\)]+))(?:\s+as\s+(?P<alias>.+))?$~ix';

diff --git a/src/QueryBuilder/Join/Join.php b/src/QueryBuilder/Join/Join.php
@@ -29,4 +29,12 @@ public function toSql(): string
     {
         return $this->type->getValue() . ' ' . $this->joinedTable->toSql() . ' ON ' . $this->condition->toSql();
     }
+
+    /**
+     * @return mixed[]
+     */
+    public function getParameters(): array
+    {
+        return $this->condition->getParameters();
+    }
 }
diff --git a/src/QueryBuilder/Statement/Select.php b/src/QueryBuilder/Statement/Select.php
@@ -228,4 +228,24 @@ public function getQuery(): string
 
         return 'SELECT ' . $this->fieldSet->toSql() . $from . $joins . $condition . $orders . $limit . $offset;
     }
+
+    /**
+     * @return mixed[]
+     */
+    public function getParameters(): array
+    {
+        $parameters = [];
+
+        if ($this->condition !== null) {
+            $parameters = array_merge($parameters, $this->condition->getParameters());
+        }
+
+        if ($this->joins) {
+            foreach ($this->joins as $join) {
+                $parameters = array_merge($parameters, $join->getParameters());
+            }
+        }
+
+        return $parameters;
+    }
 }