Ternary between and tests

Di Wu · Di Wu · commit aa8422e1b547 · 2013-06-06T18:33:03.000-07:00
diff --git a/lib/dialect/postgres.js b/lib/dialect/postgres.js
@@ -45,6 +45,7 @@ Postgres.prototype.visit = function(node) {
     case 'COLUMN': return this.visitColumn(node);
     case 'JOIN': return this.visitJoin(node);
     case 'TEXT': return node.text;
+    case 'TERNARY': return this.visitTernary(node);
     case 'UNARY': return this.visitUnary(node);
     case 'PARAMETER': return this.visitParameter(node);
     case 'DEFAULT': return this.visitDefault(node);
@@ -215,6 +216,31 @@ Postgres.prototype.visitBinary = function(binary) {
   return result;
 };
 
+Postgres.prototype.visitTernary = function(ternary) {
+  var self = this;
+  var result = '(' + this.visit(ternary.left) + ' ' + ternary.operator + ' ';
+
+  var visitPart = function(value) {
+    var text = '';
+    if (Array.isArray(value)) {
+      text += '(' + value.map(function (node) {
+        return self.visit(node);
+      }).join(', ') + ')';
+    }
+    else {
+      text += self.visit(value);
+    }
+    return text;
+  };
+
+  result += visitPart(ternary.middle);
+  result += ' ' + ternary.separator + ' ';
+  result += visitPart(ternary.right);
+
+  result += ')';
+  return result;
+};
+
 Postgres.prototype.visitUnary = function(unary) {
   return '(' + this.visit(unary.left) + ' ' + unary.operator + ')';
 };
diff --git a/lib/node/binary.js b/lib/node/binary.js
@@ -1,7 +1,7 @@
 'use strict';
 
-var _        = require('lodash');
-var Node     = require(__dirname);
+var _                    = require('lodash');
+var Node                 = require(__dirname);
 var valueExpressionMixin = require(__dirname + '/valueExpression');
 
 var valueExpressionMixed = false;
@@ -12,10 +12,9 @@ var BinaryNode = Node.define(_.extend({
     this.left = config.left;
     this.operator = config.operator;
     this.right = config.right;
+
     // Delay mixin to runtime, when all nodes have been defined, and
-    // mixin only once.
-    // There is circular dependency between unary, binary and value
-    // expression mixin, thus this must be delayed to runtime.
+    // mixin only once. ValueExpressionMixin has circular dependencies.
     if (!valueExpressionMixed) {
       valueExpressionMixed = true;
       _.extend(BinaryNode.prototype, valueExpressionMixin());
diff --git a/lib/node/ternary.js b/lib/node/ternary.js
@@ -0,0 +1,27 @@
+'use strict';
+
+var _                    = require('lodash');
+var Node                 = require(__dirname);
+var valueExpressionMixin = require(__dirname + '/valueExpression');
+
+var valueExpressionMixed = false;
+var TernaryNode = Node.define(_.extend({
+  type: 'TERNARY',
+  constructor: function(config) {
+    Node.call(this);
+    this.left = config.left;
+    this.middle = config.middle;
+    this.operator = config.operator;
+    this.right = config.right;
+    this.separator = config.separator;
+
+    // Delay mixin to runtime, when all nodes have been defined, and
+    // mixin only once. ValueExpressionMixin has circular dependencies.
+    if (!valueExpressionMixed) {
+      valueExpressionMixed = true;
+      _.extend(TernaryNode.prototype, valueExpressionMixin());
+    }
+  },
+}));
+
+module.exports = TernaryNode;
diff --git a/lib/node/unary.js b/lib/node/unary.js
@@ -1,7 +1,7 @@
 'use strict';
 
-var _ = require('lodash');
-var Node = require(__dirname);
+var _                    = require('lodash');
+var Node                 = require(__dirname);
 var valueExpressionMixin = require(__dirname + '/valueExpression');
 
 var valueExpressionMixed = false;
diff --git a/lib/node/valueExpression.js b/lib/node/valueExpression.js
@@ -18,6 +18,7 @@ var processParams = function(val) {
 // "thunk" around it.
 var ValueExpressionMixin = module.exports = function() {
   var BinaryNode = require(__dirname + '/binary');
+  var TernaryNode = require(__dirname + '/ternary');
   var UnaryNode  = require(__dirname + '/unary');
 
   var binaryMethod = function(operator) {
@@ -30,6 +31,18 @@ var ValueExpressionMixin = module.exports = function() {
     };
   };
 
+  var ternaryMethod = function(operator, separator) {
+    return function(middle, right) {
+      return new TernaryNode({
+        left: this.toNode(),
+        middle: processParams(middle),
+        operator: operator,
+        right: processParams(right),
+        separator: separator
+      });
+    };
+  };
+
   var unaryMethod = function(operator) {
     /*jshint unused: false */
     return function(val) {
@@ -61,6 +74,7 @@ var ValueExpressionMixin = module.exports = function() {
     in       : binaryMethod('IN'),
     notIn    : binaryMethod('NOT IN'),
     isNull   : unaryMethod('IS NULL'),
-    isNotNull: unaryMethod('IS NOT NULL')
+    isNotNull: unaryMethod('IS NOT NULL'),
+    between  : ternaryMethod('BETWEEN', 'AND')
   };
 };
diff --git a/test/dialects/ternary-clause-tests.js b/test/dialects/ternary-clause-tests.js
@@ -0,0 +1,22 @@
+'use strict';
+
+var Harness = require('./support');
+var customer = Harness.defineCustomerTable();
+var post = Harness.definePostTable();
+var Table = require(__dirname + '/../../lib/table');
+
+Harness.test({
+  query : customer.select().where(customer.age.between(18, 25)),
+  pg    : 'SELECT "customer".* FROM "customer" WHERE ("customer"."age" BETWEEN $1 AND $2)',
+  sqlite: 'SELECT "customer".* FROM "customer" WHERE ("customer"."age" BETWEEN $1 AND $2)',
+  mysql : 'SELECT `customer`.* FROM `customer` WHERE (`customer`.`age` BETWEEN ? AND ?)',
+  params: [18, 25]
+});
+
+Harness.test({
+  query : post.select().where(post.userId.between(customer.subQuery().select(customer.id.min()), customer.subQuery().select(customer.id.max()))),
+  pg    : 'SELECT "post".* FROM "post" WHERE ("post"."userId" BETWEEN (SELECT MIN("customer"."id") AS "id_min" FROM "customer") AND (SELECT MAX("customer"."id") AS "id_max" FROM "customer"))',
+  sqlite: 'SELECT "post".* FROM "post" WHERE ("post"."userId" BETWEEN (SELECT MIN("customer"."id") AS "id_min" FROM "customer") AND (SELECT MAX("customer"."id") AS "id_max" FROM "customer"))',
+  mysql : 'SELECT `post`.* FROM `post` WHERE (`post`.`userId` BETWEEN (SELECT MIN(`customer`.`id`) AS `id_min` FROM `customer`) AND (SELECT MAX(`customer`.`id`) AS `id_max` FROM `customer`))',
+  params: []
+});
diff --git a/test/ternary-clause-tests.js b/test/ternary-clause-tests.js
@@ -0,0 +1,15 @@
+/* global test */
+'use strict';
+
+var assert = require('assert');
+var Table = require(__dirname + '/../lib/table');
+
+var Foo = Table.define({
+  name: 'foo',
+  columns: ['baz','bar']
+});
+
+test('operators', function() {
+  assert.equal(Foo.bar.between(1, 2).operator, 'BETWEEN');
+  assert.equal(Foo.baz.between(1, 2).separator, 'AND');
+});
diff --git a/test/unary-clause-tests.js b/test/unary-clause-tests.js
@@ -0,0 +1,15 @@
+/* global test */
+'use strict';
+
+var assert = require('assert');
+var Table = require(__dirname + '/../lib/table');
+
+var Foo = Table.define({
+  name: 'foo',
+  columns: ['baz','bar']
+});
+
+test('operators', function() {
+  assert.equal(Foo.bar.isNull().operator, 'IS NULL');
+  assert.equal(Foo.baz.isNotNull().operator, 'IS NOT NULL');
+});
