From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 18 Mar 2010 02:33:08 +0000 (-0400)
Subject: some ms fixes
X-Git-Tag: rel_0_6beta2~40^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6b4f60e746c1aa895c35e31e9843da5d4270f18;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

some ms fixes
---

diff --git a/lib/sqlalchemy/dialects/mssql/base.py b/lib/sqlalchemy/dialects/mssql/base.py
index 4d697854fb..bd5af4e8e4 100644
--- 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 3c9d5f0a75..0347a64696 100644
--- 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_(