Merge branch 'master' into fix-unit-of-time

src/stringify.js

@@ -551,8 +551,26 @@ Sql.prototype.travelSelectParenthesized = function(ast) {
   this.travel(ast.value);
   this.appendKeyword(')');
 };
+
 Sql.prototype.travelIntervalExpression = function (ast) {
   this.appendKeyword('interval');
   this.travel(ast.value);
   this.appendKeyword(ast.unit);
+};
+Sql.prototype.travelPlaceHolder = function (ast) {
+  if (ast.left) {
+    this.travel(ast.left);
+  }
+
+  if (ast.operator) {
+    this.append(ast.operator);
+  }
+
+  if (ast.right) {
+    this.append(ast.right);
+  }
+
+  if (ast.value) {
+    this.travel(ast.value);
+  }
 };

test/main.test.js

@@ -423,4 +423,31 @@ describe('select grammar support', function () {
       SELECT a, b from t1 where created_at >= DATE_SUB(NOW(),INTERVAL 1 MONTH)
     `)
   })
+
+  });
+  it('place holder support', function() {
+    testParser(
+    "select sum(quota_value) value, busi_col2 as sh, ${a} as a, YEAR(now()) from der_quota_summary where table_ename = 'gshmyyszje_derivedidx' and cd = (select id from t1 where a = ${t1})"
+    )
+  });
+
+  it('support quoted alias: multiple alias and orderby support', function () {
+    testParser('select a as `A A`, b as `B B` from z');
+    testParser('select a as `A A` from z order by `A A` desc');
+    testParser('select a as `A A`, b as `B B` from z group by `A A`, `B B` order by `A A` desc');
+  });
+
+  it('support double quoted alias', function () {
+    testParser('select a as "A A" from z');
+    testParser('select a as "A A" from z order by "A A" desc');
+  });
+
+  it('support quoted alias', function () {
+    testParser('select a as \'A A\' from z');
+    testParser('select a as \'"A#A\' from z order by \'"A#A\' desc');
+  });
+
+  it('test IDENTIFIER', function () {
+    testParser('select `aa#sfs`(a) as \'A A\' from z');
+  });
 });