Merge branch 'hotfix/issue-2599' of git://github.com/robertbasic/zf2 …

…into robertbasic-hotfix/issue-2599
zendframework · Oct 9, 2012 · f9620ac · f9620ac
2 parents bce7ef3 + ab11948
commit f9620ac
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/library/Zend/Db/Sql/Select.php b/library/Zend/Db/Sql/Select.php
@@ -533,7 +533,7 @@ protected function processSelect(PlatformInterface $platform, Adapter $adapter =
             $fromTable = ($this->prefixColumnsWithTable) ? $table : '';
         }
 
-        $fromTable .= $platform->getIdentifierSeparator();
+        $fromTable .= ($this->prefixColumnsWithTable) ? $platform->getIdentifierSeparator() : '';
 
         // process table columns
         $columns = array();

diff --git a/tests/ZendTest/Db/Sql/SelectTest.php b/tests/ZendTest/Db/Sql/SelectTest.php
@@ -470,6 +470,20 @@ public function testProcessMethods(Select $select, $unused, $unused2, $unused3,
         }
     }
 
+    /**
+     * @autor robertbasic
+     * @group issue2599
+     * @testdox unit test: Not prefixing columns with table will create a valid query
+     */
+    public function testNotPrefixingColumnsWithTableNameCreatesValidQuery()
+    {
+        $select = new Select;
+        $select->from('foo')
+                ->columns(array('bar'), false);
+
+        $this->assertEquals('SELECT "bar" AS "bar" FROM "foo"', $select->getSqlString());
+    }
+
     public function providerData()
     {
         // basic table