some improvements and bug fixes

src/Tests/PersistUnit/DBInsert.php

@@ -0,0 +1,26 @@
+<?php
+namespace PhpPlatform\Tests\PersistUnit;
+
+class DBInsert extends \PHPUnit_Extensions_Database_Operation_Insert{
+
+	/**
+	 * @param PHPUnit_Extensions_Database_DB_IDatabaseConnection $connection
+	 * @param DataSet $dataSet
+	 */
+	public function execute(\PHPUnit_Extensions_Database_DB_IDatabaseConnection $connection,\PHPUnit_Extensions_Database_DataSet_IDataSet $dataSet)
+	{
+		$connection->getConnection()->query("SET foreign_key_checks = 0");
+
+		// execute the data files first
+		$dataFiles = $dataSet->getDataFiles();
+		foreach ($dataFiles as $dataFile){
+			$dataFileContent = file_get_contents($dataFile);
+			$connection->getConnection()->exec($dataFileContent);
+		}
+
+		// execute data set
+		parent::execute($connection, $dataSet);
+		$connection->getConnection()->query("SET foreign_key_checks = 1");
+	}
+
+}

src/Tests/PersistUnit/DataSet.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace PhpPlatform\Tests\PersistUnit;
+
+class DataSet extends \PHPUnit_Extensions_Database_DataSet_MysqlXmlDataSet{
+
+	private $datafiles = array();
+
+	function __construct($datafiles,$xmlFile){
+		$this->datafiles = $datafiles;
+		parent::__construct($xmlFile);
+	}
+
+	function getDataFiles(){
+		return $this->datafiles;
+	}
+
+}

src/Tests/PersistUnit/ModelTest.php

@@ -14,6 +14,7 @@
 use PhpPlatform\Config\SettingsCache;
 use PhpPlatform\JSONCache\Cache;
 use PhpPlatform\Errors\ErrorHandler;
+use PhpPlatform\Persist\TransactionManager;
 
 abstract class ModelTest extends DBUnitTestcase{
 
@@ -29,6 +30,13 @@ protected static function getSchemaFiles(){
     	return array();
     }
 
+    /**
+     * @return string[] of schema sql files to run before tests
+     */
+    protected static function getDataFiles(){
+    	return array();
+    }
+
     /**
      * @return string[] of data set xml files to create initial data 
      */
@@ -91,7 +99,7 @@ public static function setUpBeforeClass(){
     	MockSettings::setSettings('php-platform/persist', "outputDateTimeFormat", "%Y-%m-%d %H:%i:%S");
 
     	$logFile = getenv('sqlLogFile');
-    	if(!$logFile){
+    	if($logFile){
     		MockSettings::setSettings('php-platform/persist', "sqlLogFile", $logFile);
     	}
     	self::setTriggers(array());
@@ -111,6 +119,13 @@ public static function setUpBeforeClass(){
     }
 
     public static function tearDownAfterClass(){
+
+    	$transaction = TransactionManager::$transaction;
+    	while ($transaction != null){
+    		TransactionManager::abortTransaction();
+    		$transaction = TransactionManager::$transaction;
+    	}
+
     	// create pdo without database
     	$_pdo = new PDO('mysql:host='.self::$_connectionParams['host'].';port='.self::$_connectionParams['port'], self::$_connectionParams['username'],self::$_connectionParams['password']);
 
@@ -123,6 +138,14 @@ public static function tearDownAfterClass(){
     	unset($result);
     	unset($_pdo);
     }
+
+    public function getSetUpOperation()
+    {
+    	return new \PHPUnit_Extensions_Database_Operation_Composite(array(
+    			\PHPUnit_Extensions_Database_Operation_Factory::TRUNCATE(),
+    			new DBInsert()
+    	));
+    }
 
     public function getConnection(){
         return $this->createDefaultDBConnection(self::$_pdo);
@@ -143,7 +166,7 @@ public function getDataset($seedxml = null){
 		$tmpFile = tempnam(sys_get_temp_dir(),self::$_databaseName);
 		file_put_contents($tmpFile,$seedContent);
 
-		return $this->createMySQLXMLDataSet($tmpFile);
+		return new DataSet(static::getDataFiles(), $tmpFile);
 	}
 
 	public function getDatasetValue($table,$row,$column = null){