fixing a huge mess going on because of counting on error and union techniques

This commit is contained in:
Miroslav Stampar
2011-03-23 11:36:40 +00:00
parent 7ea45e9032
commit 0f7bce5c66
3 changed files with 9 additions and 6 deletions

View File

@@ -194,8 +194,8 @@ def errorUse(expression, expected=None, resumeValue=True, dump=False):
expression.upper() and ((Backend.getIdentifiedDbms() not in FROM_TABLE) \
or (Backend.getIdentifiedDbms() in FROM_TABLE and not \
expression.upper().endswith(FROM_TABLE[Backend.getIdentifiedDbms()]))) \
and "EXISTS(" not in expression.upper() and "COUNT(*)" not in expression.upper() \
and ("(CASE" not in expression.upper() or ("(CASE" in expression.upper() and "WHEN use" in expression))):
and ("(CASE" not in expression.upper() or ("(CASE" in expression.upper() and "WHEN use" in expression))) \
and not any(map(lambda x: x in expression.upper(), ["COUNT(*)", "EXISTS(", "MAX(", "MIN("])):
limitRegExp = re.search(queries[Backend.getIdentifiedDbms()].limitregexp.query, expression, re.I)
topLimit = re.search("TOP\s+([\d]+)\s+", expression, re.I)