Merge pull request #46 from JavaScriptor/dev

fix: #40

Author: albin3

src/sqlParser.jison

@@ -126,8 +126,9 @@ UNION                                                             return 'UNION'
 
 [a-zA-Z_\u4e00-\u9fa5][a-zA-Z0-9_\u4e00-\u9fa5]*                  return 'IDENTIFIER'
 \.                                                                return 'DOT'
-['"][a-zA-Z_\u4e00-\u9fa5][a-zA-Z0-9_\u4e00-\u9fa5]*["']          return 'IDENTIFIER'
-([`])(?:(?=(\\?))\2.)*?\1                                         return 'IDENTIFIER'
+["][a-zA-Z_\u4e00-\u9fa5][a-zA-Z0-9_\u4e00-\u9fa5]*["]            return 'STRING'
+['][a-zA-Z_\u4e00-\u9fa5][a-zA-Z0-9_\u4e00-\u9fa5]*[']            return 'STRING'
+[`].+[`]                                                          return 'IDENTIFIER'
 
 <<EOF>>                                                           return 'EOF'
 .                                                                 return 'INVALID'

test/main.test.js

@@ -422,4 +422,13 @@ describe('select grammar support', 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.only('test IDENTIFIER', function () {
+    testParser('select `aa#sfs`(a) as \'A A\' from z');
+  });
 });