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

string query and ingore_common_filters

Browse Source
This commit is contained in:
Massimo Di Pierro
2012-01-24 21:15:20 -06:00
parent c0a63aeaa8
commit c67d95c928
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 1.99.4 (2012-01-24 08:37:21) stable Version 1.99.4 (2012-01-24 21:14:55) stable
gluon/dal.py
+14 -7
View File
@@ -1316,7 +1316,8 @@ class BaseAdapter(ConnectionPool):
def _count(self, query, distinct=None): def _count(self, query, distinct=None):
tablenames = self.tables(query) tablenames = self.tables(query)
if query: if query:
if not query.ignore_common_filters: if hasattr(query,'ignore_common_filters') and \
not query.ignore_common_filters:
query = self.common_filter(query, tablenames) query = self.common_filter(query, tablenames)
sql_w = ' WHERE ' + self.expand(query) sql_w = ' WHERE ' + self.expand(query)
else: else:
@@ -3503,8 +3504,10 @@ class GoogleDatastoreAdapter(NoSQLAdapter):
else: else:
raise SyntaxError, "Unable to determine a tablename" raise SyntaxError, "Unable to determine a tablename"
if query and not query.ignore_common_filters: if query:
query = self.common_filter(query,[tablename]) if hasattr(query,'ignore_common_filters') and \
not query.ignore_common_filters:
query = self.common_filter(query,[tablename])
tableobj = self.db[tablename]._tableobj tableobj = self.db[tablename]._tableobj
items = tableobj.all() items = tableobj.all()
@@ -4830,7 +4833,8 @@ class IMAPAdapter(NoSQLAdapter):
rows rows
""" """
if not query.ignore_common_filters: if hasattr(query,'ignore_common_filters') and \
not query.ignore_common_filters:
query = self.common_filter(query, [self.get_query_mailbox(query),]) query = self.common_filter(query, [self.get_query_mailbox(query),])
# move this statement elsewhere (upper-level) # move this statement elsewhere (upper-level)
@@ -5048,7 +5052,8 @@ class IMAPAdapter(NoSQLAdapter):
def update(self, tablename, query, fields): def update(self, tablename, query, fields):
# print "_update" # print "_update"
if not query.ignore_common_filters: if hasattr(query,'ignore_common_filters') and \
not query.ignore_common_filters:
query = self.common_filter(query, [tablename,]) query = self.common_filter(query, [tablename,])
mark = [] mark = []
@@ -5093,7 +5098,8 @@ class IMAPAdapter(NoSQLAdapter):
counter = 0 counter = 0
tablename = self.get_query_mailbox(query) tablename = self.get_query_mailbox(query)
if query and tablename is not None: if query and tablename is not None:
if not query.ignore_common_filters: if hasattr(query,'ignore_common_filters') and \
not query.ignore_common_filters:
query = self.common_filter(query, [tablename,]) query = self.common_filter(query, [tablename,])
# print "Selecting mailbox ..." # print "Selecting mailbox ..."
result, data = self.connection.select(self.connection.mailbox_names[tablename]) result, data = self.connection.select(self.connection.mailbox_names[tablename])
@@ -5108,7 +5114,8 @@ class IMAPAdapter(NoSQLAdapter):
counter = 0 counter = 0
if query: if query:
# print "Selecting mailbox ..." # print "Selecting mailbox ..."
if not query.ignore_common_filters: if hasattr(query,'ignore_common_filters') and \
not query.ignore_common_filters:
query = self.common_filter(query, [tablename,]) query = self.common_filter(query, [tablename,])
result, data = self.connection.select(self.connection.mailbox_names[tablename]) result, data = self.connection.select(self.connection.mailbox_names[tablename])
# print "Retrieving sequence numbers remotely" # print "Retrieving sequence numbers remotely"