merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -17,6 +17,7 @@ Fixed:
 - issue search page allows setting of no sorting / grouping (sf bug
   1119475)
 - better edit conflict handling (sf bug 1118790)
+- consistent text searching behaviour (AND everywhere) (sf bug 1101036)
 
 
 2005-01-13 0.8.0b2

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.179.2.3 2005-01-06 17:59:38 a1s Exp $
+#$Id: back_anydbm.py,v 1.179.2.4 2005-02-13 22:40:53 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
@@ -1612,15 +1612,12 @@ def filter(self, search_matches, filterspec, sort=(None,None),
             elif isinstance(propclass, hyperdb.String) and k != 'id':
                 if type(v) is not type([]):
                     v = [v]
-                m = []
                 for v in v:
                     # simple glob searching
                     v = re.sub(r'([\|\{\}\\\.\+\[\]\(\)])', r'\\\1', v)
                     v = v.replace('?', '.')
                     v = v.replace('*', '.*?')
-                    m.append(v)
-                m = re.compile('(%s)'%('|'.join(m)), re.I)
-                l.append((STRING, k, m))
+                    l.append((STRING, k, re.compile(v, re.I)))
             elif isinstance(propclass, hyperdb.Date):
                 try:
                     date_rng = date.Range(v, date.Date, offset=timezone)

roundup/backends/back_metakit.py

@@ -1,4 +1,4 @@
-# $Id: back_metakit.py,v 1.88 2004-10-24 10:44:49 a1s Exp $
+# $Id: back_metakit.py,v 1.88.2.1 2005-02-13 22:40:53 richard Exp $
 '''Metakit backend for Roundup, originally by Gordon McMillan.
 
 Known Current Bugs:
@@ -1212,7 +1212,7 @@ def filter(self, search_matches, filterspec, sort=(None,None),
         where = {'_isdel':0}
         wherehigh = {}
         mlcriteria = {}
-        regexes = {}
+        regexes = []
         orcriteria = {}
         for propname, value in filterspec.items():
             prop = self.ruprops.get(propname, None)
@@ -1258,14 +1258,12 @@ def filter(self, search_matches, filterspec, sort=(None,None),
             elif isinstance(prop, hyperdb.String):
                 if type(value) is not type([]):
                     value = [value]
-                m = []
                 for v in value:
                     # simple glob searching
                     v = re.sub(r'([\|\{\}\\\.\+\[\]\(\)])', r'\\\1', v)
                     v = v.replace('?', '.')
                     v = v.replace('*', '.*?')
-                    m.append(v)
-                regexes[propname] = re.compile('(%s)'%('|'.join(m)), re.I)
+                    regexes.append((propname, re.compile(v, re.I)))
             elif propname == 'id':
                 where[propname] = int(value)
             elif isinstance(prop, hyperdb.Boolean):
@@ -1353,7 +1351,7 @@ def ff(row, crit=orcriteria):
 
         if regexes:
             def ff(row, r=regexes):
-                for propname, regex in r.items():
+                for propname, regex in r:
                     val = str(getattr(row, propname))
                     if not regex.search(val):
                         return 0

roundup/backends/back_mysql.py

@@ -572,7 +572,7 @@ def filter(self, search_matches, filterspec, sort=(None,None),
 
                 # now add to the where clause
                 where.append('('
-                    +' or '.join(["_%s._%s LIKE '%s'"%(cn, k, s) for s in v])
+                    +' and '.join(["_%s._%s LIKE '%s'"%(cn, k, s) for s in v])
                     +')')
                 # note: args are embedded in the query string now
             elif isinstance(propclass, Link):

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.142.2.3 2005-01-13 05:05:12 richard Exp $
+# $Id: rdbms_common.py,v 1.142.2.4 2005-02-13 22:40:53 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -2100,7 +2100,7 @@ def filter(self, search_matches, filterspec, sort=(None,None),
 
                 # now add to the where clause
                 where.append('('
-                    +' or '.join(["_%s._%s LIKE '%s'"%(cn, k, s) for s in v])
+                    +' and '.join(["_%s._%s LIKE '%s'"%(cn, k, s) for s in v])
                     +')')
                 # note: args are embedded in the query string now
             elif isinstance(propclass, Link):

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.55.2.2 2005-01-04 01:33:04 richard Exp $
+# $Id: db_test_base.py,v 1.55.2.3 2005-02-13 22:40:53 richard Exp $
 
 import unittest, os, shutil, errno, imp, sys, time, pprint
 
@@ -920,10 +920,14 @@ def testFilteringNumber(self):
     def testFilteringString(self):
         ae, filt = self.filteringSetup()
         ae(filt(None, {'title': ['one']}, ('+','id'), (None,None)), ['1'])
+        ae(filt(None, {'title': ['issue one']}, ('+','id'), (None,None)),
+            ['1'])
+        ae(filt(None, {'title': ['issue', 'one']}, ('+','id'), (None,None)),
+            ['1'])
         ae(filt(None, {'title': ['issue']}, ('+','id'), (None,None)),
             ['1','2','3'])
         ae(filt(None, {'title': ['one', 'two']}, ('+','id'), (None,None)),
-            ['1', '2'])
+            [])
 
     def testFilteringLink(self):
         ae, filt = self.filteringSetup()