cariboujs 2.0.4 → 2.0.6

package/sql/plsql/PlSqlParserBase.js

@@ -1,5 +1,6 @@
 import antlr4 from 'antlr4';
 import JavaScriptLexer from './PlSqlParser.js';
+import PlSqlLexer from './PlSqlLexer.js';
 
 export default class PlSqlParserBase extends antlr4.Parser {
   _isVersion10;
@@ -36,4 +37,33 @@ export default class PlSqlParserBase extends antlr4.Parser {
   setVersion12(value) {
     this._isVersion12 = value;
   }
+
+  IsNotNumericFunction() {
+    const lt1 = this.getTokenStream().LT(1);
+    const lt2 = this.getTokenStream().LT(2);
+    if ((lt1.type === PlSqlLexer.SUM ||
+      lt1.type === PlSqlLexer.COUNT ||
+      lt1.type === PlSqlLexer.AVG ||
+      lt1.type === PlSqlLexer.MIN ||
+      lt1.type === PlSqlLexer.MAX ||
+      lt1.type === PlSqlLexer.ROUND ||
+      lt1.type === PlSqlLexer.LEAST ||
+      lt1.type === PlSqlLexer.GREATEST) && lt2.type === PlSqlLexer.LEFT_PAREN)
+      return false;
+    return true;
+  }
+
+  isNotStartOfJoin() {
+    const lt1 = this.getTokenStream().LT(1);
+    if (lt1.type == PlSqlLexer.INNER ||
+        lt1.type == PlSqlLexer.CROSS ||
+        lt1.type == PlSqlLexer.NATURAL ||
+        lt1.type == PlSqlLexer.PARTITION ||
+        lt1.type == PlSqlLexer.FULL ||
+        lt1.type == PlSqlLexer.LEFT ||
+        lt1.type == PlSqlLexer.RIGHT ||
+        lt1.type == PlSqlLexer.OUTER)
+        return false;
+    return true;
+  }
 }

package/sql/plsql/PlSqlParserListener.js

@@ -4532,6 +4532,24 @@ export default class PlSqlParserListener extends antlr4.tree.ParseTreeListener {
 	}
 
 
+	// Enter a parse tree produced by PlSqlParser#query_rewrite_clause.
+	enterQuery_rewrite_clause(ctx) {
+	}
+
+	// Exit a parse tree produced by PlSqlParser#query_rewrite_clause.
+	exitQuery_rewrite_clause(ctx) {
+	}
+
+
+	// Enter a parse tree produced by PlSqlParser#unusable_editions_clause.
+	enterUnusable_editions_clause(ctx) {
+	}
+
+	// Exit a parse tree produced by PlSqlParser#unusable_editions_clause.
+	exitUnusable_editions_clause(ctx) {
+	}
+
+
 	// Enter a parse tree produced by PlSqlParser#drop_materialized_view.
 	enterDrop_materialized_view(ctx) {
 	}
@@ -9527,6 +9545,15 @@ export default class PlSqlParserListener extends antlr4.tree.ParseTreeListener {
 	}
 
 
+	// Enter a parse tree produced by PlSqlParser#unary_expression_core.
+	enterUnary_expression_core(ctx) {
+	}
+
+	// Exit a parse tree produced by PlSqlParser#unary_expression_core.
+	exitUnary_expression_core(ctx) {
+	}
+
+
 	// Enter a parse tree produced by PlSqlParser#implicit_cursor_expression.
 	enterImplicit_cursor_expression(ctx) {
 	}
@@ -10130,15 +10157,6 @@ export default class PlSqlParserListener extends antlr4.tree.ParseTreeListener {
 	}
 
 
-	// Enter a parse tree produced by PlSqlParser#sql_plus_command_no_semicolon.
-	enterSql_plus_command_no_semicolon(ctx) {
-	}
-
-	// Exit a parse tree produced by PlSqlParser#sql_plus_command_no_semicolon.
-	exitSql_plus_command_no_semicolon(ctx) {
-	}
-
-
 	// Enter a parse tree produced by PlSqlParser#sql_plus_command.
 	enterSql_plus_command(ctx) {
 	}
@@ -10157,6 +10175,15 @@ export default class PlSqlParserListener extends antlr4.tree.ParseTreeListener {
 	}
 
 
+	// Enter a parse tree produced by PlSqlParser#sql_plus_filepath.
+	enterSql_plus_filepath(ctx) {
+	}
+
+	// Exit a parse tree produced by PlSqlParser#sql_plus_filepath.
+	exitSql_plus_filepath(ctx) {
+	}
+
+
 	// Enter a parse tree produced by PlSqlParser#whenever_command.
 	enterWhenever_command(ctx) {
 	}

package/sql/plsql/PlSqlParserVisitor.js

@@ -3024,6 +3024,18 @@ export default class PlSqlParserVisitor extends antlr4.tree.ParseTreeVisitor {
 	}
 
 
+	// Visit a parse tree produced by PlSqlParser#query_rewrite_clause.
+	visitQuery_rewrite_clause(ctx) {
+	  return this.visitChildren(ctx);
+	}
+
+
+	// Visit a parse tree produced by PlSqlParser#unusable_editions_clause.
+	visitUnusable_editions_clause(ctx) {
+	  return this.visitChildren(ctx);
+	}
+
+
 	// Visit a parse tree produced by PlSqlParser#drop_materialized_view.
 	visitDrop_materialized_view(ctx) {
 	  return this.visitChildren(ctx);
@@ -6354,6 +6366,12 @@ export default class PlSqlParserVisitor extends antlr4.tree.ParseTreeVisitor {
 	}
 
 
+	// Visit a parse tree produced by PlSqlParser#unary_expression_core.
+	visitUnary_expression_core(ctx) {
+	  return this.visitChildren(ctx);
+	}
+
+
 	// Visit a parse tree produced by PlSqlParser#implicit_cursor_expression.
 	visitImplicit_cursor_expression(ctx) {
 	  return this.visitChildren(ctx);
@@ -6756,12 +6774,6 @@ export default class PlSqlParserVisitor extends antlr4.tree.ParseTreeVisitor {
 	}
 
 
-	// Visit a parse tree produced by PlSqlParser#sql_plus_command_no_semicolon.
-	visitSql_plus_command_no_semicolon(ctx) {
-	  return this.visitChildren(ctx);
-	}
-
-
 	// Visit a parse tree produced by PlSqlParser#sql_plus_command.
 	visitSql_plus_command(ctx) {
 	  return this.visitChildren(ctx);
@@ -6774,6 +6786,12 @@ export default class PlSqlParserVisitor extends antlr4.tree.ParseTreeVisitor {
 	}
 
 
+	// Visit a parse tree produced by PlSqlParser#sql_plus_filepath.
+	visitSql_plus_filepath(ctx) {
+	  return this.visitChildren(ctx);
+	}
+
+
 	// Visit a parse tree produced by PlSqlParser#whenever_command.
 	visitWhenever_command(ctx) {
 	  return this.visitChildren(ctx);

package/sql/postgresql/PostgreSQLParser.js

@@ -930,7 +930,7 @@ const serializedATN = [4,1,599,10520,2,0,7,0,2,1,7,1,2,2,7,2,2,3,7,3,2,4,
 1,714,1,714,1,714,1,714,1,714,1,714,1,714,1,714,1,714,1,714,1,714,1,714,
 1,714,1,714,1,714,1,714,1,714,1,714,1,714,1,714,1,714,1,714,1,714,1,714,
 1,714,1,714,3,714,10501,8,714,1,715,1,715,1,716,1,716,1,717,1,717,1,718,
-1,718,1,719,1,719,3,719,10513,8,719,1,719,1,719,1,719,3,719,10518,8,719,
+1,718,1,719,1,719,1,719,1,719,3,719,10515,8,719,1,719,3,719,10518,8,719,
 1,719,0,4,1206,1332,1358,1366,720,0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,
 30,32,34,36,38,40,42,44,46,48,50,52,54,56,58,60,62,64,66,68,70,72,74,76,
 78,80,82,84,86,88,90,92,94,96,98,100,102,104,106,108,110,112,114,116,118,
@@ -4102,82 +4102,82 @@ const serializedATN = [4,1,599,10520,2,0,7,0,2,1,7,1,2,2,7,2,2,3,7,3,2,4,
 0,10500,10496,1,0,0,0,10500,10497,1,0,0,0,10500,10498,1,0,0,0,10500,10499,
 1,0,0,0,10501,1429,1,0,0,0,10502,10503,7,63,0,0,10503,1431,1,0,0,0,10504,
 10505,7,64,0,0,10505,1433,1,0,0,0,10506,10507,7,65,0,0,10507,1435,1,0,0,
-0,10508,10509,3,1416,708,0,10509,1437,1,0,0,0,10510,10512,5,554,0,0,10511,
-10513,3,1406,703,0,10512,10511,1,0,0,0,10512,10513,1,0,0,0,10513,10518,1,
-0,0,0,10514,10518,5,555,0,0,10515,10518,5,559,0,0,10516,10518,5,582,0,0,
-10517,10510,1,0,0,0,10517,10514,1,0,0,0,10517,10515,1,0,0,0,10517,10516,
-1,0,0,0,10518,1439,1,0,0,0,1051,1446,1450,1454,1581,1590,1599,1605,1611,
-1626,1638,1644,1652,1663,1667,1675,1683,1701,1704,1709,1718,1727,1731,1743,
-1749,1765,1778,1785,1793,1798,1805,1811,1818,1829,1833,1837,1850,1854,1859,
-1864,1876,1885,1898,1903,1914,1920,1926,1931,1942,1948,1954,1963,1973,1988,
-1994,2001,2006,2013,2024,2048,2055,2064,2073,2081,2091,2100,2109,2117,2125,
-2134,2143,2147,2154,2162,2172,2178,2182,2186,2190,2194,2199,2202,2206,2227,
-2233,2328,2335,2351,2365,2375,2377,2382,2386,2389,2395,2397,2425,2435,2448,
-2455,2461,2465,2471,2476,2479,2481,2486,2490,2494,2498,2502,2505,2509,2517,
-2521,2525,2534,2541,2546,2553,2558,2565,2570,2588,2593,2605,2610,2619,2626,
-2633,2639,2644,2648,2651,2654,2657,2660,2663,2668,2671,2674,2677,2680,2683,
-2689,2693,2696,2699,2702,2705,2707,2716,2729,2737,2743,2747,2752,2759,2766,
-2777,2784,2787,2792,2795,2802,2811,2818,2823,2826,2829,2831,2836,2843,2853,
-2863,2876,2879,2882,2889,2897,2900,2903,2910,2914,2920,2923,2926,2929,2941,
-2944,2947,2951,2965,2983,2994,3009,3025,3046,3051,3054,3058,3061,3067,3070,
-3072,3081,3090,3109,3113,3124,3133,3139,3145,3149,3152,3155,3158,3161,3167,
-3171,3178,3184,3188,3191,3194,3197,3205,3209,3213,3219,3223,3229,3243,3252,
-3269,3274,3277,3279,3289,3296,3301,3304,3307,3314,3317,3319,3325,3334,3344,
-3349,3358,3367,3371,3378,3388,3399,3509,3517,3520,3530,3535,3545,3556,3568,
-3581,3591,3604,3607,3614,3623,3626,3633,3635,3643,3653,3655,3663,3667,3672,
-3683,3687,3692,3702,3708,3721,3727,3729,3736,3744,3749,3764,3777,3779,3783,
-3803,3820,3823,3826,3829,3832,3840,3843,3846,3892,3895,3898,3916,3923,3932,
-3938,3945,3955,3963,3968,3980,3997,4003,4010,4018,4032,4060,4067,4081,4096,
-4109,4118,4143,4154,4221,4232,4238,4246,4257,4271,4280,4290,4302,4317,4328,
-4336,4346,4353,4356,4362,4365,4380,4393,4422,4429,4444,4453,4464,4466,4475,
-4486,4488,4495,4510,4516,4524,4530,4538,4548,4554,4562,4568,4576,4583,4592,
-4594,4619,4626,4637,4643,4652,4657,4663,4670,4675,4679,4682,4688,4837,4841,
-4846,4857,4868,4879,4890,4901,4912,4923,4935,4946,4954,4961,4967,4975,4980,
-4985,4990,4996,5003,5009,5015,5020,5026,5033,5038,5044,5051,5054,5067,5076,
-5088,5090,5107,5114,5119,5123,5127,5131,5133,5193,5200,5206,5217,5220,5227,
-5230,5240,5243,5245,5264,5276,5285,5294,5306,5308,5314,5318,5321,5324,5329,
-5335,5338,5341,5344,5347,5351,5355,5358,5364,5370,5373,5376,5379,5382,5384,
-5390,5408,5412,5415,5418,5421,5424,5429,5432,5434,5447,5459,5473,5477,5489,
-5491,5500,5509,5517,5526,5528,5532,5541,5546,5552,5557,5561,5566,5574,5581,
-5586,5601,5610,5621,5627,5666,5676,5683,5694,5708,5716,5721,5729,5737,5743,
-5751,5757,5765,5767,5773,5781,5783,5789,5797,5799,5823,5830,5840,5852,5857,
-5870,5882,5894,5896,5902,5907,5915,5922,5967,5972,5979,5983,5987,5993,5997,
-6002,6006,6009,6011,6033,6104,6299,6312,6323,6336,6348,6362,6394,6408,6520,
-6522,6533,6544,6555,6568,6580,6591,6598,6819,6834,6845,6852,6906,7047,7053,
-7056,7066,7095,7105,7112,7135,7144,7156,7162,7170,7172,7176,7186,7190,7200,
-7203,7207,7211,7219,7230,7242,7246,7249,7253,7256,7261,7265,7268,7272,7275,
-7279,7282,7293,7300,7313,7327,7331,7336,7343,7350,7353,7358,7361,7370,7372,
-7377,7381,7393,7396,7403,7407,7412,7422,7431,7434,7439,7450,7454,7460,7467,
-7487,7508,7512,7517,7600,7606,7619,7623,7627,7631,7637,7644,7647,7650,7653,
-7656,7663,7665,7669,7672,7679,7681,7688,7696,7703,7708,7712,7716,7720,7724,
-7740,7747,7757,7770,7781,7788,7793,7797,7801,7806,7819,7824,7828,7836,7839,
-7843,7854,7857,7859,7875,7878,7885,7888,7893,7908,7914,7923,7932,7939,7942,
-7948,7953,7960,7964,7969,7972,7978,7982,7984,7987,7994,7997,8004,8012,8015,
-8024,8029,8035,8038,8041,8048,8052,8055,8070,8073,8080,8083,8090,8093,8096,
-8103,8116,8126,8134,8146,8148,8155,8159,8169,8173,8177,8181,8183,8188,8192,
-8196,8198,8200,8205,8210,8216,8221,8226,8229,8232,8235,8238,8241,8244,8247,
-8252,8255,8258,8261,8264,8267,8269,8275,8279,8288,8293,8297,8306,8316,8320,
-8325,8331,8343,8358,8365,8367,8370,8374,8378,8380,8388,8397,8403,8405,8407,
-8414,8418,8427,8431,8446,8454,8482,8489,8493,8496,8501,8505,8508,8524,8535,
-8540,8543,8547,8551,8555,8560,8564,8568,8570,8579,8584,8590,8594,8596,8603,
-8608,8614,8616,8620,8627,8632,8635,8641,8645,8654,8658,8666,8668,8675,8680,
-8683,8691,8700,8708,8710,8714,8721,8740,8749,8755,8774,8783,8789,8793,8798,
-8808,8815,8824,8827,8836,8838,8842,8847,8857,8863,8866,8873,8877,8880,8893,
-8899,8903,8907,8910,8918,8922,8926,8934,8941,8948,8952,8958,8960,8969,8972,
-8982,8998,9004,9009,9016,9029,9036,9044,9052,9057,9061,9067,9071,9075,9078,
-9084,9089,9105,9108,9110,9122,9124,9128,9134,9138,9140,9148,9152,9161,9169,
-9175,9178,9187,9192,9199,9209,9235,9246,9248,9250,9258,9280,9289,9299,9302,
-9307,9312,9316,9322,9325,9328,9331,9335,9349,9356,9363,9370,9389,9397,9405,
-9407,9413,9420,9422,9435,9474,9476,9496,9506,9517,9534,9537,9540,9543,9545,
-9552,9555,9559,9562,9565,9567,9574,9587,9600,9603,9607,9610,9620,9623,9633,
-9636,9639,9643,9650,9662,9674,9680,9688,9705,9730,9740,9744,9747,9750,9753,
-9766,9771,9776,9778,9786,9795,9804,9809,9818,9823,9837,9847,9855,9869,9876,
-9884,9892,9899,9905,9914,9929,9940,9972,9981,9988,9992,9996,10003,10017,
-10022,10027,10031,10033,10036,10043,10048,10062,10094,10099,10111,10128,
-10136,10144,10160,10165,10176,10188,10198,10209,10217,10225,10235,10242,
-10245,10254,10257,10262,10275,10283,10286,10293,10298,10305,10318,10330,
-10335,10343,10350,10355,10367,10375,10380,10390,10397,10404,10410,10415,
-10421,10429,10433,10500,10512,10517];
+0,10508,10509,3,1416,708,0,10509,1437,1,0,0,0,10510,10518,5,554,0,0,10511,
+10518,5,555,0,0,10512,10514,5,559,0,0,10513,10515,3,1406,703,0,10514,10513,
+1,0,0,0,10514,10515,1,0,0,0,10515,10518,1,0,0,0,10516,10518,5,582,0,0,10517,
+10510,1,0,0,0,10517,10511,1,0,0,0,10517,10512,1,0,0,0,10517,10516,1,0,0,
+0,10518,1439,1,0,0,0,1051,1446,1450,1454,1581,1590,1599,1605,1611,1626,1638,
+1644,1652,1663,1667,1675,1683,1701,1704,1709,1718,1727,1731,1743,1749,1765,
+1778,1785,1793,1798,1805,1811,1818,1829,1833,1837,1850,1854,1859,1864,1876,
+1885,1898,1903,1914,1920,1926,1931,1942,1948,1954,1963,1973,1988,1994,2001,
+2006,2013,2024,2048,2055,2064,2073,2081,2091,2100,2109,2117,2125,2134,2143,
+2147,2154,2162,2172,2178,2182,2186,2190,2194,2199,2202,2206,2227,2233,2328,
+2335,2351,2365,2375,2377,2382,2386,2389,2395,2397,2425,2435,2448,2455,2461,
+2465,2471,2476,2479,2481,2486,2490,2494,2498,2502,2505,2509,2517,2521,2525,
+2534,2541,2546,2553,2558,2565,2570,2588,2593,2605,2610,2619,2626,2633,2639,
+2644,2648,2651,2654,2657,2660,2663,2668,2671,2674,2677,2680,2683,2689,2693,
+2696,2699,2702,2705,2707,2716,2729,2737,2743,2747,2752,2759,2766,2777,2784,
+2787,2792,2795,2802,2811,2818,2823,2826,2829,2831,2836,2843,2853,2863,2876,
+2879,2882,2889,2897,2900,2903,2910,2914,2920,2923,2926,2929,2941,2944,2947,
+2951,2965,2983,2994,3009,3025,3046,3051,3054,3058,3061,3067,3070,3072,3081,
+3090,3109,3113,3124,3133,3139,3145,3149,3152,3155,3158,3161,3167,3171,3178,
+3184,3188,3191,3194,3197,3205,3209,3213,3219,3223,3229,3243,3252,3269,3274,
+3277,3279,3289,3296,3301,3304,3307,3314,3317,3319,3325,3334,3344,3349,3358,
+3367,3371,3378,3388,3399,3509,3517,3520,3530,3535,3545,3556,3568,3581,3591,
+3604,3607,3614,3623,3626,3633,3635,3643,3653,3655,3663,3667,3672,3683,3687,
+3692,3702,3708,3721,3727,3729,3736,3744,3749,3764,3777,3779,3783,3803,3820,
+3823,3826,3829,3832,3840,3843,3846,3892,3895,3898,3916,3923,3932,3938,3945,
+3955,3963,3968,3980,3997,4003,4010,4018,4032,4060,4067,4081,4096,4109,4118,
+4143,4154,4221,4232,4238,4246,4257,4271,4280,4290,4302,4317,4328,4336,4346,
+4353,4356,4362,4365,4380,4393,4422,4429,4444,4453,4464,4466,4475,4486,4488,
+4495,4510,4516,4524,4530,4538,4548,4554,4562,4568,4576,4583,4592,4594,4619,
+4626,4637,4643,4652,4657,4663,4670,4675,4679,4682,4688,4837,4841,4846,4857,
+4868,4879,4890,4901,4912,4923,4935,4946,4954,4961,4967,4975,4980,4985,4990,
+4996,5003,5009,5015,5020,5026,5033,5038,5044,5051,5054,5067,5076,5088,5090,
+5107,5114,5119,5123,5127,5131,5133,5193,5200,5206,5217,5220,5227,5230,5240,
+5243,5245,5264,5276,5285,5294,5306,5308,5314,5318,5321,5324,5329,5335,5338,
+5341,5344,5347,5351,5355,5358,5364,5370,5373,5376,5379,5382,5384,5390,5408,
+5412,5415,5418,5421,5424,5429,5432,5434,5447,5459,5473,5477,5489,5491,5500,
+5509,5517,5526,5528,5532,5541,5546,5552,5557,5561,5566,5574,5581,5586,5601,
+5610,5621,5627,5666,5676,5683,5694,5708,5716,5721,5729,5737,5743,5751,5757,
+5765,5767,5773,5781,5783,5789,5797,5799,5823,5830,5840,5852,5857,5870,5882,
+5894,5896,5902,5907,5915,5922,5967,5972,5979,5983,5987,5993,5997,6002,6006,
+6009,6011,6033,6104,6299,6312,6323,6336,6348,6362,6394,6408,6520,6522,6533,
+6544,6555,6568,6580,6591,6598,6819,6834,6845,6852,6906,7047,7053,7056,7066,
+7095,7105,7112,7135,7144,7156,7162,7170,7172,7176,7186,7190,7200,7203,7207,
+7211,7219,7230,7242,7246,7249,7253,7256,7261,7265,7268,7272,7275,7279,7282,
+7293,7300,7313,7327,7331,7336,7343,7350,7353,7358,7361,7370,7372,7377,7381,
+7393,7396,7403,7407,7412,7422,7431,7434,7439,7450,7454,7460,7467,7487,7508,
+7512,7517,7600,7606,7619,7623,7627,7631,7637,7644,7647,7650,7653,7656,7663,
+7665,7669,7672,7679,7681,7688,7696,7703,7708,7712,7716,7720,7724,7740,7747,
+7757,7770,7781,7788,7793,7797,7801,7806,7819,7824,7828,7836,7839,7843,7854,
+7857,7859,7875,7878,7885,7888,7893,7908,7914,7923,7932,7939,7942,7948,7953,
+7960,7964,7969,7972,7978,7982,7984,7987,7994,7997,8004,8012,8015,8024,8029,
+8035,8038,8041,8048,8052,8055,8070,8073,8080,8083,8090,8093,8096,8103,8116,
+8126,8134,8146,8148,8155,8159,8169,8173,8177,8181,8183,8188,8192,8196,8198,
+8200,8205,8210,8216,8221,8226,8229,8232,8235,8238,8241,8244,8247,8252,8255,
+8258,8261,8264,8267,8269,8275,8279,8288,8293,8297,8306,8316,8320,8325,8331,
+8343,8358,8365,8367,8370,8374,8378,8380,8388,8397,8403,8405,8407,8414,8418,
+8427,8431,8446,8454,8482,8489,8493,8496,8501,8505,8508,8524,8535,8540,8543,
+8547,8551,8555,8560,8564,8568,8570,8579,8584,8590,8594,8596,8603,8608,8614,
+8616,8620,8627,8632,8635,8641,8645,8654,8658,8666,8668,8675,8680,8683,8691,
+8700,8708,8710,8714,8721,8740,8749,8755,8774,8783,8789,8793,8798,8808,8815,
+8824,8827,8836,8838,8842,8847,8857,8863,8866,8873,8877,8880,8893,8899,8903,
+8907,8910,8918,8922,8926,8934,8941,8948,8952,8958,8960,8969,8972,8982,8998,
+9004,9009,9016,9029,9036,9044,9052,9057,9061,9067,9071,9075,9078,9084,9089,
+9105,9108,9110,9122,9124,9128,9134,9138,9140,9148,9152,9161,9169,9175,9178,
+9187,9192,9199,9209,9235,9246,9248,9250,9258,9280,9289,9299,9302,9307,9312,
+9316,9322,9325,9328,9331,9335,9349,9356,9363,9370,9389,9397,9405,9407,9413,
+9420,9422,9435,9474,9476,9496,9506,9517,9534,9537,9540,9543,9545,9552,9555,
+9559,9562,9565,9567,9574,9587,9600,9603,9607,9610,9620,9623,9633,9636,9639,
+9643,9650,9662,9674,9680,9688,9705,9730,9740,9744,9747,9750,9753,9766,9771,
+9776,9778,9786,9795,9804,9809,9818,9823,9837,9847,9855,9869,9876,9884,9892,
+9899,9905,9914,9929,9940,9972,9981,9988,9992,9996,10003,10017,10022,10027,
+10031,10033,10036,10043,10048,10062,10094,10099,10111,10128,10136,10144,
+10160,10165,10176,10188,10198,10209,10217,10225,10235,10242,10245,10254,
+10257,10262,10275,10283,10286,10293,10298,10305,10318,10330,10335,10343,
+10350,10355,10367,10375,10380,10390,10397,10404,10410,10415,10421,10429,
+10433,10500,10514,10517];
 
 
 const atn = new antlr4.atn.ATNDeserializer().deserialize(serializedATN);
@@ -62363,24 +62363,24 @@ export default class PostgreSQLParser extends PostgreSQLParserBase {
 	            this.enterOuterAlt(localctx, 1);
 	            this.state = 10510;
 	            this.match(PostgreSQLParser.Identifier);
-	            this.state = 10512;
-	            this._errHandler.sync(this);
-	            var la_ = this._interp.adaptivePredict(this._input,1049,this._ctx);
-	            if(la_===1) {
-	                this.state = 10511;
-	                this.uescape_();
-
-	            }
 	            break;
 	        case 555:
 	            this.enterOuterAlt(localctx, 2);
-	            this.state = 10514;
+	            this.state = 10511;
 	            this.match(PostgreSQLParser.QuotedIdentifier);
 	            break;
 	        case 559:
 	            this.enterOuterAlt(localctx, 3);
-	            this.state = 10515;
+	            this.state = 10512;
 	            this.match(PostgreSQLParser.UnicodeQuotedIdentifier);
+	            this.state = 10514;
+	            this._errHandler.sync(this);
+	            var la_ = this._interp.adaptivePredict(this._input,1049,this._ctx);
+	            if(la_===1) {
+	                this.state = 10513;
+	                this.uescape_();
+
+	            }
 	            break;
 	        case 582:
 	            this.enterOuterAlt(localctx, 4);
@@ -112361,10 +112361,6 @@ class IdentifierContext extends antlr4.ParserRuleContext {
 	    return this.getToken(PostgreSQLParser.Identifier, 0);
 	};
 
-	uescape_() {
-	    return this.getTypedRuleContext(Uescape_Context,0);
-	};
-
 	QuotedIdentifier() {
 	    return this.getToken(PostgreSQLParser.QuotedIdentifier, 0);
 	};
@@ -112373,6 +112369,10 @@ class IdentifierContext extends antlr4.ParserRuleContext {
 	    return this.getToken(PostgreSQLParser.UnicodeQuotedIdentifier, 0);
 	};
 
+	uescape_() {
+	    return this.getTypedRuleContext(Uescape_Context,0);
+	};
+
 	PLSQLVARIABLENAME() {
 	    return this.getToken(PostgreSQLParser.PLSQLVARIABLENAME, 0);
 	};