Commit 53ffb05e authored by Benjamin Eberlei's avatar Benjamin Eberlei

Fix mysql connection and pgsql tests problem (seems to work on two different connections)

parent 16864430
...@@ -36,7 +36,9 @@ class TypeConversionTest extends \Doctrine\Tests\DbalFunctionalTestCase ...@@ -36,7 +36,9 @@ class TypeConversionTest extends \Doctrine\Tests\DbalFunctionalTestCase
$table->addColumn('test_decimal', 'decimal', array('notnull' => false, 'scale' => 2, 'precision' => 10)); $table->addColumn('test_decimal', 'decimal', array('notnull' => false, 'scale' => 2, 'precision' => 10));
$table->setPrimaryKey(array('id')); $table->setPrimaryKey(array('id'));
$sm->createTable($table); foreach ($this->_conn->getDatabasePlatform()->getCreateTableSQL($table) AS $sql) {
$this->_conn->executeQuery($sql);
}
} }
} }
......
...@@ -38,16 +38,16 @@ class TestUtil ...@@ -38,16 +38,16 @@ class TestUtil
$GLOBALS['tmpdb_host'], $GLOBALS['tmpdb_name'], $GLOBALS['tmpdb_port'])) { $GLOBALS['tmpdb_host'], $GLOBALS['tmpdb_name'], $GLOBALS['tmpdb_port'])) {
$realDbParams = array( $realDbParams = array(
'driver' => $GLOBALS['db_type'], 'driver' => $GLOBALS['db_type'],
'user' => $GLOBALS['db_username'] ?: null, 'user' => $GLOBALS['db_username'],
'password' => $GLOBALS['db_password']?: null, 'password' => $GLOBALS['db_password'],
'host' => $GLOBALS['db_host'], 'host' => $GLOBALS['db_host'],
'dbname' => $GLOBALS['db_name'], 'dbname' => $GLOBALS['db_name'],
'port' => $GLOBALS['db_port'] 'port' => $GLOBALS['db_port']
); );
$tmpDbParams = array( $tmpDbParams = array(
'driver' => $GLOBALS['tmpdb_type'], 'driver' => $GLOBALS['tmpdb_type'],
'user' => $GLOBALS['tmpdb_username']?: null, 'user' => $GLOBALS['tmpdb_username'],
'password' => $GLOBALS['tmpdb_password']?: null, 'password' => $GLOBALS['tmpdb_password'],
'host' => $GLOBALS['tmpdb_host'], 'host' => $GLOBALS['tmpdb_host'],
'dbname' => $GLOBALS['tmpdb_name'], 'dbname' => $GLOBALS['tmpdb_name'],
'port' => $GLOBALS['tmpdb_port'] 'port' => $GLOBALS['tmpdb_port']
......
...@@ -3,14 +3,14 @@ ...@@ -3,14 +3,14 @@
<php> <php>
<var name="db_type" value="pdo_mysql"/> <var name="db_type" value="pdo_mysql"/>
<var name="db_host" value="localhost" /> <var name="db_host" value="localhost" />
<var name="db_username" value="" /> <var name="db_username" value="travis" />
<var name="db_password" value="" /> <var name="db_password" value="" />
<var name="db_name" value="doctrine_tests" /> <var name="db_name" value="doctrine_tests" />
<var name="db_port" value="3306"/> <var name="db_port" value="3306"/>
<var name="tmpdb_type" value="pdo_mysql"/> <var name="tmpdb_type" value="pdo_mysql"/>
<var name="tmpdb_host" value="localhost" /> <var name="tmpdb_host" value="localhost" />
<var name="tmpdb_username" value="" /> <var name="tmpdb_username" value="travis" />
<var name="tmpdb_password" value="" /> <var name="tmpdb_password" value="" />
<var name="tmpdb_name" value="doctrine_tests_tmp" /> <var name="tmpdb_name" value="doctrine_tests_tmp" />
<var name="tmpdb_port" value="3306"/> <var name="tmpdb_port" value="3306"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment