Removed support for files, now operates directly with sql strings

Author: Ivan Kerin

src/Openbuildings/DBFixtures/Fixture.php

@@ -78,26 +78,26 @@ public function truncate_all()
 	 * @param  string $file sql inserts file
 	 * @return Fixture       $this
 	 */
-	public function replace($file)
+	public function replace($sql)
 	{
 		$this->truncate_all();
 
-		$this->load($file);
+		$this->load($sql);
 
 		return $this;
 	}
 
 	/**
-	 * Dump the contents of the database as insert scripts
-	 * @param  string $file 
-	 * @return Fixture $this
+	 * Dump the contents of the database as insert statements
+	 * 
+	 * @return string
 	 */
-	public function dump($file)
+	public function dump()
 	{
-		$handle = fopen($file, 'w');
-
 		$pdo = $this->pdo();
 
+		$sql = '';
+
 		foreach ($this->list_tables() as $table)
 		{
 			$query = $pdo->query("SELECT * FROM `{$table}`");
@@ -111,13 +111,11 @@ public function dump($file)
 					$values[] = $pdo->quote($column);
 				}
 
-				fputs($handle, "INSERT INTO `{$table}` VALUES (".join(',', $values). ");\n");
+				$sql .= "INSERT INTO `{$table}` VALUES (".join(',', $values). ");\n";
 			}
 		}
 
-		fclose($handle);
-
-		return $this;
+		return $sql;
 	}
 
 	/**
@@ -139,20 +137,9 @@ public function execute_import_files(array $files)
 	 * @param  string $file 
 	 * @return Fixture       $this
 	 */
-	public function load($file)
+	public function load($sql)
 	{
-		$handle = fopen($file, 'r');
-
-		while (($sql_line = fgets($handle)) !== FALSE) 
-		{
-			if (trim($sql_line)) 
-			{
-				$this->pdo()->exec($sql_line);
-			}
-		}
-		
-		fclose($handle);
-
+		$this->pdo()->exec($sql);
 		$this->pdo()->exec('FLUSH TABLES');
 
 		return $this;

tests/tests/DatabaseTest.php

@@ -14,28 +14,24 @@ public function test_connect()
 		$database = new Fixture();
 		$database->connect('mysql:host=localhost;dbname=test-db-fixtures', 'root');
 
-		$database->load(__DIR__.'/../test_data/database.sql');
+		$database->load(file_get_contents(__DIR__.'/../test_data/database.sql'));
 
 		$this->assertEquals(array('table1', 'table2'), $database->list_tables());
 
 		$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->dump(__DIR__.'/../test_data/dumped.sql');
+		$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');
 
 DUMPED;
-		
-		$dumped = file_get_contents(__DIR__.'/../test_data/dumped.sql');
 
 		$this->assertEquals($expected, $dumped);
 
-		unlink(__DIR__.'/../test_data/dumped.sql');
-
-		$database->replace(__DIR__.'/../test_data/replacement.sql');
+		$database->replace(file_get_contents(__DIR__.'/../test_data/replacement.sql'));
 
 
 		$database = new Fixture();