Split Unary into PrefixUnary and PostfixUnary

kevinoid · kevinoid · commit 5329b03a2c66 · 2013-06-24T19:04:05.000-06:00
Separate unary nodes into separate prefix- and postfix- unary nodes in
preparation for adding prefix unary operators to the supported grammar.

Signed-off-by: Kevin Locke &lt;klocke@quantpost.com&gt;
diff --git a/lib/dialect/postgres.js b/lib/dialect/postgres.js
@@ -130,7 +130,8 @@ Postgres.prototype.visit = function(node) {
     case 'DROP INDEX'      : return this.visitDropIndex(node);
     case 'FUNCTION CALL'   : return this.visitFunctionCall(node);
 
-    case 'UNARY'   : return this.visitUnary(node);
+    case 'POSTFIX UNARY'   : return this.visitPostfixUnary(node);
+    case 'PREFIX UNARY'   : return this.visitPrefixUnary(node);
     case 'BINARY'  : return this.visitBinary(node);
     case 'TERNARY' : return this.visitTernary(node);
 
@@ -295,7 +296,12 @@ Postgres.prototype.visitHaving = function(having) {
   return result;
 };
 
-Postgres.prototype.visitUnary = function(unary) {
+Postgres.prototype.visitPrefixUnary = function(unary) {
+  var text = '(' + unary.operator + ' ' + this.visit(unary.left) + ')';
+  return [text];
+};
+
+Postgres.prototype.visitPostfixUnary = function(unary) {
   var text = '(' + this.visit(unary.left) + ' ' + unary.operator + ')';
   return [text];
 };
diff --git a/lib/node/postfixUnary.js b/lib/node/postfixUnary.js
@@ -0,0 +1,28 @@
+'use strict';
+
+var _                    = require('lodash');
+var Node                 = require(__dirname);
+var valueExpressionMixin = require(__dirname + '/valueExpression');
+
+var valueExpressionMixed = false;
+var PostfixUnaryNode = Node.define({
+  type: 'POSTFIX UNARY',
+  constructor: function(config) {
+    Node.call(this);
+    this.left = config.left;
+    this.operator = config.operator;
+
+    // Delay mixin to runtime, when all nodes have been defined, and
+    // mixin only once. ValueExpressionMixin has circular dependencies.
+    if (!valueExpressionMixed) {
+      valueExpressionMixed = true;
+      _.extend(PostfixUnaryNode.prototype, valueExpressionMixin());
+    }
+  }
+});
+
+// allow aliasing
+var AliasNode = require(__dirname + '/alias');
+_.extend(PostfixUnaryNode.prototype, AliasNode.AliasMixin);
+
+module.exports = PostfixUnaryNode;
diff --git a/lib/node/prefixUnary.js b/lib/node/prefixUnary.js
@@ -5,8 +5,8 @@ var Node                 = require(__dirname);
 var valueExpressionMixin = require(__dirname + '/valueExpression');
 
 var valueExpressionMixed = false;
-var UnaryNode = Node.define({
-  type: 'UNARY',
+var PrefixUnaryNode = Node.define({
+  type: 'PREFIX UNARY',
   constructor: function(config) {
     Node.call(this);
     this.left = config.left;
@@ -16,13 +16,13 @@ var UnaryNode = Node.define({
     // mixin only once. ValueExpressionMixin has circular dependencies.
     if (!valueExpressionMixed) {
       valueExpressionMixed = true;
-      _.extend(UnaryNode.prototype, valueExpressionMixin());
+      _.extend(PrefixUnaryNode.prototype, valueExpressionMixin());
     }
   }
 });
 
 // allow aliasing
 var AliasNode = require(__dirname + '/alias');
-_.extend(UnaryNode.prototype, AliasNode.AliasMixin);
+_.extend(PrefixUnaryNode.prototype, AliasNode.AliasMixin);
 
-module.exports = UnaryNode;
+module.exports = PrefixUnaryNode;
diff --git a/lib/node/valueExpression.js b/lib/node/valueExpression.js
@@ -13,14 +13,14 @@ var processParams = function(val) {
 // ValueExpressionMixin is evaluated at runtime, hence the
 // "thunk" around it.
 var ValueExpressionMixin = module.exports = function() {
-  var UnaryNode   = require(__dirname + '/unary');
+  var PostfixUnaryNode   = require(__dirname + '/postfixUnary');
   var BinaryNode  = require(__dirname + '/binary');
   var TernaryNode = require(__dirname + '/ternary');
 
-  var unaryMethod = function(operator) {
+  var postfixUnaryMethod = function(operator) {
     /*jshint unused: false */
     return function(val) {
-      return new UnaryNode({
+      return new PostfixUnaryNode({
         left: this.toNode(),
         operator: operator
       });
@@ -50,8 +50,8 @@ var ValueExpressionMixin = module.exports = function() {
   };
 
   return {
-    isNull     : unaryMethod('IS NULL'),
-    isNotNull  : unaryMethod('IS NOT NULL'),
+    isNull     : postfixUnaryMethod('IS NULL'),
+    isNotNull  : postfixUnaryMethod('IS NOT NULL'),
     or         : binaryMethod('OR'),
     and        : binaryMethod('AND'),
     equals     : binaryMethod('='),
