Merge pull request m-novikov#47 from kristijanhusak/feature/postgres-alias

Add support for postgres aliases with double quotes

Author: DerekStride

grammar.js

@@ -893,11 +893,11 @@ module.exports = grammar({
         seq(
           optional(
             seq(
-              field('schema', $.identifier),
+              field('schema', $._alias_identifier),
               '.',
             ),
           ),
-          field('table_alias', $.identifier),
+          field('table_alias', $._alias_identifier),
           '.',
         ),
       ),
@@ -961,11 +961,11 @@ module.exports = grammar({
         seq(
           optional(
             seq(
-              field('schema', $.identifier),
+              field('schema', $._alias_identifier),
               '.',
             ),
           ),
-          field('table_alias', $.identifier),
+          field('table_alias', $._alias_identifier),
           '.',
         ),
       ),
@@ -1111,11 +1111,16 @@ module.exports = grammar({
       ),
     ),
 
+    _alias_identifier : $ => choice(
+      $.identifier,
+      alias($._double_quote_string, $.identifier),
+    ),
+
     _alias: $ => choice(
-      field('alias', $.identifier),
+      field('alias', $._alias_identifier),
       seq(
         $.keyword_as,
-        field('alias', $.identifier),
+        field('alias', $._alias_identifier),
       ),
     ),
 
@@ -1165,7 +1170,7 @@ module.exports = grammar({
       optional(
         seq(
           optional($.keyword_as),
-          field('table_alias', $.identifier),
+          field('table_alias', $._alias_identifier),
           optional(alias($._column_list_without_order, $.column_list)),
         ),
       ),
@@ -1430,9 +1435,10 @@ module.exports = grammar({
         $.keyword_null,
       ),
     ),
-    _literal_string: _ => choice(
+    _double_quote_string: _ => seq('"', /[^"]*/, '"'),
+    _literal_string: $ => choice(
       seq("'", /[^']*/, "'"),
-      seq('"', /[^"]*/, '"'),
+      $._double_quote_string,
     ),
     _number: _ => /\d+/,
 

src/grammar.json

@@ -3856,7 +3856,7 @@
                           "name": "schema",
                           "content": {
                             "type": "SYMBOL",
-                            "name": "identifier"
+                            "name": "_alias_identifier"
                           }
                         },
                         {
@@ -3875,7 +3875,7 @@
                   "name": "table_alias",
                   "content": {
                     "type": "SYMBOL",
-                    "name": "identifier"
+                    "name": "_alias_identifier"
                   }
                 },
                 {
@@ -4079,7 +4079,7 @@
                           "name": "schema",
                           "content": {
                             "type": "SYMBOL",
-                            "name": "identifier"
+                            "name": "_alias_identifier"
                           }
                         },
                         {
@@ -4098,7 +4098,7 @@
                   "name": "table_alias",
                   "content": {
                     "type": "SYMBOL",
-                    "name": "identifier"
+                    "name": "_alias_identifier"
                   }
                 },
                 {
@@ -4603,6 +4603,24 @@
         }
       ]
     },
+    "_alias_identifier": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "identifier"
+        },
+        {
+          "type": "ALIAS",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_double_quote_string"
+          },
+          "named": true,
+          "value": "identifier"
+        }
+      ]
+    },
     "_alias": {
       "type": "CHOICE",
       "members": [
@@ -4611,7 +4629,7 @@
           "name": "alias",
           "content": {
             "type": "SYMBOL",
-            "name": "identifier"
+            "name": "_alias_identifier"
           }
         },
         {
@@ -4626,7 +4644,7 @@
               "name": "alias",
               "content": {
                 "type": "SYMBOL",
-                "name": "identifier"
+                "name": "_alias_identifier"
               }
             }
           ]
@@ -4828,7 +4846,7 @@
                   "name": "table_alias",
                   "content": {
                     "type": "SYMBOL",
-                    "name": "identifier"
+                    "name": "_alias_identifier"
                   }
                 },
                 {
@@ -6406,6 +6424,23 @@
         ]
       }
     },
+    "_double_quote_string": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "\""
+        },
+        {
+          "type": "PATTERN",
+          "value": "[^\"]*"
+        },
+        {
+          "type": "STRING",
+          "value": "\""
+        }
+      ]
+    },
     "_literal_string": {
       "type": "CHOICE",
       "members": [
@@ -6427,21 +6462,8 @@
           ]
         },
         {
-          "type": "SEQ",
-          "members": [
-            {
-              "type": "STRING",
-              "value": "\""
-            },
-            {
-              "type": "PATTERN",
-              "value": "[^\"]*"
-            },
-            {
-              "type": "STRING",
-              "value": "\""
-            }
-          ]
+          "type": "SYMBOL",
+          "name": "_double_quote_string"
         }
       ]
     },