From ed315d24da96e5ed332a3ffcb9d82dfadc808e3e Mon Sep 17 00:00:00 2001
From: Dan Rzeppa <danrzeppa@pobox.com>
Date: Sat, 9 Jun 2018 12:08:55 -0400
Subject: [PATCH 1/3] - Override for Microsoft SQL Server concatenation
 operator.

---
 lib/dialect/mssql.js                    |  5 ++++
 test/dialects/value-expression-tests.js | 34 ++++++++++++++++++++++---
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/lib/dialect/mssql.js b/lib/dialect/mssql.js
index 488f7fa2..92229e06 100644
--- a/lib/dialect/mssql.js
+++ b/lib/dialect/mssql.js
@@ -48,6 +48,11 @@ Mssql.prototype.visitBinary = function(binary) {
     return [text];
   }
 
+  if(binary.operator === '||'){
+    var text = '(' + this.visit(binary.left) + ' + ' + this.visit(binary.right) + ')';
+    return [text];
+  }
+
   if (!isRightSideArray(binary)){
     return Mssql.super_.prototype.visitBinary.call(this, binary);
   }
diff --git a/test/dialects/value-expression-tests.js b/test/dialects/value-expression-tests.js
index 5eaae5ae..d5c7fcd4 100644
--- a/test/dialects/value-expression-tests.js
+++ b/test/dialects/value-expression-tests.js
@@ -114,20 +114,46 @@ Harness.test({
   query: post.select(post.id).where(post.content.equals(new Buffer('test'))),
   pg: {
     text  : 'SELECT "post"."id" FROM "post" WHERE ("post"."content" = $1)',
-    string: 'SELECT "post"."id" FROM "post" WHERE ("post"."content" = \'\\x74657374\')',
+    string: 'SELECT "post"."id" FROM "post" WHERE ("post"."content" = \'\\x74657374\')'
   },
   sqlite: {
     text  : 'SELECT "post"."id" FROM "post" WHERE ("post"."content" = $1)',
-    string: 'SELECT "post"."id" FROM "post" WHERE ("post"."content" = x\'74657374\')',
+    string: 'SELECT "post"."id" FROM "post" WHERE ("post"."content" = x\'74657374\')'
   },
   mysql: {
     text  : 'SELECT `post`.`id` FROM `post` WHERE (`post`.`content` = ?)',
-    string: 'SELECT `post`.`id` FROM `post` WHERE (`post`.`content` = x\'74657374\')',
+    string: 'SELECT `post`.`id` FROM `post` WHERE (`post`.`content` = x\'74657374\')'
   },
   oracle: {
     text  : 'SELECT "post"."id" FROM "post" WHERE ("post"."content" = :1)',
-    string: 'SELECT "post"."id" FROM "post" WHERE ("post"."content" = utl_raw.cast_to_varchar2(hextoraw(\'74657374\')))',
+    string: 'SELECT "post"."id" FROM "post" WHERE ("post"."content" = utl_raw.cast_to_varchar2(hextoraw(\'74657374\')))'
   },
   params: [new Buffer('test')]
 });
 
+// concat tests
+Harness.test({
+  query: post.select(post.content.concat(post.tags)),
+  pg: {
+    text  : 'SELECT ("post"."content" || "post"."tags") FROM "post"',
+    string: 'SELECT ("post"."content" || "post"."tags") FROM "post"'
+  },
+  sqlite: {
+    text  : 'SELECT ("post"."content" || "post"."tags") FROM "post"',
+    string: 'SELECT ("post"."content" || "post"."tags") FROM "post"'
+  },
+  mysql: {
+    text  : 'SELECT (`post`.`content` || `post`.`tags`) FROM `post`',
+    string: 'SELECT (`post`.`content` || `post`.`tags`) FROM `post`'
+  },
+  mssql: {
+    text  : 'SELECT ([post].[content] + [post].[tags]) FROM [post]',
+    string: 'SELECT ([post].[content] + [post].[tags]) FROM [post]'
+  },
+  oracle: {
+    text  : 'SELECT ("post"."content" || "post"."tags") FROM "post"',
+    string: 'SELECT ("post"."content" || "post"."tags") FROM "post"'
+  },
+  params: []
+});
+

From b0c1622ab53192b099db081b6bdbe58461a8d0f6 Mon Sep 17 00:00:00 2001
From: Dan Rzeppa <danrzeppa@pobox.com>
Date: Sat, 9 Jun 2018 12:21:39 -0400
Subject: [PATCH 2/3] Tweak so that travis checks will pass

---
 lib/dialect/mssql.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/dialect/mssql.js b/lib/dialect/mssql.js
index 92229e06..413ebd9b 100644
--- a/lib/dialect/mssql.js
+++ b/lib/dialect/mssql.js
@@ -49,8 +49,7 @@ Mssql.prototype.visitBinary = function(binary) {
   }
 
   if(binary.operator === '||'){
-    var text = '(' + this.visit(binary.left) + ' + ' + this.visit(binary.right) + ')';
-    return [text];
+    return ['(' + this.visit(binary.left) + ' + ' + this.visit(binary.right) + ')'];
   }
 
   if (!isRightSideArray(binary)){

From 845e4cc2986041c5c3459975e345701e0e65c692 Mon Sep 17 00:00:00 2001
From: Dan Rzeppa <danrzeppa@pobox.com>
Date: Sat, 9 Jun 2018 12:31:01 -0400
Subject: [PATCH 3/3] - Update ".travis.yml" to allow failures on Node 0.10 and
 0.11 since the mocha library is doing stuff that  isn't allowed.

---
 .travis.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index f04dabe6..07becfb2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,3 +4,8 @@ node_js:
   - "4.2"
   - "0.10"
   - "0.11"
+
+matrix:
+  allow_failures:
+    - node_js: "0.10"
+    - node_js: "0.11"
\ No newline at end of file