--no commit message

--no commit message

tests/AuditLogTestCase.php

@@ -35,7 +35,11 @@ class Doctrine_AuditLog_TestCase extends Doctrine_UnitTestCase
     public function prepareData() 
     { }
     public function prepareTables()
-    { }
+    { 
+        $this->tables = array('Versionable');
+        
+        parent::prepareTables();
+    }
     public function testVersionTableSqlReturnsProperQuery()
     {
         $table = $this->conn->getTable('Versionable');

tests/Collection/SnapshotTestCase.php

@@ -38,6 +38,12 @@
  */
 class Doctrine_Collection_Snapshot_TestCase extends Doctrine_UnitTestCase
 {
+    public function prepareTables()
+    {
+    	$this->tables[] = 'Book';
+    	
+    	parent::prepareTables();
+    }
     public function testDiffForSimpleCollection()
     {
         $coll = Doctrine_Query::create()->from('User u')->orderby('u.id')->execute();

tests/IntegrityActionTestCase.php

+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.phpdoctrine.com>.
+ */
+
+/**
+ * Doctrine_IntegrityAction_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.phpdoctrine.com
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_IntegrityAction_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareData()
+    { }
+    public function prepareTables()
+    {
+        $this->tables = array('CascadeDeleteTest', 'CascadeDeleteRelatedTest', 'CascadeDeleteRelatedTest2');
+        
+        parent::prepareTables();
+    }
+    public function testIntegrityActionsAreAddedIntoGlobalActionsArray()
+    {
+        $c = new CascadeDeleteTest;
+        $c2 = new CascadeDeleteRelatedTest;
+
+        $expected = array('CascadeDeleteRelatedTest' => 'CASCADE');
+        $this->assertEqual($this->manager->getDeleteActions('CascadeDeleteTest'), $expected);
+        
+        $expected = array('CascadeDeleteRelatedTest' => 'SET NULL');
+        $this->assertEqual($this->manager->getUpdateActions('CascadeDeleteTest'), $expected);
+    }
+    public function testOnDeleteCascadeEmulation()
+    {
+        $c = new CascadeDeleteTest;
+        $c->name = 'c 1';
+        $c->Related[]->name = 'r 1';
+        $c->Related[]->name = 'r 2';
+        $c->Related[0]->Related[]->name = 'r r 1';
+        $c->Related[1]->Related[]->name = 'r r 2';
+        
+        $c->save();
+        
+        $this->connection->clear();
+        
+        $c = $this->conn->queryOne('FROM CascadeDeleteTest c WHERE c.id = 1');
+        
+        $c->delete();
+    }
+}
+class CascadeDeleteTest extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string');
+    }
+    public function setUp()
+    {
+        $this->hasMany('CascadeDeleteRelatedTest as Related', 
+                        array('local' => 'id',
+                              'foreign' => 'cscd_id'));
+    }
+}
+class CascadeDeleteRelatedTest extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string');
+        $this->hasColumn('cscd_id', 'integer');
+    }
+    public function setUp()
+    {
+        $this->hasOne('CascadeDeleteTest', array('local' => 'cscd_id', 
+                                                 'foreign' => 'id',
+                                                 'onDelete' => 'CASCADE',
+                                                 'onUpdate' => 'SET NULL'));
+
+        $this->hasMany('CascadeDeleteRelatedTest2 as Related',
+                        array('local' => 'id',
+                              'foreign' => 'cscd_id'));
+    }
+}
+class CascadeDeleteRelatedTest2 extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string');
+        $this->hasColumn('cscd_id', 'integer');
+    }
+    public function setUp()
+    {
+        $this->hasOne('CascadeDeleteRelatedTest', array('local' => 'cscd_id',
+                                                        'foreign' => 'id',
+                                                        'onDelete' => 'SET NULL'));
+    }
+}
+

tests/Query/WhereTestCase.php

@@ -35,7 +35,7 @@ class Doctrine_Query_Where_TestCase extends Doctrine_UnitTestCase
 {
     public function prepareData() { }
     public function prepareTables() { 
-        $this->tables = array('entity');
+        $this->tables = array('Entity', 'EnumTest');
         parent::prepareTables();
     }
 

tests/run.php

@@ -209,8 +209,8 @@ $test->addTestCase(new Doctrine_SchemaTestCase());
 $test->addTestCase(new Doctrine_Query_Condition_TestCase());
 
 $test->addTestCase(new Doctrine_CustomPrimaryKey_TestCase());
-$test->addTestCase(new Doctrine_CustomResultSetOrder_TestCase());
 
+$test->addTestCase(new Doctrine_CustomResultSetOrder_TestCase());
 
 // Query tests
 
@@ -223,6 +223,7 @@ $test->addTestCase(new Doctrine_Query_ReferenceModel_TestCase());
 $test->addTestCase(new Doctrine_Query_ComponentAlias_TestCase());
 
 
+
 $test->addTestCase(new Doctrine_Query_ShortAliases_TestCase());
 
 $test->addTestCase(new Doctrine_Query_Expression_TestCase());
@@ -284,8 +285,6 @@ $test->addTestCase(new Doctrine_Query_Where_TestCase());
 
 $test->addTestCase(new Doctrine_Query_From_TestCase());
 
-$test->addTestCase(new Doctrine_AuditLog_TestCase());
-
 $test->addTestCase(new Doctrine_Query_Select_TestCase());
 
 $test->addTestCase(new Doctrine_Query_JoinCondition_TestCase());
@@ -293,6 +292,10 @@ $test->addTestCase(new Doctrine_Query_JoinCondition_TestCase());
 $test->addTestCase(new Doctrine_Query_MultipleAggregateValue_TestCase());
 
 $test->addTestCase(new Doctrine_IntegrityAction_TestCase());
+
+//$test->addTestCase(new Doctrine_AuditLog_TestCase());
+
+
 // Cache tests
 //$test->addTestCase(new Doctrine_Cache_Query_SqliteTestCase());
 //$test->addTestCase(new Doctrine_Cache_FileTestCase());