Commit 669aed8f authored by Benjamin Eberlei's avatar Benjamin Eberlei

Fixed bug introduced in e8fa2e1f, fixing DDC-625. Fixed bug in testsuite

parent 5ba5a66d
...@@ -128,8 +128,8 @@ class MySqlPlatform extends AbstractPlatform ...@@ -128,8 +128,8 @@ class MySqlPlatform extends AbstractPlatform
" c.constraint_name = k.constraint_name AND ". " c.constraint_name = k.constraint_name AND ".
" c.table_name = '$table' */ WHERE k.table_name = '$table'"; " c.table_name = '$table' */ WHERE k.table_name = '$table'";
if ( ! is_null($database)) { if ($database) {
$sql .= " AND c.table_schema = '$database' AND k.constraint_schema = '" . $database . "'"; $sql .= " AND k.table_schema = '$database' AND c.constraint_schema = '$database'";
} }
$sql .= " AND `REFERENCED_COLUMN_NAME` is not NULL"; $sql .= " AND `REFERENCED_COLUMN_NAME` is not NULL";
......
...@@ -25,15 +25,15 @@ class AllTests ...@@ -25,15 +25,15 @@ class AllTests
$conn= TestUtil::getConnection(); $conn= TestUtil::getConnection();
$sm = $conn->getSchemaManager(); $sm = $conn->getSchemaManager();
if ($sm instanceof Doctrine\DBAL\Schema\SqliteSchemaManager) { if ($sm instanceof \Doctrine\DBAL\Schema\SqliteSchemaManager) {
$suite->addTestSuite('Doctrine\Tests\DBAL\Functional\Schema\SqliteSchemaManagerTest'); $suite->addTestSuite('Doctrine\Tests\DBAL\Functional\Schema\SqliteSchemaManagerTest');
} else if ($sm instanceof Doctrine\DBAL\Schema\MySqlSchemaManager) { } else if ($sm instanceof \Doctrine\DBAL\Schema\MySqlSchemaManager) {
$suite->addTestSuite('Doctrine\Tests\DBAL\Functional\Schema\MySqlSchemaManagerTest'); $suite->addTestSuite('Doctrine\Tests\DBAL\Functional\Schema\MySqlSchemaManagerTest');
} else if ($sm instanceof Doctrine\DBAL\Schema\PostgreSqlSchemaManager) { } else if ($sm instanceof \Doctrine\DBAL\Schema\PostgreSqlSchemaManager) {
$suite->addTestSuite('Doctrine\Tests\DBAL\Functional\Schema\PostgreSqlSchemaManagerTest'); $suite->addTestSuite('Doctrine\Tests\DBAL\Functional\Schema\PostgreSqlSchemaManagerTest');
} else if ($sm instanceof Doctrine\DBAL\Schema\OracleSchemaManager) { } else if ($sm instanceof \Doctrine\DBAL\Schema\OracleSchemaManager) {
$suite->addTestSuite('Doctrine\Tests\DBAL\Functional\Schema\OracleSchemaManagerTest'); $suite->addTestSuite('Doctrine\Tests\DBAL\Functional\Schema\OracleSchemaManagerTest');
} else if ($sm instanceof Doctrine\DBAL\Schema\DB2SchemaManager) { } else if ($sm instanceof \Doctrine\DBAL\Schema\DB2SchemaManager) {
$suite->addTestSuite('Doctrine\Tests\DBAL\Functional\Schema\Db2SchemaManagerTest'); $suite->addTestSuite('Doctrine\Tests\DBAL\Functional\Schema\Db2SchemaManagerTest');
} }
$suite->addTestSuite('Doctrine\Tests\DBAL\Functional\ConnectionTest'); $suite->addTestSuite('Doctrine\Tests\DBAL\Functional\ConnectionTest');
......
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