some ms fixes

diff --git a/lib/sqlalchemy/dialects/mssql/base.py b/lib/sqlalchemy/dialects/mssql/base.py
index 4d697854fb2de4942909a8e20b73145b9df000fe..bd5af4e8e4acfcb15e08aa1dc081b2a9bb6bd345 100644 (file)
--- a/lib/sqlalchemy/dialects/mssql/base.py
+++ b/lib/sqlalchemy/dialects/mssql/base.py
@@ -868,11 +868,13 @@ 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):
-        return "%s + %s" % (self.process(binary.left), self.process(binary.right))
+    def visit_concat_op(self, binary, **kw):
+        return "%s + %s" % (self.process(binary.left, **kw), self.process(binary.right, **kw))
         
-    def visit_match_op(self, binary):
-        return "CONTAINS (%s, %s)" % (self.process(binary.left), self.process(binary.right))
+    def visit_match_op(self, binary, **kw):
+        return "CONTAINS (%s, %s)" % (
+                                        self.process(binary.left, **kw), 
+                                        self.process(binary.right, **kw))
         
     def get_select_precolumns(self, select):
         """ MS-SQL puts TOP, it's version of LIMIT here """

diff --git a/test/sql/test_query.py b/test/sql/test_query.py
index 3c9d5f0a75abc259c1f3b657bc5460023d70cc9e..0347a6469623f50a3b81830c79e7ca4ae9241ed2 100644 (file)
--- a/test/sql/test_query.py
+++ b/test/sql/test_query.py
@@ -264,6 +264,7 @@ class QueryTest(TestBase):
 
         @testing.fails_on('postgresql', 'only simple labels allowed')
         @testing.fails_on('sybase', 'only simple labels allowed')
+        @testing.fails_on('mssql', 'only simple labels allowed')
         def go():
             concat = ("test: " + users.c.user_name).label('thedata')
             eq_(