summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/databases
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2007-08-13 20:00:38 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2007-08-13 20:00:38 +0000
commit66142098952f6c1027dbede243a25c003671dee3 (patch)
tree9139f22ebc8c276ae3ddaa018c842335b5f62f45 /lib/sqlalchemy/databases
parent799f45866789271301d5b09a175c789d1e4f6e95 (diff)
downloadsqlalchemy-66142098952f6c1027dbede243a25c003671dee3.tar.gz
- generalized a SQLCompileTest out of select.py, installed
into dialect/mssql.py, dialect/oracle.py, sql/generative.py - fixed oracle issues [ticket:732], [ticket:733], [ticket:734]
Diffstat (limited to 'lib/sqlalchemy/databases')
-rw-r--r--lib/sqlalchemy/databases/oracle.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/sqlalchemy/databases/oracle.py b/lib/sqlalchemy/databases/oracle.py
index 78ceddb4e..2c45c94e8 100644
--- a/lib/sqlalchemy/databases/oracle.py
+++ b/lib/sqlalchemy/databases/oracle.py
@@ -401,7 +401,7 @@ class OracleDialect(ansisql.ANSIDialect):
def _normalize_name(self, name):
if name is None:
return None
- elif name.upper() == name and not self.identifier_preparer._requires_quotes(name.lower(), True):
+ elif name.upper() == name and not self.identifier_preparer._requires_quotes(name.lower()):
return name.lower()
else:
return name
@@ -409,7 +409,7 @@ class OracleDialect(ansisql.ANSIDialect):
def _denormalize_name(self, name):
if name is None:
return None
- elif name.lower() == name and not self.identifier_preparer._requires_quotes(name.lower(), True):
+ elif name.lower() == name and not self.identifier_preparer._requires_quotes(name.lower()):
return name.upper()
else:
return name
@@ -605,7 +605,7 @@ class OracleCompiler(ansisql.ANSICompiler):
"""Oracle doesn't like ``FROM table AS alias``. Is the AS standard SQL??"""
if asfrom:
- return self.process(alias.original, asfrom=asfrom, **kwargs) + " " + alias.name
+ return self.process(alias.original, asfrom=asfrom, **kwargs) + " " + self.preparer.format_alias(alias, self._anonymize(alias.name))
else:
return self.process(alias.original, **kwargs)
@@ -650,7 +650,7 @@ class OracleCompiler(ansisql.ANSICompiler):
limitselect.append_whereclause("ora_rn<=%d" % (select._limit + select._offset))
else:
limitselect.append_whereclause("ora_rn<=%d" % select._limit)
- return self.process(limitselect)
+ return self.process(limitselect, **kwargs)
else:
return ansisql.ANSICompiler.visit_select(self, select, **kwargs)