summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/ansisql.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2007-08-07 17:12:35 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2007-08-07 17:12:35 +0000
commitc7ee47e545316272ff0864e46c5afbd338df9cb1 (patch)
tree81d93dff2b8ffea77f4af9b7d0d13959c8f263b1 /lib/sqlalchemy/ansisql.py
parent2babbe7843ac2d15ce415b6b604144f5d0d30359 (diff)
downloadsqlalchemy-c7ee47e545316272ff0864e46c5afbd338df9cb1.tar.gz
- migrated 'desc', 'asc', and 'distinct' to be in the Operators framework
- fixes to operator() method signature/calling
Diffstat (limited to 'lib/sqlalchemy/ansisql.py')
-rw-r--r--lib/sqlalchemy/ansisql.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/sqlalchemy/ansisql.py b/lib/sqlalchemy/ansisql.py
index 13e2c985d..ce3830db8 100644
--- a/lib/sqlalchemy/ansisql.py
+++ b/lib/sqlalchemy/ansisql.py
@@ -60,6 +60,7 @@ OPERATORS = {
operator.gt : '>',
operator.ge : '>=',
operator.eq : '=',
+ sql.ColumnOperators.distinct_op : 'DISTINCT',
sql.ColumnOperators.concat_op : '||',
sql.ColumnOperators.like_op : 'LIKE',
sql.ColumnOperators.notlike_op : 'NOT LIKE',
@@ -69,6 +70,9 @@ OPERATORS = {
sql.ColumnOperators.in_op : 'IN',
sql.ColumnOperators.notin_op : 'NOT IN',
sql.ColumnOperators.comma_op : ', ',
+ sql.ColumnOperators.desc_op : 'DESC',
+ sql.ColumnOperators.asc_op : 'ASC',
+
sql.Operators.from_ : 'FROM',
sql.Operators.as_ : 'AS',
sql.Operators.exists : 'EXISTS',
@@ -392,7 +396,7 @@ class ANSICompiler(engine.Compiled, sql.ClauseVisitor):
if unary.operator:
s = self.operator_string(unary.operator) + " " + s
if unary.modifier:
- s = s + " " + unary.modifier
+ s = s + " " + self.operator_string(unary.modifier)
return s
def visit_binary(self, binary, **kwargs):