merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -11,6 +11,7 @@ Fixed:
 - fix some column datatypes in postgresql and mysql (sf bugs 962611,
   959177 and 964231)
 - fixed RDBMS journal packing (sf bug 959177)
+- fixed filtering by floats in anydbm (sf bug 963584)
 
 
 2004-05-28 0.7.3

roundup/backends/back_anydbm.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-#$Id: back_anydbm.py,v 1.146.2.4 2004-06-08 05:34:21 richard Exp $
+#$Id: back_anydbm.py,v 1.146.2.5 2004-06-09 06:37:22 richard Exp $
 '''This module defines a backend that saves the hyperdatabase in a
 database chosen by anydbm. It is guaranteed to always be available in python
 versions >2.1.1 (the dumbdbm fallback in 2.1.1 and earlier has several
@@ -1656,7 +1656,7 @@ def filter(self, search_matches, filterspec, sort=(None,None),
                     bv = v
                 l.append((OTHER, k, bv))
             elif isinstance(propclass, Number):
-                l.append((OTHER, k, int(v)))
+                l.append((OTHER, k, float(v)))
             else:
                 l.append((OTHER, k, v))
         filterspec = l

test/db_test_base.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: db_test_base.py,v 1.27.2.2 2004-06-08 05:35:44 richard Exp $ 
+# $Id: db_test_base.py,v 1.27.2.3 2004-06-09 06:37:22 richard Exp $ 
 
 import unittest, os, shutil, errno, imp, sys, time, pprint
 
@@ -813,9 +813,9 @@ def testStringFind(self):
 
     def filteringSetup(self):
         for user in (
-                {'username': 'bleep'},
-                {'username': 'blop'},
-                {'username': 'blorp'}):
+                {'username': 'bleep', 'age': 1},
+                {'username': 'blop', 'age': 1.5},
+                {'username': 'blorp', 'age': 2}):
             self.db.user.create(**user)
         iss = self.db.issue
         for issue in (
@@ -840,6 +840,13 @@ def testFilteringID(self):
         ae(filt(None, {'id': '2'}, ('+','id'), (None,None)), ['2'])
         ae(filt(None, {'id': '10'}, ('+','id'), (None,None)), [])
 
+    def testFilteringNumber(self):
+        self.filteringSetup()
+        ae, filt = self.assertEqual, self.db.user.filter
+        ae(filt(None, {'age': '1'}, ('+','id'), (None,None)), ['3'])
+        ae(filt(None, {'age': '1.5'}, ('+','id'), (None,None)), ['4'])
+        ae(filt(None, {'age': '2'}, ('+','id'), (None,None)), ['5'])
+
     def testFilteringString(self):
         ae, filt = self.filteringSetup()
         ae(filt(None, {'title': ['one']}, ('+','id'), (None,None)), ['1'])