Merge remote-tracking branch 'origin/master' into 0.5

ifacesoft · Apr 10, 2015 · 83c6f6b · 83c6f6b
2 parents 0159750 + ae15439
commit 83c6f6b
Show file tree

Hide file tree

Showing 4 changed files with 332 additions and 267 deletions.
diff --git a/Config/Ice/Core/Route.php b/Config/Ice/Core/Route.php
@@ -20,7 +20,7 @@
             'GET' => [
                 'Ice:Layout_Test' => [
                     'actions' => [
-                        'testAction' => 'Ice:Test'
+                        'Ice:Test' => 'testAction'
                     ]
                 ]
             ]

diff --git a/Source/Ice/Model/Ice/Test.php b/Source/Ice/Model/Ice/Test.php
@@ -0,0 +1,33 @@
+<?php namespace Ice\Model;
+
+use Ice\Core\Model;
+
+/**
+ * Class Ice_Test
+ *
+ *
+ * @see Ice\Core\Model
+ *
+ * @package Ice\Model
+ */
+class Ice_Test extends Model
+{
+    protected static function config()
+    {
+        return [
+		    'revision' => '04061558_ep',
+		    'dataSourceKey' => 'Ice\\Data\\Source\\Mongodb/default.test',
+		    'scheme' => [
+		        'tableName' => 'ice_test',
+		        'engine' => 'MongoDB',
+		        'charset' => 'utf-8',
+		        'comment' => 'ice_test',
+		    ],
+		    'schemeHash' => 2457038805,
+		    'columns' => [],
+		    'indexes' => [],
+		    'indexesHash' => 223132457,
+		    'columnsHash' => 223132457,
+		];
+    }
+}
diff --git a/Source/Ice/Query/Translator/Mongodb.php b/Source/Ice/Query/Translator/Mongodb.php
@@ -277,7 +277,7 @@ protected function translateSelect(array $part)
 
         list($modelClass, $items) = each($part);
 
-        list($tableAlias, $fieldNames) = $items;
+        list($tableAlias, $fieldNames) = each($items);
 
         $columnNames = [];