[Neo-report] r2583 gregory - in /trunk/neo: storage/database/ tests/storage/

[nobody at svn.erp5.org]

Author: gregory
Date: Wed Jan  5 09:42:11 2011
New Revision: 2583

Log:
deleteObjectsAbove deals with obj_short too.

Modified:
    trunk/neo/storage/database/mysqldb.py
    trunk/neo/tests/storage/testStorageDBTests.py

Modified: trunk/neo/storage/database/mysqldb.py
==============================================================================
--- trunk/neo/storage/database/mysqldb.py [iso-8859-1] (original)
+++ trunk/neo/storage/database/mysqldb.py [iso-8859-1] Wed Jan  5 09:42:11 2011
@@ -597,7 +597,7 @@ class MySQLDatabaseManager(DatabaseManag
         u64 = util.u64
         self.begin()
         try:
-            self.query('DELETE FROM obj WHERE partition=%(partition)d AND ('
+            self.objQuery('DELETE FROM %%(table)s WHERE partition=%(partition)d AND ('
               'oid > %(oid)d OR (oid = %(oid)d AND serial >= %(serial)d))' % {
                 'partition': partition,
                 'oid': u64(oid),

Modified: trunk/neo/tests/storage/testStorageDBTests.py
==============================================================================
--- trunk/neo/tests/storage/testStorageDBTests.py [iso-8859-1] (original)
+++ trunk/neo/tests/storage/testStorageDBTests.py [iso-8859-1] Wed Jan  5 09:42:11 2011
@@ -382,6 +382,10 @@ class StorageDBTests(NeoUnitTestBase):
             self.db.storeTransaction(tid, objs, txn)
             self.db.finishTransaction(tid)
         self.db.deleteObjectsAbove(2, 0, oid1, tid2)
+        # Check getObjectHistoryFrom because MySQL adapter use two tables
+        # that must be synchronized
+        self.assertEqual(self.db.getObjectHistoryFrom(ZERO_OID, ZERO_TID,
+            MAX_TID, 10, 2, 0), {oid1: [tid1]})
         # Right partition, below cutoff
         self.assertNotEqual(self.db.getObject(oid1, tid=tid1), None)
         # Right partition, above tid cutoff