Fixed recent DBAL test failures with several open connections and Dummy Select statements

lib/Doctrine/DBAL/Platforms/AbstractPlatform.php

@@ -1901,4 +1901,14 @@ abstract class AbstractPlatform
     {
         return 'TRUNCATE '.$tableName;
     }
+
+    /**
+     * This is for test reasons, many vendors have special requirements for dummy statements.
+     * 
+     * @return string
+     */
+    public function getDummySelectSQL()
+    {
+        return 'SELECT 1';
+    }
 }
\ No newline at end of file

lib/Doctrine/DBAL/Platforms/DB2Platform.php

@@ -518,4 +518,9 @@ class DB2Platform extends AbstractPlatform
     {
         return ' WITH RR USE AND KEEP UPDATE LOCKS';
     }
+
+    public function getDummySelectSQL()
+    {
+        return 'SELECT 1 FROM sysibm.sysdummy1';
+    }
 }
\ No newline at end of file

lib/Doctrine/DBAL/Platforms/OraclePlatform.php

@@ -650,4 +650,14 @@ LEFT JOIN all_cons_columns r_cols
     {
         return 'TRUNCATE TABLE '.$tableName;
     }
+
+    /**
+     * This is for test reasons, many vendors have special requirements for dummy statements.
+     *
+     * @return string
+     */
+    public function getDummySelectSQL()
+    {
+        return 'SELECT 1 FROM DUAL';
+    }
 }

tests/Doctrine/Tests/DBAL/Functional/ConnectionTest.php

@@ -88,7 +88,7 @@ class ConnectionTest extends \Doctrine\Tests\DbalFunctionalTestCase
     {
         try {
             $this->_conn->transactional(function($conn) {
-                $conn->executeQuery("select 1");
+                $conn->executeQuery($conn->getDatabasePlatform()->getDummySelectSQL());
                 throw new \RuntimeException("Ooops!");
             });
         } catch (\RuntimeException $expected) {
@@ -99,7 +99,8 @@ class ConnectionTest extends \Doctrine\Tests\DbalFunctionalTestCase
     public function testTransactional()
     {
         $this->_conn->transactional(function($conn) {
-            $conn->executeQuery("select 1");
+            /* @var $conn Connection */
+            $conn->executeQuery($conn->getDatabasePlatform()->getDummySelectSQL());
         });
     }
 }
\ No newline at end of file

tests/Doctrine/Tests/DBAL/Functional/WriteTest.php

@@ -27,8 +27,7 @@ class WriteTest extends \Doctrine\Tests\DbalFunctionalTestCase
 
     public function testExecuteUpdate()
     {
-        $sql = "INSERT INTO " . $this->_conn->quoteIdentifier('write_table') . " ( " .
-               $this->_conn->quoteIdentifier('test_int') . " ) VALUES ( " . $this->_conn->quote(1) . ")";
+        $sql = "INSERT INTO write_table (test_int) VALUES ( " . $this->_conn->quote(1) . ")";
         $affected = $this->_conn->executeUpdate($sql);
 
         $this->assertEquals(1, $affected, "executeUpdate() should return the number of affected rows!");

tests/Doctrine/Tests/DbalFunctionalTestCase.php

@@ -14,9 +14,15 @@ class DbalFunctionalTestCase extends DbalTestCase
 
     protected function resetSharedConn()
     {
+        if ($this->sharedFixture['conn']) {
+            $this->sharedFixture['conn']->close();
             $this->sharedFixture['conn'] = null;
+        }
+        if (self::$_sharedConn) {
+            self::$_sharedConn->close();
             self::$_sharedConn = null;
         }
+    }
 
     protected function setUp()
     {