Fix binary expression deflate with argument array

c9s · Sep 23, 2015 · d409623 · d409623
1 parent 3ac2382
commit d409623
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/SQLBuilder/Universal/Expr/BinaryExpr.php b/src/SQLBuilder/Universal/Expr/BinaryExpr.php
@@ -20,7 +20,7 @@ public function __construct($operand, $op, $operand2) {
     }
 
     public function toSql(BaseDriver $driver, ArgumentArray $args) {
-        return $this->operand . ' ' . $this->op . ' ' . $driver->deflate($this->operand2);
+        return $this->operand . ' ' . $this->op . ' ' . $driver->deflate($this->operand2, $args);
     }
 
     static public function __set_state($array)

diff --git a/src/SQLBuilder/Universal/Expr/UnaryExpr.php b/src/SQLBuilder/Universal/Expr/UnaryExpr.php
@@ -14,13 +14,15 @@ class UnaryExpr implements ToSqlInterface
 
     public $operand;
 
-    public function __construct($op, $operand) {
+    public function __construct($op, $operand)
+    {
         $this->op = $op;
         $this->operand = $operand;
     }
 
-    public function toSql(BaseDriver $driver, ArgumentArray $args) {
-        return $this->op . ' ' . $this->operand;
+    public function toSql(BaseDriver $driver, ArgumentArray $args)
+    {
+        return $this->op . ' ' . $driver->deflate($this->operand, $args);
     }
 
     static public function __set_state(array $array)