Merge pull request brianc#398 from danrzeppa/dan-mssqlconcat

danrzeppa · web-flow · commit c90f04479563 · 2019-09-24T08:26:06.000-04:00
Override for Microsoft SQL Server concatenation operator.
diff --git a/lib/dialect/mssql.js b/lib/dialect/mssql.js
@@ -48,6 +48,10 @@ Mssql.prototype.visitBinary = function(binary) {
     return [text];
   }
 
+  if(binary.operator === '||'){
+    return ['(' + this.visit(binary.left) + ' + ' + this.visit(binary.right) + ')'];
+  }
+
   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
@@ -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: []
+});
+

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,10 @@ Mssql.prototype.visitBinary = function(binary) {`
`48`	`48`	`return [text];`
`49`	`49`	`}`
`50`	`50`
	`51`	`+ if(binary.operator === '\|\|'){`
	`52`	`+ return ['(' + this.visit(binary.left) + ' + ' + this.visit(binary.right) + ')'];`
	`53`	`+ }`
	`54`	`+`
`51`	`55`	`if (!isRightSideArray(binary)){`
`52`	`56`	`return Mssql.super_.prototype.visitBinary.call(this, binary);`
`53`	`57`	`}`