Changeset 2649

Timestamp:

01/10/2007 09:29:12 PM (2 years ago)

Author:

paul

Message:

Added testChildren unit test to trunk bizobj.

Fixed IsAdding? to return False if there aren't any records.

Fixed the saveAll() and save() routines in my branch to actually save the
child records, including new ones. For the first time, my branch works with
all my applications, so after some final testing tomorrow I'll probably do a
big honking merge into trunk.

Files:

• branches/paul_sandbox/dabo/biz/dBizobj.py (modified) (3 diffs)
• branches/paul_sandbox/dabo/biz/test/test_dBizobj.py (modified) (3 diffs)
• branches/paul_sandbox/dabo/db/dCursorMixin.py (modified) (3 diffs)
• trunk/dabo/biz/test/test_dBizobj.py (modified) (4 diffs)
• trunk/dabo/db/dCursorMixin.py (modified) (1 diff)

branches/paul_sandbox/dabo/biz/dBizobj.py

@@ -257 +257 @@
-
-        useTransact = startTransaction or topLevel
-        old_currentCursorKey = self.__currentCursorKey
-        old_pk = getattr(self.Record, self.KeyField, None)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if old_pk is not None:
-            self._moveToPK(old_pk)
@@ -954 +949 @@
-            # identified until the record is saved and a permanent PK is obtained.
-            cursor.genTempAutoPK()
-        cursor.setNewFlag()
-        # Fill in the link to the parent record
-        if self.Parent and self.FillLinkFromParent and self.LinkField:
-            self.setParentFK()
-        cursor.setDefaults(self.DefaultValues)
+        cursor.setNewFlag()
-
-        # Call the custom hook method
@@ -1099 +1094 @@
-            # Let the child know the current dependent PK
-            child.setCurrentParent(pk)
-
-
-
+
+
+
+
-        self.afterChildRequery()
-

branches/paul_sandbox/dabo/biz/test/test_dBizobj.py

@@ -201 +201 @@
-        bizChild.DataSource = self.temp_child_table_name
-        bizChild.LinkField = "parent_fk"
+        bizChild.FillLinkFromParent = True
-        
-        bizMain.addChild(bizChild)
@@ -255 +256 @@
-
-        # Add a new child record:
+        self.assertEqual(bizChild.IsAdding, False)
-        bizChild.new()
+        self.assertEqual(bizChild.IsAdding, True)
-        self.assertEqual(bizChild.RowCount, 1)
-        self.assertEqual(bizChild.isAnyChanged(), True)
@@ -262 +265 @@
-        self.assertEqual(bizMain.isChanged(), True)
-        bizChild.Record.cInvNum = "IN99991"
+
+        bizMain.prior()
+        self.assertEqual(bizChild.IsAdding, False)
+        bizMain.next()
+        self.assertEqual(bizChild.IsAdding, True)
+
+        self.assertEqual(bizChild.RowCount, 1)
+        self.assertEqual(bizChild.isAnyChanged(), True)
+        self.assertEqual(bizChild.isChanged(), True)
+        self.assertEqual(bizMain.isAnyChanged(), True)
+        self.assertEqual(bizMain.isChanged(), True)
+        self.assertEqual(bizChild.Record.cInvNum, "IN99991")
+
-        bizMain.saveAll()
+
+        self.assertEqual(bizMain.RowCount, 3)
+        self.assertEqual(bizMain.RowNumber, 2)
+        self.assertEqual(bizChild.RowCount, 1)
+        self.assertEqual(bizChild.Record.cInvNum, "IN99991")
+        self.assertEqual(bizChild.IsAdding, False)
-        bizMain.requery()
-        self.assertEqual(bizMain.RowCount, 3)

branches/paul_sandbox/dabo/db/dCursorMixin.py

@@ -984 +984 @@
-        # Make sure that there is data to save
-        if self.RowCount <= 0:
-d
+NoRecords
-        # Make sure that there is a PK
-        self.checkPK()
@@ -1031 +1031 @@
-        newrec = self._newRecords.has_key(rec[self.KeyField])
-        diff = self.getRecordStatus(row)
-
-        if diff or newrec:
-            if newrec:
@@ -1963 +1962 @@
-    def _getIsAdding(self):
-        """ Return True if the current record is a new record."""
+        if self.RowCount <= 0:
+            return False
-        return self._newRecords.has_key(self._records[self.RowNumber][self.KeyField])
-    

trunk/dabo/biz/test/test_dBizobj.py

@@ -23 +23 @@
-    def setUp(self):
-        biz = self.biz
-
+
+
+
-        self.createSchema()
-        biz.UserSQL = "select * from %s" % self.temp_table_name
@@ -138 +140 @@
-    ## - End property unit tests -
-
+    def testChildren(self):
+        bizMain = self.biz
+        bizChild = dabo.biz.dBizobj(self.con)
+        bizChild.UserSQL = "select * from %s" % self.temp_child_table_name
+        bizChild.KeyField = "pk"
+        bizChild.DataSource = self.temp_child_table_name
+        bizChild.LinkField = "parent_fk"
+        
+        bizMain.addChild(bizChild)
+        bizMain.requery()
+
+        # At this point bizMain should be at row 0, and bizChild should have
+        # two records, and be on row 0
+        self.assertEqual(bizMain.Record.pk, 1)
+        self.assertEqual(bizMain.RowNumber, 0)
+        self.assertEqual(bizChild.RowCount, 2)
+        self.assertEqual(bizChild.RowNumber, 0)
+        self.assertEqual(bizChild.Record.pk, 1)
+        self.assertEqual(bizChild.Record.parent_fk, 1)
+
+        bizMain.next()
+        
+        # At this point bizMain should be at row 1, and bizChild should have
+        # zero records.
+        self.assertEqual(bizMain.Record.pk, 2)
+        self.assertEqual(bizMain.RowNumber, 1)
+        self.assertEqual(bizChild.RowCount, 0)
+        self.assertEqual(bizChild.RowNumber, 0)
+        
+        # Trying to get the field value from the nonexistent record should raise
+        # dException.NoRecordsException:
+        def testGetField():
+            return bizChild.Record.pk
+        def testSetField():
+            bizChild.Record.pk = 23
+        self.assertRaises(dabo.dException.NoRecordsException, testGetField)
+        self.assertRaises(dabo.dException.NoRecordsException, testSetField)
+
+        bizMain.next()
+
+        # At this point bizMain should be at row 2, and bizChild should have
+        # one record, and be on row 0.
+        self.assertEqual(bizMain.Record.pk, 3)
+        self.assertEqual(bizMain.RowNumber, 2)
+        self.assertEqual(bizChild.RowCount, 1)
+        self.assertEqual(bizChild.RowNumber, 0)
+        self.assertEqual(bizChild.Record.pk, 3)
+        self.assertEqual(bizChild.Record.parent_fk, 3)
+        
+        # Try a delete, which takes effect immediately without need to save:
+        bizChild.delete()
+        self.assertEqual(bizMain.RowNumber, 2)
+        self.assertEqual(bizChild.RowCount, 0)
+        self.assertEqual(bizChild.isAnyChanged(), False)
+        self.assertEqual(bizMain.isAnyChanged(), False)
+        bizMain.prior()
+        self.assertEqual(bizChild.RowCount, 0)
+        bizMain.next()
+        self.assertEqual(bizChild.RowCount, 0)
+
+        # Add a new child record:
+        self.assertEqual(bizChild.IsAdding, False)
+        bizChild.new()
+        self.assertEqual(bizChild.IsAdding, True)
+        self.assertEqual(bizChild.RowCount, 1)
+        self.assertEqual(bizChild.isAnyChanged(), True)
+        self.assertEqual(bizChild.isChanged(), True)
+        self.assertEqual(bizMain.isAnyChanged(), True)
+        self.assertEqual(bizMain.isChanged(), True)
+        bizChild.Record.cInvNum = "IN99991"
+
+        bizMain.prior()
+        self.assertEqual(bizChild.IsAdding, False)
+        bizMain.next()
+        self.assertEqual(bizChild.IsAdding, True)
+
+        self.assertEqual(bizChild.RowCount, 1)
+        self.assertEqual(bizChild.isAnyChanged(), True)
+        self.assertEqual(bizChild.isChanged(), True)
+        self.assertEqual(bizMain.isAnyChanged(), True)
+        self.assertEqual(bizMain.isChanged(), True)
+        self.assertEqual(bizChild.Record.cInvNum, "IN99991")
+
+        bizMain.saveAll()
+        bizMain.requery()
+        self.assertEqual(bizMain.RowCount, 3)
+        self.assertEqual(bizMain.RowNumber, 2)
+        self.assertEqual(bizChild.RowCount, 1)
+        self.assertEqual(bizChild.Record.cInvNum, "IN99991")
+        bizMain.prior()
+        bizMain.next()
+        self.assertEqual(bizChild.RowCount, 1)
+        self.assertEqual(bizChild.Record.cInvNum, "IN99991")
+
-
-class Test_dBizobj_sqlite(Test_dBizobj, sqlite_unittest):
-    def setUp(self):
-
-
+self.
+self.
-        super(Test_dBizobj_sqlite, self).setUp()
-
@@ -148 +244 @@
-        biz = self.biz
-        tableName = self.temp_table_name
+        childTableName = self.temp_child_table_name
-        biz._CurrentCursor.executescript("""
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-class Test_dBizobj_mysql(Test_dBizobj, mysql_unittest):
-    def setUp(self):
-
+self.
-                password="T30T35DB4K30Z45I67N60", Database="dabo_unittest",
-                Host="paulmcnett.com")
-
+self.
-        super(Test_dBizobj_mysql, self).setUp()
-
@@ -171 +273 @@
-        biz = self.biz
-        cur = biz._CurrentCursor
+        tableName = self.temp_table_name
+        childTableName = self.temp_child_table_name
-        cur.execute("""
-create table %s (pk INTEGER PRIMARY KEY AUTO_INCREMENT, cField CHAR (32), iField INT, nField DECIMAL (8,2))
-self.temp_table_n
+tableN
-        cur.execute("""     
-insert into %s (cField, iField, nField) values ("Paul Keith McNett", 23, 23.23)
-self.temp_table_n
+tableN
-        cur.execute("""     
-insert into %s (cField, iField, nField) values ("Edward Leafe", 42, 42.42)
-self.temp_table_n
+tableN
-        cur.execute("""     
-insert into %s (cField, iField, nField) values ("Carl Karsten", 10223, 23032.76)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-

trunk/dabo/db/dCursorMixin.py

@@ -1878 +1878 @@
-    def _getIsAdding(self):
-        """ Return True if the current record is a new record."""
+        if self.RowCount <= 0:
+            return False
-        return self._records[self.RowNumber].has_key(kons.CURSOR_NEWFLAG)
-