Merge branch 'GH-203' into 2.3

e00ce939 · Benjamin Eberlei · e7874c44 · 20b191ef · e00ce939
Commit e00ce939 authored Oct 05, 2012 by Benjamin Eberlei
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

MasterSlaveConnectionTest.php ...trine/Tests/DBAL/Functional/MasterSlaveConnectionTest.php +4 -1

No files found.
--- a/tests/Doctrine/Tests/DBAL/Functional/MasterSlaveConnectionTest.php
+++ b/tests/Doctrine/Tests/DBAL/Functional/MasterSlaveConnectionTest.php
@@ -27,9 +27,12 @@ class MasterSlaveConnectionTest extends DbalFunctionalTestCase
            $sm = $this->_conn->getSchemaManager();
            $sm->createTable($table);

-            $this->_conn->insert('master_slave_table', array('test_int' => 1));
+
        } catch(\Exception $e) {
        }
+
+        $this->_conn->executeUpdate('DELETE FROM master_slave_table');
+        $this->_conn->insert('master_slave_table', array('test_int' => 1));
    }

    public function createMasterSlaveConnection($keepSlave = false)