changeset 2208:fc1d10a74651 maint-0.6

don't match retired items in RDBMS stringFind
author Richard Jones <richard@users.sourceforge.net>
date Mon, 12 Apr 2004 23:50:04 +0000
parents d2d574224110
children e481d576e8b4
files CHANGES.txt roundup/backends/rdbms_common.py
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGES.txt	Sat Apr 10 22:10:48 2004 +0000
+++ b/CHANGES.txt	Mon Apr 12 23:50:04 2004 +0000
@@ -6,6 +6,7 @@
 - paging in classhelp popup was broken
 - socket timeout error logging can fail
 - hyperlink designators in message display (sf bug 931828)
+- don't match retired items in RDBMS stringFind
 
 
 2004-04-01 0.6.8
--- a/roundup/backends/rdbms_common.py	Sat Apr 10 22:10:48 2004 +0000
+++ b/roundup/backends/rdbms_common.py	Mon Apr 12 23:50:04 2004 +0000
@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.58.2.4 2004-03-31 01:13:22 richard Exp $
+# $Id: rdbms_common.py,v 1.58.2.5 2004-04-12 23:50:04 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -1726,6 +1726,9 @@
 
         # generate the where clause
         s = ' and '.join(['lower(_%s)=%s'%(col, self.db.arg) for col in where])
+        # don't match retired items
+        s = s + ' and __retired__ <> %s'%self.db.arg
+        args.append(1)
         sql = 'select id from _%s where %s'%(self.classname, s)
         self.db.sql(sql, tuple(args))
         l = [x[0] for x in self.db.sql_fetchall()]

Roundup Issue Tracker: http://roundup-tracker.org/