[SQL-CVS] SQLObject/tests SQLObjectTest.py,1.18,1.18.2.1 test.py,1.34,1.34.2.1

[<dre...@us...>]

Update of /cvsroot/sqlobject/SQLObject/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv3728/tests

Modified Files:
      Tag: cascadegeddon-branch
	SQLObjectTest.py test.py 
Log Message:
Implemented cascade deletes and restriction of deletes. For postgres, it does create a column restriction as well. XXX destroySelf always tries to do the manual delete, even though postgres will do the dirty job for us. Tested with Postgres and SQLLite, all tests pass

Index: SQLObjectTest.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/tests/SQLObjectTest.py,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -C2 -d -r1.18 -r1.18.2.1
*** SQLObjectTest.py	1 Oct 2003 01:53:48 -0000	1.18
--- SQLObjectTest.py	3 Dec 2003 21:58:05 -0000	1.18.2.1
***************
*** 104,109 ****
                  __connection__.query(c.drop)
              elif hasattr(c, 'dropTable'):
!                 c.dropTable(ifExists=True)
!                 
              if hasattr(c, '%sCreate' % self.databaseName):
                  if not __connection__.tableExists(c._table):
--- 104,109 ----
                  __connection__.query(c.drop)
              elif hasattr(c, 'dropTable'):
!                 c.dropTable(ifExists=True, cascade=True)
! 
              if hasattr(c, '%sCreate' % self.databaseName):
                  if not __connection__.tableExists(c._table):

Index: test.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/tests/test.py,v
retrieving revision 1.34
retrieving revision 1.34.2.1
diff -C2 -d -r1.34 -r1.34.2.1
*** test.py	4 Nov 2003 02:28:35 -0000	1.34
--- test.py	3 Dec 2003 21:58:05 -0000	1.34.2.1
***************
*** 120,123 ****
--- 120,241 ----
          self.assertEqual(tcc2.other, tc4a)
  
+ class TestSO5(SQLObject):
+     name = StringCol(length=10, dbName='name_col')
+     other = ForeignKey('TestSO6', default=None, cascade=True)
+     another = ForeignKey('TestSO7', default=None, cascade=True)
+ 
+ class TestSO6(SQLObject):
+     name = StringCol(length=10, dbName='name_col')
+     other = ForeignKey('TestSO7', default=None, cascade=True)
+ 
+ class TestSO7(SQLObject):
+     name = StringCol(length=10, dbName='name_col')
+ 
+ class TestCase567(SQLObjectTest):
+ 
+     classes = [TestSO7, TestSO6, TestSO5]
+ 
+     def testForeignKeyDestroySelfCascade(self):
+         tc5 = TestSO5.new(name='a')
+         tc6a = TestSO6.new(name='1')
+         tc5.other = tc6a
+         tc7a = TestSO7.new(name='2')
+         tc6a.other = tc7a
+         tc5.another = tc7a
+         self.assertEqual(tc5.other, tc6a)
+         self.assertEqual(tc5.otherID, tc6a.id)
+         self.assertEqual(tc6a.other, tc7a)
+         self.assertEqual(tc6a.otherID, tc7a.id)
+         self.assertEqual(tc5.other.other, tc7a)
+         self.assertEqual(tc5.other.otherID, tc7a.id)
+         self.assertEqual(tc5.another, tc7a)
+         self.assertEqual(tc5.anotherID, tc7a.id)
+         self.assertEqual(tc5.other.other, tc5.another)
+         self.assertEqual(TestSO5.select().count(), 1)
+         self.assertEqual(TestSO6.select().count(), 1)
+         self.assertEqual(TestSO7.select().count(), 1)
+         tc6b = TestSO6.new(name='3')
+         tc6c = TestSO6.new(name='4')
+         tc7b = TestSO7.new(name='5')
+         tc6b.other = tc7b
+         tc6c.other = tc7b
+         self.assertEqual(TestSO5.select().count(), 1)
+         self.assertEqual(TestSO6.select().count(), 3)
+         self.assertEqual(TestSO7.select().count(), 2)
+         tc6b.destroySelf()
+         self.assertEqual(TestSO5.select().count(), 1)
+         self.assertEqual(TestSO6.select().count(), 2)
+         self.assertEqual(TestSO7.select().count(), 2)
+         tc7b.destroySelf()
+         self.assertEqual(TestSO5.select().count(), 1)
+         self.assertEqual(TestSO6.select().count(), 1)
+         self.assertEqual(TestSO7.select().count(), 1)
+         tc7a.destroySelf()
+         self.assertEqual(TestSO5.select().count(), 0)
+         self.assertEqual(TestSO6.select().count(), 0)
+         self.assertEqual(TestSO7.select().count(), 0)
+ 
+     def testForeignKeyDropTableCascade(self):
+         tc5a = TestSO5.new(name='a')
+         tc6a = TestSO6.new(name='1')
+         tc5a.other = tc6a
+         tc7a = TestSO7.new(name='2')
+         tc6a.other = tc7a
+         tc5a.another = tc7a
+         tc5b = TestSO5.new(name='b')
+         tc5c = TestSO5.new(name='c')
+         tc6b = TestSO6.new(name='3')
+         tc5c.other = tc6b
+         self.assertEqual(TestSO5.select().count(), 3)
+         self.assertEqual(TestSO6.select().count(), 2)
+         self.assertEqual(TestSO7.select().count(), 1)
+         TestSO7.dropTable(cascade=True)
+         self.assertEqual(TestSO5.select().count(), 3)
+         self.assertEqual(TestSO6.select().count(), 2)
+         tc6a.destroySelf()
+         self.assertEqual(TestSO5.select().count(), 2)
+         self.assertEqual(TestSO6.select().count(), 1)
+         tc6b.destroySelf()
+         self.assertEqual(TestSO5.select().count(), 1)
+         self.assertEqual(TestSO6.select().count(), 0)
+         self.assertEqual(iter(TestSO5.select()).next(), tc5b)
+         tc6c = TestSO6.new(name='3')
+         tc5b.other = tc6c
+         self.assertEqual(TestSO5.select().count(), 1)
+         self.assertEqual(TestSO6.select().count(), 1)
+         tc6c.destroySelf()
+         self.assertEqual(TestSO5.select().count(), 0)
+         self.assertEqual(TestSO6.select().count(), 0)
+ 
+ class TestSO8(SQLObject):
+     name = StringCol(length=10, dbName='name_col')
+     other = ForeignKey('TestSO9', default=None, cascade=False)
+ 
+ class TestSO9(SQLObject):
+     name = StringCol(length=10, dbName='name_col')
+ 
+ class TestCase89(SQLObjectTest):
+ 
+     classes = [TestSO9, TestSO8]
+ 
+     def testForeignKeyDestroySelfRestrict(self):
+         tc8a = TestSO8.new(name='a')
+         tc9a = TestSO9.new(name='1')
+         tc8a.other = tc9a
+         tc8b = TestSO8.new(name='b')
+         tc9b = TestSO9.new(name='2')
+         self.assertEqual(tc8a.other, tc9a)
+         self.assertEqual(tc8a.otherID, tc9a.id)
+         self.assertEqual(TestSO8.select().count(), 2)
+         self.assertEqual(TestSO9.select().count(), 2)
+         self.assertRaises(Exception, tc9a.destroySelf)
+         tc9b.destroySelf()
+         self.assertEqual(TestSO8.select().count(), 2)
+         self.assertEqual(TestSO9.select().count(), 1)
+         tc8a.destroySelf()
+         tc8b.destroySelf()
+         tc9a.destroySelf()
+         self.assertEqual(TestSO8.select().count(), 0)
+         self.assertEqual(TestSO9.select().count(), 0)
  
  ########################################