fixes

Author: Richard Jones

CHANGES.txt

@@ -20,6 +20,7 @@ Fixed:
 - fix python 2.3.3 strftime deprecation warning (sf patch 968398)
 - fix some column datatypes in postgresql and mysql (sf bugs 962611,
   959177 and 964231)
+- fixed RDBMS journal packing (sf bug 959177)
 
 
 2004-05-28 0.7.3

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.105 2004-06-09 05:13:14 richard Exp $
+# $Id: rdbms_common.py,v 1.106 2004-06-09 06:13:52 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -1148,8 +1148,7 @@ def load_journal(self, classname, cols, nodeid):
     def pack(self, pack_before):
         ''' Delete all journal entries except "create" before 'pack_before'.
         '''
-        # get a 'yyyymmddhhmmss' version of the date
-        date_stamp = pack_before.serialise()
+        date_stamp = self.hyperdb_to_sql_value[Date](pack_before)
 
         # do the delete
         for classname in self.classes.keys():

roundup/date.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: date.py,v 1.72 2004-06-08 05:37:36 richard Exp $
+# $Id: date.py,v 1.73 2004-06-09 06:13:52 richard Exp $
 
 """Date, time and time interval handling.
 """
@@ -662,7 +662,7 @@ def pretty(self):
             s = self.ngettext("%(number)s year", "%(number)s years",
                 self.year) % {'number': self.year}
         elif self.month or self.day > 28:
-            _months = int(((self.month * 30) + self.day) / 30)
+            _months = max(1, int(((self.month * 30) + self.day) / 30))
             s = self.ngettext("%(number)s month", "%(number)s months",
                 _months) % {'number': _months}
         elif self.day > 7:
@@ -689,7 +689,7 @@ def pretty(self):
                 s = self._('1 1/2 hours')
             else:
                 s = self.ngettext('1 %(number)s/4 hours',
-                    '1 %(number)s/4 hours', _quarters) % {'number': _quarters}
+                    '1 %(number)s/4 hours', _quarters)%{'number': _quarters}
         elif self.minute < 1:
             if self.sign > 0:
                 return self._('in a moment')
@@ -705,7 +705,7 @@ def pretty(self):
         elif _quarters == 2:
             s = self._('1/2 an hour')
         else:
-            s = self.ngettext('%(number)s/4 hours', '%(number)s/4 hours',
+            s = self.ngettext('%(number)s/4 hour', '%(number)s/4 hours',
                 _quarters) % {'number': _quarters}
         # XXX this is internationally broken
         if self.sign < 0: