summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/databases/access.py1
-rw-r--r--lib/sqlalchemy/databases/firebird.py3
-rw-r--r--lib/sqlalchemy/databases/informix.py5
-rw-r--r--lib/sqlalchemy/databases/maxdb.py1
-rw-r--r--lib/sqlalchemy/databases/mssql.py2
-rw-r--r--lib/sqlalchemy/databases/oracle.py1
-rw-r--r--lib/sqlalchemy/databases/postgres.py2
-rw-r--r--lib/sqlalchemy/databases/sybase.py1
-rw-r--r--lib/sqlalchemy/engine/default.py1
-rw-r--r--lib/sqlalchemy/sql/compiler.py39
10 files changed, 36 insertions, 20 deletions
diff --git a/lib/sqlalchemy/databases/access.py b/lib/sqlalchemy/databases/access.py
index 425c1eb69..0dfa62888 100644
--- a/lib/sqlalchemy/databases/access.py
+++ b/lib/sqlalchemy/databases/access.py
@@ -170,6 +170,7 @@ class AccessDialect(default.DefaultDialect):
name = 'access'
supports_sane_rowcount = False
supports_sane_multi_rowcount = False
+ supports_simple_order_by_label = False
def type_descriptor(self, typeobj):
newobj = types.adapt_type(typeobj, self.colspecs)
diff --git a/lib/sqlalchemy/databases/firebird.py b/lib/sqlalchemy/databases/firebird.py
index 33ae4feab..412f7bce6 100644
--- a/lib/sqlalchemy/databases/firebird.py
+++ b/lib/sqlalchemy/databases/firebird.py
@@ -310,6 +310,7 @@ class FBDialect(default.DefaultDialect):
max_identifier_length = 31
preexecute_pk_sequences = True
supports_pk_autoincrement = False
+ supports_simple_order_by_label = False
def __init__(self, type_conv=200, concurrency_level=1, **kwargs):
default.DefaultDialect.__init__(self, **kwargs)
@@ -675,7 +676,7 @@ class FBCompiler(sql.compiler.DefaultCompiler):
yield co
else:
yield c
- columns = [self.process(c, render_labels=True)
+ columns = [self.process(c, within_columns_clause=True)
for c in flatten_columnlist(returning_cols)]
text += ' RETURNING ' + ', '.join(columns)
return text
diff --git a/lib/sqlalchemy/databases/informix.py b/lib/sqlalchemy/databases/informix.py
index 130b08c41..39d0ee96a 100644
--- a/lib/sqlalchemy/databases/informix.py
+++ b/lib/sqlalchemy/databases/informix.py
@@ -202,6 +202,7 @@ class InfoDialect(default.DefaultDialect):
default_paramstyle = 'qmark'
# for informix 7.31
max_identifier_length = 18
+ supports_simple_order_by_label = False
def __init__(self, use_ansi=True, **kwargs):
self.use_ansi = use_ansi
@@ -414,12 +415,12 @@ class InfoCompiler(compiler.DefaultCompiler):
else:
return compiler.DefaultCompiler.visit_function( self , func )
- def visit_clauselist(self, list):
+ def visit_clauselist(self, list, within_order_by=False, **kwargs):
try:
li = [ c for c in list.clauses if c.name != 'oid' ]
except:
li = [ c for c in list.clauses ]
- return ', '.join([s for s in [self.process(c) for c in li] if s is not None])
+ return ', '.join([s for s in [self.process(c, within_order_by=within_order_by) for c in li] if s is not None])
class InfoSchemaGenerator(compiler.SchemaGenerator):
def get_column_specification(self, column, first_pk=False):
diff --git a/lib/sqlalchemy/databases/maxdb.py b/lib/sqlalchemy/databases/maxdb.py
index c9ea2b579..c51f1b431 100644
--- a/lib/sqlalchemy/databases/maxdb.py
+++ b/lib/sqlalchemy/databases/maxdb.py
@@ -473,6 +473,7 @@ class MaxDBDialect(default.DefaultDialect):
supports_sane_rowcount = True
supports_sane_multi_rowcount = False
preexecute_pk_sequences = True
+ supports_simple_order_by_label = False
# MaxDB-specific
datetimeformat = 'internal'
diff --git a/lib/sqlalchemy/databases/mssql.py b/lib/sqlalchemy/databases/mssql.py
index 0341d1823..f03856736 100644
--- a/lib/sqlalchemy/databases/mssql.py
+++ b/lib/sqlalchemy/databases/mssql.py
@@ -361,6 +361,8 @@ class MSSQLExecutionContext_pyodbc (MSSQLExecutionContext):
class MSSQLDialect(default.DefaultDialect):
name = 'mssql'
+ supports_simple_order_by_label = False
+
colspecs = {
sqltypes.Unicode : MSNVarchar,
sqltypes.Integer : MSInteger,
diff --git a/lib/sqlalchemy/databases/oracle.py b/lib/sqlalchemy/databases/oracle.py
index f2e5ba2f6..8341e3401 100644
--- a/lib/sqlalchemy/databases/oracle.py
+++ b/lib/sqlalchemy/databases/oracle.py
@@ -240,6 +240,7 @@ class OracleDialect(default.DefaultDialect):
preexecute_pk_sequences = True
supports_pk_autoincrement = False
default_paramstyle = 'named'
+ supports_simple_order_by_label = False
def __init__(self, use_ansi=True, auto_setinputsizes=True, auto_convert_lobs=True, threaded=True, allow_twophase=True, arraysize=50, **kwargs):
default.DefaultDialect.__init__(self, **kwargs)
diff --git a/lib/sqlalchemy/databases/postgres.py b/lib/sqlalchemy/databases/postgres.py
index 5d61b32ad..744a573c9 100644
--- a/lib/sqlalchemy/databases/postgres.py
+++ b/lib/sqlalchemy/databases/postgres.py
@@ -703,7 +703,7 @@ class PGCompiler(compiler.DefaultCompiler):
yield co
else:
yield c
- columns = [self.process(c, render_labels=True) for c in flatten_columnlist(returning_cols)]
+ columns = [self.process(c, within_columns_clause=True) for c in flatten_columnlist(returning_cols)]
text += ' RETURNING ' + string.join(columns, ', ')
return text
diff --git a/lib/sqlalchemy/databases/sybase.py b/lib/sqlalchemy/databases/sybase.py
index aea77f8bf..dd55ac0d2 100644
--- a/lib/sqlalchemy/databases/sybase.py
+++ b/lib/sqlalchemy/databases/sybase.py
@@ -455,6 +455,7 @@ class SybaseSQLDialect(default.DefaultDialect):
supports_unicode_statements = False
supports_sane_rowcount = False
supports_sane_multi_rowcount = False
+ supports_simple_order_by_label = False
def __new__(cls, dbapi=None, *args, **kwargs):
if cls != SybaseSQLDialect:
diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py
index a3ae6d456..b240130f6 100644
--- a/lib/sqlalchemy/engine/default.py
+++ b/lib/sqlalchemy/engine/default.py
@@ -40,6 +40,7 @@ class DefaultDialect(base.Dialect):
dbapi_type_map = {}
default_paramstyle = 'named'
supports_default_values = True
+ supports_simple_order_by_label = True
def __init__(self, convert_unicode=False, assert_unicode=False, encoding='utf-8', paramstyle=None, dbapi=None, **kwargs):
self.convert_unicode = convert_unicode
diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py
index 044e5d5fe..4ad07b49d 100644
--- a/lib/sqlalchemy/sql/compiler.py
+++ b/lib/sqlalchemy/sql/compiler.py
@@ -226,17 +226,24 @@ class DefaultCompiler(engine.Compiled):
def visit_grouping(self, grouping, **kwargs):
return "(" + self.process(grouping.element) + ")"
- def visit_label(self, label, result_map=None, render_labels=False):
- if not render_labels:
- return self.process(label.element)
-
- labelname = self._truncated_identifier("colident", label.name)
+ def visit_label(self, label, result_map=None, within_columns_clause=False, within_order_by=False):
+ # only render labels within the columns clause
+ # or ORDER BY clause of a select. dialect-specific compilers
+ # can modify this behavior.
+ if within_columns_clause:
+ labelname = self._truncated_identifier("colident", label.name)
- if result_map is not None:
- result_map[labelname.lower()] = (label.name, (label, label.element, labelname), label.element.type)
+ if result_map is not None:
+ result_map[labelname.lower()] = (label.name, (label, label.element, labelname), label.element.type)
- return " ".join([self.process(label.element), self.operator_string(operators.as_), self.preparer.format_label(label, labelname)])
+ return " ".join([self.process(label.element), self.operator_string(operators.as_), self.preparer.format_label(label, labelname)])
+ elif within_order_by and self.dialect.supports_simple_order_by_label:
+ labelname = self._truncated_identifier("colident", label.name)
+ return self.preparer.format_label(label, labelname)
+ else:
+ return self.process(label.element)
+
def visit_column(self, column, result_map=None, **kwargs):
if column._is_oid:
@@ -304,7 +311,7 @@ class DefaultCompiler(engine.Compiled):
def visit_null(self, null, **kwargs):
return 'NULL'
- def visit_clauselist(self, clauselist, **kwargs):
+ def visit_clauselist(self, clauselist, within_order_by=False, **kwargs):
sep = clauselist.operator
if sep is None:
sep = " "
@@ -312,7 +319,7 @@ class DefaultCompiler(engine.Compiled):
sep = ', '
else:
sep = " " + self.operator_string(clauselist.operator) + " "
- return sep.join(s for s in (self.process(c) for c in clauselist.clauses)
+ return sep.join(s for s in (self.process(c, within_order_by=within_order_by) for c in clauselist.clauses)
if s is not None)
def visit_calculatedclause(self, clause, **kwargs):
@@ -332,8 +339,8 @@ class DefaultCompiler(engine.Compiled):
else:
return ".".join(func.packagenames + [name]) % {'expr':self.function_argspec(func)}
- def function_argspec(self, func):
- return self.process(func.clause_expr)
+ def function_argspec(self, func, **kwargs):
+ return self.process(func.clause_expr, **kwargs)
def function_string(self, func):
return self.functions.get(func.__class__, self.functions.get(func.name, func.name + "%(expr)s"))
@@ -364,8 +371,8 @@ class DefaultCompiler(engine.Compiled):
else:
return text
- def visit_unary(self, unary, **kwargs):
- s = self.process(unary.element)
+ def visit_unary(self, unary, within_order_by=False, **kwargs):
+ s = self.process(unary.element, within_order_by=within_order_by)
if unary.operator:
s = self.operator_string(unary.operator) + " " + s
if unary.modifier:
@@ -505,7 +512,7 @@ class DefaultCompiler(engine.Compiled):
[c for c in [
self.process(
self.label_select_column(select, co, asfrom=asfrom),
- render_labels=True,
+ within_columns_clause=True,
**column_clause_args)
for co in select.inner_columns
]
@@ -557,7 +564,7 @@ class DefaultCompiler(engine.Compiled):
return select._distinct and "DISTINCT " or ""
def order_by_clause(self, select):
- order_by = self.process(select._order_by_clause)
+ order_by = self.process(select._order_by_clause, within_order_by=True)
if order_by:
return " ORDER BY " + order_by
else:
View Lorry Controller Status