extended support for join

added support for custom condtions as arrayo
spotorm · Jun 13, 2016 · 74e9235 · 74e9235
1 parent 5f4d636
commit 74e9235
Show file tree

Hide file tree

Showing 13 changed files with 113 additions and 10 deletions.
diff --git a/lib/Mapper.php b/lib/Mapper.php
@@ -91,12 +91,14 @@ public function collectionClass()
 
     /**
      * Entity manager class for storing information and meta-data about entities
-     *
+     * @param string $entityName
      * @return \Spot\Entity\Manager
      */
-    public function entityManager()
+    public function entityManager($entityName = null)
     {
-        $entityName = $this->entity();
+        if (!$entityName) {
+            $entityName = $this->entity();
+        }
         if (!isset(self::$entityManager[$entityName])) {
             self::$entityManager[$entityName] = new Entity\Manager($entityName);
         }

diff --git a/lib/Query.php b/lib/Query.php
@@ -421,10 +421,11 @@ public function whereSql($sql)
      *
      * @param array $where Array of conditions for this clause
      * @param bool $useAlias
+     * @param string $entityName
      * @return array SQL fragment strings for WHERE clause
      * @throws Exception
      */
-    private function parseWhereToSQLFragments(array $where, $useAlias = true)
+    private function parseWhereToSQLFragments(array $where, $useAlias = true, $entityName=null)
     {
         $builder = $this->builder();
 
@@ -457,9 +458,14 @@ private function parseWhereToSQLFragments(array $where, $useAlias = true)
 
             // Prefix column name with alias
             if ($useAlias === true) {
-                $col = $this->fieldWithAlias($col);
+                $col = $this->fieldWithAlias($col, true, $entityName);
             }
 
+            if ( $this->stringIsExistingField($entityName, $value) ){
+                $value = function () use ($value){
+                        return $value;
+                };
+            }
             $sqlFragments[] = $operatorCallable($builder, $col, $value);
         }
 
@@ -777,18 +783,25 @@ public function escapeIdentifier($identifier)
      * Get field name with table alias appended
      * @param string $field
      * @param bool $escaped
+     * @param string $entityName
      * @return string
      */
-    public function fieldWithAlias($field, $escaped = true)
+    public function fieldWithAlias($field, $escaped = true, $entityName = null)
     {
-        $fieldInfo = $this->_mapper->entityManager()->fields();
+        $fieldInfo = $this->_mapper->entityManager($entityName)->fields();
 
+        //extract table alias if present
+        list($field, $table) = $this->extractTableAndFieldFromString($field);
         // Determine real field name (column alias support)
         if (isset($fieldInfo[$field])) {
             $field = $fieldInfo[$field]['column'];
         }
 
-        $field = $this->_tableName . '.' . $field;
+        if (!$table) {
+            $table = $this->_mapper->entityManager($entityName)->table();
+        }
+
+        $field = $table . '.' . $field;
 
         return $escaped ? $this->escapeIdentifier($field) : $field;
     }
@@ -903,7 +916,7 @@ private function addMapping($type, array $data)
     public function makeJoin($type, $fromAlias, $entityName, $alias, $condition)
     {
         $joinTable = $this->mapper()->getMapper($entityName)->table();
-        $conditionString = (string)$condition;
+//        $conditionString = (string)$condition;
 
         $this->addMapping(
             'join',
@@ -916,6 +929,8 @@ public function makeJoin($type, $fromAlias, $entityName, $alias, $condition)
                 ),
             )
         );
+//        $testCondition = explode('=', $condition);
+        $conditionString = implode(' AND ', $this->parseWhereToSQLFragments($condition, true, $entityName));
 //        $conditionString = implode(' =', $condition);
         //@FIXME: now parameters are double escaped, because the initial are double escaped also :(
         $this->builder()->$type(
@@ -927,4 +942,45 @@ public function makeJoin($type, $fromAlias, $entityName, $alias, $condition)
 
         return $this;
     }
+
+    /**
+     * Extract data from string, for strings which contains "point"
+     * @Example: table.field
+     * @param $string
+     * @return array
+     */
+    public function extractTableAndFieldFromString($string)
+    {
+        $pointPosition = strpos($string, '.');
+        if ($pointPosition !== false) {
+            $table = substr($string, 0, $pointPosition);
+            $field = substr($string, $pointPosition + 1);
+        } else {
+            $table = null;
+            $field = $string;
+        }
+
+        return [$field, $table];
+
+    }
+
+    public function stringIsExistingField($entityName, $value)
+    {
+        $field = null;
+
+        if (is_array($value)) {
+            return $field;
+        }
+
+        $fieldInfo = array_merge($this->_mapper->entityManager($entityName)->fields(),
+            $this->_mapper->entityManager()->fields());
+        //extract table alias if present
+        list($extractedField, $table) = $this->extractTableAndFieldFromString($value);
+        // Determine real field name (column alias support)
+        if (isset($fieldInfo[$extractedField])) {
+            $field = $fieldInfo[$extractedField]['column'];
+        }
+
+        return $field;
+    }
 }
diff --git a/lib/Query/Operator/Equals.php b/lib/Query/Operator/Equals.php
@@ -28,6 +28,10 @@ public function __invoke(QueryBuilder $builder, $column, $value)
             return $column . ' IS NULL';
         }
 
+        if ($value instanceof \Closure) {
+            return $column . ' = ' . $value();
+        }
+
         return $column . ' = ' . $builder->createPositionalParameter($value);
     }
 }
diff --git a/lib/Query/Operator/FullText.php b/lib/Query/Operator/FullText.php
@@ -17,6 +17,10 @@ class FullText
      */
     public function __invoke(QueryBuilder $builder, $column, $value)
     {
+        if ($value instanceof \Closure) {
+            return $column . ' = ' . $value();
+        }
+
         return 'MATCH(' . $column . ') AGAINST (' . $builder->createPositionalParameter($value) . ')';
     }
 }
diff --git a/lib/Query/Operator/FullTextBoolean.php b/lib/Query/Operator/FullTextBoolean.php
@@ -17,6 +17,10 @@ class FullTextBoolean
      */
     public function __invoke(QueryBuilder $builder, $column, $value)
     {
+        if ($value instanceof \Closure) {
+            return $column . ' = ' . $value();
+        }
+
         return 'MATCH(' . $column . ') AGAINST (' . $builder->createPositionalParameter($value) . ' IN BOOLEAN MODE)';
     }
 }
diff --git a/lib/Query/Operator/GreaterThan.php b/lib/Query/Operator/GreaterThan.php
@@ -17,6 +17,10 @@ class GreaterThan
      */
     public function __invoke(QueryBuilder $builder, $column, $value)
     {
+        if ($value instanceof \Closure) {
+            return $column . ' = ' . $value();
+        }
+
         return $column . ' > ' . $builder->createPositionalParameter($value);
     }
 }
diff --git a/lib/Query/Operator/GreaterThanOrEqual.php b/lib/Query/Operator/GreaterThanOrEqual.php
@@ -17,6 +17,10 @@ class GreaterThanOrEqual
      */
     public function __invoke(QueryBuilder $builder, $column, $value)
     {
+        if ($value instanceof \Closure) {
+            return $column . ' = ' . $value();
+        }
+
         return $column . ' >= ' . $builder->createPositionalParameter($value);
     }
 }
diff --git a/lib/Query/Operator/In.php b/lib/Query/Operator/In.php
@@ -24,6 +24,10 @@ public function __invoke(QueryBuilder $builder, $column, $value)
             throw new Exception("Use of IN operator expects value to be array. Got " . gettype($value) . ".");
         }
 
+        if ($value instanceof \Closure) {
+            return $column . ' = ' . $value();
+        }
+
         return $column . ' IN (' . $builder->createPositionalParameter($value, Connection::PARAM_STR_ARRAY) . ')';
     }
 }
diff --git a/lib/Query/Operator/LessThan.php b/lib/Query/Operator/LessThan.php
@@ -17,6 +17,10 @@ class LessThan
      */
     public function __invoke(QueryBuilder $builder, $column, $value)
     {
+        if ($value instanceof \Closure) {
+            return $column . ' < ' . $value();
+        }
+
         return $column . ' < ' . $builder->createPositionalParameter($value);
     }
 }
diff --git a/lib/Query/Operator/LessThanOrEqual.php b/lib/Query/Operator/LessThanOrEqual.php
@@ -17,6 +17,10 @@ class LessThanOrEqual
      */
     public function __invoke(QueryBuilder $builder, $column, $value)
     {
+        if ($value instanceof \Closure) {
+            return $column . ' <= ' . $value();
+        }
+
         return $column . ' <= ' . $builder->createPositionalParameter($value);
     }
 }
diff --git a/lib/Query/Operator/Like.php b/lib/Query/Operator/Like.php
@@ -17,6 +17,10 @@ class Like
      */
     public function __invoke(QueryBuilder $builder, $column, $value)
     {
+        if ($value instanceof \Closure) {
+            return $column . ' = ' . $value();
+        }
+
         return $column . ' LIKE ' . $builder->createPositionalParameter($value);
     }
 }
diff --git a/lib/Query/Operator/Not.php b/lib/Query/Operator/Not.php
@@ -21,13 +21,18 @@ class Not
     public function __invoke(QueryBuilder $builder, $column, $value)
     {
         if (is_array($value) && !empty($value)) {
-            return $column . ' NOT IN (' . $builder->createPositionalParameter($value, Connection::PARAM_STR_ARRAY) . ')';
+            return $column . ' NOT IN (' . $builder->createPositionalParameter($value,
+                Connection::PARAM_STR_ARRAY) . ')';
         }
 
         if ($value === null || (is_array($value) && empty($value))) {
             return $column . ' IS NOT NULL';
         }
 
+        if ($value instanceof \Closure) {
+            return $column . ' = ' . $value();
+        }
+
         return $column . ' != ' . $builder->createPositionalParameter($value);
     }
 }
diff --git a/lib/Query/Operator/RegExp.php b/lib/Query/Operator/RegExp.php
@@ -17,6 +17,10 @@ class RegExp
      */
     public function __invoke(QueryBuilder $builder, $column, $value)
     {
+        if ($value instanceof \Closure) {
+            return $column . ' = ' . $value();
+        }
+
         return $column . ' REGEXP ' . $builder->createPositionalParameter($value);
     }
 }