- fix concat() operator, tests

- [feature] Custom unary operators can now be
  used by combining operators.custom_op() with
  UnaryExpression().
- clean up the operator dispatch system and make it more consistent.
This does change the compiler contract for custom ops.

4 files changed, 17 insertions, 14 deletions

diff --git a/lib/sqlalchemy/dialects/mssql/base.py b/lib/sqlalchemy/dialects/mssql/base.py
index cc50fbe6b..83f6346a7 100644
--- a/lib/sqlalchemy/dialects/mssql/base.py
+++ b/lib/sqlalchemy/dialects/mssql/base.py
@@ -748,12 +748,12 @@ class MSSQLCompiler(compiler.SQLCompiler):
     def visit_char_length_func(self, fn, **kw):
         return "LEN%s" % self.function_argspec(fn, **kw)
 
-    def visit_concat_op(self, binary, **kw):
+    def visit_concat_op_binary(self, binary, operator, **kw):
         return "%s + %s" % \
                 (self.process(binary.left, **kw),
                 self.process(binary.right, **kw))
 
-    def visit_match_op(self, binary, **kw):
+    def visit_match_op_binary(self, binary, operator, **kw):
         return "CONTAINS (%s, %s)" % (
                                         self.process(binary.left, **kw),
                                         self.process(binary.right, **kw))
@@ -969,14 +969,14 @@ class MSSQLStrictCompiler(MSSQLCompiler):
     """
     ansi_bind_rules = True
 
-    def visit_in_op(self, binary, **kw):
+    def visit_in_op_binary(self, binary, operator, **kw):
         kw['literal_binds'] = True
         return "%s IN %s" % (
                                 self.process(binary.left, **kw),
                                 self.process(binary.right, **kw)
             )
 
-    def visit_notin_op(self, binary, **kw):
+    def visit_notin_op_binary(self, binary, operator, **kw):
         kw['literal_binds'] = True
         return "%s NOT IN %s" % (
                                 self.process(binary.left, **kw),
diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py
index d8bef2d4b..2c440605e 100644
--- a/lib/sqlalchemy/dialects/mysql/base.py
+++ b/lib/sqlalchemy/dialects/mysql/base.py
@@ -1254,11 +1254,13 @@ class MySQLCompiler(compiler.SQLCompiler):
     def visit_sysdate_func(self, fn, **kw):
         return "SYSDATE()"
 
-    def visit_concat_op(self, binary, **kw):
-        return "concat(%s, %s)" % (self.process(binary.left), self.process(binary.right))
+    def visit_concat_op_binary(self, binary, operator, **kw):
+        return "concat(%s, %s)" % (self.process(binary.left),
+                                                self.process(binary.right))
 
-    def visit_match_op(self, binary, **kw):
-        return "MATCH (%s) AGAINST (%s IN BOOLEAN MODE)" % (self.process(binary.left), self.process(binary.right))
+    def visit_match_op_binary(self, binary, operator, **kw):
+        return "MATCH (%s) AGAINST (%s IN BOOLEAN MODE)" % \
+                    (self.process(binary.left), self.process(binary.right))
 
     def get_from_hint_text(self, table, text):
         return text
diff --git a/lib/sqlalchemy/dialects/oracle/base.py b/lib/sqlalchemy/dialects/oracle/base.py
index 3c6ec55af..7279f254b 100644
--- a/lib/sqlalchemy/dialects/oracle/base.py
+++ b/lib/sqlalchemy/dialects/oracle/base.py
@@ -398,7 +398,7 @@ class OracleCompiler(compiler.SQLCompiler):
     compound_keywords = util.update_copy(
         compiler.SQLCompiler.compound_keywords,
         {
-        expression.CompoundSelect.EXCEPT : 'MINUS'
+        expression.CompoundSelect.EXCEPT: 'MINUS'
         }
     )
 
@@ -416,8 +416,9 @@ class OracleCompiler(compiler.SQLCompiler):
     def visit_char_length_func(self, fn, **kw):
         return "LENGTH" + self.function_argspec(fn, **kw)
 
-    def visit_match_op(self, binary, **kw):
-        return "CONTAINS (%s, %s)" % (self.process(binary.left), self.process(binary.right))
+    def visit_match_op_binary(self, binary, operator, **kw):
+        return "CONTAINS (%s, %s)" % (self.process(binary.left),
+                                        self.process(binary.right))
 
     def get_select_hint_text(self, byfroms):
         return " ".join(
diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py
index d779935ce..a9ff988e8 100644
--- a/lib/sqlalchemy/dialects/postgresql/base.py
+++ b/lib/sqlalchemy/dialects/postgresql/base.py
@@ -619,12 +619,12 @@ ischema_names = {
 
 class PGCompiler(compiler.SQLCompiler):
 
-    def visit_match_op(self, binary, **kw):
+    def visit_match_op_binary(self, binary, operator, **kw):
         return "%s @@ to_tsquery(%s)" % (
                         self.process(binary.left),
                         self.process(binary.right))
 
-    def visit_ilike_op(self, binary, **kw):
+    def visit_ilike_op_binary(self, binary, operator, **kw):
         escape = binary.modifiers.get("escape", None)
         return '%s ILIKE %s' % \
                 (self.process(binary.left), self.process(binary.right)) \
@@ -632,7 +632,7 @@ class PGCompiler(compiler.SQLCompiler):
                         (' ESCAPE ' + self.render_literal_value(escape, None))
                         or '')
 
-    def visit_notilike_op(self, binary, **kw):
+    def visit_notilike_op_binary(self, binary, operator, **kw):
         escape = binary.modifiers.get("escape", None)
         return '%s NOT ILIKE %s' % \
                 (self.process(binary.left), self.process(binary.right)) \