issue 701, select(...,processor=f)
This commit is contained in:
@@ -1 +1 @@
|
|||||||
Version 1.99.7 (2012-03-12 13:48:35) dev
|
Version 1.99.7 (2012-03-12 15:15:29) dev
|
||||||
|
|||||||
+10
-6
@@ -1317,7 +1317,8 @@ class BaseAdapter(ConnectionPool):
|
|||||||
rows = list(rows)
|
rows = list(rows)
|
||||||
limitby = attributes.get('limitby', None) or (0,)
|
limitby = attributes.get('limitby', None) or (0,)
|
||||||
rows = self.rowslice(rows,limitby[0],None)
|
rows = self.rowslice(rows,limitby[0],None)
|
||||||
return self.parse(rows,fields,self._colnames)
|
processor = attributes.get('processor',self.parse)
|
||||||
|
return processor(rows,fields,self._colnames)
|
||||||
|
|
||||||
def _count(self, query, distinct=None):
|
def _count(self, query, distinct=None):
|
||||||
tablenames = self.tables(query)
|
tablenames = self.tables(query)
|
||||||
@@ -3758,7 +3759,8 @@ class GoogleDatastoreAdapter(NoSQLAdapter):
|
|||||||
item.key().name()) or getattr(item, t) for t in fields]
|
item.key().name()) or getattr(item, t) for t in fields]
|
||||||
for item in items]
|
for item in items]
|
||||||
colnames = ['%s.%s' % (tablename, t) for t in fields]
|
colnames = ['%s.%s' % (tablename, t) for t in fields]
|
||||||
return self.parse(rows, fields, colnames, False)
|
processor = attributes.get('processor',self.parse)
|
||||||
|
return processor(rows,fields,colnames,False)
|
||||||
|
|
||||||
|
|
||||||
def count(self,query,distinct=None):
|
def count(self,query,distinct=None):
|
||||||
@@ -3952,7 +3954,8 @@ class CouchDBAdapter(NoSQLAdapter):
|
|||||||
tablename = colnames[0].split('.')[0]
|
tablename = colnames[0].split('.')[0]
|
||||||
ctable = self.connection[tablename]
|
ctable = self.connection[tablename]
|
||||||
rows = [cols['value'] for cols in ctable.query(fn)]
|
rows = [cols['value'] for cols in ctable.query(fn)]
|
||||||
return self.parse(rows, fields, colnames, False)
|
processor = attributes.get('processor',self.parse)
|
||||||
|
return processor(rows,fields,colnames,False)
|
||||||
|
|
||||||
def delete(self,tablename,query):
|
def delete(self,tablename,query):
|
||||||
if not isinstance(query,Query):
|
if not isinstance(query,Query):
|
||||||
@@ -4289,7 +4292,8 @@ class MongoDBAdapter(NoSQLAdapter):
|
|||||||
rows.append(row)
|
rows.append(row)
|
||||||
#else the id is not supposed to be included. Work around error. mongo always sends key:(
|
#else the id is not supposed to be included. Work around error. mongo always sends key:(
|
||||||
|
|
||||||
return self.parse(rows,fields,mongofields_dict.keys(),False)
|
processor = attributes.get('processor',self.parse)
|
||||||
|
return processor(rows,fields,mongofields_dict.keys(),False)
|
||||||
|
|
||||||
def INVERT(self,first):
|
def INVERT(self,first):
|
||||||
#print "in invert first=%s" % first
|
#print "in invert first=%s" % first
|
||||||
@@ -5242,8 +5246,8 @@ class IMAPAdapter(NoSQLAdapter):
|
|||||||
tablename, imapqry_array , fieldnames = self._select(query,fields,attributes)
|
tablename, imapqry_array , fieldnames = self._select(query,fields,attributes)
|
||||||
# parse result and return a rows object
|
# parse result and return a rows object
|
||||||
colnames = fieldnames
|
colnames = fieldnames
|
||||||
result = self.parse(imapqry_array, fields, colnames)
|
processor = attributes.get('processor',self.parse)
|
||||||
return result
|
return processor(imapqry_array, fields, colnames)
|
||||||
|
|
||||||
def update(self, tablename, query, fields):
|
def update(self, tablename, query, fields):
|
||||||
# print "_update"
|
# print "_update"
|
||||||
|
|||||||
Reference in New Issue
Block a user