Fixes yiisoft#14161, yiisoft#14150: fixed primary table aliasing (inc…

…lude case manual set alias) in validators
Deele · May 16, 2017 · 921147d · 921147d
1 parent 2d12e1a
commit 921147d
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 26 deletions.
diff --git a/framework/validators/ExistValidator.php b/framework/validators/ExistValidator.php
@@ -10,6 +10,7 @@
 use Yii;
 use yii\base\InvalidConfigException;
 use yii\base\Model;
+use yii\db\ActiveQuery;
 use yii\db\ActiveRecord;
 
 /**
@@ -206,6 +207,29 @@ protected function createQuery($targetClass, $condition)
         return $query;
     }
 
+    /**
+     * Returns conditions with alias
+     * @param ActiveQuery $query
+     * @param array $conditions array of condition, keys to be modified
+     * @param null|string $alias set empty string for no apply alias. Set null for apply primary table alias
+     * @return array
+     */
+    private function applyTableAlias($query, $conditions, $alias = null)
+    {
+        if ($alias === null) {
+            $alias = array_keys($query->getTablesUsedInFrom())[0];
+        }
+        $prefixedConditions = [];
+        foreach ($conditions as $columnName => $columnValue) {
+            $prefixedColumn = "{$alias}.[[" . preg_replace(
+                    '/^' . preg_quote($alias) . '\.(.*)$/',
+                    "$1",
+                    $columnName) . "]]";
+            $prefixedConditions[$prefixedColumn] = $columnValue;
+        }
+        return $prefixedConditions;
+    }
+
     /**
      * Prefix conditions with aliases
      *
@@ -218,15 +242,6 @@ private function prefixConditions($model, $conditions)
         $targetModelClass = $this->getTargetClass($model);
 
         /** @var ActiveRecord $targetModelClass */
-        $query = $targetModelClass::find();
-        $tableAliases = array_keys($query->getTablesUsedInFrom());
-        $primaryTableAlias = $tableAliases[0];
-        $prefixedConditions = [];
-        foreach ($conditions as $columnName => $columnValue) {
-            $prefixedColumn = "{$primaryTableAlias}.[[{$columnName}]]";
-            $prefixedConditions[$prefixedColumn] = $columnValue;
-        }
-
-        return $prefixedConditions;
+        return $this->applyTableAlias($targetModelClass::find(), $conditions);
     }
 }
diff --git a/framework/validators/UniqueValidator.php b/framework/validators/UniqueValidator.php
@@ -173,12 +173,8 @@ private function modelExists($targetClass, $conditions, $model)
             // if current $model is in the database already we can't use exists()
             if ($query instanceof \yii\db\ActiveQuery) {
                 // only select primary key to optimize query
-                $primaryAlias = array_keys($query->getTablesUsedInFrom())[0];
-                $columns = $targetClass::primaryKey();
-                foreach($columns as $c => $column) {
-                    $columns[$c] = "{$primaryAlias}.[[$column]]";
-                }
-                $query->select($columns);
+                $columnsCondition = array_flip($targetClass::primaryKey());
+                $query->select(array_flip($this->applyTableAlias($query, $columnsCondition)));
             }
             $models = $query->limit(2)->asArray()->all();
             $n = count($models);
@@ -279,6 +275,29 @@ private function addComboNotUniqueError($model, $attribute)
         ]);
     }
 
+    /**
+     * Returns conditions with alias
+     * @param ActiveQuery $query
+     * @param array $conditions array of condition, keys to be modified
+     * @param null|string $alias set empty string for no apply alias. Set null for apply primary table alias
+     * @return array
+     */
+    private function applyTableAlias($query, $conditions, $alias = null)
+    {
+        if ($alias === null) {
+            $alias = array_keys($query->getTablesUsedInFrom())[0];
+        }
+        $prefixedConditions = [];
+        foreach ($conditions as $columnName => $columnValue) {
+            $prefixedColumn = "{$alias}.[[" . preg_replace(
+                    '/^' . preg_quote($alias) . '\.(.*)$/',
+                    "$1",
+                    $columnName) . "]]";
+            $prefixedConditions[$prefixedColumn] = $columnValue;
+        }
+        return $prefixedConditions;
+    }
+
     /**
      * Prefix conditions with aliases
      *
@@ -291,15 +310,6 @@ private function prefixConditions($model, $conditions)
         $targetModelClass = $this->getTargetClass($model);
 
         /** @var ActiveRecord $targetModelClass */
-        $query = $targetModelClass::find();
-        $tableAliases = array_keys($query->getTablesUsedInFrom());
-        $primaryTableAlias = $tableAliases[0];
-        $prefixedConditions = [];
-        foreach ($conditions as $columnName => $columnValue) {
-            $prefixedColumn = "{$primaryTableAlias}.[[{$columnName}]]";
-            $prefixedConditions[$prefixedColumn] = $columnValue;
-        }
-
-        return $prefixedConditions;
+        return $this->applyTableAlias($targetModelClass::find(), $conditions);
     }
 }