Skip to content

Commit e03bb35

Browse files
author
Di Wu
committed
fix merge conflicts
1 parent 37fdb01 commit e03bb35

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

lib/dialect/postgres.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,10 @@ Postgres.prototype.visit = function(node) {
132132
case 'DROP INDEX' : return this.visitDropIndex(node);
133133
case 'FUNCTION CALL' : return this.visitFunctionCall(node);
134134

135-
case 'POSTFIX UNARY' : return this.visitPostfixUnary(node);
136-
case 'PREFIX UNARY' : return this.visitPrefixUnary(node);
137-
case 'BINARY' : return this.visitBinary(node);
138-
case 'TERNARY' : return this.visitTernary(node);
135+
case 'POSTFIX UNARY' : return this.visitPostfixUnary(node);
136+
case 'PREFIX UNARY' : return this.visitPrefixUnary(node);
137+
case 'BINARY' : return this.visitBinary(node);
138+
case 'TERNARY' : return this.visitTernary(node);
139139

140140
case 'LIMIT' :
141141
case 'OFFSET':

lib/node/orderByValue.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
var Node = require(__dirname);
44

55
var OrderByColumn = Node.define({
6-
type: 'ORDER BY COLUMN',
6+
type: 'ORDER BY VALUE',
77
constructor: function(config) {
88
Node.call(this);
99
this.value = config.value;

0 commit comments

Comments
 (0)