- Fixed issue #16208: Warning in ezcQuery alias function

git-svn-id: http://svn.ez.no/svn/ezcomponents/trunk/Database@11394 bc0e7bdc-f0fc-0310-8ff6-f601c06e1256
naderman · Feb 18, 2010 · d866db0 · d866db0
1 parent e0e2d7d
commit d866db0
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+1.4.7 - [RELEASEDATE]
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+- Fixed issue #16208: Warning in ezcQuery alias function
+
+
 1.4.6 - Monday 27 July 2009
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 

diff --git a/src/sqlabstraction/query.php b/src/sqlabstraction/query.php
@@ -229,7 +229,8 @@ protected function getIdentifier( $alias )
         if ( count( $aliasParts ) == 1 )
         {
             if ( $this->aliases !== null &&
-                array_key_exists( $alias, $this->aliases ) )
+                 is_string( $alias ) &&
+                 array_key_exists( $alias, $this->aliases ) )
             {
                 $alias = $this->aliases[$alias];
             }

diff --git a/tests/sqlabstraction/query_subselect_test.php b/tests/sqlabstraction/query_subselect_test.php
@@ -251,6 +251,22 @@ public function testSubselectNotQuotedInInExpr()
         );
     }
 
+    public function testSubselectWithAlias()
+    {
+        $db = ezcDbInstance::get();
+
+        $q = $db->createSelectQuery();
+        $q->setAliases( array( 'ID' => 'id' ) );
+        $q = $q->select( 'ID', 'name' )->from( 'main' );
+
+        $q2 = $q->subSelect();
+            $q2->select( 'main_id' )->from( 'sub' );
+            $q2->limit(20,0);
+
+        $q->innerJoin( $q->alias( $q2, 'sub_items' ), 'sub_items.main_id', 'main.id' );   
+
+        $this->assertEquals( "SELECT id, name FROM main INNER JOIN ( SELECT main_id FROM sub LIMIT 20 OFFSET 0 ) AS sub_items ON sub_items.main_id = main.id", $q->getQuery() );
+    }
 
     public static function suite()
     {