dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improvements to GoogleAdapter, thanks Quint

Browse Source
This commit is contained in:
mdipierro
2013-11-16 04:10:18 -06:00
parent e482cba237
commit d35321c6c6
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.7.4-stable+timestamp.2013.11.16.03.53.15 Version 2.7.4-stable+timestamp.2013.11.16.04.09.31
gluon/dal.py
+5 -5
View File
@@ -2199,7 +2199,7 @@ class BaseAdapter(ConnectionPool):
# GoogleDatastoreAdapter # GoogleDatastoreAdapter
# references # references
if isinstance(self, GoogleDatastoreAdapter): if isinstance(self, GoogleDatastoreAdapter):
id = value.key().id_or_name() id = value.key.id() if self.use_ndb else value.key().id_or_name()
colset[fieldname] = id colset[fieldname] = id
colset.gae_item = value colset.gae_item = value
else: else:
@@ -5067,7 +5067,7 @@ class GoogleDatastoreAdapter(NoSQLAdapter):
# key qeuries return a class instance, # key qeuries return a class instance,
# can't use projection # can't use projection
# extra values will be ignored in post-processing later # extra values will be ignored in post-processing later
item = (self.use_ndb and filter.value.get()) or tableobj.get(filter.value) item = filter.value.get() if self.use_ndb else tableobj.get(filter.value)
items = (item and [item]) or [] items = (item and [item]) or []
else: else:
# key qeuries return a class instance, # key qeuries return a class instance,
@@ -5084,7 +5084,7 @@ class GoogleDatastoreAdapter(NoSQLAdapter):
items.order(tableobj._key) items.order(tableobj._key)
else: else:
items.order('__key__') items.order('__key__')
items = (self.use_ndb and self.filter(items, tableobj, filter.name, filter.op, filter.value)) or\ items = self.filter(items, tableobj, filter.name, filter.op, filter.value) if self.use_ndb else\
items.filter('%s %s' % (filter.name,filter.op), filter.value) items.filter('%s %s' % (filter.name,filter.op), filter.value)
if not isinstance(items,list): if not isinstance(items,list):
@@ -5125,7 +5125,7 @@ class GoogleDatastoreAdapter(NoSQLAdapter):
#cursor is only useful if there was a limit and we didn't return #cursor is only useful if there was a limit and we didn't return
# all results # all results
if args_get('reusecursor'): if args_get('reusecursor'):
db['_lastcursor'] = (self.use_ndb and cursor) or items.cursor() db['_lastcursor'] = cursor if self.use_ndb else items.cursor()
items = rows items = rows
return (items, tablename, projection or db[tablename].fields) return (items, tablename, projection or db[tablename].fields)
@@ -5218,7 +5218,7 @@ class GoogleDatastoreAdapter(NoSQLAdapter):
# table._db['_lastsql'] = self._insert(table,fields) # table._db['_lastsql'] = self._insert(table,fields)
tmp = table._tableobj(**dfields) tmp = table._tableobj(**dfields)
tmp.put() tmp.put()
key = (self.use_ndb and tmp.key) or tmp.key() key = tmp.key if self.use_ndb else tmp.key()
rid = Reference(key.id()) rid = Reference(key.id())
(rid._table, rid._record, rid._gaekey) = (table, None, key) (rid._table, rid._record, rid._gaekey) = (table, None, key)
return rid return rid