Commit 88342ae9 authored by D'Arcy J.M. Cain's avatar D'Arcy J.M. Cain

Add oid to list of keys cached.

Add a test to avoid an exception in certain cases.
parent 6b6f8327
...@@ -139,7 +139,8 @@ class DB: ...@@ -139,7 +139,8 @@ class DB:
else: else:
l[attname] = 'text' l[attname] = 'text'
self.__attnames__[cl] = l l['oid'] = 'int' # every table has this
self.__attnames__[cl] = l # cache it
return self.__attnames__[cl] return self.__attnames__[cl]
# return a tuple from a database # return a tuple from a database
...@@ -194,7 +195,7 @@ class DB: ...@@ -194,7 +195,7 @@ class DB:
l = [] l = []
n = [] n = []
for f in fnames.keys(): for f in fnames.keys():
if a.has_key(f): if f != 'oid' and a.has_key(f):
l.append(_quote(a[f], fnames[f])) l.append(_quote(a[f], fnames[f]))
n.append(f) n.append(f)
...@@ -228,7 +229,7 @@ class DB: ...@@ -228,7 +229,7 @@ class DB:
fnames = self.get_attnames(cl) fnames = self.get_attnames(cl)
for ff in fnames.keys(): for ff in fnames.keys():
if a.has_key(ff): if ff != 'oid' and a.has_key(ff):
v.append("%s = %s" % (ff, _quote(a[ff], fnames[ff]))) v.append("%s = %s" % (ff, _quote(a[ff], fnames[ff])))
if v == []: if v == []:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment