Mercurial Repository: p/roundup/code: roundup/backends/rdbms

merge from HEAD

author	Richard Jones <richard@users.sourceforge.net>
date	Tue, 29 Jun 2004 05:53:37 +0000
parents	f89a84f881f0
children	7e823f8938e9

comparison

equal deleted inserted replaced

-:f89a84f881f0
+:ea887c804103
-# $Id: rdbms_common.py,v 1.98.2.12 2004-06-28 23:15:39 richard Exp $
+# $Id: rdbms_common.py,v 1.98.2.13 2004-06-29 05:53:37 richard Exp $
 ''' Relational database (SQL) backend common code.
 Basics:
 - map roundup classes to relational tables
 where.append(' or '.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):
 if isinstance(v, type([])):
-if '-1' in v:
+d = {}
-v = v[:]
+for entry in v:
-v.remove('-1')
+if entry == '-1':
-xtra = ' or _%s._%s is NULL'%(cn, k)
+entry = None
-else:
+d[entry] = entry
-xtra = ''
+l = []
-if v:
+if d.has_key(None) or not d:
+del d[None]
+l.append('_%s._%s is NULL'%(cn, k))
+if d:
+v = d.keys()
 s = ','.join([a for x in v])
-where.append('(_%s._%s in (%s)%s)'%(cn, k, s, xtra))
+where.append('(_%s._%s in (%s))'%(cn, k, s))
 args = args + v
-else:
+where.append(' or '.join(l))
-where.append('_%s._%s is NULL'%(cn, k))
 else:
-if v == '-1':
+if v in ('-1', None):
 v = None
 where.append('_%s._%s is NULL'%(cn, k))
 else:
 where.append('_%s._%s=%s'%(cn, k, a))
 args.append(v)

Mercurial > p > roundup > code