Additional fix for #4167

yiisoft · Feb 3, 2018 · 9e5e427 · 9e5e427
1 parent 2ebe9b6
commit 9e5e427
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/framework/gii/generators/model/ModelCode.php b/framework/gii/generators/model/ModelCode.php
@@ -368,7 +368,8 @@ protected function generateRelations()
 	protected function isRelationTable($table)
 	{
 		$pk=$table->primaryKey;
-		return (count($pk) === 2 // we want 2 columns
+        $count=is_array($pk) ? count($pk) : 1;
+        return ($count === 2 // we want 2 columns
 			&& isset($table->foreignKeys[$pk[0]]) // pk column 1 is also a foreign key
 			&& isset($table->foreignKeys[$pk[1]]) // pk column 2 is also a foriegn key
 			&& $table->foreignKeys[$pk[0]][0] !== $table->foreignKeys[$pk[1]][0]); // and the foreign keys point different tables