pg_query 6.1.0 → 6.2.1

data/ext/pg_query/src_backend_parser_gram.c

@@ -3549,160 +3549,160 @@ static const yytype_uint16 yyrline[] =
    13827, 13834, 13845, 13846, 13859, 13863, 13871, 13885, 13899, 13900,
    13915, 13926, 13939, 13944, 13945, 13948, 13949, 13952, 13953, 13958,
    13959, 13964, 13965, 13974, 13979, 13980, 13984, 13988, 13994, 14019,
-   14030, 14044, 14045, 14049, 14063, 14120, 14134, 14136, 14141, 14143,
-   14145, 14147, 14149, 14154, 14156, 14161, 14169, 14180, 14208, 14209,
-   14213, 14215, 14220, 14229, 14249, 14269, 14287, 14299, 14314, 14315,
-   14319, 14322, 14335, 14340, 14347, 14352, 14358, 14363, 14372, 14374,
-   14377, 14381, 14382, 14383, 14384, 14385, 14386, 14391, 14397, 14412,
-   14413, 14414, 14415, 14416, 14427, 14433, 14441, 14442, 14448, 14453,
-   14458, 14463, 14468, 14473, 14478, 14483, 14489, 14495, 14501, 14508,
-   14530, 14539, 14543, 14551, 14555, 14563, 14575, 14596, 14600, 14606,
-   14610, 14623, 14631, 14641, 14643, 14645, 14647, 14649, 14651, 14656,
-   14657, 14664, 14673, 14681, 14690, 14701, 14709, 14710, 14711, 14715,
-   14717, 14719, 14721, 14723, 14725, 14727, 14732, 14737, 14743, 14751,
-   14756, 14763, 14770, 14774, 14778, 14786, 14821, 14822, 14824, 14833,
-   14840, 14856, 14858, 14860, 14862, 14864, 14866, 14868, 14870, 14872,
-   14874, 14876, 14878, 14880, 14882, 14885, 14887, 14890, 14892, 14894,
-   14896, 14899, 14904, 14913, 14918, 14927, 14932, 14941, 14946, 14956,
-   14965, 14974, 14983, 15002, 15011, 15020, 15029, 15038, 15055, 15064,
-   15073, 15082, 15091, 15100, 15109, 15113, 15117, 15125, 15133, 15141,
-   15149, 15170, 15193, 15205, 15212, 15228, 15233, 15239, 15246, 15253,
-   15261, 15269, 15286, 15305, 15331, 15333, 15335, 15337, 15339, 15341,
-   15343, 15345, 15347, 15349, 15351, 15353, 15355, 15357, 15359, 15361,
-   15363, 15365, 15367, 15371, 15375, 15380, 15396, 15397, 15398, 15415,
-   15428, 15430, 15432, 15444, 15469, 15481, 15493, 15501, 15512, 15523,
-   15533, 15539, 15548, 15558, 15568, 15581, 15591, 15622, 15658, 15668,
-   15679, 15680, 15681, 15688, 15695, 15699, 15703, 15707, 15711, 15715,
-   15719, 15723, 15727, 15731, 15735, 15739, 15743, 15750, 15754, 15758,
-   15762, 15764, 15771, 15778, 15785, 15792, 15803, 15817, 15827, 15838,
-   15854, 15864, 15871, 15878, 15885, 15889, 15897, 15906, 15915, 15919,
-   15923, 15927, 15931, 15935, 15944, 15948, 15958, 15962, 15966, 15971,
-   15982, 15988, 16002, 16013, 16027, 16043, 16055, 16065, 16074, 16083,
-   16091, 16113, 16129, 16153, 16155, 16159, 16161, 16163, 16166, 16169,
-   16172, 16173, 16176, 16184, 16194, 16195, 16198, 16199, 16200, 16203,
-   16204, 16205, 16210, 16214, 16218, 16222, 16229, 16230, 16238, 16239,
-   16243, 16244, 16252, 16253, 16257, 16258, 16263, 16272, 16274, 16289,
-   16292, 16320, 16321, 16324, 16325, 16333, 16341, 16349, 16358, 16368,
-   16386, 16432, 16441, 16450, 16459, 16468, 16480, 16481, 16482, 16483,
-   16484, 16498, 16499, 16500, 16503, 16504, 16507, 16510, 16511, 16512,
-   16515, 16516, 16519, 16520, 16521, 16522, 16523, 16524, 16525, 16526,
-   16527, 16528, 16529, 16530, 16533, 16535, 16540, 16542, 16547, 16549,
-   16551, 16553, 16555, 16557, 16569, 16573, 16580, 16584, 16590, 16594,
-   16604, 16616, 16617, 16620, 16621, 16624, 16628, 16632, 16638, 16639,
-   16644, 16648, 16658, 16659, 16660, 16661, 16662, 16663, 16664, 16665,
-   16669, 16670, 16671, 16672, 16677, 16682, 16691, 16712, 16716, 16721,
-   16732, 16749, 16755, 16756, 16757, 16760, 16768, 16778, 16793, 16794,
-   16798, 16810, 16811, 16814, 16815, 16818, 16822, 16829, 16833, 16837,
-   16846, 16858, 16859, 16863, 16864, 16868, 16869, 16872, 16873, 16878,
-   16879, 16883, 16884, 16888, 16900, 16901, 16902, 16903, 16904, 16905,
-   16906, 16907, 16908, 16912, 16914, 16919, 16920, 16921, 16922, 16923,
-   16924, 16925, 16927, 16931, 16933, 16935, 16938, 16942, 16945, 16949,
-   16958, 16975, 16982, 16987, 16993, 16994, 16995, 16996, 16997, 17001,
-   17010, 17024, 17025, 17026, 17027, 17028, 17037, 17038, 17039, 17040,
-   17041, 17045, 17047, 17057, 17060, 17066, 17067, 17068, 17072, 17073,
-   17074, 17078, 17079, 17083, 17101, 17121, 17122, 17131, 17132, 17136,
-   17137, 17140, 17148, 17156, 17164, 17187, 17188, 17199, 17203, 17209,
-   17211, 17216, 17218, 17220, 17230, 17232, 17243, 17247, 17251, 17255,
-   17259, 17268, 17276, 17308, 17315, 17347, 17351, 17358, 17366, 17370,
-   17376, 17383, 17387, 17391, 17397, 17398, 17400, 17401, 17402, 17406,
-   17447, 17475, 17479, 17483, 17489, 17491, 17505, 17541, 17554, 17555,
-   17558, 17559, 17576, 17577, 17578, 17583, 17584, 17585, 17590, 17591,
-   17592, 17593, 17599, 17600, 17601, 17602, 17603, 17609, 17610, 17630,
-   17631, 17632, 17633, 17634, 17635, 17636, 17637, 17638, 17639, 17640,
-   17641, 17642, 17643, 17644, 17645, 17646, 17647, 17648, 17649, 17650,
-   17651, 17652, 17653, 17654, 17655, 17656, 17657, 17658, 17659, 17660,
-   17661, 17662, 17663, 17664, 17665, 17666, 17667, 17668, 17669, 17670,
-   17671, 17672, 17673, 17674, 17675, 17676, 17677, 17678, 17679, 17680,
-   17681, 17682, 17683, 17684, 17685, 17686, 17687, 17688, 17689, 17690,
-   17691, 17692, 17693, 17694, 17695, 17696, 17697, 17698, 17699, 17700,
-   17701, 17702, 17703, 17704, 17705, 17706, 17707, 17708, 17709, 17710,
-   17711, 17712, 17713, 17714, 17715, 17716, 17717, 17718, 17719, 17720,
-   17721, 17722, 17723, 17724, 17725, 17726, 17727, 17728, 17729, 17730,
-   17731, 17732, 17733, 17734, 17735, 17736, 17737, 17738, 17739, 17740,
-   17741, 17742, 17743, 17744, 17745, 17746, 17747, 17748, 17749, 17750,
-   17751, 17752, 17753, 17754, 17755, 17756, 17757, 17758, 17759, 17760,
-   17761, 17762, 17763, 17764, 17765, 17766, 17767, 17768, 17769, 17770,
-   17771, 17772, 17773, 17774, 17775, 17776, 17777, 17778, 17779, 17780,
-   17781, 17782, 17783, 17784, 17785, 17786, 17787, 17788, 17789, 17790,
-   17791, 17792, 17793, 17794, 17795, 17796, 17797, 17798, 17799, 17800,
-   17801, 17802, 17803, 17804, 17805, 17806, 17807, 17808, 17809, 17810,
-   17811, 17812, 17813, 17814, 17815, 17816, 17817, 17818, 17819, 17820,
-   17821, 17822, 17823, 17824, 17825, 17826, 17827, 17828, 17829, 17830,
-   17831, 17832, 17833, 17834, 17835, 17836, 17837, 17838, 17839, 17840,
-   17841, 17842, 17843, 17844, 17845, 17846, 17847, 17848, 17849, 17850,
-   17851, 17852, 17853, 17854, 17855, 17856, 17857, 17858, 17859, 17860,
-   17861, 17862, 17863, 17864, 17865, 17866, 17867, 17868, 17869, 17870,
-   17871, 17872, 17873, 17874, 17875, 17876, 17877, 17878, 17879, 17880,
-   17881, 17882, 17883, 17884, 17885, 17886, 17887, 17888, 17889, 17890,
-   17891, 17892, 17893, 17894, 17895, 17896, 17897, 17898, 17899, 17900,
-   17901, 17902, 17903, 17904, 17905, 17906, 17907, 17908, 17909, 17910,
-   17911, 17912, 17913, 17914, 17915, 17916, 17917, 17918, 17919, 17920,
-   17921, 17922, 17923, 17924, 17925, 17926, 17927, 17928, 17929, 17930,
-   17931, 17932, 17933, 17934, 17935, 17936, 17937, 17938, 17939, 17940,
-   17941, 17942, 17943, 17944, 17945, 17946, 17947, 17948, 17949, 17950,
-   17951, 17952, 17953, 17954, 17955, 17956, 17970, 17971, 17972, 17973,
-   17974, 17975, 17976, 17977, 17978, 17979, 17980, 17981, 17982, 17983,
-   17984, 17985, 17986, 17987, 17988, 17989, 17990, 17991, 17992, 17993,
-   17994, 17995, 17996, 17997, 17998, 17999, 18000, 18001, 18002, 18003,
-   18004, 18005, 18006, 18007, 18008, 18009, 18010, 18011, 18012, 18013,
-   18014, 18015, 18016, 18017, 18018, 18019, 18020, 18021, 18022, 18023,
-   18024, 18025, 18026, 18027, 18028, 18029, 18030, 18031, 18032, 18046,
-   18047, 18048, 18049, 18050, 18051, 18052, 18053, 18054, 18055, 18056,
-   18057, 18058, 18059, 18060, 18061, 18062, 18063, 18064, 18065, 18066,
-   18067, 18068, 18078, 18079, 18080, 18081, 18082, 18083, 18084, 18085,
-   18086, 18087, 18088, 18089, 18090, 18091, 18092, 18093, 18094, 18095,
-   18096, 18097, 18098, 18099, 18100, 18101, 18102, 18103, 18104, 18105,
-   18106, 18107, 18108, 18109, 18110, 18111, 18112, 18113, 18114, 18115,
-   18116, 18117, 18118, 18119, 18120, 18121, 18122, 18123, 18124, 18125,
-   18126, 18127, 18128, 18129, 18130, 18131, 18132, 18133, 18134, 18135,
-   18136, 18137, 18138, 18139, 18140, 18141, 18142, 18143, 18144, 18145,
-   18146, 18147, 18148, 18149, 18150, 18151, 18152, 18153, 18154, 18155,
-   18168, 18169, 18170, 18171, 18172, 18173, 18174, 18175, 18176, 18177,
-   18178, 18179, 18180, 18181, 18182, 18183, 18184, 18185, 18186, 18187,
-   18188, 18189, 18190, 18191, 18192, 18193, 18194, 18195, 18196, 18197,
-   18198, 18199, 18200, 18201, 18202, 18203, 18204, 18205, 18206, 18207,
-   18208, 18209, 18210, 18211, 18212, 18213, 18214, 18215, 18216, 18217,
-   18218, 18219, 18220, 18221, 18222, 18223, 18224, 18225, 18226, 18227,
-   18228, 18229, 18230, 18231, 18232, 18233, 18234, 18235, 18236, 18237,
-   18238, 18239, 18240, 18241, 18242, 18243, 18244, 18245, 18246, 18247,
-   18248, 18249, 18250, 18251, 18252, 18253, 18254, 18255, 18256, 18257,
-   18258, 18259, 18260, 18261, 18262, 18263, 18264, 18265, 18266, 18267,
-   18268, 18269, 18270, 18271, 18272, 18273, 18274, 18275, 18276, 18277,
-   18278, 18279, 18280, 18281, 18282, 18283, 18284, 18285, 18286, 18287,
-   18288, 18289, 18290, 18291, 18292, 18293, 18294, 18295, 18296, 18297,
-   18298, 18299, 18300, 18301, 18302, 18303, 18304, 18305, 18306, 18307,
-   18308, 18309, 18310, 18311, 18312, 18313, 18314, 18315, 18316, 18317,
-   18318, 18319, 18320, 18321, 18322, 18323, 18324, 18325, 18326, 18327,
-   18328, 18329, 18330, 18331, 18332, 18333, 18334, 18335, 18336, 18337,
-   18338, 18339, 18340, 18341, 18342, 18343, 18344, 18345, 18346, 18347,
-   18348, 18349, 18350, 18351, 18352, 18353, 18354, 18355, 18356, 18357,
-   18358, 18359, 18360, 18361, 18362, 18363, 18364, 18365, 18366, 18367,
-   18368, 18369, 18370, 18371, 18372, 18373, 18374, 18375, 18376, 18377,
-   18378, 18379, 18380, 18381, 18382, 18383, 18384, 18385, 18386, 18387,
-   18388, 18389, 18390, 18391, 18392, 18393, 18394, 18395, 18396, 18397,
-   18398, 18399, 18400, 18401, 18402, 18403, 18404, 18405, 18406, 18407,
-   18408, 18409, 18410, 18411, 18412, 18413, 18414, 18415, 18416, 18417,
-   18418, 18419, 18420, 18421, 18422, 18423, 18424, 18425, 18426, 18427,
-   18428, 18429, 18430, 18431, 18432, 18433, 18434, 18435, 18436, 18437,
-   18438, 18439, 18440, 18441, 18442, 18443, 18444, 18445, 18446, 18447,
-   18448, 18449, 18450, 18451, 18452, 18453, 18454, 18455, 18456, 18457,
-   18458, 18459, 18460, 18461, 18462, 18463, 18464, 18465, 18466, 18467,
-   18468, 18469, 18470, 18471, 18472, 18473, 18474, 18475, 18476, 18477,
-   18478, 18479, 18480, 18481, 18482, 18483, 18484, 18485, 18486, 18487,
-   18488, 18489, 18490, 18491, 18492, 18493, 18494, 18495, 18496, 18497,
-   18498, 18499, 18500, 18501, 18502, 18503, 18504, 18505, 18506, 18507,
-   18508, 18509, 18510, 18511, 18512, 18513, 18514, 18515, 18516, 18517,
-   18518, 18519, 18520, 18521, 18522, 18523, 18524, 18525, 18526, 18527,
-   18528, 18529, 18530, 18531, 18532, 18533, 18534, 18535, 18536, 18537,
-   18538, 18539, 18540, 18541, 18542, 18543, 18544, 18545, 18546, 18547,
-   18548, 18549, 18550, 18551, 18552, 18553, 18554, 18555, 18556, 18557,
-   18558, 18559, 18560, 18561, 18562, 18563, 18564, 18565, 18566, 18567,
-   18568, 18569, 18570, 18571, 18572, 18573, 18574, 18575, 18576, 18577,
-   18578, 18579, 18580, 18581, 18582, 18583, 18584, 18585, 18586, 18587,
-   18588, 18589, 18590, 18591, 18592, 18593, 18594, 18595, 18596, 18597,
-   18598, 18599, 18600, 18601, 18602, 18603, 18604, 18605, 18606, 18607,
-   18608, 18609, 18610, 18611, 18612, 18613, 18614, 18615, 18616, 18617,
-   18618, 18619
+   14030, 14044, 14045, 14049, 14063, 14120, 14134, 14136, 14141, 14150,
+   14152, 14154, 14156, 14161, 14163, 14168, 14176, 14187, 14215, 14216,
+   14220, 14222, 14227, 14236, 14256, 14276, 14294, 14306, 14321, 14322,
+   14326, 14329, 14342, 14347, 14354, 14359, 14365, 14370, 14379, 14381,
+   14384, 14388, 14389, 14390, 14391, 14392, 14393, 14398, 14404, 14419,
+   14420, 14421, 14422, 14423, 14434, 14440, 14448, 14449, 14455, 14460,
+   14465, 14470, 14475, 14480, 14485, 14490, 14496, 14502, 14508, 14515,
+   14537, 14546, 14550, 14558, 14562, 14570, 14582, 14603, 14607, 14613,
+   14617, 14630, 14638, 14648, 14650, 14652, 14654, 14656, 14658, 14663,
+   14664, 14671, 14680, 14688, 14697, 14708, 14716, 14717, 14718, 14722,
+   14724, 14726, 14728, 14730, 14732, 14734, 14739, 14744, 14750, 14758,
+   14763, 14770, 14777, 14781, 14785, 14793, 14828, 14829, 14831, 14840,
+   14847, 14863, 14865, 14867, 14869, 14871, 14873, 14875, 14877, 14879,
+   14881, 14883, 14885, 14887, 14889, 14892, 14894, 14897, 14899, 14901,
+   14903, 14906, 14911, 14920, 14925, 14934, 14939, 14948, 14953, 14963,
+   14972, 14981, 14990, 15009, 15018, 15027, 15036, 15045, 15062, 15071,
+   15080, 15089, 15098, 15107, 15116, 15120, 15124, 15132, 15140, 15148,
+   15156, 15177, 15200, 15212, 15219, 15235, 15240, 15246, 15253, 15260,
+   15268, 15276, 15293, 15312, 15338, 15340, 15342, 15344, 15346, 15348,
+   15350, 15352, 15354, 15356, 15358, 15360, 15362, 15364, 15366, 15368,
+   15370, 15372, 15374, 15378, 15382, 15387, 15403, 15404, 15405, 15422,
+   15435, 15437, 15439, 15451, 15476, 15488, 15500, 15508, 15519, 15530,
+   15540, 15546, 15555, 15565, 15575, 15588, 15598, 15629, 15665, 15675,
+   15686, 15687, 15688, 15695, 15702, 15706, 15710, 15714, 15718, 15722,
+   15726, 15730, 15734, 15738, 15742, 15746, 15750, 15757, 15761, 15765,
+   15769, 15771, 15778, 15785, 15792, 15799, 15810, 15824, 15834, 15845,
+   15861, 15871, 15878, 15885, 15892, 15896, 15904, 15913, 15922, 15926,
+   15930, 15934, 15938, 15942, 15951, 15955, 15965, 15969, 15973, 15978,
+   15989, 15995, 16009, 16020, 16034, 16050, 16062, 16072, 16081, 16090,
+   16098, 16120, 16136, 16160, 16162, 16166, 16168, 16170, 16173, 16176,
+   16179, 16180, 16183, 16191, 16201, 16202, 16205, 16206, 16207, 16210,
+   16211, 16212, 16217, 16221, 16225, 16229, 16236, 16237, 16245, 16246,
+   16250, 16251, 16259, 16260, 16264, 16265, 16270, 16279, 16281, 16296,
+   16299, 16327, 16328, 16331, 16332, 16340, 16348, 16356, 16365, 16375,
+   16393, 16439, 16448, 16457, 16466, 16475, 16487, 16488, 16489, 16490,
+   16491, 16505, 16506, 16507, 16510, 16511, 16514, 16517, 16518, 16519,
+   16522, 16523, 16526, 16527, 16528, 16529, 16530, 16531, 16532, 16533,
+   16534, 16535, 16536, 16537, 16540, 16542, 16547, 16549, 16554, 16556,
+   16558, 16560, 16562, 16564, 16576, 16580, 16587, 16591, 16597, 16601,
+   16611, 16623, 16624, 16627, 16628, 16631, 16635, 16639, 16645, 16646,
+   16651, 16655, 16665, 16666, 16667, 16668, 16669, 16670, 16671, 16672,
+   16676, 16677, 16678, 16679, 16684, 16689, 16698, 16719, 16723, 16728,
+   16739, 16756, 16762, 16763, 16764, 16767, 16775, 16785, 16800, 16801,
+   16805, 16817, 16818, 16821, 16822, 16825, 16829, 16836, 16840, 16844,
+   16853, 16865, 16866, 16870, 16871, 16875, 16876, 16879, 16880, 16885,
+   16886, 16890, 16891, 16895, 16907, 16908, 16909, 16910, 16911, 16912,
+   16913, 16914, 16915, 16919, 16921, 16926, 16927, 16928, 16929, 16930,
+   16931, 16932, 16934, 16938, 16940, 16942, 16945, 16949, 16952, 16956,
+   16965, 16982, 16989, 16994, 17000, 17001, 17002, 17003, 17004, 17008,
+   17017, 17031, 17032, 17033, 17034, 17035, 17044, 17045, 17046, 17047,
+   17048, 17052, 17054, 17064, 17067, 17073, 17074, 17075, 17079, 17080,
+   17081, 17085, 17086, 17090, 17108, 17128, 17129, 17138, 17139, 17143,
+   17144, 17147, 17155, 17163, 17171, 17194, 17195, 17206, 17210, 17216,
+   17218, 17223, 17225, 17227, 17237, 17239, 17250, 17254, 17258, 17262,
+   17266, 17275, 17283, 17315, 17322, 17354, 17358, 17365, 17373, 17377,
+   17383, 17390, 17394, 17398, 17404, 17405, 17407, 17408, 17409, 17413,
+   17454, 17482, 17486, 17490, 17496, 17498, 17512, 17548, 17561, 17562,
+   17565, 17566, 17583, 17584, 17585, 17590, 17591, 17592, 17597, 17598,
+   17599, 17600, 17606, 17607, 17608, 17609, 17610, 17616, 17617, 17637,
+   17638, 17639, 17640, 17641, 17642, 17643, 17644, 17645, 17646, 17647,
+   17648, 17649, 17650, 17651, 17652, 17653, 17654, 17655, 17656, 17657,
+   17658, 17659, 17660, 17661, 17662, 17663, 17664, 17665, 17666, 17667,
+   17668, 17669, 17670, 17671, 17672, 17673, 17674, 17675, 17676, 17677,
+   17678, 17679, 17680, 17681, 17682, 17683, 17684, 17685, 17686, 17687,
+   17688, 17689, 17690, 17691, 17692, 17693, 17694, 17695, 17696, 17697,
+   17698, 17699, 17700, 17701, 17702, 17703, 17704, 17705, 17706, 17707,
+   17708, 17709, 17710, 17711, 17712, 17713, 17714, 17715, 17716, 17717,
+   17718, 17719, 17720, 17721, 17722, 17723, 17724, 17725, 17726, 17727,
+   17728, 17729, 17730, 17731, 17732, 17733, 17734, 17735, 17736, 17737,
+   17738, 17739, 17740, 17741, 17742, 17743, 17744, 17745, 17746, 17747,
+   17748, 17749, 17750, 17751, 17752, 17753, 17754, 17755, 17756, 17757,
+   17758, 17759, 17760, 17761, 17762, 17763, 17764, 17765, 17766, 17767,
+   17768, 17769, 17770, 17771, 17772, 17773, 17774, 17775, 17776, 17777,
+   17778, 17779, 17780, 17781, 17782, 17783, 17784, 17785, 17786, 17787,
+   17788, 17789, 17790, 17791, 17792, 17793, 17794, 17795, 17796, 17797,
+   17798, 17799, 17800, 17801, 17802, 17803, 17804, 17805, 17806, 17807,
+   17808, 17809, 17810, 17811, 17812, 17813, 17814, 17815, 17816, 17817,
+   17818, 17819, 17820, 17821, 17822, 17823, 17824, 17825, 17826, 17827,
+   17828, 17829, 17830, 17831, 17832, 17833, 17834, 17835, 17836, 17837,
+   17838, 17839, 17840, 17841, 17842, 17843, 17844, 17845, 17846, 17847,
+   17848, 17849, 17850, 17851, 17852, 17853, 17854, 17855, 17856, 17857,
+   17858, 17859, 17860, 17861, 17862, 17863, 17864, 17865, 17866, 17867,
+   17868, 17869, 17870, 17871, 17872, 17873, 17874, 17875, 17876, 17877,
+   17878, 17879, 17880, 17881, 17882, 17883, 17884, 17885, 17886, 17887,
+   17888, 17889, 17890, 17891, 17892, 17893, 17894, 17895, 17896, 17897,
+   17898, 17899, 17900, 17901, 17902, 17903, 17904, 17905, 17906, 17907,
+   17908, 17909, 17910, 17911, 17912, 17913, 17914, 17915, 17916, 17917,
+   17918, 17919, 17920, 17921, 17922, 17923, 17924, 17925, 17926, 17927,
+   17928, 17929, 17930, 17931, 17932, 17933, 17934, 17935, 17936, 17937,
+   17938, 17939, 17940, 17941, 17942, 17943, 17944, 17945, 17946, 17947,
+   17948, 17949, 17950, 17951, 17952, 17953, 17954, 17955, 17956, 17957,
+   17958, 17959, 17960, 17961, 17962, 17963, 17977, 17978, 17979, 17980,
+   17981, 17982, 17983, 17984, 17985, 17986, 17987, 17988, 17989, 17990,
+   17991, 17992, 17993, 17994, 17995, 17996, 17997, 17998, 17999, 18000,
+   18001, 18002, 18003, 18004, 18005, 18006, 18007, 18008, 18009, 18010,
+   18011, 18012, 18013, 18014, 18015, 18016, 18017, 18018, 18019, 18020,
+   18021, 18022, 18023, 18024, 18025, 18026, 18027, 18028, 18029, 18030,
+   18031, 18032, 18033, 18034, 18035, 18036, 18037, 18038, 18039, 18053,
+   18054, 18055, 18056, 18057, 18058, 18059, 18060, 18061, 18062, 18063,
+   18064, 18065, 18066, 18067, 18068, 18069, 18070, 18071, 18072, 18073,
+   18074, 18075, 18085, 18086, 18087, 18088, 18089, 18090, 18091, 18092,
+   18093, 18094, 18095, 18096, 18097, 18098, 18099, 18100, 18101, 18102,
+   18103, 18104, 18105, 18106, 18107, 18108, 18109, 18110, 18111, 18112,
+   18113, 18114, 18115, 18116, 18117, 18118, 18119, 18120, 18121, 18122,
+   18123, 18124, 18125, 18126, 18127, 18128, 18129, 18130, 18131, 18132,
+   18133, 18134, 18135, 18136, 18137, 18138, 18139, 18140, 18141, 18142,
+   18143, 18144, 18145, 18146, 18147, 18148, 18149, 18150, 18151, 18152,
+   18153, 18154, 18155, 18156, 18157, 18158, 18159, 18160, 18161, 18162,
+   18175, 18176, 18177, 18178, 18179, 18180, 18181, 18182, 18183, 18184,
+   18185, 18186, 18187, 18188, 18189, 18190, 18191, 18192, 18193, 18194,
+   18195, 18196, 18197, 18198, 18199, 18200, 18201, 18202, 18203, 18204,
+   18205, 18206, 18207, 18208, 18209, 18210, 18211, 18212, 18213, 18214,
+   18215, 18216, 18217, 18218, 18219, 18220, 18221, 18222, 18223, 18224,
+   18225, 18226, 18227, 18228, 18229, 18230, 18231, 18232, 18233, 18234,
+   18235, 18236, 18237, 18238, 18239, 18240, 18241, 18242, 18243, 18244,
+   18245, 18246, 18247, 18248, 18249, 18250, 18251, 18252, 18253, 18254,
+   18255, 18256, 18257, 18258, 18259, 18260, 18261, 18262, 18263, 18264,
+   18265, 18266, 18267, 18268, 18269, 18270, 18271, 18272, 18273, 18274,
+   18275, 18276, 18277, 18278, 18279, 18280, 18281, 18282, 18283, 18284,
+   18285, 18286, 18287, 18288, 18289, 18290, 18291, 18292, 18293, 18294,
+   18295, 18296, 18297, 18298, 18299, 18300, 18301, 18302, 18303, 18304,
+   18305, 18306, 18307, 18308, 18309, 18310, 18311, 18312, 18313, 18314,
+   18315, 18316, 18317, 18318, 18319, 18320, 18321, 18322, 18323, 18324,
+   18325, 18326, 18327, 18328, 18329, 18330, 18331, 18332, 18333, 18334,
+   18335, 18336, 18337, 18338, 18339, 18340, 18341, 18342, 18343, 18344,
+   18345, 18346, 18347, 18348, 18349, 18350, 18351, 18352, 18353, 18354,
+   18355, 18356, 18357, 18358, 18359, 18360, 18361, 18362, 18363, 18364,
+   18365, 18366, 18367, 18368, 18369, 18370, 18371, 18372, 18373, 18374,
+   18375, 18376, 18377, 18378, 18379, 18380, 18381, 18382, 18383, 18384,
+   18385, 18386, 18387, 18388, 18389, 18390, 18391, 18392, 18393, 18394,
+   18395, 18396, 18397, 18398, 18399, 18400, 18401, 18402, 18403, 18404,
+   18405, 18406, 18407, 18408, 18409, 18410, 18411, 18412, 18413, 18414,
+   18415, 18416, 18417, 18418, 18419, 18420, 18421, 18422, 18423, 18424,
+   18425, 18426, 18427, 18428, 18429, 18430, 18431, 18432, 18433, 18434,
+   18435, 18436, 18437, 18438, 18439, 18440, 18441, 18442, 18443, 18444,
+   18445, 18446, 18447, 18448, 18449, 18450, 18451, 18452, 18453, 18454,
+   18455, 18456, 18457, 18458, 18459, 18460, 18461, 18462, 18463, 18464,
+   18465, 18466, 18467, 18468, 18469, 18470, 18471, 18472, 18473, 18474,
+   18475, 18476, 18477, 18478, 18479, 18480, 18481, 18482, 18483, 18484,
+   18485, 18486, 18487, 18488, 18489, 18490, 18491, 18492, 18493, 18494,
+   18495, 18496, 18497, 18498, 18499, 18500, 18501, 18502, 18503, 18504,
+   18505, 18506, 18507, 18508, 18509, 18510, 18511, 18512, 18513, 18514,
+   18515, 18516, 18517, 18518, 18519, 18520, 18521, 18522, 18523, 18524,
+   18525, 18526, 18527, 18528, 18529, 18530, 18531, 18532, 18533, 18534,
+   18535, 18536, 18537, 18538, 18539, 18540, 18541, 18542, 18543, 18544,
+   18545, 18546, 18547, 18548, 18549, 18550, 18551, 18552, 18553, 18554,
+   18555, 18556, 18557, 18558, 18559, 18560, 18561, 18562, 18563, 18564,
+   18565, 18566, 18567, 18568, 18569, 18570, 18571, 18572, 18573, 18574,
+   18575, 18576, 18577, 18578, 18579, 18580, 18581, 18582, 18583, 18584,
+   18585, 18586, 18587, 18588, 18589, 18590, 18591, 18592, 18593, 18594,
+   18595, 18596, 18597, 18598, 18599, 18600, 18601, 18602, 18603, 18604,
+   18605, 18606, 18607, 18608, 18609, 18610, 18611, 18612, 18613, 18614,
+   18615, 18616, 18617, 18618, 18619, 18620, 18621, 18622, 18623, 18624,
+   18625, 18626
 };
 #endif
 
@@ -47930,7 +47930,7 @@ yyreduce:
 										 parser_errposition(defel->location)));
 							fc->colexpr = defel->arg;
 						}
-						else if (strcmp(defel->defname, "is_not_null") == 0)
+						else if (strcmp(defel->defname, "__pg__is_not_null") == 0)
 						{
 							if (nullability_seen)
 								ereport(ERROR,
@@ -47979,41 +47979,48 @@ yyreduce:
 
   case 1898:
 #line 14142 "gram.y"
-    { (yyval.defelt) = makeDefElem((yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].node), (yylsp[(1) - (2)])); ;}
+    {
+					if (strcmp((yyvsp[(1) - (2)].str), "__pg__is_not_null") == 0)
+						ereport(ERROR,
+								(errcode(ERRCODE_SYNTAX_ERROR),
+								 errmsg("option name \"%s\" cannot be used in XMLTABLE", (yyvsp[(1) - (2)].str)),
+								 parser_errposition((yylsp[(1) - (2)]))));
+					(yyval.defelt) = makeDefElem((yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].node), (yylsp[(1) - (2)]));
+				;}
     break;
 
   case 1899:
-#line 14144 "gram.y"
+#line 14151 "gram.y"
     { (yyval.defelt) = makeDefElem("default", (yyvsp[(2) - (2)].node), (yylsp[(1) - (2)])); ;}
     break;
 
   case 1900:
-#line 14146 "gram.y"
-    { (yyval.defelt) = makeDefElem("is_not_null", (Node *) makeBoolean(true), (yylsp[(1) - (2)])); ;}
+#line 14153 "gram.y"
+    { (yyval.defelt) = makeDefElem("__pg__is_not_null", (Node *) makeBoolean(true), (yylsp[(1) - (2)])); ;}
     break;
 
   case 1901:
-#line 14148 "gram.y"
-    { (yyval.defelt) = makeDefElem("is_not_null", (Node *) makeBoolean(false), (yylsp[(1) - (1)])); ;}
+#line 14155 "gram.y"
+    { (yyval.defelt) = makeDefElem("__pg__is_not_null", (Node *) makeBoolean(false), (yylsp[(1) - (1)])); ;}
     break;
 
   case 1902:
-#line 14150 "gram.y"
+#line 14157 "gram.y"
     { (yyval.defelt) = makeDefElem("path", (yyvsp[(2) - (2)].node), (yylsp[(1) - (2)])); ;}
     break;
 
   case 1903:
-#line 14155 "gram.y"
+#line 14162 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].target)); ;}
     break;
 
   case 1904:
-#line 14157 "gram.y"
+#line 14164 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].target)); ;}
     break;
 
   case 1905:
-#line 14162 "gram.y"
+#line 14169 "gram.y"
     {
 					(yyval.target) = makeNode(ResTarget);
 					(yyval.target)->name = (yyvsp[(3) - (3)].str);
@@ -48024,7 +48031,7 @@ yyreduce:
     break;
 
   case 1906:
-#line 14170 "gram.y"
+#line 14177 "gram.y"
     {
 					(yyval.target) = makeNode(ResTarget);
 					(yyval.target)->name = NULL;
@@ -48035,7 +48042,7 @@ yyreduce:
     break;
 
   case 1907:
-#line 14186 "gram.y"
+#line 14193 "gram.y"
     {
 					JsonTable *n = makeNode(JsonTable);
 					char	  *pathstring;
@@ -48058,27 +48065,27 @@ yyreduce:
     break;
 
   case 1908:
-#line 14208 "gram.y"
+#line 14215 "gram.y"
     { (yyval.str) = (yyvsp[(2) - (2)].str); ;}
     break;
 
   case 1909:
-#line 14209 "gram.y"
+#line 14216 "gram.y"
     { (yyval.str) = NULL; ;}
     break;
 
   case 1910:
-#line 14214 "gram.y"
+#line 14221 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].node)); ;}
     break;
 
   case 1911:
-#line 14216 "gram.y"
+#line 14223 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].node)); ;}
     break;
 
   case 1912:
-#line 14221 "gram.y"
+#line 14228 "gram.y"
     {
 					JsonTableColumn *n = makeNode(JsonTableColumn);
 
@@ -48090,7 +48097,7 @@ yyreduce:
     break;
 
   case 1913:
-#line 14234 "gram.y"
+#line 14241 "gram.y"
     {
 					JsonTableColumn *n = makeNode(JsonTableColumn);
 
@@ -48109,7 +48116,7 @@ yyreduce:
     break;
 
   case 1914:
-#line 14254 "gram.y"
+#line 14261 "gram.y"
     {
 					JsonTableColumn *n = makeNode(JsonTableColumn);
 
@@ -48128,7 +48135,7 @@ yyreduce:
     break;
 
   case 1915:
-#line 14272 "gram.y"
+#line 14279 "gram.y"
     {
 					JsonTableColumn *n = makeNode(JsonTableColumn);
 
@@ -48147,7 +48154,7 @@ yyreduce:
     break;
 
   case 1916:
-#line 14289 "gram.y"
+#line 14296 "gram.y"
     {
 					JsonTableColumn *n = makeNode(JsonTableColumn);
 
@@ -48161,7 +48168,7 @@ yyreduce:
     break;
 
   case 1917:
-#line 14301 "gram.y"
+#line 14308 "gram.y"
     {
 					JsonTableColumn *n = makeNode(JsonTableColumn);
 
@@ -48175,17 +48182,17 @@ yyreduce:
     break;
 
   case 1920:
-#line 14320 "gram.y"
+#line 14327 "gram.y"
     { (yyval.node) = (Node *) makeJsonTablePathSpec((yyvsp[(2) - (2)].str), NULL, (yylsp[(2) - (2)]), -1); ;}
     break;
 
   case 1921:
-#line 14322 "gram.y"
+#line 14329 "gram.y"
     { (yyval.node) = NULL; ;}
     break;
 
   case 1922:
-#line 14336 "gram.y"
+#line 14343 "gram.y"
     {
 					(yyval.typnam) = (yyvsp[(1) - (2)].typnam);
 					(yyval.typnam)->arrayBounds = (yyvsp[(2) - (2)].list);
@@ -48193,7 +48200,7 @@ yyreduce:
     break;
 
   case 1923:
-#line 14341 "gram.y"
+#line 14348 "gram.y"
     {
 					(yyval.typnam) = (yyvsp[(2) - (3)].typnam);
 					(yyval.typnam)->arrayBounds = (yyvsp[(3) - (3)].list);
@@ -48202,7 +48209,7 @@ yyreduce:
     break;
 
   case 1924:
-#line 14348 "gram.y"
+#line 14355 "gram.y"
     {
 					(yyval.typnam) = (yyvsp[(1) - (5)].typnam);
 					(yyval.typnam)->arrayBounds = list_make1(makeInteger((yyvsp[(4) - (5)].ival)));
@@ -48210,7 +48217,7 @@ yyreduce:
     break;
 
   case 1925:
-#line 14353 "gram.y"
+#line 14360 "gram.y"
     {
 					(yyval.typnam) = (yyvsp[(2) - (6)].typnam);
 					(yyval.typnam)->arrayBounds = list_make1(makeInteger((yyvsp[(5) - (6)].ival)));
@@ -48219,7 +48226,7 @@ yyreduce:
     break;
 
   case 1926:
-#line 14359 "gram.y"
+#line 14366 "gram.y"
     {
 					(yyval.typnam) = (yyvsp[(1) - (2)].typnam);
 					(yyval.typnam)->arrayBounds = list_make1(makeInteger(-1));
@@ -48227,7 +48234,7 @@ yyreduce:
     break;
 
   case 1927:
-#line 14364 "gram.y"
+#line 14371 "gram.y"
     {
 					(yyval.typnam) = (yyvsp[(2) - (3)].typnam);
 					(yyval.typnam)->arrayBounds = list_make1(makeInteger(-1));
@@ -48236,47 +48243,47 @@ yyreduce:
     break;
 
   case 1928:
-#line 14373 "gram.y"
+#line 14380 "gram.y"
     {  (yyval.list) = lappend((yyvsp[(1) - (3)].list), makeInteger(-1)); ;}
     break;
 
   case 1929:
-#line 14375 "gram.y"
+#line 14382 "gram.y"
     {  (yyval.list) = lappend((yyvsp[(1) - (4)].list), makeInteger((yyvsp[(3) - (4)].ival))); ;}
     break;
 
   case 1930:
-#line 14377 "gram.y"
+#line 14384 "gram.y"
     {  (yyval.list) = NIL; ;}
     break;
 
   case 1931:
-#line 14381 "gram.y"
+#line 14388 "gram.y"
     { (yyval.typnam) = (yyvsp[(1) - (1)].typnam); ;}
     break;
 
   case 1932:
-#line 14382 "gram.y"
+#line 14389 "gram.y"
     { (yyval.typnam) = (yyvsp[(1) - (1)].typnam); ;}
     break;
 
   case 1933:
-#line 14383 "gram.y"
+#line 14390 "gram.y"
     { (yyval.typnam) = (yyvsp[(1) - (1)].typnam); ;}
     break;
 
   case 1934:
-#line 14384 "gram.y"
+#line 14391 "gram.y"
     { (yyval.typnam) = (yyvsp[(1) - (1)].typnam); ;}
     break;
 
   case 1935:
-#line 14385 "gram.y"
+#line 14392 "gram.y"
     { (yyval.typnam) = (yyvsp[(1) - (1)].typnam); ;}
     break;
 
   case 1936:
-#line 14387 "gram.y"
+#line 14394 "gram.y"
     {
 					(yyval.typnam) = (yyvsp[(1) - (2)].typnam);
 					(yyval.typnam)->typmods = (yyvsp[(2) - (2)].list);
@@ -48284,7 +48291,7 @@ yyreduce:
     break;
 
   case 1937:
-#line 14392 "gram.y"
+#line 14399 "gram.y"
     {
 					(yyval.typnam) = (yyvsp[(1) - (4)].typnam);
 					(yyval.typnam)->typmods = list_make2(makeIntConst(INTERVAL_FULL_RANGE, -1),
@@ -48293,37 +48300,37 @@ yyreduce:
     break;
 
   case 1938:
-#line 14397 "gram.y"
+#line 14404 "gram.y"
     { (yyval.typnam) = (yyvsp[(1) - (1)].typnam); ;}
     break;
 
   case 1939:
-#line 14412 "gram.y"
+#line 14419 "gram.y"
     { (yyval.typnam) = (yyvsp[(1) - (1)].typnam); ;}
     break;
 
   case 1940:
-#line 14413 "gram.y"
+#line 14420 "gram.y"
     { (yyval.typnam) = (yyvsp[(1) - (1)].typnam); ;}
     break;
 
   case 1941:
-#line 14414 "gram.y"
+#line 14421 "gram.y"
     { (yyval.typnam) = (yyvsp[(1) - (1)].typnam); ;}
     break;
 
   case 1942:
-#line 14415 "gram.y"
+#line 14422 "gram.y"
     { (yyval.typnam) = (yyvsp[(1) - (1)].typnam); ;}
     break;
 
   case 1943:
-#line 14416 "gram.y"
+#line 14423 "gram.y"
     { (yyval.typnam) = (yyvsp[(1) - (1)].typnam); ;}
     break;
 
   case 1944:
-#line 14428 "gram.y"
+#line 14435 "gram.y"
     {
 					(yyval.typnam) = makeTypeName((yyvsp[(1) - (2)].str));
 					(yyval.typnam)->typmods = (yyvsp[(2) - (2)].list);
@@ -48332,7 +48339,7 @@ yyreduce:
     break;
 
   case 1945:
-#line 14434 "gram.y"
+#line 14441 "gram.y"
     {
 					(yyval.typnam) = makeTypeNameFromNameList(lcons(makeString((yyvsp[(1) - (3)].str)), (yyvsp[(2) - (3)].list)));
 					(yyval.typnam)->typmods = (yyvsp[(3) - (3)].list);
@@ -48341,17 +48348,17 @@ yyreduce:
     break;
 
   case 1946:
-#line 14441 "gram.y"
+#line 14448 "gram.y"
     { (yyval.list) = (yyvsp[(2) - (3)].list); ;}
     break;
 
   case 1947:
-#line 14442 "gram.y"
+#line 14449 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 1948:
-#line 14449 "gram.y"
+#line 14456 "gram.y"
     {
 					(yyval.typnam) = SystemTypeName("int4");
 					(yyval.typnam)->location = (yylsp[(1) - (1)]);
@@ -48359,7 +48366,7 @@ yyreduce:
     break;
 
   case 1949:
-#line 14454 "gram.y"
+#line 14461 "gram.y"
     {
 					(yyval.typnam) = SystemTypeName("int4");
 					(yyval.typnam)->location = (yylsp[(1) - (1)]);
@@ -48367,7 +48374,7 @@ yyreduce:
     break;
 
   case 1950:
-#line 14459 "gram.y"
+#line 14466 "gram.y"
     {
 					(yyval.typnam) = SystemTypeName("int2");
 					(yyval.typnam)->location = (yylsp[(1) - (1)]);
@@ -48375,7 +48382,7 @@ yyreduce:
     break;
 
   case 1951:
-#line 14464 "gram.y"
+#line 14471 "gram.y"
     {
 					(yyval.typnam) = SystemTypeName("int8");
 					(yyval.typnam)->location = (yylsp[(1) - (1)]);
@@ -48383,7 +48390,7 @@ yyreduce:
     break;
 
   case 1952:
-#line 14469 "gram.y"
+#line 14476 "gram.y"
     {
 					(yyval.typnam) = SystemTypeName("float4");
 					(yyval.typnam)->location = (yylsp[(1) - (1)]);
@@ -48391,7 +48398,7 @@ yyreduce:
     break;
 
   case 1953:
-#line 14474 "gram.y"
+#line 14481 "gram.y"
     {
 					(yyval.typnam) = (yyvsp[(2) - (2)].typnam);
 					(yyval.typnam)->location = (yylsp[(1) - (2)]);
@@ -48399,7 +48406,7 @@ yyreduce:
     break;
 
   case 1954:
-#line 14479 "gram.y"
+#line 14486 "gram.y"
     {
 					(yyval.typnam) = SystemTypeName("float8");
 					(yyval.typnam)->location = (yylsp[(1) - (2)]);
@@ -48407,7 +48414,7 @@ yyreduce:
     break;
 
   case 1955:
-#line 14484 "gram.y"
+#line 14491 "gram.y"
     {
 					(yyval.typnam) = SystemTypeName("numeric");
 					(yyval.typnam)->typmods = (yyvsp[(2) - (2)].list);
@@ -48416,7 +48423,7 @@ yyreduce:
     break;
 
   case 1956:
-#line 14490 "gram.y"
+#line 14497 "gram.y"
     {
 					(yyval.typnam) = SystemTypeName("numeric");
 					(yyval.typnam)->typmods = (yyvsp[(2) - (2)].list);
@@ -48425,7 +48432,7 @@ yyreduce:
     break;
 
   case 1957:
-#line 14496 "gram.y"
+#line 14503 "gram.y"
     {
 					(yyval.typnam) = SystemTypeName("numeric");
 					(yyval.typnam)->typmods = (yyvsp[(2) - (2)].list);
@@ -48434,7 +48441,7 @@ yyreduce:
     break;
 
   case 1958:
-#line 14502 "gram.y"
+#line 14509 "gram.y"
     {
 					(yyval.typnam) = SystemTypeName("bool");
 					(yyval.typnam)->location = (yylsp[(1) - (1)]);
@@ -48442,7 +48449,7 @@ yyreduce:
     break;
 
   case 1959:
-#line 14509 "gram.y"
+#line 14516 "gram.y"
     {
 					/*
 					 * Check FLOAT() precision limits assuming IEEE floating
@@ -48466,35 +48473,35 @@ yyreduce:
     break;
 
   case 1960:
-#line 14530 "gram.y"
+#line 14537 "gram.y"
     {
 					(yyval.typnam) = SystemTypeName("float8");
 				;}
     break;
 
   case 1961:
-#line 14540 "gram.y"
+#line 14547 "gram.y"
     {
 					(yyval.typnam) = (yyvsp[(1) - (1)].typnam);
 				;}
     break;
 
   case 1962:
-#line 14544 "gram.y"
+#line 14551 "gram.y"
     {
 					(yyval.typnam) = (yyvsp[(1) - (1)].typnam);
 				;}
     break;
 
   case 1963:
-#line 14552 "gram.y"
+#line 14559 "gram.y"
     {
 					(yyval.typnam) = (yyvsp[(1) - (1)].typnam);
 				;}
     break;
 
   case 1964:
-#line 14556 "gram.y"
+#line 14563 "gram.y"
     {
 					(yyval.typnam) = (yyvsp[(1) - (1)].typnam);
 					(yyval.typnam)->typmods = NIL;
@@ -48502,7 +48509,7 @@ yyreduce:
     break;
 
   case 1965:
-#line 14564 "gram.y"
+#line 14571 "gram.y"
     {
 					char *typname;
 
@@ -48514,7 +48521,7 @@ yyreduce:
     break;
 
   case 1966:
-#line 14576 "gram.y"
+#line 14583 "gram.y"
     {
 					/* bit defaults to bit(1), varbit to no limit */
 					if ((yyvsp[(2) - (2)].boolean))
@@ -48531,28 +48538,28 @@ yyreduce:
     break;
 
   case 1967:
-#line 14597 "gram.y"
+#line 14604 "gram.y"
     {
 					(yyval.typnam) = (yyvsp[(1) - (1)].typnam);
 				;}
     break;
 
   case 1968:
-#line 14601 "gram.y"
+#line 14608 "gram.y"
     {
 					(yyval.typnam) = (yyvsp[(1) - (1)].typnam);
 				;}
     break;
 
   case 1969:
-#line 14607 "gram.y"
+#line 14614 "gram.y"
     {
 					(yyval.typnam) = (yyvsp[(1) - (1)].typnam);
 				;}
     break;
 
   case 1970:
-#line 14611 "gram.y"
+#line 14618 "gram.y"
     {
 					/* Length was not specified so allow to be unrestricted.
 					 * This handles problems with fixed-length (bpchar) strings
@@ -48566,7 +48573,7 @@ yyreduce:
     break;
 
   case 1971:
-#line 14624 "gram.y"
+#line 14631 "gram.y"
     {
 					(yyval.typnam) = SystemTypeName((yyvsp[(1) - (4)].str));
 					(yyval.typnam)->typmods = list_make1(makeIntConst((yyvsp[(3) - (4)].ival), (yylsp[(3) - (4)])));
@@ -48575,7 +48582,7 @@ yyreduce:
     break;
 
   case 1972:
-#line 14632 "gram.y"
+#line 14639 "gram.y"
     {
 					(yyval.typnam) = SystemTypeName((yyvsp[(1) - (1)].str));
 					/* char defaults to char(1), varchar to no limit */
@@ -48586,47 +48593,47 @@ yyreduce:
     break;
 
   case 1973:
-#line 14642 "gram.y"
+#line 14649 "gram.y"
     { (yyval.str) = (yyvsp[(2) - (2)].boolean) ? "varchar": "bpchar"; ;}
     break;
 
   case 1974:
-#line 14644 "gram.y"
+#line 14651 "gram.y"
     { (yyval.str) = (yyvsp[(2) - (2)].boolean) ? "varchar": "bpchar"; ;}
     break;
 
   case 1975:
-#line 14646 "gram.y"
+#line 14653 "gram.y"
     { (yyval.str) = "varchar"; ;}
     break;
 
   case 1976:
-#line 14648 "gram.y"
+#line 14655 "gram.y"
     { (yyval.str) = (yyvsp[(3) - (3)].boolean) ? "varchar": "bpchar"; ;}
     break;
 
   case 1977:
-#line 14650 "gram.y"
+#line 14657 "gram.y"
     { (yyval.str) = (yyvsp[(3) - (3)].boolean) ? "varchar": "bpchar"; ;}
     break;
 
   case 1978:
-#line 14652 "gram.y"
+#line 14659 "gram.y"
     { (yyval.str) = (yyvsp[(2) - (2)].boolean) ? "varchar": "bpchar"; ;}
     break;
 
   case 1979:
-#line 14656 "gram.y"
+#line 14663 "gram.y"
     { (yyval.boolean) = true; ;}
     break;
 
   case 1980:
-#line 14657 "gram.y"
+#line 14664 "gram.y"
     { (yyval.boolean) = false; ;}
     break;
 
   case 1981:
-#line 14665 "gram.y"
+#line 14672 "gram.y"
     {
 					if ((yyvsp[(5) - (5)].boolean))
 						(yyval.typnam) = SystemTypeName("timestamptz");
@@ -48638,7 +48645,7 @@ yyreduce:
     break;
 
   case 1982:
-#line 14674 "gram.y"
+#line 14681 "gram.y"
     {
 					if ((yyvsp[(2) - (2)].boolean))
 						(yyval.typnam) = SystemTypeName("timestamptz");
@@ -48649,7 +48656,7 @@ yyreduce:
     break;
 
   case 1983:
-#line 14682 "gram.y"
+#line 14689 "gram.y"
     {
 					if ((yyvsp[(5) - (5)].boolean))
 						(yyval.typnam) = SystemTypeName("timetz");
@@ -48661,7 +48668,7 @@ yyreduce:
     break;
 
   case 1984:
-#line 14691 "gram.y"
+#line 14698 "gram.y"
     {
 					if ((yyvsp[(2) - (2)].boolean))
 						(yyval.typnam) = SystemTypeName("timetz");
@@ -48672,7 +48679,7 @@ yyreduce:
     break;
 
   case 1985:
-#line 14702 "gram.y"
+#line 14709 "gram.y"
     {
 					(yyval.typnam) = SystemTypeName("interval");
 					(yyval.typnam)->location = (yylsp[(1) - (1)]);
@@ -48680,52 +48687,52 @@ yyreduce:
     break;
 
   case 1986:
-#line 14709 "gram.y"
+#line 14716 "gram.y"
     { (yyval.boolean) = true; ;}
     break;
 
   case 1987:
-#line 14710 "gram.y"
+#line 14717 "gram.y"
     { (yyval.boolean) = false; ;}
     break;
 
   case 1988:
-#line 14711 "gram.y"
+#line 14718 "gram.y"
     { (yyval.boolean) = false; ;}
     break;
 
   case 1989:
-#line 14716 "gram.y"
+#line 14723 "gram.y"
     { (yyval.list) = list_make1(makeIntConst(INTERVAL_MASK(YEAR), (yylsp[(1) - (1)]))); ;}
     break;
 
   case 1990:
-#line 14718 "gram.y"
+#line 14725 "gram.y"
     { (yyval.list) = list_make1(makeIntConst(INTERVAL_MASK(MONTH), (yylsp[(1) - (1)]))); ;}
     break;
 
   case 1991:
-#line 14720 "gram.y"
+#line 14727 "gram.y"
     { (yyval.list) = list_make1(makeIntConst(INTERVAL_MASK(DAY), (yylsp[(1) - (1)]))); ;}
     break;
 
   case 1992:
-#line 14722 "gram.y"
+#line 14729 "gram.y"
     { (yyval.list) = list_make1(makeIntConst(INTERVAL_MASK(HOUR), (yylsp[(1) - (1)]))); ;}
     break;
 
   case 1993:
-#line 14724 "gram.y"
+#line 14731 "gram.y"
     { (yyval.list) = list_make1(makeIntConst(INTERVAL_MASK(MINUTE), (yylsp[(1) - (1)]))); ;}
     break;
 
   case 1994:
-#line 14726 "gram.y"
+#line 14733 "gram.y"
     { (yyval.list) = (yyvsp[(1) - (1)].list); ;}
     break;
 
   case 1995:
-#line 14728 "gram.y"
+#line 14735 "gram.y"
     {
 					(yyval.list) = list_make1(makeIntConst(INTERVAL_MASK(YEAR) |
 												 INTERVAL_MASK(MONTH), (yylsp[(1) - (3)])));
@@ -48733,7 +48740,7 @@ yyreduce:
     break;
 
   case 1996:
-#line 14733 "gram.y"
+#line 14740 "gram.y"
     {
 					(yyval.list) = list_make1(makeIntConst(INTERVAL_MASK(DAY) |
 												 INTERVAL_MASK(HOUR), (yylsp[(1) - (3)])));
@@ -48741,7 +48748,7 @@ yyreduce:
     break;
 
   case 1997:
-#line 14738 "gram.y"
+#line 14745 "gram.y"
     {
 					(yyval.list) = list_make1(makeIntConst(INTERVAL_MASK(DAY) |
 												 INTERVAL_MASK(HOUR) |
@@ -48750,7 +48757,7 @@ yyreduce:
     break;
 
   case 1998:
-#line 14744 "gram.y"
+#line 14751 "gram.y"
     {
 					(yyval.list) = (yyvsp[(3) - (3)].list);
 					linitial((yyval.list)) = makeIntConst(INTERVAL_MASK(DAY) |
@@ -48761,7 +48768,7 @@ yyreduce:
     break;
 
   case 1999:
-#line 14752 "gram.y"
+#line 14759 "gram.y"
     {
 					(yyval.list) = list_make1(makeIntConst(INTERVAL_MASK(HOUR) |
 												 INTERVAL_MASK(MINUTE), (yylsp[(1) - (3)])));
@@ -48769,7 +48776,7 @@ yyreduce:
     break;
 
   case 2000:
-#line 14757 "gram.y"
+#line 14764 "gram.y"
     {
 					(yyval.list) = (yyvsp[(3) - (3)].list);
 					linitial((yyval.list)) = makeIntConst(INTERVAL_MASK(HOUR) |
@@ -48779,7 +48786,7 @@ yyreduce:
     break;
 
   case 2001:
-#line 14764 "gram.y"
+#line 14771 "gram.y"
     {
 					(yyval.list) = (yyvsp[(3) - (3)].list);
 					linitial((yyval.list)) = makeIntConst(INTERVAL_MASK(MINUTE) |
@@ -48788,19 +48795,19 @@ yyreduce:
     break;
 
   case 2002:
-#line 14770 "gram.y"
+#line 14777 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 2003:
-#line 14775 "gram.y"
+#line 14782 "gram.y"
     {
 					(yyval.list) = list_make1(makeIntConst(INTERVAL_MASK(SECOND), (yylsp[(1) - (1)])));
 				;}
     break;
 
   case 2004:
-#line 14779 "gram.y"
+#line 14786 "gram.y"
     {
 					(yyval.list) = list_make2(makeIntConst(INTERVAL_MASK(SECOND), (yylsp[(1) - (4)])),
 									makeIntConst((yyvsp[(3) - (4)].ival), (yylsp[(3) - (4)])));
@@ -48808,7 +48815,7 @@ yyreduce:
     break;
 
   case 2005:
-#line 14787 "gram.y"
+#line 14794 "gram.y"
     {
 					(yyval.typnam) = SystemTypeName("json");
 					(yyval.typnam)->location = (yylsp[(1) - (1)]);
@@ -48816,17 +48823,17 @@ yyreduce:
     break;
 
   case 2006:
-#line 14821 "gram.y"
+#line 14828 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 2007:
-#line 14823 "gram.y"
+#line 14830 "gram.y"
     { (yyval.node) = makeTypeCast((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].typnam), (yylsp[(2) - (3)])); ;}
     break;
 
   case 2008:
-#line 14825 "gram.y"
+#line 14832 "gram.y"
     {
 					CollateClause *n = makeNode(CollateClause);
 
@@ -48838,7 +48845,7 @@ yyreduce:
     break;
 
   case 2009:
-#line 14834 "gram.y"
+#line 14841 "gram.y"
     {
 					(yyval.node) = (Node *) makeFuncCall(SystemFuncName("timezone"),
 											   list_make2((yyvsp[(5) - (5)].node), (yyvsp[(1) - (5)].node)),
@@ -48848,7 +48855,7 @@ yyreduce:
     break;
 
   case 2010:
-#line 14841 "gram.y"
+#line 14848 "gram.y"
     {
 					(yyval.node) = (Node *) makeFuncCall(SystemFuncName("timezone"),
 											   list_make1((yyvsp[(1) - (3)].node)),
@@ -48858,107 +48865,107 @@ yyreduce:
     break;
 
   case 2011:
-#line 14857 "gram.y"
+#line 14864 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "+", NULL, (yyvsp[(2) - (2)].node), (yylsp[(1) - (2)])); ;}
     break;
 
   case 2012:
-#line 14859 "gram.y"
+#line 14866 "gram.y"
     { (yyval.node) = doNegate((yyvsp[(2) - (2)].node), (yylsp[(1) - (2)])); ;}
     break;
 
   case 2013:
-#line 14861 "gram.y"
+#line 14868 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "+", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 2014:
-#line 14863 "gram.y"
+#line 14870 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "-", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 2015:
-#line 14865 "gram.y"
+#line 14872 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "*", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 2016:
-#line 14867 "gram.y"
+#line 14874 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "/", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 2017:
-#line 14869 "gram.y"
+#line 14876 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "%", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 2018:
-#line 14871 "gram.y"
+#line 14878 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "^", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 2019:
-#line 14873 "gram.y"
+#line 14880 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "<", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 2020:
-#line 14875 "gram.y"
+#line 14882 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, ">", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 2021:
-#line 14877 "gram.y"
+#line 14884 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "=", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 2022:
-#line 14879 "gram.y"
+#line 14886 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "<=", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 2023:
-#line 14881 "gram.y"
+#line 14888 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, ">=", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 2024:
-#line 14883 "gram.y"
+#line 14890 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "<>", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 2025:
-#line 14886 "gram.y"
+#line 14893 "gram.y"
     { (yyval.node) = (Node *) makeA_Expr(AEXPR_OP, (yyvsp[(2) - (3)].list), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 2026:
-#line 14888 "gram.y"
+#line 14895 "gram.y"
     { (yyval.node) = (Node *) makeA_Expr(AEXPR_OP, (yyvsp[(1) - (2)].list), NULL, (yyvsp[(2) - (2)].node), (yylsp[(1) - (2)])); ;}
     break;
 
   case 2027:
-#line 14891 "gram.y"
+#line 14898 "gram.y"
     { (yyval.node) = makeAndExpr((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 2028:
-#line 14893 "gram.y"
+#line 14900 "gram.y"
     { (yyval.node) = makeOrExpr((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 2029:
-#line 14895 "gram.y"
+#line 14902 "gram.y"
     { (yyval.node) = makeNotExpr((yyvsp[(2) - (2)].node), (yylsp[(1) - (2)])); ;}
     break;
 
   case 2030:
-#line 14897 "gram.y"
+#line 14904 "gram.y"
     { (yyval.node) = makeNotExpr((yyvsp[(2) - (2)].node), (yylsp[(1) - (2)])); ;}
     break;
 
   case 2031:
-#line 14900 "gram.y"
+#line 14907 "gram.y"
     {
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_LIKE, "~~",
 												   (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)]));
@@ -48966,7 +48973,7 @@ yyreduce:
     break;
 
   case 2032:
-#line 14905 "gram.y"
+#line 14912 "gram.y"
     {
 					FuncCall   *n = makeFuncCall(SystemFuncName("like_escape"),
 												 list_make2((yyvsp[(3) - (5)].node), (yyvsp[(5) - (5)].node)),
@@ -48978,7 +48985,7 @@ yyreduce:
     break;
 
   case 2033:
-#line 14914 "gram.y"
+#line 14921 "gram.y"
     {
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_LIKE, "!~~",
 												   (yyvsp[(1) - (4)].node), (yyvsp[(4) - (4)].node), (yylsp[(2) - (4)]));
@@ -48986,7 +48993,7 @@ yyreduce:
     break;
 
   case 2034:
-#line 14919 "gram.y"
+#line 14926 "gram.y"
     {
 					FuncCall   *n = makeFuncCall(SystemFuncName("like_escape"),
 												 list_make2((yyvsp[(4) - (6)].node), (yyvsp[(6) - (6)].node)),
@@ -48998,7 +49005,7 @@ yyreduce:
     break;
 
   case 2035:
-#line 14928 "gram.y"
+#line 14935 "gram.y"
     {
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_ILIKE, "~~*",
 												   (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)]));
@@ -49006,7 +49013,7 @@ yyreduce:
     break;
 
   case 2036:
-#line 14933 "gram.y"
+#line 14940 "gram.y"
     {
 					FuncCall   *n = makeFuncCall(SystemFuncName("like_escape"),
 												 list_make2((yyvsp[(3) - (5)].node), (yyvsp[(5) - (5)].node)),
@@ -49018,7 +49025,7 @@ yyreduce:
     break;
 
   case 2037:
-#line 14942 "gram.y"
+#line 14949 "gram.y"
     {
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_ILIKE, "!~~*",
 												   (yyvsp[(1) - (4)].node), (yyvsp[(4) - (4)].node), (yylsp[(2) - (4)]));
@@ -49026,7 +49033,7 @@ yyreduce:
     break;
 
   case 2038:
-#line 14947 "gram.y"
+#line 14954 "gram.y"
     {
 					FuncCall   *n = makeFuncCall(SystemFuncName("like_escape"),
 												 list_make2((yyvsp[(4) - (6)].node), (yyvsp[(6) - (6)].node)),
@@ -49038,7 +49045,7 @@ yyreduce:
     break;
 
   case 2039:
-#line 14957 "gram.y"
+#line 14964 "gram.y"
     {
 					FuncCall   *n = makeFuncCall(SystemFuncName("similar_to_escape"),
 												 list_make1((yyvsp[(4) - (4)].node)),
@@ -49050,7 +49057,7 @@ yyreduce:
     break;
 
   case 2040:
-#line 14966 "gram.y"
+#line 14973 "gram.y"
     {
 					FuncCall   *n = makeFuncCall(SystemFuncName("similar_to_escape"),
 												 list_make2((yyvsp[(4) - (6)].node), (yyvsp[(6) - (6)].node)),
@@ -49062,7 +49069,7 @@ yyreduce:
     break;
 
   case 2041:
-#line 14975 "gram.y"
+#line 14982 "gram.y"
     {
 					FuncCall   *n = makeFuncCall(SystemFuncName("similar_to_escape"),
 												 list_make1((yyvsp[(5) - (5)].node)),
@@ -49074,7 +49081,7 @@ yyreduce:
     break;
 
   case 2042:
-#line 14984 "gram.y"
+#line 14991 "gram.y"
     {
 					FuncCall   *n = makeFuncCall(SystemFuncName("similar_to_escape"),
 												 list_make2((yyvsp[(5) - (7)].node), (yyvsp[(7) - (7)].node)),
@@ -49086,7 +49093,7 @@ yyreduce:
     break;
 
   case 2043:
-#line 15003 "gram.y"
+#line 15010 "gram.y"
     {
 					NullTest   *n = makeNode(NullTest);
 
@@ -49098,7 +49105,7 @@ yyreduce:
     break;
 
   case 2044:
-#line 15012 "gram.y"
+#line 15019 "gram.y"
     {
 					NullTest   *n = makeNode(NullTest);
 
@@ -49110,7 +49117,7 @@ yyreduce:
     break;
 
   case 2045:
-#line 15021 "gram.y"
+#line 15028 "gram.y"
     {
 					NullTest   *n = makeNode(NullTest);
 
@@ -49122,7 +49129,7 @@ yyreduce:
     break;
 
   case 2046:
-#line 15030 "gram.y"
+#line 15037 "gram.y"
     {
 					NullTest   *n = makeNode(NullTest);
 
@@ -49134,7 +49141,7 @@ yyreduce:
     break;
 
   case 2047:
-#line 15039 "gram.y"
+#line 15046 "gram.y"
     {
 					if (list_length((yyvsp[(1) - (3)].list)) != 2)
 						ereport(ERROR,
@@ -49154,7 +49161,7 @@ yyreduce:
     break;
 
   case 2048:
-#line 15056 "gram.y"
+#line 15063 "gram.y"
     {
 					BooleanTest *b = makeNode(BooleanTest);
 
@@ -49166,7 +49173,7 @@ yyreduce:
     break;
 
   case 2049:
-#line 15065 "gram.y"
+#line 15072 "gram.y"
     {
 					BooleanTest *b = makeNode(BooleanTest);
 
@@ -49178,7 +49185,7 @@ yyreduce:
     break;
 
   case 2050:
-#line 15074 "gram.y"
+#line 15081 "gram.y"
     {
 					BooleanTest *b = makeNode(BooleanTest);
 
@@ -49190,7 +49197,7 @@ yyreduce:
     break;
 
   case 2051:
-#line 15083 "gram.y"
+#line 15090 "gram.y"
     {
 					BooleanTest *b = makeNode(BooleanTest);
 
@@ -49202,7 +49209,7 @@ yyreduce:
     break;
 
   case 2052:
-#line 15092 "gram.y"
+#line 15099 "gram.y"
     {
 					BooleanTest *b = makeNode(BooleanTest);
 
@@ -49214,7 +49221,7 @@ yyreduce:
     break;
 
   case 2053:
-#line 15101 "gram.y"
+#line 15108 "gram.y"
     {
 					BooleanTest *b = makeNode(BooleanTest);
 
@@ -49226,21 +49233,21 @@ yyreduce:
     break;
 
   case 2054:
-#line 15110 "gram.y"
+#line 15117 "gram.y"
     {
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_DISTINCT, "=", (yyvsp[(1) - (5)].node), (yyvsp[(5) - (5)].node), (yylsp[(2) - (5)]));
 				;}
     break;
 
   case 2055:
-#line 15114 "gram.y"
+#line 15121 "gram.y"
     {
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_NOT_DISTINCT, "=", (yyvsp[(1) - (6)].node), (yyvsp[(6) - (6)].node), (yylsp[(2) - (6)]));
 				;}
     break;
 
   case 2056:
-#line 15118 "gram.y"
+#line 15125 "gram.y"
     {
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_BETWEEN,
 												   "BETWEEN",
@@ -49251,7 +49258,7 @@ yyreduce:
     break;
 
   case 2057:
-#line 15126 "gram.y"
+#line 15133 "gram.y"
     {
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_NOT_BETWEEN,
 												   "NOT BETWEEN",
@@ -49262,7 +49269,7 @@ yyreduce:
     break;
 
   case 2058:
-#line 15134 "gram.y"
+#line 15141 "gram.y"
     {
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_BETWEEN_SYM,
 												   "BETWEEN SYMMETRIC",
@@ -49273,7 +49280,7 @@ yyreduce:
     break;
 
   case 2059:
-#line 15142 "gram.y"
+#line 15149 "gram.y"
     {
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_NOT_BETWEEN_SYM,
 												   "NOT BETWEEN SYMMETRIC",
@@ -49284,7 +49291,7 @@ yyreduce:
     break;
 
   case 2060:
-#line 15150 "gram.y"
+#line 15157 "gram.y"
     {
 					/* in_expr returns a SubLink or a list of a_exprs */
 					if (IsA((yyvsp[(3) - (3)].node), SubLink))
@@ -49308,7 +49315,7 @@ yyreduce:
     break;
 
   case 2061:
-#line 15171 "gram.y"
+#line 15178 "gram.y"
     {
 					/* in_expr returns a SubLink or a list of a_exprs */
 					if (IsA((yyvsp[(4) - (4)].node), SubLink))
@@ -49334,7 +49341,7 @@ yyreduce:
     break;
 
   case 2062:
-#line 15194 "gram.y"
+#line 15201 "gram.y"
     {
 					SubLink	   *n = makeNode(SubLink);
 
@@ -49349,7 +49356,7 @@ yyreduce:
     break;
 
   case 2063:
-#line 15206 "gram.y"
+#line 15213 "gram.y"
     {
 					if ((yyvsp[(3) - (6)].ival) == ANY_SUBLINK)
 						(yyval.node) = (Node *) makeA_Expr(AEXPR_OP_ANY, (yyvsp[(2) - (6)].list), (yyvsp[(1) - (6)].node), (yyvsp[(5) - (6)].node), (yylsp[(2) - (6)]));
@@ -49359,7 +49366,7 @@ yyreduce:
     break;
 
   case 2064:
-#line 15213 "gram.y"
+#line 15220 "gram.y"
     {
 					/* Not sure how to get rid of the parentheses
 					 * but there are lots of shift/reduce errors without them.
@@ -49378,7 +49385,7 @@ yyreduce:
     break;
 
   case 2065:
-#line 15229 "gram.y"
+#line 15236 "gram.y"
     {
 					(yyval.node) = makeXmlExpr(IS_DOCUMENT, NULL, NIL,
 									 list_make1((yyvsp[(1) - (3)].node)), (yylsp[(2) - (3)]));
@@ -49386,7 +49393,7 @@ yyreduce:
     break;
 
   case 2066:
-#line 15234 "gram.y"
+#line 15241 "gram.y"
     {
 					(yyval.node) = makeNotExpr(makeXmlExpr(IS_DOCUMENT, NULL, NIL,
 												 list_make1((yyvsp[(1) - (4)].node)), (yylsp[(2) - (4)])),
@@ -49395,7 +49402,7 @@ yyreduce:
     break;
 
   case 2067:
-#line 15240 "gram.y"
+#line 15247 "gram.y"
     {
 					(yyval.node) = (Node *) makeFuncCall(SystemFuncName("is_normalized"),
 											   list_make1((yyvsp[(1) - (3)].node)),
@@ -49405,7 +49412,7 @@ yyreduce:
     break;
 
   case 2068:
-#line 15247 "gram.y"
+#line 15254 "gram.y"
     {
 					(yyval.node) = (Node *) makeFuncCall(SystemFuncName("is_normalized"),
 											   list_make2((yyvsp[(1) - (4)].node), makeStringConst((yyvsp[(3) - (4)].str), (yylsp[(3) - (4)]))),
@@ -49415,7 +49422,7 @@ yyreduce:
     break;
 
   case 2069:
-#line 15254 "gram.y"
+#line 15261 "gram.y"
     {
 					(yyval.node) = makeNotExpr((Node *) makeFuncCall(SystemFuncName("is_normalized"),
 														   list_make1((yyvsp[(1) - (4)].node)),
@@ -49426,7 +49433,7 @@ yyreduce:
     break;
 
   case 2070:
-#line 15262 "gram.y"
+#line 15269 "gram.y"
     {
 					(yyval.node) = makeNotExpr((Node *) makeFuncCall(SystemFuncName("is_normalized"),
 														   list_make2((yyvsp[(1) - (5)].node), makeStringConst((yyvsp[(4) - (5)].str), (yylsp[(4) - (5)]))),
@@ -49437,7 +49444,7 @@ yyreduce:
     break;
 
   case 2071:
-#line 15271 "gram.y"
+#line 15278 "gram.y"
     {
 					JsonFormat *format = makeJsonFormat(JS_FORMAT_DEFAULT, JS_ENC_DEFAULT, -1);
 
@@ -49446,7 +49453,7 @@ yyreduce:
     break;
 
   case 2072:
-#line 15289 "gram.y"
+#line 15296 "gram.y"
     {
 					JsonFormat *format = makeJsonFormat(JS_FORMAT_DEFAULT, JS_ENC_DEFAULT, -1);
 
@@ -49455,7 +49462,7 @@ yyreduce:
     break;
 
   case 2073:
-#line 15306 "gram.y"
+#line 15313 "gram.y"
     {
 					/*
 					 * The SQL spec only allows DEFAULT in "contextually typed
@@ -49473,111 +49480,111 @@ yyreduce:
     break;
 
   case 2074:
-#line 15332 "gram.y"
+#line 15339 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 2075:
-#line 15334 "gram.y"
+#line 15341 "gram.y"
     { (yyval.node) = makeTypeCast((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].typnam), (yylsp[(2) - (3)])); ;}
     break;
 
   case 2076:
-#line 15336 "gram.y"
+#line 15343 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "+", NULL, (yyvsp[(2) - (2)].node), (yylsp[(1) - (2)])); ;}
     break;
 
   case 2077:
-#line 15338 "gram.y"
+#line 15345 "gram.y"
     { (yyval.node) = doNegate((yyvsp[(2) - (2)].node), (yylsp[(1) - (2)])); ;}
     break;
 
   case 2078:
-#line 15340 "gram.y"
+#line 15347 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "+", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 2079:
-#line 15342 "gram.y"
+#line 15349 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "-", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 2080:
-#line 15344 "gram.y"
+#line 15351 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "*", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 2081:
-#line 15346 "gram.y"
+#line 15353 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "/", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 2082:
-#line 15348 "gram.y"
+#line 15355 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "%", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 2083:
-#line 15350 "gram.y"
+#line 15357 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "^", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 2084:
-#line 15352 "gram.y"
+#line 15359 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "<", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 2085:
-#line 15354 "gram.y"
+#line 15361 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, ">", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 2086:
-#line 15356 "gram.y"
+#line 15363 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "=", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 2087:
-#line 15358 "gram.y"
+#line 15365 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "<=", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 2088:
-#line 15360 "gram.y"
+#line 15367 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, ">=", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 2089:
-#line 15362 "gram.y"
+#line 15369 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "<>", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 2090:
-#line 15364 "gram.y"
+#line 15371 "gram.y"
     { (yyval.node) = (Node *) makeA_Expr(AEXPR_OP, (yyvsp[(2) - (3)].list), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 2091:
-#line 15366 "gram.y"
+#line 15373 "gram.y"
     { (yyval.node) = (Node *) makeA_Expr(AEXPR_OP, (yyvsp[(1) - (2)].list), NULL, (yyvsp[(2) - (2)].node), (yylsp[(1) - (2)])); ;}
     break;
 
   case 2092:
-#line 15368 "gram.y"
+#line 15375 "gram.y"
     {
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_DISTINCT, "=", (yyvsp[(1) - (5)].node), (yyvsp[(5) - (5)].node), (yylsp[(2) - (5)]));
 				;}
     break;
 
   case 2093:
-#line 15372 "gram.y"
+#line 15379 "gram.y"
     {
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_NOT_DISTINCT, "=", (yyvsp[(1) - (6)].node), (yyvsp[(6) - (6)].node), (yylsp[(2) - (6)]));
 				;}
     break;
 
   case 2094:
-#line 15376 "gram.y"
+#line 15383 "gram.y"
     {
 					(yyval.node) = makeXmlExpr(IS_DOCUMENT, NULL, NIL,
 									 list_make1((yyvsp[(1) - (3)].node)), (yylsp[(2) - (3)]));
@@ -49585,7 +49592,7 @@ yyreduce:
     break;
 
   case 2095:
-#line 15381 "gram.y"
+#line 15388 "gram.y"
     {
 					(yyval.node) = makeNotExpr(makeXmlExpr(IS_DOCUMENT, NULL, NIL,
 												 list_make1((yyvsp[(1) - (4)].node)), (yylsp[(2) - (4)])),
@@ -49594,17 +49601,17 @@ yyreduce:
     break;
 
   case 2096:
-#line 15396 "gram.y"
+#line 15403 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 2097:
-#line 15397 "gram.y"
+#line 15404 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 2098:
-#line 15399 "gram.y"
+#line 15406 "gram.y"
     {
 					ParamRef   *p = makeNode(ParamRef);
 
@@ -49624,7 +49631,7 @@ yyreduce:
     break;
 
   case 2099:
-#line 15416 "gram.y"
+#line 15423 "gram.y"
     {
 					if ((yyvsp[(4) - (4)].list))
 					{
@@ -49640,17 +49647,17 @@ yyreduce:
     break;
 
   case 2100:
-#line 15429 "gram.y"
+#line 15436 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 2101:
-#line 15431 "gram.y"
+#line 15438 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 2102:
-#line 15433 "gram.y"
+#line 15440 "gram.y"
     {
 					SubLink	   *n = makeNode(SubLink);
 
@@ -49665,7 +49672,7 @@ yyreduce:
     break;
 
   case 2103:
-#line 15445 "gram.y"
+#line 15452 "gram.y"
     {
 					/*
 					 * Because the select_with_parens nonterminal is designed
@@ -49693,7 +49700,7 @@ yyreduce:
     break;
 
   case 2104:
-#line 15470 "gram.y"
+#line 15477 "gram.y"
     {
 					SubLink	   *n = makeNode(SubLink);
 
@@ -49708,7 +49715,7 @@ yyreduce:
     break;
 
   case 2105:
-#line 15482 "gram.y"
+#line 15489 "gram.y"
     {
 					SubLink	   *n = makeNode(SubLink);
 
@@ -49723,7 +49730,7 @@ yyreduce:
     break;
 
   case 2106:
-#line 15494 "gram.y"
+#line 15501 "gram.y"
     {
 					A_ArrayExpr *n = castNode(A_ArrayExpr, (yyvsp[(2) - (2)].node));
 
@@ -49734,7 +49741,7 @@ yyreduce:
     break;
 
   case 2107:
-#line 15502 "gram.y"
+#line 15509 "gram.y"
     {
 					RowExpr	   *r = makeNode(RowExpr);
 
@@ -49748,7 +49755,7 @@ yyreduce:
     break;
 
   case 2108:
-#line 15513 "gram.y"
+#line 15520 "gram.y"
     {
 					RowExpr	   *r = makeNode(RowExpr);
 
@@ -49762,7 +49769,7 @@ yyreduce:
     break;
 
   case 2109:
-#line 15524 "gram.y"
+#line 15531 "gram.y"
     {
 				  GroupingFunc *g = makeNode(GroupingFunc);
 
@@ -49773,7 +49780,7 @@ yyreduce:
     break;
 
   case 2110:
-#line 15534 "gram.y"
+#line 15541 "gram.y"
     {
 					(yyval.node) = (Node *) makeFuncCall((yyvsp[(1) - (3)].list), NIL,
 											   COERCE_EXPLICIT_CALL,
@@ -49782,7 +49789,7 @@ yyreduce:
     break;
 
   case 2111:
-#line 15540 "gram.y"
+#line 15547 "gram.y"
     {
 					FuncCall   *n = makeFuncCall((yyvsp[(1) - (5)].list), (yyvsp[(3) - (5)].list),
 												 COERCE_EXPLICIT_CALL,
@@ -49794,7 +49801,7 @@ yyreduce:
     break;
 
   case 2112:
-#line 15549 "gram.y"
+#line 15556 "gram.y"
     {
 					FuncCall   *n = makeFuncCall((yyvsp[(1) - (6)].list), list_make1((yyvsp[(4) - (6)].node)),
 												 COERCE_EXPLICIT_CALL,
@@ -49807,7 +49814,7 @@ yyreduce:
     break;
 
   case 2113:
-#line 15559 "gram.y"
+#line 15566 "gram.y"
     {
 					FuncCall   *n = makeFuncCall((yyvsp[(1) - (8)].list), lappend((yyvsp[(3) - (8)].list), (yyvsp[(6) - (8)].node)),
 												 COERCE_EXPLICIT_CALL,
@@ -49820,7 +49827,7 @@ yyreduce:
     break;
 
   case 2114:
-#line 15569 "gram.y"
+#line 15576 "gram.y"
     {
 					FuncCall   *n = makeFuncCall((yyvsp[(1) - (6)].list), (yyvsp[(4) - (6)].list),
 												 COERCE_EXPLICIT_CALL,
@@ -49836,7 +49843,7 @@ yyreduce:
     break;
 
   case 2115:
-#line 15582 "gram.y"
+#line 15589 "gram.y"
     {
 					FuncCall   *n = makeFuncCall((yyvsp[(1) - (6)].list), (yyvsp[(4) - (6)].list),
 												 COERCE_EXPLICIT_CALL,
@@ -49849,7 +49856,7 @@ yyreduce:
     break;
 
   case 2116:
-#line 15592 "gram.y"
+#line 15599 "gram.y"
     {
 					/*
 					 * We consider AGGREGATE(*) to invoke a parameterless
@@ -49871,7 +49878,7 @@ yyreduce:
     break;
 
   case 2117:
-#line 15623 "gram.y"
+#line 15630 "gram.y"
     {
 					FuncCall   *n = (FuncCall *) (yyvsp[(1) - (4)].node);
 
@@ -49910,7 +49917,7 @@ yyreduce:
     break;
 
   case 2118:
-#line 15659 "gram.y"
+#line 15666 "gram.y"
     {
 					JsonAggConstructor *n = IsA((yyvsp[(1) - (3)].node), JsonObjectAgg) ?
 						((JsonObjectAgg *) (yyvsp[(1) - (3)].node))->constructor :
@@ -49923,27 +49930,27 @@ yyreduce:
     break;
 
   case 2119:
-#line 15669 "gram.y"
+#line 15676 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 2120:
-#line 15679 "gram.y"
+#line 15686 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 2121:
-#line 15680 "gram.y"
+#line 15687 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 2122:
-#line 15681 "gram.y"
+#line 15688 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 2123:
-#line 15689 "gram.y"
+#line 15696 "gram.y"
     {
 					(yyval.node) = (Node *) makeFuncCall(SystemFuncName("pg_collation_for"),
 											   list_make1((yyvsp[(4) - (5)].node)),
@@ -49953,91 +49960,91 @@ yyreduce:
     break;
 
   case 2124:
-#line 15696 "gram.y"
+#line 15703 "gram.y"
     {
 					(yyval.node) = makeSQLValueFunction(SVFOP_CURRENT_DATE, -1, (yylsp[(1) - (1)]));
 				;}
     break;
 
   case 2125:
-#line 15700 "gram.y"
+#line 15707 "gram.y"
     {
 					(yyval.node) = makeSQLValueFunction(SVFOP_CURRENT_TIME, -1, (yylsp[(1) - (1)]));
 				;}
     break;
 
   case 2126:
-#line 15704 "gram.y"
+#line 15711 "gram.y"
     {
 					(yyval.node) = makeSQLValueFunction(SVFOP_CURRENT_TIME_N, (yyvsp[(3) - (4)].ival), (yylsp[(1) - (4)]));
 				;}
     break;
 
   case 2127:
-#line 15708 "gram.y"
+#line 15715 "gram.y"
     {
 					(yyval.node) = makeSQLValueFunction(SVFOP_CURRENT_TIMESTAMP, -1, (yylsp[(1) - (1)]));
 				;}
     break;
 
   case 2128:
-#line 15712 "gram.y"
+#line 15719 "gram.y"
     {
 					(yyval.node) = makeSQLValueFunction(SVFOP_CURRENT_TIMESTAMP_N, (yyvsp[(3) - (4)].ival), (yylsp[(1) - (4)]));
 				;}
     break;
 
   case 2129:
-#line 15716 "gram.y"
+#line 15723 "gram.y"
     {
 					(yyval.node) = makeSQLValueFunction(SVFOP_LOCALTIME, -1, (yylsp[(1) - (1)]));
 				;}
     break;
 
   case 2130:
-#line 15720 "gram.y"
+#line 15727 "gram.y"
     {
 					(yyval.node) = makeSQLValueFunction(SVFOP_LOCALTIME_N, (yyvsp[(3) - (4)].ival), (yylsp[(1) - (4)]));
 				;}
     break;
 
   case 2131:
-#line 15724 "gram.y"
+#line 15731 "gram.y"
     {
 					(yyval.node) = makeSQLValueFunction(SVFOP_LOCALTIMESTAMP, -1, (yylsp[(1) - (1)]));
 				;}
     break;
 
   case 2132:
-#line 15728 "gram.y"
+#line 15735 "gram.y"
     {
 					(yyval.node) = makeSQLValueFunction(SVFOP_LOCALTIMESTAMP_N, (yyvsp[(3) - (4)].ival), (yylsp[(1) - (4)]));
 				;}
     break;
 
   case 2133:
-#line 15732 "gram.y"
+#line 15739 "gram.y"
     {
 					(yyval.node) = makeSQLValueFunction(SVFOP_CURRENT_ROLE, -1, (yylsp[(1) - (1)]));
 				;}
     break;
 
   case 2134:
-#line 15736 "gram.y"
+#line 15743 "gram.y"
     {
 					(yyval.node) = makeSQLValueFunction(SVFOP_CURRENT_USER, -1, (yylsp[(1) - (1)]));
 				;}
     break;
 
   case 2135:
-#line 15740 "gram.y"
+#line 15747 "gram.y"
     {
 					(yyval.node) = makeSQLValueFunction(SVFOP_SESSION_USER, -1, (yylsp[(1) - (1)]));
 				;}
     break;
 
   case 2136:
-#line 15744 "gram.y"
+#line 15751 "gram.y"
     {
 					(yyval.node) = (Node *) makeFuncCall(SystemFuncName("system_user"),
 											   NIL,
@@ -50047,33 +50054,33 @@ yyreduce:
     break;
 
   case 2137:
-#line 15751 "gram.y"
+#line 15758 "gram.y"
     {
 					(yyval.node) = makeSQLValueFunction(SVFOP_USER, -1, (yylsp[(1) - (1)]));
 				;}
     break;
 
   case 2138:
-#line 15755 "gram.y"
+#line 15762 "gram.y"
     {
 					(yyval.node) = makeSQLValueFunction(SVFOP_CURRENT_CATALOG, -1, (yylsp[(1) - (1)]));
 				;}
     break;
 
   case 2139:
-#line 15759 "gram.y"
+#line 15766 "gram.y"
     {
 					(yyval.node) = makeSQLValueFunction(SVFOP_CURRENT_SCHEMA, -1, (yylsp[(1) - (1)]));
 				;}
     break;
 
   case 2140:
-#line 15763 "gram.y"
+#line 15770 "gram.y"
     { (yyval.node) = makeTypeCast((yyvsp[(3) - (6)].node), (yyvsp[(5) - (6)].typnam), (yylsp[(1) - (6)])); ;}
     break;
 
   case 2141:
-#line 15765 "gram.y"
+#line 15772 "gram.y"
     {
 					(yyval.node) = (Node *) makeFuncCall(SystemFuncName("extract"),
 											   (yyvsp[(3) - (4)].list),
@@ -50083,7 +50090,7 @@ yyreduce:
     break;
 
   case 2142:
-#line 15772 "gram.y"
+#line 15779 "gram.y"
     {
 					(yyval.node) = (Node *) makeFuncCall(SystemFuncName("normalize"),
 											   list_make1((yyvsp[(3) - (4)].node)),
@@ -50093,7 +50100,7 @@ yyreduce:
     break;
 
   case 2143:
-#line 15779 "gram.y"
+#line 15786 "gram.y"
     {
 					(yyval.node) = (Node *) makeFuncCall(SystemFuncName("normalize"),
 											   list_make2((yyvsp[(3) - (6)].node), makeStringConst((yyvsp[(5) - (6)].str), (yylsp[(5) - (6)]))),
@@ -50103,7 +50110,7 @@ yyreduce:
     break;
 
   case 2144:
-#line 15786 "gram.y"
+#line 15793 "gram.y"
     {
 					(yyval.node) = (Node *) makeFuncCall(SystemFuncName("overlay"),
 											   (yyvsp[(3) - (4)].list),
@@ -50113,7 +50120,7 @@ yyreduce:
     break;
 
   case 2145:
-#line 15793 "gram.y"
+#line 15800 "gram.y"
     {
 					/*
 					 * allow functions named overlay() to be called without
@@ -50127,7 +50134,7 @@ yyreduce:
     break;
 
   case 2146:
-#line 15804 "gram.y"
+#line 15811 "gram.y"
     {
 					/*
 					 * position(A in B) is converted to position(B, A)
@@ -50144,7 +50151,7 @@ yyreduce:
     break;
 
   case 2147:
-#line 15818 "gram.y"
+#line 15825 "gram.y"
     {
 					/* substring(A from B for C) is converted to
 					 * substring(A, B, C) - thomas 2000-11-28
@@ -50157,7 +50164,7 @@ yyreduce:
     break;
 
   case 2148:
-#line 15828 "gram.y"
+#line 15835 "gram.y"
     {
 					/*
 					 * allow functions named substring() to be called without
@@ -50171,7 +50178,7 @@ yyreduce:
     break;
 
   case 2149:
-#line 15839 "gram.y"
+#line 15846 "gram.y"
     {
 					/* TREAT(expr AS target) converts expr of a particular type to target,
 					 * which is defined to be a subtype of the original expression.
@@ -50190,7 +50197,7 @@ yyreduce:
     break;
 
   case 2150:
-#line 15855 "gram.y"
+#line 15862 "gram.y"
     {
 					/* various trim expressions are defined in SQL
 					 * - thomas 1997-07-19
@@ -50203,7 +50210,7 @@ yyreduce:
     break;
 
   case 2151:
-#line 15865 "gram.y"
+#line 15872 "gram.y"
     {
 					(yyval.node) = (Node *) makeFuncCall(SystemFuncName("ltrim"),
 											   (yyvsp[(4) - (5)].list),
@@ -50213,7 +50220,7 @@ yyreduce:
     break;
 
   case 2152:
-#line 15872 "gram.y"
+#line 15879 "gram.y"
     {
 					(yyval.node) = (Node *) makeFuncCall(SystemFuncName("rtrim"),
 											   (yyvsp[(4) - (5)].list),
@@ -50223,7 +50230,7 @@ yyreduce:
     break;
 
   case 2153:
-#line 15879 "gram.y"
+#line 15886 "gram.y"
     {
 					(yyval.node) = (Node *) makeFuncCall(SystemFuncName("btrim"),
 											   (yyvsp[(3) - (4)].list),
@@ -50233,14 +50240,14 @@ yyreduce:
     break;
 
   case 2154:
-#line 15886 "gram.y"
+#line 15893 "gram.y"
     {
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_NULLIF, "=", (yyvsp[(3) - (6)].node), (yyvsp[(5) - (6)].node), (yylsp[(1) - (6)]));
 				;}
     break;
 
   case 2155:
-#line 15890 "gram.y"
+#line 15897 "gram.y"
     {
 					CoalesceExpr *c = makeNode(CoalesceExpr);
 
@@ -50251,7 +50258,7 @@ yyreduce:
     break;
 
   case 2156:
-#line 15898 "gram.y"
+#line 15905 "gram.y"
     {
 					MinMaxExpr *v = makeNode(MinMaxExpr);
 
@@ -50263,7 +50270,7 @@ yyreduce:
     break;
 
   case 2157:
-#line 15907 "gram.y"
+#line 15914 "gram.y"
     {
 					MinMaxExpr *v = makeNode(MinMaxExpr);
 
@@ -50275,42 +50282,42 @@ yyreduce:
     break;
 
   case 2158:
-#line 15916 "gram.y"
+#line 15923 "gram.y"
     {
 					(yyval.node) = makeXmlExpr(IS_XMLCONCAT, NULL, NIL, (yyvsp[(3) - (4)].list), (yylsp[(1) - (4)]));
 				;}
     break;
 
   case 2159:
-#line 15920 "gram.y"
+#line 15927 "gram.y"
     {
 					(yyval.node) = makeXmlExpr(IS_XMLELEMENT, (yyvsp[(4) - (5)].str), NIL, NIL, (yylsp[(1) - (5)]));
 				;}
     break;
 
   case 2160:
-#line 15924 "gram.y"
+#line 15931 "gram.y"
     {
 					(yyval.node) = makeXmlExpr(IS_XMLELEMENT, (yyvsp[(4) - (7)].str), (yyvsp[(6) - (7)].list), NIL, (yylsp[(1) - (7)]));
 				;}
     break;
 
   case 2161:
-#line 15928 "gram.y"
+#line 15935 "gram.y"
     {
 					(yyval.node) = makeXmlExpr(IS_XMLELEMENT, (yyvsp[(4) - (7)].str), NIL, (yyvsp[(6) - (7)].list), (yylsp[(1) - (7)]));
 				;}
     break;
 
   case 2162:
-#line 15932 "gram.y"
+#line 15939 "gram.y"
     {
 					(yyval.node) = makeXmlExpr(IS_XMLELEMENT, (yyvsp[(4) - (9)].str), (yyvsp[(6) - (9)].list), (yyvsp[(8) - (9)].list), (yylsp[(1) - (9)]));
 				;}
     break;
 
   case 2163:
-#line 15936 "gram.y"
+#line 15943 "gram.y"
     {
 					/* xmlexists(A PASSING [BY REF] B [BY REF]) is
 					 * converted to xmlexists(A, B)*/
@@ -50322,14 +50329,14 @@ yyreduce:
     break;
 
   case 2164:
-#line 15945 "gram.y"
+#line 15952 "gram.y"
     {
 					(yyval.node) = makeXmlExpr(IS_XMLFOREST, NULL, (yyvsp[(3) - (4)].list), NIL, (yylsp[(1) - (4)]));
 				;}
     break;
 
   case 2165:
-#line 15949 "gram.y"
+#line 15956 "gram.y"
     {
 					XmlExpr *x = (XmlExpr *)
 						makeXmlExpr(IS_XMLPARSE, NULL, NIL,
@@ -50342,21 +50349,21 @@ yyreduce:
     break;
 
   case 2166:
-#line 15959 "gram.y"
+#line 15966 "gram.y"
     {
 					(yyval.node) = makeXmlExpr(IS_XMLPI, (yyvsp[(4) - (5)].str), NULL, NIL, (yylsp[(1) - (5)]));
 				;}
     break;
 
   case 2167:
-#line 15963 "gram.y"
+#line 15970 "gram.y"
     {
 					(yyval.node) = makeXmlExpr(IS_XMLPI, (yyvsp[(4) - (7)].str), NULL, list_make1((yyvsp[(6) - (7)].node)), (yylsp[(1) - (7)]));
 				;}
     break;
 
   case 2168:
-#line 15967 "gram.y"
+#line 15974 "gram.y"
     {
 					(yyval.node) = makeXmlExpr(IS_XMLROOT, NULL, NIL,
 									 list_make3((yyvsp[(3) - (7)].node), (yyvsp[(5) - (7)].node), (yyvsp[(6) - (7)].node)), (yylsp[(1) - (7)]));
@@ -50364,7 +50371,7 @@ yyreduce:
     break;
 
   case 2169:
-#line 15972 "gram.y"
+#line 15979 "gram.y"
     {
 					XmlSerialize *n = makeNode(XmlSerialize);
 
@@ -50378,7 +50385,7 @@ yyreduce:
     break;
 
   case 2170:
-#line 15983 "gram.y"
+#line 15990 "gram.y"
     {
 					/* Support for legacy (non-standard) json_object() */
 					(yyval.node) = (Node *) makeFuncCall(SystemFuncName("json_object"),
@@ -50387,7 +50394,7 @@ yyreduce:
     break;
 
   case 2171:
-#line 15992 "gram.y"
+#line 15999 "gram.y"
     {
 					JsonObjectConstructor *n = makeNode(JsonObjectConstructor);
 
@@ -50401,7 +50408,7 @@ yyreduce:
     break;
 
   case 2172:
-#line 16003 "gram.y"
+#line 16010 "gram.y"
     {
 					JsonObjectConstructor *n = makeNode(JsonObjectConstructor);
 
@@ -50415,7 +50422,7 @@ yyreduce:
     break;
 
   case 2173:
-#line 16018 "gram.y"
+#line 16025 "gram.y"
     {
 					JsonArrayConstructor *n = makeNode(JsonArrayConstructor);
 
@@ -50428,7 +50435,7 @@ yyreduce:
     break;
 
   case 2174:
-#line 16033 "gram.y"
+#line 16040 "gram.y"
     {
 					JsonArrayQueryConstructor *n = makeNode(JsonArrayQueryConstructor);
 
@@ -50442,7 +50449,7 @@ yyreduce:
     break;
 
   case 2175:
-#line 16046 "gram.y"
+#line 16053 "gram.y"
     {
 					JsonArrayConstructor *n = makeNode(JsonArrayConstructor);
 
@@ -50455,7 +50462,7 @@ yyreduce:
     break;
 
   case 2176:
-#line 16056 "gram.y"
+#line 16063 "gram.y"
     {
 					JsonParseExpr *n = makeNode(JsonParseExpr);
 
@@ -50468,7 +50475,7 @@ yyreduce:
     break;
 
   case 2177:
-#line 16066 "gram.y"
+#line 16073 "gram.y"
     {
 					JsonScalarExpr *n = makeNode(JsonScalarExpr);
 
@@ -50480,7 +50487,7 @@ yyreduce:
     break;
 
   case 2178:
-#line 16075 "gram.y"
+#line 16082 "gram.y"
     {
 					JsonSerializeExpr *n = makeNode(JsonSerializeExpr);
 
@@ -50492,7 +50499,7 @@ yyreduce:
     break;
 
   case 2179:
-#line 16084 "gram.y"
+#line 16091 "gram.y"
     {
 					MergeSupportFunc *m = makeNode(MergeSupportFunc);
 
@@ -50503,7 +50510,7 @@ yyreduce:
     break;
 
   case 2180:
-#line 16098 "gram.y"
+#line 16105 "gram.y"
     {
 					JsonFuncExpr *n = makeNode(JsonFuncExpr);
 
@@ -50522,7 +50529,7 @@ yyreduce:
     break;
 
   case 2181:
-#line 16117 "gram.y"
+#line 16124 "gram.y"
     {
 					JsonFuncExpr *n = makeNode(JsonFuncExpr);
 
@@ -50538,7 +50545,7 @@ yyreduce:
     break;
 
   case 2182:
-#line 16134 "gram.y"
+#line 16141 "gram.y"
     {
 					JsonFuncExpr *n = makeNode(JsonFuncExpr);
 
@@ -50555,52 +50562,52 @@ yyreduce:
     break;
 
   case 2183:
-#line 16154 "gram.y"
+#line 16161 "gram.y"
     { (yyval.node) = (yyvsp[(2) - (2)].node); ;}
     break;
 
   case 2184:
-#line 16156 "gram.y"
+#line 16163 "gram.y"
     { (yyval.node) = makeNullAConst(-1); ;}
     break;
 
   case 2185:
-#line 16160 "gram.y"
+#line 16167 "gram.y"
     { (yyval.node) = makeIntConst(XML_STANDALONE_YES, -1); ;}
     break;
 
   case 2186:
-#line 16162 "gram.y"
+#line 16169 "gram.y"
     { (yyval.node) = makeIntConst(XML_STANDALONE_NO, -1); ;}
     break;
 
   case 2187:
-#line 16164 "gram.y"
+#line 16171 "gram.y"
     { (yyval.node) = makeIntConst(XML_STANDALONE_NO_VALUE, -1); ;}
     break;
 
   case 2188:
-#line 16166 "gram.y"
+#line 16173 "gram.y"
     { (yyval.node) = makeIntConst(XML_STANDALONE_OMITTED, -1); ;}
     break;
 
   case 2189:
-#line 16169 "gram.y"
+#line 16176 "gram.y"
     { (yyval.list) = (yyvsp[(3) - (4)].list); ;}
     break;
 
   case 2190:
-#line 16172 "gram.y"
+#line 16179 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].target)); ;}
     break;
 
   case 2191:
-#line 16173 "gram.y"
+#line 16180 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].target)); ;}
     break;
 
   case 2192:
-#line 16177 "gram.y"
+#line 16184 "gram.y"
     {
 					(yyval.target) = makeNode(ResTarget);
 					(yyval.target)->name = (yyvsp[(3) - (3)].str);
@@ -50611,7 +50618,7 @@ yyreduce:
     break;
 
   case 2193:
-#line 16185 "gram.y"
+#line 16192 "gram.y"
     {
 					(yyval.target) = makeNode(ResTarget);
 					(yyval.target)->name = NULL;
@@ -50622,115 +50629,115 @@ yyreduce:
     break;
 
   case 2194:
-#line 16194 "gram.y"
+#line 16201 "gram.y"
     { (yyval.ival) = XMLOPTION_DOCUMENT; ;}
     break;
 
   case 2195:
-#line 16195 "gram.y"
+#line 16202 "gram.y"
     { (yyval.ival) = XMLOPTION_CONTENT; ;}
     break;
 
   case 2196:
-#line 16198 "gram.y"
+#line 16205 "gram.y"
     { (yyval.boolean) = true; ;}
     break;
 
   case 2197:
-#line 16199 "gram.y"
+#line 16206 "gram.y"
     { (yyval.boolean) = false; ;}
     break;
 
   case 2198:
-#line 16200 "gram.y"
+#line 16207 "gram.y"
     { (yyval.boolean) = false; ;}
     break;
 
   case 2199:
-#line 16203 "gram.y"
+#line 16210 "gram.y"
     { (yyval.boolean) = true; ;}
     break;
 
   case 2200:
-#line 16204 "gram.y"
+#line 16211 "gram.y"
     { (yyval.boolean) = false; ;}
     break;
 
   case 2201:
-#line 16205 "gram.y"
+#line 16212 "gram.y"
     { (yyval.boolean) = false; ;}
     break;
 
   case 2202:
-#line 16211 "gram.y"
+#line 16218 "gram.y"
     {
 					(yyval.node) = (yyvsp[(2) - (2)].node);
 				;}
     break;
 
   case 2203:
-#line 16215 "gram.y"
+#line 16222 "gram.y"
     {
 					(yyval.node) = (yyvsp[(2) - (3)].node);
 				;}
     break;
 
   case 2204:
-#line 16219 "gram.y"
+#line 16226 "gram.y"
     {
 					(yyval.node) = (yyvsp[(3) - (3)].node);
 				;}
     break;
 
   case 2205:
-#line 16223 "gram.y"
+#line 16230 "gram.y"
     {
 					(yyval.node) = (yyvsp[(3) - (4)].node);
 				;}
     break;
 
   case 2208:
-#line 16238 "gram.y"
+#line 16245 "gram.y"
     { (yyval.list) = (yyvsp[(4) - (5)].list); ;}
     break;
 
   case 2209:
-#line 16239 "gram.y"
+#line 16246 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 2210:
-#line 16243 "gram.y"
+#line 16250 "gram.y"
     { (yyval.node) = (yyvsp[(4) - (5)].node); ;}
     break;
 
   case 2211:
-#line 16244 "gram.y"
+#line 16251 "gram.y"
     { (yyval.node) = NULL; ;}
     break;
 
   case 2212:
-#line 16252 "gram.y"
+#line 16259 "gram.y"
     { (yyval.list) = (yyvsp[(2) - (2)].list); ;}
     break;
 
   case 2213:
-#line 16253 "gram.y"
+#line 16260 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 2214:
-#line 16257 "gram.y"
+#line 16264 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].windef)); ;}
     break;
 
   case 2215:
-#line 16259 "gram.y"
+#line 16266 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].windef)); ;}
     break;
 
   case 2216:
-#line 16264 "gram.y"
+#line 16271 "gram.y"
     {
 					WindowDef  *n = (yyvsp[(3) - (3)].windef);
 
@@ -50740,12 +50747,12 @@ yyreduce:
     break;
 
   case 2217:
-#line 16273 "gram.y"
+#line 16280 "gram.y"
     { (yyval.windef) = (yyvsp[(2) - (2)].windef); ;}
     break;
 
   case 2218:
-#line 16275 "gram.y"
+#line 16282 "gram.y"
     {
 					WindowDef  *n = makeNode(WindowDef);
 
@@ -50762,12 +50769,12 @@ yyreduce:
     break;
 
   case 2219:
-#line 16289 "gram.y"
+#line 16296 "gram.y"
     { (yyval.windef) = NULL; ;}
     break;
 
   case 2220:
-#line 16294 "gram.y"
+#line 16301 "gram.y"
     {
 					WindowDef  *n = makeNode(WindowDef);
 
@@ -50785,27 +50792,27 @@ yyreduce:
     break;
 
   case 2221:
-#line 16320 "gram.y"
+#line 16327 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2222:
-#line 16321 "gram.y"
+#line 16328 "gram.y"
     { (yyval.str) = NULL; ;}
     break;
 
   case 2223:
-#line 16324 "gram.y"
+#line 16331 "gram.y"
     { (yyval.list) = (yyvsp[(3) - (3)].list); ;}
     break;
 
   case 2224:
-#line 16325 "gram.y"
+#line 16332 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 2225:
-#line 16334 "gram.y"
+#line 16341 "gram.y"
     {
 					WindowDef  *n = (yyvsp[(2) - (3)].windef);
 
@@ -50816,7 +50823,7 @@ yyreduce:
     break;
 
   case 2226:
-#line 16342 "gram.y"
+#line 16349 "gram.y"
     {
 					WindowDef  *n = (yyvsp[(2) - (3)].windef);
 
@@ -50827,7 +50834,7 @@ yyreduce:
     break;
 
   case 2227:
-#line 16350 "gram.y"
+#line 16357 "gram.y"
     {
 					WindowDef  *n = (yyvsp[(2) - (3)].windef);
 
@@ -50838,7 +50845,7 @@ yyreduce:
     break;
 
   case 2228:
-#line 16358 "gram.y"
+#line 16365 "gram.y"
     {
 					WindowDef  *n = makeNode(WindowDef);
 
@@ -50850,7 +50857,7 @@ yyreduce:
     break;
 
   case 2229:
-#line 16369 "gram.y"
+#line 16376 "gram.y"
     {
 					WindowDef  *n = (yyvsp[(1) - (1)].windef);
 
@@ -50871,7 +50878,7 @@ yyreduce:
     break;
 
   case 2230:
-#line 16387 "gram.y"
+#line 16394 "gram.y"
     {
 					WindowDef  *n1 = (yyvsp[(2) - (4)].windef);
 					WindowDef  *n2 = (yyvsp[(4) - (4)].windef);
@@ -50912,7 +50919,7 @@ yyreduce:
     break;
 
   case 2231:
-#line 16433 "gram.y"
+#line 16440 "gram.y"
     {
 					WindowDef  *n = makeNode(WindowDef);
 
@@ -50924,7 +50931,7 @@ yyreduce:
     break;
 
   case 2232:
-#line 16442 "gram.y"
+#line 16449 "gram.y"
     {
 					WindowDef  *n = makeNode(WindowDef);
 
@@ -50936,7 +50943,7 @@ yyreduce:
     break;
 
   case 2233:
-#line 16451 "gram.y"
+#line 16458 "gram.y"
     {
 					WindowDef  *n = makeNode(WindowDef);
 
@@ -50948,7 +50955,7 @@ yyreduce:
     break;
 
   case 2234:
-#line 16460 "gram.y"
+#line 16467 "gram.y"
     {
 					WindowDef  *n = makeNode(WindowDef);
 
@@ -50960,7 +50967,7 @@ yyreduce:
     break;
 
   case 2235:
-#line 16469 "gram.y"
+#line 16476 "gram.y"
     {
 					WindowDef  *n = makeNode(WindowDef);
 
@@ -50972,232 +50979,232 @@ yyreduce:
     break;
 
   case 2236:
-#line 16480 "gram.y"
+#line 16487 "gram.y"
     { (yyval.ival) = FRAMEOPTION_EXCLUDE_CURRENT_ROW; ;}
     break;
 
   case 2237:
-#line 16481 "gram.y"
+#line 16488 "gram.y"
     { (yyval.ival) = FRAMEOPTION_EXCLUDE_GROUP; ;}
     break;
 
   case 2238:
-#line 16482 "gram.y"
+#line 16489 "gram.y"
     { (yyval.ival) = FRAMEOPTION_EXCLUDE_TIES; ;}
     break;
 
   case 2239:
-#line 16483 "gram.y"
+#line 16490 "gram.y"
     { (yyval.ival) = 0; ;}
     break;
 
   case 2240:
-#line 16484 "gram.y"
+#line 16491 "gram.y"
     { (yyval.ival) = 0; ;}
     break;
 
   case 2241:
-#line 16498 "gram.y"
+#line 16505 "gram.y"
     { (yyval.list) = (yyvsp[(3) - (4)].list); ;}
     break;
 
   case 2242:
-#line 16499 "gram.y"
+#line 16506 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 2243:
-#line 16500 "gram.y"
+#line 16507 "gram.y"
     { (yyval.list) = lappend((yyvsp[(2) - (5)].list), (yyvsp[(4) - (5)].node)); ;}
     break;
 
   case 2244:
-#line 16503 "gram.y"
+#line 16510 "gram.y"
     { (yyval.list) = (yyvsp[(3) - (4)].list); ;}
     break;
 
   case 2245:
-#line 16504 "gram.y"
+#line 16511 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 2246:
-#line 16507 "gram.y"
+#line 16514 "gram.y"
     { (yyval.list) = lappend((yyvsp[(2) - (5)].list), (yyvsp[(4) - (5)].node)); ;}
     break;
 
   case 2247:
-#line 16510 "gram.y"
+#line 16517 "gram.y"
     { (yyval.ival) = ANY_SUBLINK; ;}
     break;
 
   case 2248:
-#line 16511 "gram.y"
+#line 16518 "gram.y"
     { (yyval.ival) = ANY_SUBLINK; ;}
     break;
 
   case 2249:
-#line 16512 "gram.y"
+#line 16519 "gram.y"
     { (yyval.ival) = ALL_SUBLINK; ;}
     break;
 
   case 2250:
-#line 16515 "gram.y"
+#line 16522 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2251:
-#line 16516 "gram.y"
+#line 16523 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2252:
-#line 16519 "gram.y"
+#line 16526 "gram.y"
     { (yyval.str) = "+"; ;}
     break;
 
   case 2253:
-#line 16520 "gram.y"
+#line 16527 "gram.y"
     { (yyval.str) = "-"; ;}
     break;
 
   case 2254:
-#line 16521 "gram.y"
+#line 16528 "gram.y"
     { (yyval.str) = "*"; ;}
     break;
 
   case 2255:
-#line 16522 "gram.y"
+#line 16529 "gram.y"
     { (yyval.str) = "/"; ;}
     break;
 
   case 2256:
-#line 16523 "gram.y"
+#line 16530 "gram.y"
     { (yyval.str) = "%"; ;}
     break;
 
   case 2257:
-#line 16524 "gram.y"
+#line 16531 "gram.y"
     { (yyval.str) = "^"; ;}
     break;
 
   case 2258:
-#line 16525 "gram.y"
+#line 16532 "gram.y"
     { (yyval.str) = "<"; ;}
     break;
 
   case 2259:
-#line 16526 "gram.y"
+#line 16533 "gram.y"
     { (yyval.str) = ">"; ;}
     break;
 
   case 2260:
-#line 16527 "gram.y"
+#line 16534 "gram.y"
     { (yyval.str) = "="; ;}
     break;
 
   case 2261:
-#line 16528 "gram.y"
+#line 16535 "gram.y"
     { (yyval.str) = "<="; ;}
     break;
 
   case 2262:
-#line 16529 "gram.y"
+#line 16536 "gram.y"
     { (yyval.str) = ">="; ;}
     break;
 
   case 2263:
-#line 16530 "gram.y"
+#line 16537 "gram.y"
     { (yyval.str) = "<>"; ;}
     break;
 
   case 2264:
-#line 16534 "gram.y"
+#line 16541 "gram.y"
     { (yyval.list) = list_make1(makeString((yyvsp[(1) - (1)].str))); ;}
     break;
 
   case 2265:
-#line 16536 "gram.y"
+#line 16543 "gram.y"
     { (yyval.list) = (yyvsp[(3) - (4)].list); ;}
     break;
 
   case 2266:
-#line 16541 "gram.y"
+#line 16548 "gram.y"
     { (yyval.list) = list_make1(makeString((yyvsp[(1) - (1)].str))); ;}
     break;
 
   case 2267:
-#line 16543 "gram.y"
+#line 16550 "gram.y"
     { (yyval.list) = (yyvsp[(3) - (4)].list); ;}
     break;
 
   case 2268:
-#line 16548 "gram.y"
+#line 16555 "gram.y"
     { (yyval.list) = list_make1(makeString((yyvsp[(1) - (1)].str))); ;}
     break;
 
   case 2269:
-#line 16550 "gram.y"
+#line 16557 "gram.y"
     { (yyval.list) = (yyvsp[(3) - (4)].list); ;}
     break;
 
   case 2270:
-#line 16552 "gram.y"
+#line 16559 "gram.y"
     { (yyval.list) = list_make1(makeString("~~")); ;}
     break;
 
   case 2271:
-#line 16554 "gram.y"
+#line 16561 "gram.y"
     { (yyval.list) = list_make1(makeString("!~~")); ;}
     break;
 
   case 2272:
-#line 16556 "gram.y"
+#line 16563 "gram.y"
     { (yyval.list) = list_make1(makeString("~~*")); ;}
     break;
 
   case 2273:
-#line 16558 "gram.y"
+#line 16565 "gram.y"
     { (yyval.list) = list_make1(makeString("!~~*")); ;}
     break;
 
   case 2274:
-#line 16570 "gram.y"
+#line 16577 "gram.y"
     {
 					(yyval.list) = list_make1((yyvsp[(1) - (1)].node));
 				;}
     break;
 
   case 2275:
-#line 16574 "gram.y"
+#line 16581 "gram.y"
     {
 					(yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].node));
 				;}
     break;
 
   case 2276:
-#line 16581 "gram.y"
+#line 16588 "gram.y"
     {
 					(yyval.list) = list_make1((yyvsp[(1) - (1)].node));
 				;}
     break;
 
   case 2277:
-#line 16585 "gram.y"
+#line 16592 "gram.y"
     {
 					(yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].node));
 				;}
     break;
 
   case 2278:
-#line 16591 "gram.y"
+#line 16598 "gram.y"
     {
 					(yyval.node) = (yyvsp[(1) - (1)].node);
 				;}
     break;
 
   case 2279:
-#line 16595 "gram.y"
+#line 16602 "gram.y"
     {
 					NamedArgExpr *na = makeNode(NamedArgExpr);
 
@@ -51210,7 +51217,7 @@ yyreduce:
     break;
 
   case 2280:
-#line 16605 "gram.y"
+#line 16612 "gram.y"
     {
 					NamedArgExpr *na = makeNode(NamedArgExpr);
 
@@ -51223,132 +51230,132 @@ yyreduce:
     break;
 
   case 2281:
-#line 16616 "gram.y"
+#line 16623 "gram.y"
     { (yyval.list) = (yyvsp[(1) - (1)].list); ;}
     break;
 
   case 2282:
-#line 16617 "gram.y"
+#line 16624 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 2283:
-#line 16620 "gram.y"
+#line 16627 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].typnam)); ;}
     break;
 
   case 2284:
-#line 16621 "gram.y"
+#line 16628 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].typnam)); ;}
     break;
 
   case 2285:
-#line 16625 "gram.y"
+#line 16632 "gram.y"
     {
 					(yyval.node) = makeAArrayExpr((yyvsp[(2) - (3)].list), (yylsp[(1) - (3)]));
 				;}
     break;
 
   case 2286:
-#line 16629 "gram.y"
+#line 16636 "gram.y"
     {
 					(yyval.node) = makeAArrayExpr((yyvsp[(2) - (3)].list), (yylsp[(1) - (3)]));
 				;}
     break;
 
   case 2287:
-#line 16633 "gram.y"
+#line 16640 "gram.y"
     {
 					(yyval.node) = makeAArrayExpr(NIL, (yylsp[(1) - (2)]));
 				;}
     break;
 
   case 2288:
-#line 16638 "gram.y"
+#line 16645 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].node)); ;}
     break;
 
   case 2289:
-#line 16639 "gram.y"
+#line 16646 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].node)); ;}
     break;
 
   case 2290:
-#line 16645 "gram.y"
+#line 16652 "gram.y"
     {
 					(yyval.list) = list_make2(makeStringConst((yyvsp[(1) - (3)].str), (yylsp[(1) - (3)])), (yyvsp[(3) - (3)].node));
 				;}
     break;
 
   case 2291:
-#line 16649 "gram.y"
+#line 16656 "gram.y"
     {
 					(yyval.list) = list_make2(makeParamRef((yyvsp[(1) - (3)].ival), (yylsp[(1) - (3)])), (yyvsp[(3) - (3)].node));
 				;}
     break;
 
   case 2292:
-#line 16658 "gram.y"
+#line 16665 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2293:
-#line 16659 "gram.y"
+#line 16666 "gram.y"
     { (yyval.str) = "year"; ;}
     break;
 
   case 2294:
-#line 16660 "gram.y"
+#line 16667 "gram.y"
     { (yyval.str) = "month"; ;}
     break;
 
   case 2295:
-#line 16661 "gram.y"
+#line 16668 "gram.y"
     { (yyval.str) = "day"; ;}
     break;
 
   case 2296:
-#line 16662 "gram.y"
+#line 16669 "gram.y"
     { (yyval.str) = "hour"; ;}
     break;
 
   case 2297:
-#line 16663 "gram.y"
+#line 16670 "gram.y"
     { (yyval.str) = "minute"; ;}
     break;
 
   case 2298:
-#line 16664 "gram.y"
+#line 16671 "gram.y"
     { (yyval.str) = "second"; ;}
     break;
 
   case 2299:
-#line 16665 "gram.y"
+#line 16672 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2300:
-#line 16669 "gram.y"
+#line 16676 "gram.y"
     { (yyval.str) = "NFC"; ;}
     break;
 
   case 2301:
-#line 16670 "gram.y"
+#line 16677 "gram.y"
     { (yyval.str) = "NFD"; ;}
     break;
 
   case 2302:
-#line 16671 "gram.y"
+#line 16678 "gram.y"
     { (yyval.str) = "NFKC"; ;}
     break;
 
   case 2303:
-#line 16672 "gram.y"
+#line 16679 "gram.y"
     { (yyval.str) = "NFKD"; ;}
     break;
 
   case 2304:
-#line 16678 "gram.y"
+#line 16685 "gram.y"
     {
 					/* overlay(A PLACING B FROM C FOR D) is converted to overlay(A, B, C, D) */
 					(yyval.list) = list_make4((yyvsp[(1) - (7)].node), (yyvsp[(3) - (7)].node), (yyvsp[(5) - (7)].node), (yyvsp[(7) - (7)].node));
@@ -51356,7 +51363,7 @@ yyreduce:
     break;
 
   case 2305:
-#line 16683 "gram.y"
+#line 16690 "gram.y"
     {
 					/* overlay(A PLACING B FROM C) is converted to overlay(A, B, C) */
 					(yyval.list) = list_make3((yyvsp[(1) - (5)].node), (yyvsp[(3) - (5)].node), (yyvsp[(5) - (5)].node));
@@ -51364,19 +51371,19 @@ yyreduce:
     break;
 
   case 2306:
-#line 16691 "gram.y"
+#line 16698 "gram.y"
     { (yyval.list) = list_make2((yyvsp[(3) - (3)].node), (yyvsp[(1) - (3)].node)); ;}
     break;
 
   case 2307:
-#line 16713 "gram.y"
+#line 16720 "gram.y"
     {
 					(yyval.list) = list_make3((yyvsp[(1) - (5)].node), (yyvsp[(3) - (5)].node), (yyvsp[(5) - (5)].node));
 				;}
     break;
 
   case 2308:
-#line 16717 "gram.y"
+#line 16724 "gram.y"
     {
 					/* not legal per SQL, but might as well allow it */
 					(yyval.list) = list_make3((yyvsp[(1) - (5)].node), (yyvsp[(5) - (5)].node), (yyvsp[(3) - (5)].node));
@@ -51384,7 +51391,7 @@ yyreduce:
     break;
 
   case 2309:
-#line 16722 "gram.y"
+#line 16729 "gram.y"
     {
 					/*
 					 * Because we aren't restricting data types here, this
@@ -51398,7 +51405,7 @@ yyreduce:
     break;
 
   case 2310:
-#line 16733 "gram.y"
+#line 16740 "gram.y"
     {
 					/* not legal per SQL */
 
@@ -51418,29 +51425,29 @@ yyreduce:
     break;
 
   case 2311:
-#line 16750 "gram.y"
+#line 16757 "gram.y"
     {
 					(yyval.list) = list_make3((yyvsp[(1) - (5)].node), (yyvsp[(3) - (5)].node), (yyvsp[(5) - (5)].node));
 				;}
     break;
 
   case 2312:
-#line 16755 "gram.y"
+#line 16762 "gram.y"
     { (yyval.list) = lappend((yyvsp[(3) - (3)].list), (yyvsp[(1) - (3)].node)); ;}
     break;
 
   case 2313:
-#line 16756 "gram.y"
+#line 16763 "gram.y"
     { (yyval.list) = (yyvsp[(2) - (2)].list); ;}
     break;
 
   case 2314:
-#line 16757 "gram.y"
+#line 16764 "gram.y"
     { (yyval.list) = (yyvsp[(1) - (1)].list); ;}
     break;
 
   case 2315:
-#line 16761 "gram.y"
+#line 16768 "gram.y"
     {
 					SubLink	   *n = makeNode(SubLink);
 
@@ -51451,12 +51458,12 @@ yyreduce:
     break;
 
   case 2316:
-#line 16768 "gram.y"
+#line 16775 "gram.y"
     { (yyval.node) = (Node *) (yyvsp[(2) - (3)].list); ;}
     break;
 
   case 2317:
-#line 16779 "gram.y"
+#line 16786 "gram.y"
     {
 					CaseExpr   *c = makeNode(CaseExpr);
 
@@ -51470,17 +51477,17 @@ yyreduce:
     break;
 
   case 2318:
-#line 16793 "gram.y"
+#line 16800 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].node)); ;}
     break;
 
   case 2319:
-#line 16794 "gram.y"
+#line 16801 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].node)); ;}
     break;
 
   case 2320:
-#line 16799 "gram.y"
+#line 16806 "gram.y"
     {
 					CaseWhen   *w = makeNode(CaseWhen);
 
@@ -51492,55 +51499,55 @@ yyreduce:
     break;
 
   case 2321:
-#line 16810 "gram.y"
+#line 16817 "gram.y"
     { (yyval.node) = (yyvsp[(2) - (2)].node); ;}
     break;
 
   case 2322:
-#line 16811 "gram.y"
+#line 16818 "gram.y"
     { (yyval.node) = NULL; ;}
     break;
 
   case 2323:
-#line 16814 "gram.y"
+#line 16821 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 2324:
-#line 16815 "gram.y"
+#line 16822 "gram.y"
     { (yyval.node) = NULL; ;}
     break;
 
   case 2325:
-#line 16819 "gram.y"
+#line 16826 "gram.y"
     {
 					(yyval.node) = makeColumnRef((yyvsp[(1) - (1)].str), NIL, (yylsp[(1) - (1)]), yyscanner);
 				;}
     break;
 
   case 2326:
-#line 16823 "gram.y"
+#line 16830 "gram.y"
     {
 					(yyval.node) = makeColumnRef((yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].list), (yylsp[(1) - (2)]), yyscanner);
 				;}
     break;
 
   case 2327:
-#line 16830 "gram.y"
+#line 16837 "gram.y"
     {
 					(yyval.node) = (Node *) makeString((yyvsp[(2) - (2)].str));
 				;}
     break;
 
   case 2328:
-#line 16834 "gram.y"
+#line 16841 "gram.y"
     {
 					(yyval.node) = (Node *) makeNode(A_Star);
 				;}
     break;
 
   case 2329:
-#line 16838 "gram.y"
+#line 16845 "gram.y"
     {
 					A_Indices *ai = makeNode(A_Indices);
 
@@ -51552,7 +51559,7 @@ yyreduce:
     break;
 
   case 2330:
-#line 16847 "gram.y"
+#line 16854 "gram.y"
     {
 					A_Indices *ai = makeNode(A_Indices);
 
@@ -51564,57 +51571,57 @@ yyreduce:
     break;
 
   case 2331:
-#line 16858 "gram.y"
+#line 16865 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 2332:
-#line 16859 "gram.y"
+#line 16866 "gram.y"
     { (yyval.node) = NULL; ;}
     break;
 
   case 2333:
-#line 16863 "gram.y"
+#line 16870 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].node)); ;}
     break;
 
   case 2334:
-#line 16864 "gram.y"
+#line 16871 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].node)); ;}
     break;
 
   case 2335:
-#line 16868 "gram.y"
+#line 16875 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 2336:
-#line 16869 "gram.y"
+#line 16876 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].node)); ;}
     break;
 
   case 2339:
-#line 16878 "gram.y"
+#line 16885 "gram.y"
     { (yyval.list) = (yyvsp[(2) - (2)].list); ;}
     break;
 
   case 2340:
-#line 16879 "gram.y"
+#line 16886 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 2341:
-#line 16883 "gram.y"
+#line 16890 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].node)); ;}
     break;
 
   case 2342:
-#line 16884 "gram.y"
+#line 16891 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].node)); ;}
     break;
 
   case 2343:
-#line 16889 "gram.y"
+#line 16896 "gram.y"
     {
 				JsonArgument *n = makeNode(JsonArgument);
 
@@ -51625,132 +51632,132 @@ yyreduce:
     break;
 
   case 2344:
-#line 16900 "gram.y"
+#line 16907 "gram.y"
     { (yyval.ival) = JSW_NONE; ;}
     break;
 
   case 2345:
-#line 16901 "gram.y"
+#line 16908 "gram.y"
     { (yyval.ival) = JSW_NONE; ;}
     break;
 
   case 2346:
-#line 16902 "gram.y"
+#line 16909 "gram.y"
     { (yyval.ival) = JSW_UNCONDITIONAL; ;}
     break;
 
   case 2347:
-#line 16903 "gram.y"
+#line 16910 "gram.y"
     { (yyval.ival) = JSW_UNCONDITIONAL; ;}
     break;
 
   case 2348:
-#line 16904 "gram.y"
+#line 16911 "gram.y"
     { (yyval.ival) = JSW_CONDITIONAL; ;}
     break;
 
   case 2349:
-#line 16905 "gram.y"
+#line 16912 "gram.y"
     { (yyval.ival) = JSW_UNCONDITIONAL; ;}
     break;
 
   case 2350:
-#line 16906 "gram.y"
+#line 16913 "gram.y"
     { (yyval.ival) = JSW_CONDITIONAL; ;}
     break;
 
   case 2351:
-#line 16907 "gram.y"
+#line 16914 "gram.y"
     { (yyval.ival) = JSW_UNCONDITIONAL; ;}
     break;
 
   case 2352:
-#line 16908 "gram.y"
+#line 16915 "gram.y"
     { (yyval.ival) = JSW_UNSPEC; ;}
     break;
 
   case 2353:
-#line 16913 "gram.y"
+#line 16920 "gram.y"
     { (yyval.node) = (Node *) makeJsonBehavior(JSON_BEHAVIOR_DEFAULT, (yyvsp[(2) - (2)].node), (yylsp[(1) - (2)])); ;}
     break;
 
   case 2354:
-#line 16915 "gram.y"
+#line 16922 "gram.y"
     { (yyval.node) = (Node *) makeJsonBehavior((yyvsp[(1) - (1)].ival), NULL, (yylsp[(1) - (1)])); ;}
     break;
 
   case 2355:
-#line 16919 "gram.y"
+#line 16926 "gram.y"
     { (yyval.ival) = JSON_BEHAVIOR_ERROR; ;}
     break;
 
   case 2356:
-#line 16920 "gram.y"
+#line 16927 "gram.y"
     { (yyval.ival) = JSON_BEHAVIOR_NULL; ;}
     break;
 
   case 2357:
-#line 16921 "gram.y"
+#line 16928 "gram.y"
     { (yyval.ival) = JSON_BEHAVIOR_TRUE; ;}
     break;
 
   case 2358:
-#line 16922 "gram.y"
+#line 16929 "gram.y"
     { (yyval.ival) = JSON_BEHAVIOR_FALSE; ;}
     break;
 
   case 2359:
-#line 16923 "gram.y"
+#line 16930 "gram.y"
     { (yyval.ival) = JSON_BEHAVIOR_UNKNOWN; ;}
     break;
 
   case 2360:
-#line 16924 "gram.y"
+#line 16931 "gram.y"
     { (yyval.ival) = JSON_BEHAVIOR_EMPTY_ARRAY; ;}
     break;
 
   case 2361:
-#line 16925 "gram.y"
+#line 16932 "gram.y"
     { (yyval.ival) = JSON_BEHAVIOR_EMPTY_OBJECT; ;}
     break;
 
   case 2362:
-#line 16927 "gram.y"
+#line 16934 "gram.y"
     { (yyval.ival) = JSON_BEHAVIOR_EMPTY_ARRAY; ;}
     break;
 
   case 2363:
-#line 16932 "gram.y"
+#line 16939 "gram.y"
     { (yyval.list) = list_make2((yyvsp[(1) - (3)].node), NULL); ;}
     break;
 
   case 2364:
-#line 16934 "gram.y"
+#line 16941 "gram.y"
     { (yyval.list) = list_make2(NULL, (yyvsp[(1) - (3)].node)); ;}
     break;
 
   case 2365:
-#line 16936 "gram.y"
+#line 16943 "gram.y"
     { (yyval.list) = list_make2((yyvsp[(1) - (6)].node), (yyvsp[(4) - (6)].node)); ;}
     break;
 
   case 2366:
-#line 16938 "gram.y"
+#line 16945 "gram.y"
     { (yyval.list) = list_make2(NULL, NULL); ;}
     break;
 
   case 2367:
-#line 16943 "gram.y"
+#line 16950 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (3)].node); ;}
     break;
 
   case 2368:
-#line 16945 "gram.y"
+#line 16952 "gram.y"
     { (yyval.node) = NULL; ;}
     break;
 
   case 2369:
-#line 16950 "gram.y"
+#line 16957 "gram.y"
     {
 				/* formatted_expr will be set during parse-analysis. */
 				(yyval.node) = (Node *) makeJsonValueExpr((Expr *) (yyvsp[(1) - (2)].node), NULL,
@@ -51759,7 +51766,7 @@ yyreduce:
     break;
 
   case 2370:
-#line 16959 "gram.y"
+#line 16966 "gram.y"
     {
 					int		encoding;
 
@@ -51779,53 +51786,53 @@ yyreduce:
     break;
 
   case 2371:
-#line 16976 "gram.y"
+#line 16983 "gram.y"
     {
 					(yyval.node) = (Node *) makeJsonFormat(JS_FORMAT_JSON, JS_ENC_DEFAULT, (yylsp[(1) - (2)]));
 				;}
     break;
 
   case 2372:
-#line 16983 "gram.y"
+#line 16990 "gram.y"
     {
 					(yyval.node) = (yyvsp[(1) - (1)].node);
 				;}
     break;
 
   case 2373:
-#line 16987 "gram.y"
+#line 16994 "gram.y"
     {
 					(yyval.node) = (Node *) makeJsonFormat(JS_FORMAT_DEFAULT, JS_ENC_DEFAULT, -1);
 				;}
     break;
 
   case 2374:
-#line 16993 "gram.y"
+#line 17000 "gram.y"
     { (yyval.ival) = JS_QUOTES_KEEP; ;}
     break;
 
   case 2375:
-#line 16994 "gram.y"
+#line 17001 "gram.y"
     { (yyval.ival) = JS_QUOTES_KEEP; ;}
     break;
 
   case 2376:
-#line 16995 "gram.y"
+#line 17002 "gram.y"
     { (yyval.ival) = JS_QUOTES_OMIT; ;}
     break;
 
   case 2377:
-#line 16996 "gram.y"
+#line 17003 "gram.y"
     { (yyval.ival) = JS_QUOTES_OMIT; ;}
     break;
 
   case 2378:
-#line 16997 "gram.y"
+#line 17004 "gram.y"
     { (yyval.ival) = JS_QUOTES_UNSPEC; ;}
     break;
 
   case 2379:
-#line 17002 "gram.y"
+#line 17009 "gram.y"
     {
 					JsonOutput *n = makeNode(JsonOutput);
 
@@ -51837,122 +51844,122 @@ yyreduce:
     break;
 
   case 2380:
-#line 17010 "gram.y"
+#line 17017 "gram.y"
     { (yyval.node) = NULL; ;}
     break;
 
   case 2381:
-#line 17024 "gram.y"
+#line 17031 "gram.y"
     { (yyval.ival) = JS_TYPE_ANY; ;}
     break;
 
   case 2382:
-#line 17025 "gram.y"
+#line 17032 "gram.y"
     { (yyval.ival) = JS_TYPE_ANY; ;}
     break;
 
   case 2383:
-#line 17026 "gram.y"
+#line 17033 "gram.y"
     { (yyval.ival) = JS_TYPE_ARRAY; ;}
     break;
 
   case 2384:
-#line 17027 "gram.y"
+#line 17034 "gram.y"
     { (yyval.ival) = JS_TYPE_OBJECT; ;}
     break;
 
   case 2385:
-#line 17028 "gram.y"
+#line 17035 "gram.y"
     { (yyval.ival) = JS_TYPE_SCALAR; ;}
     break;
 
   case 2386:
-#line 17037 "gram.y"
+#line 17044 "gram.y"
     { (yyval.boolean) = true; ;}
     break;
 
   case 2387:
-#line 17038 "gram.y"
+#line 17045 "gram.y"
     { (yyval.boolean) = true; ;}
     break;
 
   case 2388:
-#line 17039 "gram.y"
+#line 17046 "gram.y"
     { (yyval.boolean) = false; ;}
     break;
 
   case 2389:
-#line 17040 "gram.y"
+#line 17047 "gram.y"
     { (yyval.boolean) = false; ;}
     break;
 
   case 2390:
-#line 17041 "gram.y"
+#line 17048 "gram.y"
     { (yyval.boolean) = false; ;}
     break;
 
   case 2391:
-#line 17046 "gram.y"
+#line 17053 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].node)); ;}
     break;
 
   case 2392:
-#line 17048 "gram.y"
+#line 17055 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].node)); ;}
     break;
 
   case 2393:
-#line 17058 "gram.y"
+#line 17065 "gram.y"
     { (yyval.node) = makeJsonKeyValue((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); ;}
     break;
 
   case 2394:
-#line 17061 "gram.y"
+#line 17068 "gram.y"
     { (yyval.node) = makeJsonKeyValue((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); ;}
     break;
 
   case 2395:
-#line 17066 "gram.y"
+#line 17073 "gram.y"
     { (yyval.boolean) = false; ;}
     break;
 
   case 2396:
-#line 17067 "gram.y"
+#line 17074 "gram.y"
     { (yyval.boolean) = true; ;}
     break;
 
   case 2397:
-#line 17068 "gram.y"
+#line 17075 "gram.y"
     { (yyval.boolean) = false; ;}
     break;
 
   case 2398:
-#line 17072 "gram.y"
+#line 17079 "gram.y"
     { (yyval.boolean) = false; ;}
     break;
 
   case 2399:
-#line 17073 "gram.y"
+#line 17080 "gram.y"
     { (yyval.boolean) = true; ;}
     break;
 
   case 2400:
-#line 17074 "gram.y"
+#line 17081 "gram.y"
     { (yyval.boolean) = true; ;}
     break;
 
   case 2401:
-#line 17078 "gram.y"
+#line 17085 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].node)); ;}
     break;
 
   case 2402:
-#line 17079 "gram.y"
+#line 17086 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].node));;}
     break;
 
   case 2403:
-#line 17089 "gram.y"
+#line 17096 "gram.y"
     {
 					JsonObjectAgg *n = makeNode(JsonObjectAgg);
 
@@ -51968,7 +51975,7 @@ yyreduce:
     break;
 
   case 2404:
-#line 17107 "gram.y"
+#line 17114 "gram.y"
     {
 					JsonArrayAgg *n = makeNode(JsonArrayAgg);
 
@@ -51983,37 +51990,37 @@ yyreduce:
     break;
 
   case 2405:
-#line 17121 "gram.y"
+#line 17128 "gram.y"
     { (yyval.list) = (yyvsp[(3) - (3)].list); ;}
     break;
 
   case 2406:
-#line 17122 "gram.y"
+#line 17129 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 2407:
-#line 17131 "gram.y"
+#line 17138 "gram.y"
     { (yyval.list) = (yyvsp[(1) - (1)].list); ;}
     break;
 
   case 2408:
-#line 17132 "gram.y"
+#line 17139 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 2409:
-#line 17136 "gram.y"
+#line 17143 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].target)); ;}
     break;
 
   case 2410:
-#line 17137 "gram.y"
+#line 17144 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].target)); ;}
     break;
 
   case 2411:
-#line 17141 "gram.y"
+#line 17148 "gram.y"
     {
 					(yyval.target) = makeNode(ResTarget);
 					(yyval.target)->name = (yyvsp[(3) - (3)].str);
@@ -52024,7 +52031,7 @@ yyreduce:
     break;
 
   case 2412:
-#line 17149 "gram.y"
+#line 17156 "gram.y"
     {
 					(yyval.target) = makeNode(ResTarget);
 					(yyval.target)->name = (yyvsp[(2) - (2)].str);
@@ -52035,7 +52042,7 @@ yyreduce:
     break;
 
   case 2413:
-#line 17157 "gram.y"
+#line 17164 "gram.y"
     {
 					(yyval.target) = makeNode(ResTarget);
 					(yyval.target)->name = NULL;
@@ -52046,7 +52053,7 @@ yyreduce:
     break;
 
   case 2414:
-#line 17165 "gram.y"
+#line 17172 "gram.y"
     {
 					ColumnRef  *n = makeNode(ColumnRef);
 
@@ -52062,61 +52069,61 @@ yyreduce:
     break;
 
   case 2415:
-#line 17187 "gram.y"
+#line 17194 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].range)); ;}
     break;
 
   case 2416:
-#line 17188 "gram.y"
+#line 17195 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].range)); ;}
     break;
 
   case 2417:
-#line 17200 "gram.y"
+#line 17207 "gram.y"
     {
 					(yyval.range) = makeRangeVar(NULL, (yyvsp[(1) - (1)].str), (yylsp[(1) - (1)]));
 				;}
     break;
 
   case 2418:
-#line 17204 "gram.y"
+#line 17211 "gram.y"
     {
 					(yyval.range) = makeRangeVarFromQualifiedName((yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].list), (yylsp[(1) - (2)]), yyscanner);
 				;}
     break;
 
   case 2419:
-#line 17210 "gram.y"
+#line 17217 "gram.y"
     { (yyval.list) = list_make1(makeString((yyvsp[(1) - (1)].str))); ;}
     break;
 
   case 2420:
-#line 17212 "gram.y"
+#line 17219 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), makeString((yyvsp[(3) - (3)].str))); ;}
     break;
 
   case 2421:
-#line 17216 "gram.y"
+#line 17223 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2422:
-#line 17218 "gram.y"
+#line 17225 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2423:
-#line 17220 "gram.y"
+#line 17227 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2424:
-#line 17231 "gram.y"
+#line 17238 "gram.y"
     { (yyval.list) = list_make1(makeString((yyvsp[(1) - (1)].str))); ;}
     break;
 
   case 2425:
-#line 17233 "gram.y"
+#line 17240 "gram.y"
     {
 						(yyval.list) = check_func_name(lcons(makeString((yyvsp[(1) - (2)].str)), (yyvsp[(2) - (2)].list)),
 											 yyscanner);
@@ -52124,35 +52131,35 @@ yyreduce:
     break;
 
   case 2426:
-#line 17244 "gram.y"
+#line 17251 "gram.y"
     {
 					(yyval.node) = makeIntConst((yyvsp[(1) - (1)].ival), (yylsp[(1) - (1)]));
 				;}
     break;
 
   case 2427:
-#line 17248 "gram.y"
+#line 17255 "gram.y"
     {
 					(yyval.node) = makeFloatConst((yyvsp[(1) - (1)].str), (yylsp[(1) - (1)]));
 				;}
     break;
 
   case 2428:
-#line 17252 "gram.y"
+#line 17259 "gram.y"
     {
 					(yyval.node) = makeStringConst((yyvsp[(1) - (1)].str), (yylsp[(1) - (1)]));
 				;}
     break;
 
   case 2429:
-#line 17256 "gram.y"
+#line 17263 "gram.y"
     {
 					(yyval.node) = makeBitStringConst((yyvsp[(1) - (1)].str), (yylsp[(1) - (1)]));
 				;}
     break;
 
   case 2430:
-#line 17260 "gram.y"
+#line 17267 "gram.y"
     {
 					/* This is a bit constant per SQL99:
 					 * Without Feature F511, "BIT data type",
@@ -52164,7 +52171,7 @@ yyreduce:
     break;
 
   case 2431:
-#line 17269 "gram.y"
+#line 17276 "gram.y"
     {
 					/* generic type 'literal' syntax */
 					TypeName   *t = makeTypeNameFromNameList((yyvsp[(1) - (2)].list));
@@ -52175,7 +52182,7 @@ yyreduce:
     break;
 
   case 2432:
-#line 17277 "gram.y"
+#line 17284 "gram.y"
     {
 					/* generic syntax with a type modifier */
 					TypeName   *t = makeTypeNameFromNameList((yyvsp[(1) - (6)].list));
@@ -52210,7 +52217,7 @@ yyreduce:
     break;
 
   case 2433:
-#line 17309 "gram.y"
+#line 17316 "gram.y"
     {
 					/* generic type 'literal' syntax */
 					TypeName *t = makeTypeNameFromNameList((yyvsp[(1) - (2)].list));
@@ -52220,7 +52227,7 @@ yyreduce:
     break;
 
   case 2434:
-#line 17316 "gram.y"
+#line 17323 "gram.y"
     {
 					/* generic syntax with a type modifier */
 					TypeName *t = makeTypeNameFromNameList((yyvsp[(1) - (6)].list));
@@ -52255,14 +52262,14 @@ yyreduce:
     break;
 
   case 2435:
-#line 17348 "gram.y"
+#line 17355 "gram.y"
     {
 					(yyval.node) = makeStringConstCast((yyvsp[(2) - (2)].str), (yylsp[(2) - (2)]), (yyvsp[(1) - (2)].typnam));
 				;}
     break;
 
   case 2436:
-#line 17352 "gram.y"
+#line 17359 "gram.y"
     {
 					TypeName   *t = (yyvsp[(1) - (3)].typnam);
 
@@ -52272,7 +52279,7 @@ yyreduce:
     break;
 
   case 2437:
-#line 17359 "gram.y"
+#line 17366 "gram.y"
     {
 					TypeName   *t = (yyvsp[(1) - (5)].typnam);
 
@@ -52283,14 +52290,14 @@ yyreduce:
     break;
 
   case 2438:
-#line 17367 "gram.y"
+#line 17374 "gram.y"
     {
 					(yyval.node) = makeParamRefCast((yyvsp[(2) - (2)].ival), (yylsp[(2) - (2)]), (yyvsp[(1) - (2)].typnam));
 				;}
     break;
 
   case 2439:
-#line 17371 "gram.y"
+#line 17378 "gram.y"
     {
 					TypeName *t = (yyvsp[(1) - (3)].typnam);
 					t->typmods = (yyvsp[(3) - (3)].list);
@@ -52299,7 +52306,7 @@ yyreduce:
     break;
 
   case 2440:
-#line 17377 "gram.y"
+#line 17384 "gram.y"
     {
 					TypeName *t = (yyvsp[(1) - (5)].typnam);
 					t->typmods = list_make2(makeIntConst(INTERVAL_FULL_RANGE, -1),
@@ -52309,53 +52316,53 @@ yyreduce:
     break;
 
   case 2441:
-#line 17384 "gram.y"
+#line 17391 "gram.y"
     {
 					(yyval.node) = makeBoolAConst(true, (yylsp[(1) - (1)]));
 				;}
     break;
 
   case 2442:
-#line 17388 "gram.y"
+#line 17395 "gram.y"
     {
 					(yyval.node) = makeBoolAConst(false, (yylsp[(1) - (1)]));
 				;}
     break;
 
   case 2443:
-#line 17392 "gram.y"
+#line 17399 "gram.y"
     {
 					(yyval.node) = makeNullAConst((yylsp[(1) - (1)]));
 				;}
     break;
 
   case 2444:
-#line 17397 "gram.y"
+#line 17404 "gram.y"
     { (yyval.ival) = (yyvsp[(1) - (1)].ival); ;}
     break;
 
   case 2445:
-#line 17398 "gram.y"
+#line 17405 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2446:
-#line 17400 "gram.y"
+#line 17407 "gram.y"
     { (yyval.ival) = (yyvsp[(1) - (1)].ival); ;}
     break;
 
   case 2447:
-#line 17401 "gram.y"
+#line 17408 "gram.y"
     { (yyval.ival) = + (yyvsp[(2) - (2)].ival); ;}
     break;
 
   case 2448:
-#line 17402 "gram.y"
+#line 17409 "gram.y"
     { (yyval.ival) = - (yyvsp[(2) - (2)].ival); ;}
     break;
 
   case 2449:
-#line 17407 "gram.y"
+#line 17414 "gram.y"
     {
 					RoleSpec   *spc = (RoleSpec *) (yyvsp[(1) - (1)].rolespec);
 
@@ -52397,7 +52404,7 @@ yyreduce:
     break;
 
   case 2450:
-#line 17448 "gram.y"
+#line 17455 "gram.y"
     {
 					/*
 					 * "public" and "none" are not keywords, but they must
@@ -52428,38 +52435,38 @@ yyreduce:
     break;
 
   case 2451:
-#line 17476 "gram.y"
+#line 17483 "gram.y"
     {
 					(yyval.rolespec) = makeRoleSpec(ROLESPEC_CURRENT_ROLE, (yylsp[(1) - (1)]));
 				;}
     break;
 
   case 2452:
-#line 17480 "gram.y"
+#line 17487 "gram.y"
     {
 					(yyval.rolespec) = makeRoleSpec(ROLESPEC_CURRENT_USER, (yylsp[(1) - (1)]));
 				;}
     break;
 
   case 2453:
-#line 17484 "gram.y"
+#line 17491 "gram.y"
     {
 					(yyval.rolespec) = makeRoleSpec(ROLESPEC_SESSION_USER, (yylsp[(1) - (1)]));
 				;}
     break;
 
   case 2454:
-#line 17490 "gram.y"
+#line 17497 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].rolespec)); ;}
     break;
 
   case 2455:
-#line 17492 "gram.y"
+#line 17499 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].rolespec)); ;}
     break;
 
   case 2456:
-#line 17509 "gram.y"
+#line 17516 "gram.y"
     {
 					SelectStmt *n = makeNode(SelectStmt);
 
@@ -52489,7 +52496,7 @@ yyreduce:
     break;
 
   case 2457:
-#line 17542 "gram.y"
+#line 17549 "gram.y"
     {
 					PLAssignStmt *n = makeNode(PLAssignStmt);
 
@@ -52503,103 +52510,103 @@ yyreduce:
     break;
 
   case 2458:
-#line 17554 "gram.y"
+#line 17561 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2459:
-#line 17555 "gram.y"
+#line 17562 "gram.y"
     { (yyval.str) = psprintf("$%d", (yyvsp[(1) - (1)].ival)); ;}
     break;
 
   case 2462:
-#line 17576 "gram.y"
+#line 17583 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2463:
-#line 17577 "gram.y"
+#line 17584 "gram.y"
     { (yyval.str) = pstrdup((yyvsp[(1) - (1)].keyword)); ;}
     break;
 
   case 2464:
-#line 17578 "gram.y"
+#line 17585 "gram.y"
     { (yyval.str) = pstrdup((yyvsp[(1) - (1)].keyword)); ;}
     break;
 
   case 2465:
-#line 17583 "gram.y"
+#line 17590 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2466:
-#line 17584 "gram.y"
+#line 17591 "gram.y"
     { (yyval.str) = pstrdup((yyvsp[(1) - (1)].keyword)); ;}
     break;
 
   case 2467:
-#line 17585 "gram.y"
+#line 17592 "gram.y"
     { (yyval.str) = pstrdup((yyvsp[(1) - (1)].keyword)); ;}
     break;
 
   case 2468:
-#line 17590 "gram.y"
+#line 17597 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2469:
-#line 17591 "gram.y"
+#line 17598 "gram.y"
     { (yyval.str) = pstrdup((yyvsp[(1) - (1)].keyword)); ;}
     break;
 
   case 2470:
-#line 17592 "gram.y"
+#line 17599 "gram.y"
     { (yyval.str) = pstrdup((yyvsp[(1) - (1)].keyword)); ;}
     break;
 
   case 2471:
-#line 17593 "gram.y"
+#line 17600 "gram.y"
     { (yyval.str) = pstrdup((yyvsp[(1) - (1)].keyword)); ;}
     break;
 
   case 2472:
-#line 17599 "gram.y"
+#line 17606 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2473:
-#line 17600 "gram.y"
+#line 17607 "gram.y"
     { (yyval.str) = pstrdup((yyvsp[(1) - (1)].keyword)); ;}
     break;
 
   case 2474:
-#line 17601 "gram.y"
+#line 17608 "gram.y"
     { (yyval.str) = pstrdup((yyvsp[(1) - (1)].keyword)); ;}
     break;
 
   case 2475:
-#line 17602 "gram.y"
+#line 17609 "gram.y"
     { (yyval.str) = pstrdup((yyvsp[(1) - (1)].keyword)); ;}
     break;
 
   case 2476:
-#line 17603 "gram.y"
+#line 17610 "gram.y"
     { (yyval.str) = pstrdup((yyvsp[(1) - (1)].keyword)); ;}
     break;
 
   case 2477:
-#line 17609 "gram.y"
+#line 17616 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2478:
-#line 17610 "gram.y"
+#line 17617 "gram.y"
     { (yyval.str) = pstrdup((yyvsp[(1) - (1)].keyword)); ;}
     break;
 
 
 /* Line 1267 of yacc.c.  */
-#line 52543 "gram.c"
+#line 52550 "gram.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -52819,7 +52826,7 @@ yyreturn:
 }
 
 
-#line 18622 "gram.y"
+#line 18629 "gram.y"
 
 
 /*