From: Paul Johnston <paj@pajhome.org.uk>
Date: Sun, 25 Nov 2007 23:17:02 +0000 (+0000)
Subject: Fix: MSSQL concatenate operator is + not || [ticket:879]
X-Git-Tag: rel_0_4_2~140
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=954f7b289bcbe05dfffb765d66b04411693e7d31;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Fix: MSSQL concatenate operator is + not || [ticket:879]
---

diff --git a/lib/sqlalchemy/databases/mssql.py b/lib/sqlalchemy/databases/mssql.py
index 242389cfd9..a1cefb0193 100644
--- a/lib/sqlalchemy/databases/mssql.py
+++ b/lib/sqlalchemy/databases/mssql.py
@@ -40,7 +40,7 @@ Known issues / TODO:
 import datetime, random, warnings, re, sys, operator
 
 from sqlalchemy import sql, schema, exceptions, util
-from sqlalchemy.sql import compiler, expression
+from sqlalchemy.sql import compiler, expression, operators as sqlops
 from sqlalchemy.engine import default, base
 from sqlalchemy import types as sqltypes
     
@@ -848,6 +848,9 @@ dialect_mapping = {
 
 
 class MSSQLCompiler(compiler.DefaultCompiler):
+    operators = compiler.OPERATORS.copy()
+    operators[sqlops.concat_op] = '+'
+
     def __init__(self, *args, **kwargs):
         super(MSSQLCompiler, self).__init__(*args, **kwargs)
         self.tablealiases = {}