Merge pull request #86 from prasad83/master

Accept Column object through setColumns.
nilportugues · Jun 21, 2017 · a5f6c98 · a5f6c98
2 parents 877d54f + 13fd053
commit a5f6c98
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/Syntax/SyntaxFactory.php b/src/Syntax/SyntaxFactory.php
@@ -35,6 +35,8 @@ public static function createColumns(array &$arguments, $table = null)
                     $column->setAlias($index);
                 }
 
+                $createdColumns[] = $column;
+            } else if ($column instanceof Column) {
                 $createdColumns[] = $column;
             }
         }

diff --git a/src/Syntax/Where.php b/src/Syntax/Where.php
@@ -278,7 +278,8 @@ protected function compare($column, $value, $operator)
     protected function prepareColumn($column)
     {
         //This condition handles the "Select as a a column" special case.
-        if ($column instanceof Select) {
+        //or when compare column is customized.
+        if ($column instanceof Select || $column instanceof Column) {
             return $column;
         }