From e428845d0e89f6472e558bcea94a5b8f24881b06 Mon Sep 17 00:00:00 2001 From: romanb Date: Wed, 17 Oct 2007 19:24:03 +0000 Subject: [PATCH] corrected some tests --- lib/Doctrine/Validator.php | 2 +- tests/Export/MysqlTestCase.php | 6 +++--- tests/Export/RecordTestCase.php | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/Doctrine/Validator.php b/lib/Doctrine/Validator.php index b16d45093..271b27e2a 100644 --- a/lib/Doctrine/Validator.php +++ b/lib/Doctrine/Validator.php @@ -165,7 +165,7 @@ class Doctrine_Validator extends Doctrine_Locator_Injectable { if ($column['type'] == 'timestamp' || $column['type'] == 'integer') { return true; - } elseif ($column['type'] == 'array' || $column['type'] == 'object') { + } else if ($column['type'] == 'array' || $column['type'] == 'object') { $length = strlen(serialize($value)); } else { $length = strlen($value); diff --git a/tests/Export/MysqlTestCase.php b/tests/Export/MysqlTestCase.php index 50a643886..20613a8c3 100644 --- a/tests/Export/MysqlTestCase.php +++ b/tests/Export/MysqlTestCase.php @@ -187,7 +187,7 @@ class Doctrine_Export_Mysql_TestCase extends Doctrine_UnitTestCase $sql = $this->export->createTableSql($name, $fields, $options); $this->assertEqual($sql[0], 'CREATE TABLE mytable (id TINYINT(1), foreignKey INT, INDEX foreignKey_idx (foreignKey)) ENGINE = INNODB'); - $this->assertEqual($sql[1], 'ALTER TABLE mytable ADD CONSTRAINT FOREIGN KEY (foreignKey) REFERENCES sometable(id)'); + $this->assertEqual($sql[1], 'ALTER TABLE mytable ADD FOREIGN KEY (foreignKey) REFERENCES sometable(id)'); } public function testForeignKeyIdentifierQuoting() { @@ -208,7 +208,7 @@ class Doctrine_Export_Mysql_TestCase extends Doctrine_UnitTestCase $sql = $this->export->createTableSql($name, $fields, $options); $this->assertEqual($sql[0], 'CREATE TABLE `mytable` (`id` TINYINT(1), `foreignKey` INT, INDEX `foreignKey_idx` (`foreignKey`)) ENGINE = INNODB'); - $this->assertEqual($sql[1], 'ALTER TABLE `mytable` ADD CONSTRAINT FOREIGN KEY (`foreignKey`) REFERENCES `sometable`(`id`)'); + $this->assertEqual($sql[1], 'ALTER TABLE `mytable` ADD FOREIGN KEY (`foreignKey`) REFERENCES `sometable`(`id`)'); $this->conn->setAttribute(Doctrine::ATTR_QUOTE_IDENTIFIER, false); } @@ -251,7 +251,7 @@ class Doctrine_Export_Mysql_TestCase extends Doctrine_UnitTestCase $sql = $this->export->createTableSql($name, $fields, $options); $this->assertEqual($sql[0], 'CREATE TABLE mytable (id TINYINT(1), foreignKey INT, INDEX myindex_idx (foreignKey)) ENGINE = INNODB'); - $this->assertEqual($sql[1], 'ALTER TABLE mytable ADD CONSTRAINT FOREIGN KEY (foreignKey) REFERENCES sometable(id)'); + $this->assertEqual($sql[1], 'ALTER TABLE mytable ADD FOREIGN KEY (foreignKey) REFERENCES sometable(id)'); } public function testCreateDatabaseExecutesSql() { diff --git a/tests/Export/RecordTestCase.php b/tests/Export/RecordTestCase.php index 691fe54d4..5ad2631fa 100644 --- a/tests/Export/RecordTestCase.php +++ b/tests/Export/RecordTestCase.php @@ -51,7 +51,7 @@ class Doctrine_Export_Record_TestCase extends Doctrine_UnitTestCase $this->assertEqual($sql[0], 'CREATE TABLE foreign_key_test (id BIGINT AUTO_INCREMENT, name TEXT, code INT, content TEXT, parent_id BIGINT, INDEX parent_id_idx (parent_id), PRIMARY KEY(id)) ENGINE = INNODB'); if (isset($sql[1])) { - $this->assertEqual($sql[1], 'ALTER TABLE foreign_key_test ADD CONSTRAINT FOREIGN KEY (parent_id) REFERENCES foreign_key_test(id) ON UPDATE RESTRICT ON DELETE CASCADE'); + $this->assertEqual($sql[1], 'ALTER TABLE foreign_key_test ADD FOREIGN KEY (parent_id) REFERENCES foreign_key_test(id) ON UPDATE RESTRICT ON DELETE CASCADE'); } else { $this->fail('$sql should contain ALTER TABLE statement'); } @@ -77,7 +77,7 @@ class Doctrine_Export_Record_TestCase extends Doctrine_UnitTestCase $this->assertEqual($sql[0], 'CREATE TABLE foreign_key_test (id BIGINT AUTO_INCREMENT, name TEXT, code INT, content TEXT, parent_id BIGINT, INDEX parent_id_idx (parent_id), PRIMARY KEY(id)) ENGINE = INNODB'); if (isset($sql[1])) { - $this->assertEqual($sql[1], 'ALTER TABLE foreign_key_test ADD CONSTRAINT FOREIGN KEY (parent_id) REFERENCES foreign_key_test(id) ON UPDATE RESTRICT ON DELETE CASCADE'); + $this->assertEqual($sql[1], 'ALTER TABLE foreign_key_test ADD FOREIGN KEY (parent_id) REFERENCES foreign_key_test(id) ON UPDATE RESTRICT ON DELETE CASCADE'); } else { $this->fail('$sql should contain ALTER TABLE statement'); } @@ -99,7 +99,7 @@ class Doctrine_Export_Record_TestCase extends Doctrine_UnitTestCase Doctrine::exportSchema(dirname(__FILE__) . DIRECTORY_SEPARATOR .'..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'models' . DIRECTORY_SEPARATOR . 'export'); $this->assertEqual($this->adapter->pop(), 'COMMIT'); - $this->assertEqual($this->adapter->pop(), 'ALTER TABLE cms__category_languages ADD CONSTRAINT FOREIGN KEY (category_id) REFERENCES cms__category(id) ON DELETE CASCADE'); + $this->assertEqual($this->adapter->pop(), 'ALTER TABLE cms__category_languages ADD FOREIGN KEY (category_id) REFERENCES cms__category(id) ON DELETE CASCADE'); $this->assertEqual($this->adapter->pop(), 'CREATE TABLE cms__category_languages (id BIGINT AUTO_INCREMENT, name TEXT, category_id BIGINT, language_id BIGINT, INDEX index_category_idx (category_id), INDEX index_language_idx (language_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = INNODB'); $this->assertEqual($this->adapter->pop(), 'CREATE TABLE cms__category (id BIGINT AUTO_INCREMENT, created DATETIME, parent BIGINT, position MEDIUMINT, active BIGINT, INDEX index_parent_idx (parent), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = INNODB'); $this->assertEqual($this->adapter->pop(), 'BEGIN TRANSACTION');