Correctly represent null values

Author: Ivan Kerin

src/Openbuildings/DBFixtures/Fixture.php

@@ -108,7 +108,7 @@ public function dump()
 
 				foreach ($row as $column) 
 				{
-					$values[] = $pdo->quote($column);
+					$values[] = is_null($column) ? 'NULL' : $pdo->quote($column);
 				}
 
 				$sql .= "INSERT INTO `{$table}` VALUES (".join(',', $values). ");\n";

tests/test_data/database.sql

@@ -1,4 +1,4 @@
 DROP TABLE IF EXISTS `table1`;
-CREATE TABLE `table1` (`id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, `name` varchar(32) NOT NULL, `description` varchar(255) NOT NULL, `price` decimal(10, 2) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `uniq_name` (`name`)) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+CREATE TABLE `table1` (`id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, `name` varchar(32) NULL, `description` varchar(255) NOT NULL, `price` decimal(10, 2) NULL, PRIMARY KEY (`id`), UNIQUE KEY `uniq_name` (`name`)) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 DROP TABLE IF EXISTS `table2`;
-CREATE TABLE `table2` (`id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, `name` varchar(32) NOT NULL, `description` varchar(255) NOT NULL, `price` decimal(10, 2) NOT NULL, PRIMARY KEY  (`id`), UNIQUE KEY `uniq_name` (`name`)) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+CREATE TABLE `table2` (`id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, `name` varchar(32) NULL, `description` varchar(255) NOT NULL, `price` decimal(10, 2) NULL, PRIMARY KEY  (`id`), UNIQUE KEY `uniq_name` (`name`)) ENGINE=InnoDB DEFAULT CHARSET=utf8;

tests/tests/DatabaseTest.php

@@ -20,12 +20,14 @@ public function test_connect()
 
 		$database->pdo()->exec('INSERT INTO table1 SET id = 1, name = "test1", description = "test test", price = 0.32');
 		$database->pdo()->exec('INSERT INTO table1 SET id = 2, name = "test2", description = "test test2", price = 0.11');
+		$database->pdo()->exec('INSERT INTO table1 SET id = 3, name = NULL, description = "", price = NULL');
 
 		$dumped = $database->dump();
 
 		$expected = <<<DUMPED
 INSERT INTO `table1` VALUES ('1','test1','test test','0.32');
 INSERT INTO `table1` VALUES ('2','test2','test test2','0.11');
+INSERT INTO `table1` VALUES ('3',NULL,'',NULL);
 
 DUMPED;