<html><head><meta http-equiv="Content-Type" content="text/html charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class=""><div class="">Hello. Firstly, set up your email settings.</div><div class="">I can’t directly reply to your message:</div><div class="">It is substituted with <a href="mailto:dmarc-noreply@freelists.org" class="">dmarc-noreply@freelists.org</a></div><div class=""><br class=""></div><div class="">Moreover, if you send new version of patch, please,</div><div class="">specify it with <font face="HelveticaNeue" class="">--subject-prefix='PATCH v2’ and provide change log.</font></div><div class=""><font face="HelveticaNeue" class="">However, you can avoid doing that by replying to message that contains</font></div><div class=""><font face="HelveticaNeue" class="">review comments and providing only new changes.</font></div><br class=""><div><blockquote type="cite" class=""><div class="">On 3 Apr 2018, at 14:42, Gleb (Redacted sender "gleb-skiba" for DMARC) <<a href="mailto:dmarc-noreply@freelists.org" class="">dmarc-noreply@freelists.org</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div class="">Remove support partial indexes.<br class="">Add test which check inaccessibility of partial index syntax.<br class=""></div></div></blockquote><div><br class=""></div><div>Typo: checks.</div><br class=""><blockquote type="cite" class=""><div class=""><div class="">Comment tests which use partial index.<br class="">They can be enabled after #2626.<br class=""><br class="">Fixes #2165<br class="">---<br class="">Issue from <a href="https://github.com/tarantool/tarantool/issues/2165" class="">https://github.com/tarantool/tarantool/issues/2165</a>.<br class="">Source from <a href="https://github.com/tarantool/tarantool/tree/gh-2165-remove-support-partial-indexes" class="">https://github.com/tarantool/tarantool/tree/gh-2165-remove-support-partial-indexes</a>.<br class=""> src/box/sql/parse.c | 918 +++++++++++----------<br class=""> src/box/sql/parse.y | 4 +-<br class=""> test/sql-tap/analyze9.test.lua | 146 ++--<br class=""> test/sql-tap/autoindex4.test.lua | 35 +-<br class=""> test/sql-tap/fkey1.test.lua | 64 +-<br class=""> ...gh-2165-remove-support-partial-indexes.test.lua | 17 +<br class=""> test/sql-tap/index7.test.lua | 80 +-<br class=""> test/sql-tap/suite.ini | 1 +<br class=""> 8 files changed, 643 insertions(+), 622 deletions(-)<br class=""> create mode 100755 test/sql-tap/gh-2165-remove-support-partial-indexes.test.lua<br class=""><br class="">diff --git a/src/box/sql/parse.c b/src/box/sql/parse.c<br class="">index 0019b77..8af15f1 100644<br class="">--- a/src/box/sql/parse.c<br class="">+++ b/src/box/sql/parse.c<br class="">@@ -315,16 +315,16 @@ typedef union {<br class=""> #define sqlite3ParserARG_FETCH Parse *pParse = yypParser->pParse<br class=""> #define sqlite3ParserARG_STORE yypParser->pParse = pParse<br class=""> #define YYFALLBACK 1<br class="">-#define YYNSTATE 412<br class="">+#define YYNSTATE 411<br class=""> #define YYNRULE 300<br class="">-#define YY_MAX_SHIFT 411<br class="">-#define YY_MIN_SHIFTREDUCE 608<br class="">-#define YY_MAX_SHIFTREDUCE 907<br class="">-#define YY_MIN_REDUCE 908<br class="">-#define YY_MAX_REDUCE 1207<br class="">-#define YY_ERROR_ACTION 1208<br class="">-#define YY_ACCEPT_ACTION 1209<br class="">-#define YY_NO_ACTION 1210<br class="">+#define YY_MAX_SHIFT 410<br class="">+#define YY_MIN_SHIFTREDUCE 607<br class="">+#define YY_MAX_SHIFTREDUCE 906<br class="">+#define YY_MIN_REDUCE 907<br class="">+#define YY_MAX_REDUCE 1206<br class="">+#define YY_ERROR_ACTION 1207<br class="">+#define YY_ACCEPT_ACTION 1208<br class="">+#define YY_NO_ACTION 1209<br class=""> /************* End control #defines *******************************************/<br class=""><br class=""> /* Define the yytestcase() macro to be a no-op if is not already defined<br class="">@@ -396,149 +396,151 @@ typedef union {<br class=""> ** yy_default[] Default action for each state.<br class=""> **<br class=""> *********** Begin parsing tables **********************************************/<br class="">-#define YY_ACTTAB_COUNT (1406)<br class="">+#define YY_ACTTAB_COUNT (1430)<br class=""> static const YYACTIONTYPE yy_action[] = {<br class="">- /* 0 */ 91, 92, 287, 82, 775, 775, 787, 790, 779, 779,<br class="">- /* 10 */ 89, 89, 90, 90, 90, 90, 309, 88, 88, 88,<br class="">- /* 20 */ 88, 87, 87, 86, 86, 86, 85, 309, 90, 90,<br class="">+ /* 0 */ 91, 92, 286, 82, 774, 774, 786, 789, 778, 778,<br class="">+ /* 10 */ 89, 89, 90, 90, 90, 90, 308, 88, 88, 88,<br class="">+ /* 20 */ 88, 87, 87, 86, 86, 86, 85, 308, 90, 90,<br class=""> /* 30 */ 90, 90, 83, 88, 88, 88, 88, 87, 87, 86,<br class="">- /* 40 */ 86, 86, 85, 309, 210, 122, 892, 90, 90, 90,<br class="">- /* 50 */ 90, 634, 88, 88, 88, 88, 87, 87, 86, 86,<br class="">- /* 60 */ 86, 85, 309, 87, 87, 86, 86, 86, 85, 309,<br class="">- /* 70 */ 892, 86, 86, 86, 85, 309, 91, 92, 287, 82,<br class="">- /* 80 */ 775, 775, 787, 790, 779, 779, 89, 89, 90, 90,<br class="">- /* 90 */ 90, 90, 637, 88, 88, 88, 88, 87, 87, 86,<br class="">- /* 100 */ 86, 86, 85, 309, 91, 92, 287, 82, 775, 775,<br class="">- /* 110 */ 787, 790, 779, 779, 89, 89, 90, 90, 90, 90,<br class="">- /* 120 */ 724, 88, 88, 88, 88, 87, 87, 86, 86, 86,<br class="">- /* 130 */ 85, 309, 636, 91, 92, 287, 82, 775, 775, 787,<br class="">- /* 140 */ 790, 779, 779, 89, 89, 90, 90, 90, 90, 67,<br class="">+ /* 40 */ 86, 86, 85, 308, 210, 122, 891, 90, 90, 90,<br class="">+ /* 50 */ 90, 633, 88, 88, 88, 88, 87, 87, 86, 86,<br class="">+ /* 60 */ 86, 85, 308, 87, 87, 86, 86, 86, 85, 308,<br class="">+ /* 70 */ 891, 86, 86, 86, 85, 308, 91, 92, 286, 82,<br class="">+ /* 80 */ 774, 774, 786, 789, 778, 778, 89, 89, 90, 90,<br class="">+ /* 90 */ 90, 90, 636, 88, 88, 88, 88, 87, 87, 86,<br class="">+ /* 100 */ 86, 86, 85, 308, 91, 92, 286, 82, 774, 774,<br class="">+ /* 110 */ 786, 789, 778, 778, 89, 89, 90, 90, 90, 90,<br class="">+ /* 120 */ 723, 88, 88, 88, 88, 87, 87, 86, 86, 86,<br class="">+ /* 130 */ 85, 308, 635, 91, 92, 286, 82, 774, 774, 786,<br class="">+ /* 140 */ 789, 778, 778, 89, 89, 90, 90, 90, 90, 67,<br class=""> /* 150 */ 88, 88, 88, 88, 87, 87, 86, 86, 86, 85,<br class="">- /* 160 */ 309, 776, 776, 788, 791, 320, 93, 84, 81, 176,<br class="">- /* 170 */ 307, 306, 1209, 411, 3, 723, 245, 609, 312, 725,<br class="">- /* 180 */ 726, 376, 91, 92, 287, 82, 775, 775, 787, 790,<br class="">- /* 190 */ 779, 779, 89, 89, 90, 90, 90, 90, 884, 88,<br class="">- /* 200 */ 88, 88, 88, 87, 87, 86, 86, 86, 85, 309,<br class="">+ /* 160 */ 308, 775, 775, 787, 790, 319, 93, 84, 81, 176,<br class="">+ /* 170 */ 306, 305, 1208, 410, 3, 722, 244, 608, 311, 724,<br class="">+ /* 180 */ 725, 375, 91, 92, 286, 82, 774, 774, 786, 789,<br class="">+ /* 190 */ 778, 778, 89, 89, 90, 90, 90, 90, 883, 88,<br class="">+ /* 200 */ 88, 88, 88, 87, 87, 86, 86, 86, 85, 308,<br class=""> /* 210 */ 88, 88, 88, 88, 87, 87, 86, 86, 86, 85,<br class="">- /* 220 */ 309, 122, 84, 81, 176, 642, 377, 1160, 1160, 828,<br class="">- /* 230 */ 780, 91, 92, 287, 82, 775, 775, 787, 790, 779,<br class="">- /* 240 */ 779, 89, 89, 90, 90, 90, 90, 364, 88, 88,<br class="">- /* 250 */ 88, 88, 87, 87, 86, 86, 86, 85, 309, 903,<br class="">- /* 260 */ 747, 903, 122, 410, 410, 172, 653, 710, 765, 220,<br class="">- /* 270 */ 758, 119, 877, 753, 635, 683, 238, 333, 237, 652,<br class="">- /* 280 */ 91, 92, 287, 82, 775, 775, 787, 790, 779, 779,<br class="">- /* 290 */ 89, 89, 90, 90, 90, 90, 877, 88, 88, 88,<br class="">- /* 300 */ 88, 87, 87, 86, 86, 86, 85, 309, 22, 747,<br class="">- /* 310 */ 757, 757, 759, 201, 693, 651, 359, 356, 355, 692,<br class="">- /* 320 */ 165, 710, 703, 766, 122, 238, 333, 237, 354, 91,<br class="">- /* 330 */ 92, 287, 82, 775, 775, 787, 790, 779, 779, 89,<br class="">- /* 340 */ 89, 90, 90, 90, 90, 747, 88, 88, 88, 88,<br class="">- /* 350 */ 87, 87, 86, 86, 86, 85, 309, 696, 84, 81,<br class="">- /* 360 */ 176, 238, 323, 226, 405, 405, 405, 670, 649, 84,<br class="">- /* 370 */ 81, 176, 752, 122, 218, 369, 670, 340, 91, 92,<br class="">- /* 380 */ 287, 82, 775, 775, 787, 790, 779, 779, 89, 89,<br class="">+ /* 220 */ 308, 122, 84, 81, 176, 641, 376, 1159, 1159, 827,<br class="">+ /* 230 */ 779, 91, 92, 286, 82, 774, 774, 786, 789, 778,<br class="">+ /* 240 */ 778, 89, 89, 90, 90, 90, 90, 363, 88, 88,<br class="">+ /* 250 */ 88, 88, 87, 87, 86, 86, 86, 85, 308, 902,<br class="">+ /* 260 */ 746, 902, 122, 409, 409, 172, 652, 709, 764, 220,<br class="">+ /* 270 */ 757, 119, 876, 752, 634, 682, 238, 332, 237, 651,<br class="">+ /* 280 */ 91, 92, 286, 82, 774, 774, 786, 789, 778, 778,<br class="">+ /* 290 */ 89, 89, 90, 90, 90, 90, 876, 88, 88, 88,<br class="">+ /* 300 */ 88, 87, 87, 86, 86, 86, 85, 308, 22, 746,<br class="">+ /* 310 */ 756, 756, 758, 201, 692, 650, 358, 355, 354, 691,<br class="">+ /* 320 */ 165, 709, 702, 765, 122, 238, 332, 237, 353, 91,<br class="">+ /* 330 */ 92, 286, 82, 774, 774, 786, 789, 778, 778, 89,<br class="">+ /* 340 */ 89, 90, 90, 90, 90, 746, 88, 88, 88, 88,<br class="">+ /* 350 */ 87, 87, 86, 86, 86, 85, 308, 695, 84, 81,<br class="">+ /* 360 */ 176, 238, 322, 226, 404, 404, 404, 669, 648, 84,<br class="">+ /* 370 */ 81, 176, 751, 122, 218, 368, 669, 339, 91, 92,<br class="">+ /* 380 */ 286, 82, 774, 774, 786, 789, 778, 778, 89, 89,<br class=""> /* 390 */ 90, 90, 90, 90, 209, 88, 88, 88, 88, 87,<br class="">- /* 400 */ 87, 86, 86, 86, 85, 309, 91, 92, 287, 82,<br class="">- /* 410 */ 775, 775, 787, 790, 779, 779, 89, 89, 90, 90,<br class="">- /* 420 */ 90, 90, 341, 88, 88, 88, 88, 87, 87, 86,<br class="">- /* 430 */ 86, 86, 85, 309, 91, 92, 287, 82, 775, 775,<br class="">- /* 440 */ 787, 790, 779, 779, 89, 89, 90, 90, 90, 90,<br class="">- /* 450 */ 379, 88, 88, 88, 88, 87, 87, 86, 86, 86,<br class="">- /* 460 */ 85, 309, 91, 92, 287, 82, 775, 775, 787, 790,<br class="">- /* 470 */ 779, 779, 89, 89, 90, 90, 90, 90, 145, 88,<br class="">- /* 480 */ 88, 88, 88, 87, 87, 86, 86, 86, 85, 309,<br class="">- /* 490 */ 308, 308, 308, 85, 309, 70, 92, 287, 82, 775,<br class="">- /* 500 */ 775, 787, 790, 779, 779, 89, 89, 90, 90, 90,<br class="">+ /* 400 */ 87, 86, 86, 86, 85, 308, 91, 92, 286, 82,<br class="">+ /* 410 */ 774, 774, 786, 789, 778, 778, 89, 89, 90, 90,<br class="">+ /* 420 */ 90, 90, 340, 88, 88, 88, 88, 87, 87, 86,<br class="">+ /* 430 */ 86, 86, 85, 308, 91, 92, 286, 82, 774, 774,<br class="">+ /* 440 */ 786, 789, 778, 778, 89, 89, 90, 90, 90, 90,<br class="">+ /* 450 */ 378, 88, 88, 88, 88, 87, 87, 86, 86, 86,<br class="">+ /* 460 */ 85, 308, 91, 92, 286, 82, 774, 774, 786, 789,<br class="">+ /* 470 */ 778, 778, 89, 89, 90, 90, 90, 90, 145, 88,<br class="">+ /* 480 */ 88, 88, 88, 87, 87, 86, 86, 86, 85, 308,<br class="">+ /* 490 */ 307, 307, 307, 85, 308, 70, 92, 286, 82, 774,<br class="">+ /* 500 */ 774, 786, 789, 778, 778, 89, 89, 90, 90, 90,<br class=""> /* 510 */ 90, 164, 88, 88, 88, 88, 87, 87, 86, 86,<br class="">- /* 520 */ 86, 85, 309, 73, 628, 628, 834, 834, 328, 91,<br class="">- /* 530 */ 80, 287, 82, 775, 775, 787, 790, 779, 779, 89,<br class="">- /* 540 */ 89, 90, 90, 90, 90, 390, 88, 88, 88, 88,<br class="">- /* 550 */ 87, 87, 86, 86, 86, 85, 309, 287, 82, 775,<br class="">- /* 560 */ 775, 787, 790, 779, 779, 89, 89, 90, 90, 90,<br class="">+ /* 520 */ 86, 85, 308, 73, 627, 627, 833, 833, 327, 91,<br class="">+ /* 530 */ 80, 286, 82, 774, 774, 786, 789, 778, 778, 89,<br class="">+ /* 540 */ 89, 90, 90, 90, 90, 389, 88, 88, 88, 88,<br class="">+ /* 550 */ 87, 87, 86, 86, 86, 85, 308, 286, 82, 774,<br class="">+ /* 560 */ 774, 786, 789, 778, 778, 89, 89, 90, 90, 90,<br class=""> /* 570 */ 90, 78, 88, 88, 88, 88, 87, 87, 86, 86,<br class="">- /* 580 */ 86, 85, 309, 218, 369, 698, 141, 374, 301, 141,<br class="">- /* 590 */ 75, 76, 275, 628, 628, 283, 282, 77, 286, 280,<br class="">- /* 600 */ 279, 278, 222, 276, 850, 78, 622, 143, 628, 628,<br class="">- /* 610 */ 403, 2, 1104, 298, 318, 310, 310, 202, 851, 202,<br class="">- /* 620 */ 109, 342, 880, 407, 75, 76, 852, 676, 318, 317,<br class="">- /* 630 */ 644, 77, 392, 182, 677, 162, 174, 765, 336, 758,<br class="">- /* 640 */ 48, 48, 753, 347, 403, 2, 344, 407, 137, 310,<br class="">- /* 650 */ 310, 407, 628, 628, 288, 386, 266, 219, 155, 255,<br class="">- /* 660 */ 362, 250, 361, 205, 48, 48, 392, 755, 48, 48,<br class="">- /* 670 */ 248, 765, 709, 758, 407, 302, 753, 675, 675, 757,<br class="">- /* 680 */ 757, 759, 760, 406, 18, 673, 673, 184, 109, 847,<br class="">- /* 690 */ 318, 48, 48, 180, 315, 122, 336, 122, 751, 385,<br class="">- /* 700 */ 387, 755, 185, 385, 370, 190, 373, 307, 306, 78,<br class="">- /* 710 */ 314, 628, 628, 757, 757, 759, 760, 406, 18, 210,<br class="">- /* 720 */ 407, 892, 109, 9, 9, 331, 385, 375, 75, 76,<br class="">- /* 730 */ 697, 122, 628, 628, 167, 77, 201, 48, 48, 359,<br class="">- /* 740 */ 356, 355, 401, 78, 685, 892, 334, 267, 403, 2,<br class="">- /* 750 */ 20, 354, 266, 310, 310, 372, 898, 744, 902, 23,<br class="">- /* 760 */ 191, 327, 75, 76, 332, 900, 342, 901, 407, 77,<br class="">- /* 770 */ 392, 267, 385, 384, 217, 765, 407, 758, 850, 296,<br class="">- /* 780 */ 753, 19, 403, 2, 54, 10, 10, 310, 310, 407,<br class="">- /* 790 */ 109, 338, 851, 48, 48, 407, 903, 366, 903, 295,<br class="">- /* 800 */ 852, 391, 709, 305, 392, 755, 30, 30, 831, 765,<br class="">- /* 810 */ 830, 758, 10, 10, 753, 407, 326, 757, 757, 759,<br class="">- /* 820 */ 760, 406, 18, 177, 177, 407, 297, 407, 385, 365,<br class="">- /* 830 */ 109, 407, 10, 10, 709, 372, 157, 156, 397, 755,<br class="">- /* 840 */ 225, 367, 48, 48, 10, 10, 200, 68, 47, 47,<br class="">- /* 850 */ 236, 757, 757, 759, 760, 406, 18, 95, 382, 231,<br class="">- /* 860 */ 319, 638, 638, 847, 243, 656, 75, 76, 351, 756,<br class="">- /* 870 */ 203, 360, 186, 77, 820, 822, 657, 380, 177, 177,<br class="">- /* 880 */ 893, 893, 146, 765, 709, 758, 403, 2, 753, 203,<br class="">- /* 890 */ 372, 310, 310, 5, 299, 210, 109, 892, 257, 893,<br class="">- /* 900 */ 893, 810, 265, 709, 321, 74, 407, 72, 392, 230,<br class="">- /* 910 */ 827, 407, 827, 765, 242, 758, 709, 407, 753, 254,<br class="">- /* 920 */ 334, 892, 187, 34, 34, 757, 757, 759, 35, 35,<br class="">- /* 930 */ 253, 407, 894, 712, 36, 36, 820, 110, 343, 149,<br class="">- /* 940 */ 229, 853, 228, 755, 407, 289, 709, 234, 37, 37,<br class="">- /* 950 */ 248, 894, 711, 259, 324, 757, 757, 759, 760, 406,<br class="">- /* 960 */ 18, 38, 38, 407, 289, 407, 161, 160, 159, 407,<br class="">- /* 970 */ 709, 407, 7, 407, 138, 407, 261, 407, 628, 628,<br class="">- /* 980 */ 26, 26, 27, 27, 682, 407, 29, 29, 39, 39,<br class="">- /* 990 */ 40, 40, 41, 41, 11, 11, 407, 709, 407, 693,<br class="">- /* 1000 */ 407, 163, 42, 42, 692, 407, 342, 407, 678, 407,<br class="">- /* 1010 */ 264, 407, 710, 97, 97, 43, 43, 44, 44, 407,<br class="">- /* 1020 */ 751, 407, 31, 31, 45, 45, 46, 46, 32, 32,<br class="">- /* 1030 */ 407, 1183, 407, 665, 407, 233, 112, 112, 113, 113,<br class="">- /* 1040 */ 407, 751, 859, 407, 751, 407, 845, 114, 114, 52,<br class="">- /* 1050 */ 52, 33, 33, 407, 858, 407, 681, 98, 98, 407,<br class="">- /* 1060 */ 49, 49, 99, 99, 407, 165, 710, 407, 751, 407,<br class="">- /* 1070 */ 100, 100, 96, 96, 169, 407, 111, 111, 407, 109,<br class="">- /* 1080 */ 407, 108, 108, 292, 104, 104, 103, 103, 407, 109,<br class="">- /* 1090 */ 193, 407, 101, 101, 407, 102, 102, 51, 51, 407,<br class="">- /* 1100 */ 368, 626, 688, 688, 293, 53, 53, 294, 50, 50,<br class="">- /* 1110 */ 24, 25, 25, 662, 628, 628, 28, 28, 1, 394,<br class="">- /* 1120 */ 107, 398, 628, 628, 632, 627, 290, 402, 404, 290,<br class="">- /* 1130 */ 66, 303, 175, 174, 109, 725, 726, 64, 891, 749,<br class="">- /* 1140 */ 335, 208, 208, 337, 239, 208, 66, 352, 632, 214,<br class="">- /* 1150 */ 856, 246, 109, 66, 109, 645, 645, 178, 655, 654,<br class="">- /* 1160 */ 109, 316, 690, 647, 69, 824, 719, 663, 208, 291,<br class="">- /* 1170 */ 817, 817, 813, 826, 214, 826, 630, 739, 106, 322,<br class="">- /* 1180 */ 761, 761, 227, 818, 168, 235, 844, 842, 339, 841,<br class="">- /* 1190 */ 153, 345, 346, 241, 621, 244, 357, 666, 650, 649,<br class="">- /* 1200 */ 158, 252, 249, 717, 750, 263, 393, 699, 815, 268,<br class="">- /* 1210 */ 814, 928, 269, 274, 873, 154, 135, 633, 619, 618,<br class="">- /* 1220 */ 124, 620, 870, 117, 64, 736, 325, 55, 330, 829,<br class="">- /* 1230 */ 126, 350, 232, 189, 196, 144, 128, 129, 197, 147,<br class="">- /* 1240 */ 363, 198, 130, 300, 647, 131, 669, 139, 348, 746,<br class="">- /* 1250 */ 378, 668, 284, 6, 63, 795, 846, 71, 211, 667,<br class="">- /* 1260 */ 304, 94, 383, 285, 660, 640, 21, 641, 65, 251,<br class="">- /* 1270 */ 639, 809, 659, 381, 882, 871, 224, 611, 614, 221,<br class="">- /* 1280 */ 311, 396, 223, 408, 409, 616, 179, 615, 612, 281,<br class="">- /* 1290 */ 115, 313, 400, 123, 181, 823, 821, 183, 745, 125,<br class="">- /* 1300 */ 116, 120, 127, 679, 188, 832, 105, 204, 208, 132,<br class="">- /* 1310 */ 133, 840, 329, 707, 905, 136, 256, 134, 56, 708,<br class="">- /* 1320 */ 258, 273, 271, 689, 706, 260, 270, 705, 262, 272,<br class="">- /* 1330 */ 57, 58, 59, 121, 843, 192, 839, 194, 8, 212,<br class="">- /* 1340 */ 12, 240, 253, 195, 213, 148, 624, 349, 199, 353,<br class="">- /* 1350 */ 140, 358, 60, 13, 206, 247, 14, 118, 61, 687,<br class="">- /* 1360 */ 764, 763, 658, 170, 713, 793, 15, 4, 62, 691,<br class="">- /* 1370 */ 207, 171, 371, 173, 142, 16, 718, 17, 69, 66,<br class="">- /* 1380 */ 808, 794, 792, 797, 849, 216, 848, 389, 166, 215,<br class="">- /* 1390 */ 863, 150, 395, 608, 864, 151, 399, 796, 152, 1165,<br class="">- /* 1400 */ 762, 388, 631, 79, 277, 625,<br class="">+ /* 580 */ 86, 85, 308, 218, 368, 697, 141, 373, 300, 141,<br class="">+ /* 590 */ 75, 76, 274, 627, 627, 282, 281, 77, 285, 279,<br class="">+ /* 600 */ 278, 277, 222, 275, 849, 78, 621, 143, 627, 627,<br class="">+ /* 610 */ 402, 2, 1103, 297, 317, 309, 309, 202, 850, 202,<br class="">+ /* 620 */ 109, 341, 879, 406, 75, 76, 851, 675, 317, 316,<br class="">+ /* 630 */ 643, 77, 391, 182, 676, 162, 174, 764, 335, 757,<br class="">+ /* 640 */ 48, 48, 752, 346, 402, 2, 343, 406, 137, 309,<br class="">+ /* 650 */ 309, 406, 627, 627, 287, 385, 265, 219, 155, 254,<br class="">+ /* 660 */ 361, 249, 360, 205, 48, 48, 391, 754, 48, 48,<br class="">+ /* 670 */ 247, 764, 708, 757, 406, 301, 752, 674, 674, 756,<br class="">+ /* 680 */ 756, 758, 759, 405, 18, 672, 672, 184, 109, 846,<br class="">+ /* 690 */ 317, 48, 48, 180, 314, 122, 335, 122, 750, 384,<br class="">+ /* 700 */ 386, 754, 185, 384, 369, 190, 372, 306, 305, 78,<br class="">+ /* 710 */ 313, 627, 627, 756, 756, 758, 759, 405, 18, 210,<br class="">+ /* 720 */ 406, 891, 109, 9, 9, 330, 384, 374, 75, 76,<br class="">+ /* 730 */ 696, 122, 627, 627, 167, 77, 201, 48, 48, 358,<br class="">+ /* 740 */ 355, 354, 400, 78, 684, 891, 333, 266, 402, 2,<br class="">+ /* 750 */ 20, 353, 265, 309, 309, 371, 897, 743, 901, 23,<br class="">+ /* 760 */ 191, 326, 75, 76, 331, 899, 341, 900, 406, 77,<br class="">+ /* 770 */ 391, 266, 384, 383, 217, 764, 406, 757, 849, 295,<br class="">+ /* 780 */ 752, 19, 402, 2, 54, 10, 10, 309, 309, 406,<br class="">+ /* 790 */ 109, 337, 850, 48, 48, 406, 902, 365, 902, 294,<br class="">+ /* 800 */ 851, 390, 708, 304, 391, 754, 30, 30, 830, 764,<br class="">+ /* 810 */ 829, 757, 10, 10, 752, 406, 325, 756, 756, 758,<br class="">+ /* 820 */ 759, 405, 18, 177, 177, 406, 296, 406, 384, 364,<br class="">+ /* 830 */ 109, 406, 10, 10, 708, 371, 157, 156, 396, 754,<br class="">+ /* 840 */ 225, 366, 48, 48, 10, 10, 200, 68, 47, 47,<br class="">+ /* 850 */ 236, 756, 756, 758, 759, 405, 18, 95, 381, 231,<br class="">+ /* 860 */ 318, 637, 637, 846, 242, 655, 75, 76, 350, 755,<br class="">+ /* 870 */ 203, 359, 186, 77, 819, 821, 656, 379, 177, 177,<br class="">+ /* 880 */ 892, 892, 146, 764, 708, 757, 402, 2, 752, 203,<br class="">+ /* 890 */ 371, 309, 309, 5, 298, 210, 109, 891, 256, 892,<br class="">+ /* 900 */ 892, 809, 264, 708, 320, 74, 406, 72, 391, 230,<br class="">+ /* 910 */ 826, 406, 826, 764, 241, 757, 708, 406, 752, 253,<br class="">+ /* 920 */ 333, 891, 187, 34, 34, 756, 756, 758, 35, 35,<br class="">+ /* 930 */ 252, 406, 893, 711, 36, 36, 819, 110, 342, 149,<br class="">+ /* 940 */ 229, 852, 228, 754, 406, 288, 708, 234, 37, 37,<br class="">+ /* 950 */ 247, 893, 710, 258, 323, 756, 756, 758, 759, 405,<br class="">+ /* 960 */ 18, 38, 38, 406, 288, 406, 161, 160, 159, 406,<br class="">+ /* 970 */ 708, 406, 7, 406, 138, 406, 260, 406, 627, 627,<br class="">+ /* 980 */ 26, 26, 27, 27, 681, 406, 29, 29, 39, 39,<br class="">+ /* 990 */ 40, 40, 41, 41, 11, 11, 406, 708, 406, 692,<br class="">+ /* 1000 */ 406, 163, 42, 42, 691, 406, 341, 406, 677, 406,<br class="">+ /* 1010 */ 263, 406, 709, 97, 97, 43, 43, 44, 44, 406,<br class="">+ /* 1020 */ 750, 406, 31, 31, 45, 45, 46, 46, 32, 32,<br class="">+ /* 1030 */ 406, 1182, 406, 664, 406, 233, 112, 112, 113, 113,<br class="">+ /* 1040 */ 406, 750, 858, 406, 750, 406, 844, 114, 114, 52,<br class="">+ /* 1050 */ 52, 33, 33, 406, 857, 406, 680, 98, 98, 406,<br class="">+ /* 1060 */ 49, 49, 99, 99, 406, 165, 709, 406, 750, 406,<br class="">+ /* 1070 */ 100, 100, 96, 96, 169, 406, 111, 111, 406, 109,<br class="">+ /* 1080 */ 406, 108, 108, 291, 104, 104, 103, 103, 406, 109,<br class="">+ /* 1090 */ 193, 406, 101, 101, 406, 102, 102, 51, 51, 406,<br class="">+ /* 1100 */ 367, 625, 687, 687, 292, 53, 53, 293, 50, 50,<br class="">+ /* 1110 */ 24, 25, 25, 661, 627, 627, 28, 28, 1, 393,<br class="">+ /* 1120 */ 107, 397, 627, 627, 631, 626, 289, 401, 403, 289,<br class="">+ /* 1130 */ 66, 302, 175, 174, 109, 724, 725, 64, 890, 748,<br class="">+ /* 1140 */ 334, 208, 208, 336, 808, 208, 66, 351, 631, 214,<br class="">+ /* 1150 */ 855, 245, 109, 66, 109, 644, 644, 178, 654, 653,<br class="">+ /* 1160 */ 109, 315, 689, 646, 69, 823, 718, 662, 208, 290,<br class="">+ /* 1170 */ 816, 816, 812, 825, 214, 825, 629, 738, 106, 321,<br class="">+ /* 1180 */ 760, 760, 227, 817, 168, 235, 843, 841, 338, 840,<br class="">+ /* 1190 */ 153, 344, 345, 240, 620, 243, 356, 665, 649, 648,<br class="">+ /* 1200 */ 158, 251, 248, 716, 749, 262, 392, 698, 814, 267,<br class="">+ /* 1210 */ 813, 927, 268, 273, 872, 154, 135, 632, 618, 617,<br class="">+ /* 1220 */ 124, 619, 869, 117, 64, 735, 324, 55, 329, 828,<br class="">+ /* 1230 */ 126, 349, 232, 189, 196, 144, 128, 129, 197, 147,<br class="">+ /* 1240 */ 362, 198, 130, 299, 668, 131, 667, 139, 347, 745,<br class="">+ /* 1250 */ 646, 666, 283, 377, 63, 6, 845, 71, 211, 303,<br class="">+ /* 1260 */ 640, 94, 284, 65, 659, 639, 382, 250, 380, 638,<br class="">+ /* 1270 */ 881, 21, 658, 870, 224, 610, 613, 221, 223, 310,<br class="">+ /* 1280 */ 408, 407, 615, 614, 611, 280, 179, 312, 395, 123,<br class="">+ /* 1290 */ 181, 822, 399, 820, 183, 744, 115, 125, 120, 127,<br class="">+ /* 1300 */ 188, 116, 678, 831, 208, 132, 133, 904, 328, 839,<br class="">+ /* 1310 */ 56, 105, 204, 706, 134, 255, 136, 707, 257, 57,<br class="">+ /* 1320 */ 705, 704, 269, 259, 261, 688, 270, 271, 272, 58,<br class="">+ /* 1330 */ 59, 842, 194, 192, 838, 794, 121, 12, 8, 195,<br class="">+ /* 1340 */ 148, 239, 623, 212, 213, 348, 252, 199, 140, 352,<br class="">+ /* 1350 */ 246, 357, 60, 13, 14, 206, 686, 61, 118, 763,<br class="">+ /* 1360 */ 762, 170, 712, 657, 792, 62, 15, 370, 690, 4,<br class="">+ /* 1370 */ 717, 171, 173, 207, 142, 69, 66, 16, 17, 807,<br class="">+ /* 1380 */ 793, 796, 791, 848, 607, 847, 388, 166, 394, 862,<br class="">+ /* 1390 */ 276, 150, 215, 863, 151, 398, 387, 795, 152, 1164,<br class="">+ /* 1400 */ 761, 630, 79, 909, 624, 909, 909, 909, 909, 909,<br class="">+ /* 1410 */ 909, 909, 909, 909, 909, 909, 909, 909, 909, 909,<br class="">+ /* 1420 */ 909, 909, 909, 909, 909, 909, 909, 909, 909, 216,<br class=""> };<br class=""> static const YYCODETYPE yy_lookahead[] = {<br class=""> /* 0 */ 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,<br class="">@@ -665,26 +667,28 @@ static const YYCODETYPE yy_lookahead[] = {<br class=""> /* 1210 */ 163, 101, 143, 188, 146, 186, 47, 143, 143, 143,<br class=""> /* 1220 */ 209, 143, 143, 5, 113, 189, 45, 121, 128, 225,<br class=""> /* 1230 */ 177, 45, 224, 148, 148, 47, 180, 180, 148, 209,<br class="">- /* 1240 */ 84, 148, 180, 63, 83, 180, 162, 177, 165, 177,<br class="">- /* 1250 */ 106, 162, 165, 47, 84, 213, 189, 121, 215, 162,<br class="">- /* 1260 */ 32, 112, 107, 165, 170, 164, 50, 162, 111, 162,<br class="">- /* 1270 */ 162, 189, 170, 110, 162, 40, 35, 4, 36, 144,<br class="">- /* 1280 */ 3, 165, 144, 150, 142, 142, 42, 142, 142, 141,<br class="">- /* 1290 */ 153, 72, 165, 43, 84, 48, 48, 101, 99, 114,<br class="">- /* 1300 */ 153, 88, 102, 46, 84, 127, 166, 166, 50, 127,<br class="">- /* 1310 */ 84, 1, 129, 204, 130, 114, 203, 102, 16, 204,<br class="">- /* 1320 */ 203, 189, 191, 193, 204, 203, 192, 204, 203, 190,<br class="">- /* 1330 */ 16, 16, 16, 88, 52, 105, 1, 101, 34, 218,<br class="">- /* 1340 */ 47, 124, 89, 84, 218, 49, 46, 7, 82, 66,<br class="">- /* 1350 */ 47, 66, 47, 47, 66, 48, 47, 60, 47, 95,<br class="">- /* 1360 */ 48, 48, 54, 101, 104, 48, 47, 47, 50, 48,<br class="">- /* 1370 */ 105, 48, 50, 48, 47, 105, 52, 105, 50, 50,<br class="">- /* 1380 */ 48, 48, 48, 38, 48, 101, 48, 50, 47, 50,<br class="">- /* 1390 */ 48, 47, 49, 1, 48, 47, 49, 48, 47, 0,<br class="">- /* 1400 */ 48, 75, 48, 47, 42, 48,<br class="">+ /* 1240 */ 84, 148, 180, 63, 162, 180, 162, 177, 165, 177,<br class="">+ /* 1250 */ 83, 162, 165, 106, 84, 47, 189, 121, 215, 32,<br class="">+ /* 1260 */ 162, 112, 165, 111, 170, 164, 107, 162, 110, 162,<br class="">+ /* 1270 */ 162, 50, 170, 40, 35, 4, 36, 144, 144, 3,<br class="">+ /* 1280 */ 142, 150, 142, 142, 142, 141, 42, 72, 165, 43,<br class="">+ /* 1290 */ 84, 48, 165, 48, 101, 99, 153, 114, 88, 102,<br class="">+ /* 1300 */ 84, 153, 46, 127, 50, 127, 84, 130, 129, 1,<br class="">+ /* 1310 */ 16, 166, 166, 204, 102, 203, 114, 204, 203, 16,<br class="">+ /* 1320 */ 204, 204, 192, 203, 203, 193, 191, 190, 189, 16,<br class="">+ /* 1330 */ 16, 52, 101, 105, 1, 213, 88, 47, 34, 84,<br class="">+ /* 1340 */ 49, 124, 46, 218, 218, 7, 89, 82, 47, 66,<br class="">+ /* 1350 */ 48, 66, 47, 47, 47, 66, 95, 47, 60, 48,<br class="">+ /* 1360 */ 48, 101, 104, 54, 48, 50, 47, 50, 48, 47,<br class="">+ /* 1370 */ 52, 48, 48, 105, 47, 50, 50, 105, 105, 48,<br class="">+ /* 1380 */ 48, 38, 48, 48, 1, 48, 50, 47, 49, 48,<br class="">+ /* 1390 */ 42, 47, 50, 48, 47, 49, 75, 48, 47, 0,<br class="">+ /* 1400 */ 48, 48, 47, 230, 48, 230, 230, 230, 230, 230,<br class="">+ /* 1410 */ 230, 230, 230, 230, 230, 230, 230, 230, 230, 230,<br class="">+ /* 1420 */ 230, 230, 230, 230, 230, 230, 230, 230, 230, 101,<br class=""> };<br class="">-#define YY_SHIFT_USE_DFLT (1406)<br class="">-#define YY_SHIFT_COUNT (411)<br class="">+#define YY_SHIFT_USE_DFLT (1430)<br class="">+#define YY_SHIFT_COUNT (410)<br class=""> #define YY_SHIFT_MIN (-88)<br class=""> #define YY_SHIFT_MAX (1399)<br class=""> static const short yy_shift_ofst[] = {<br class="">@@ -699,11 +703,11 @@ static const short yy_shift_ofst[] = {<br class=""> /* 80 */ 736, 736, 840, 736, 736, 736, 736, 736, 736, 736,<br class=""> /* 90 */ 736, 736, 736, 736, 736, 736, 11, 30, 30, 30,<br class=""> /* 100 */ 30, 30, 188, 37, 43, 861, 144, 144, 462, 485,<br class="">- /* 110 */ 542, -16, 1406, 1406, 1406, 581, 581, 565, 565, 821,<br class="">+ /* 110 */ 542, -16, 1430, 1430, 1430, 581, 581, 565, 565, 821,<br class=""> /* 120 */ 601, 601, 473, 542, 88, 542, 542, 542, 542, 542,<br class=""> /* 130 */ 542, 542, 542, 542, 542, 542, 542, 542, 542, 542,<br class=""> /* 140 */ 542, 221, 542, 542, 542, 221, 485, -88, -88, -88,<br class="">- /* 150 */ -88, -88, -88, 1406, 1406, 810, 195, 195, 237, 806,<br class="">+ /* 150 */ -88, -88, -88, 1430, 1430, 810, 195, 195, 237, 806,<br class=""> /* 160 */ 806, 806, 217, 846, 829, 848, 739, 441, 752, 927,<br class=""> /* 170 */ 557, 670, 670, 670, 1063, 962, 1071, 1006, 219, 542,<br class=""> /* 180 */ 542, 542, 542, 542, 542, 1024, 174, 174, 542, 542,<br class="">@@ -711,28 +715,28 @@ static const short yy_shift_ofst[] = {<br class=""> /* 200 */ 1080, 542, 983, 542, 880, 542, 1027, 542, 542, 174,<br class=""> /* 210 */ 542, 784, 1027, 1027, 542, 542, 542, 1088, 904, 542,<br class=""> /* 220 */ 890, 542, 542, 542, 542, 1169, 1218, 1111, 1181, 1181,<br class="">- /* 230 */ 1181, 1181, 1106, 1100, 1186, 1111, 1169, 1218, 1218, 1111,<br class="">- /* 240 */ 1186, 1188, 1186, 1186, 1188, 1156, 1156, 1156, 1180, 1188,<br class="">- /* 250 */ 1156, 1161, 1156, 1180, 1156, 1156, 1144, 1170, 1144, 1170,<br class="">- /* 260 */ 1144, 1170, 1144, 1170, 1206, 1136, 1188, 1228, 1228, 1188,<br class="">- /* 270 */ 1149, 1155, 1157, 1163, 1111, 1216, 1235, 1235, 1241, 1241,<br class="">- /* 280 */ 1241, 1241, 1242, 1406, 1406, 1406, 1406, 152, 816, 881,<br class="">- /* 290 */ 1073, 734, 1091, 1092, 1095, 1096, 1099, 1103, 1104, 1081,<br class="">- /* 300 */ 1077, 841, 1114, 1118, 1119, 1124, 795, 1058, 1128, 1129,<br class="">- /* 310 */ 1110, 1273, 1277, 1244, 1219, 1250, 1210, 1247, 1248, 1196,<br class="">- /* 320 */ 1199, 1185, 1213, 1200, 1220, 1257, 1178, 1258, 1182, 1184,<br class="">- /* 330 */ 1183, 1226, 1310, 1215, 1201, 1302, 1314, 1315, 1316, 1245,<br class="">- /* 340 */ 1282, 1230, 1236, 1335, 1304, 1293, 1259, 1217, 1296, 1300,<br class="">- /* 350 */ 1340, 1253, 1266, 1303, 1283, 1305, 1306, 1307, 1309, 1285,<br class="">- /* 360 */ 1308, 1311, 1288, 1297, 1312, 1313, 1317, 1318, 1264, 1319,<br class="">- /* 370 */ 1321, 1320, 1322, 1262, 1323, 1325, 1324, 1265, 1327, 1260,<br class="">- /* 380 */ 1328, 1270, 1329, 1272, 1332, 1328, 1333, 1334, 1336, 1326,<br class="">- /* 390 */ 1337, 1338, 1341, 1345, 1342, 1344, 1343, 1339, 1346, 1348,<br class="">- /* 400 */ 1347, 1339, 1349, 1351, 1352, 1354, 1356, 1284, 1357, 1362,<br class="">- /* 410 */ 1392, 1399,<br class="">+ /* 230 */ 1181, 1181, 1106, 1100, 1186, 1111, 1169, 1218, 1218, 1186,<br class="">+ /* 240 */ 1188, 1186, 1186, 1188, 1156, 1156, 1156, 1180, 1188, 1156,<br class="">+ /* 250 */ 1167, 1156, 1180, 1156, 1156, 1147, 1170, 1147, 1170, 1147,<br class="">+ /* 260 */ 1170, 1147, 1170, 1208, 1136, 1188, 1227, 1227, 1188, 1149,<br class="">+ /* 270 */ 1159, 1152, 1158, 1111, 1221, 1233, 1233, 1239, 1239, 1239,<br class="">+ /* 280 */ 1239, 1240, 1430, 1430, 1430, 1430, 152, 816, 881, 1073,<br class="">+ /* 290 */ 734, 1091, 1092, 1095, 1096, 1099, 1103, 1104, 1081, 1077,<br class="">+ /* 300 */ 841, 1114, 1118, 1119, 1124, 795, 1058, 1128, 1129, 1110,<br class="">+ /* 310 */ 1271, 1276, 1244, 1215, 1246, 1206, 1243, 1245, 1193, 1196,<br class="">+ /* 320 */ 1183, 1210, 1197, 1216, 1256, 1176, 1254, 1178, 1177, 1179,<br class="">+ /* 330 */ 1222, 1308, 1212, 1202, 1294, 1303, 1313, 1314, 1248, 1279,<br class="">+ /* 340 */ 1228, 1231, 1333, 1304, 1290, 1255, 1217, 1291, 1296, 1338,<br class="">+ /* 350 */ 1257, 1265, 1301, 1283, 1305, 1306, 1302, 1307, 1285, 1309,<br class="">+ /* 360 */ 1310, 1289, 1298, 1311, 1312, 1316, 1315, 1261, 1319, 1320,<br class="">+ /* 370 */ 1322, 1317, 1260, 1323, 1324, 1318, 1268, 1327, 1258, 1325,<br class="">+ /* 380 */ 1272, 1326, 1273, 1331, 1325, 1332, 1334, 1335, 1321, 1336,<br class="">+ /* 390 */ 1337, 1340, 1343, 1341, 1344, 1339, 1342, 1345, 1347, 1346,<br class="">+ /* 400 */ 1342, 1349, 1351, 1352, 1353, 1355, 1328, 1356, 1348, 1383,<br class="">+ /* 410 */ 1399,<br class=""> };<br class=""> #define YY_REDUCE_USE_DFLT (-110)<br class="">-#define YY_REDUCE_COUNT (286)<br class="">+#define YY_REDUCE_COUNT (285)<br class=""> #define YY_REDUCE_MIN (-109)<br class=""> #define YY_REDUCE_MAX (1148)<br class=""> static const short yy_reduce_ofst[] = {<br class="">@@ -759,56 +763,56 @@ static const short yy_reduce_ofst[] = {<br class=""> /* 200 */ 1032, 1054, 1028, 1055, 1031, 1059, 1038, 1060, 1061, 1003,<br class=""> /* 210 */ 1064, 990, 1045, 1047, 1066, 1069, 726, 1025, 1029, 1074,<br class=""> /* 220 */ 1068, 1075, 1076, 1078, 1079, 1011, 1053, 1036, 1056, 1057,<br class="">- /* 230 */ 1062, 1065, 1004, 1008, 1085, 1067, 1030, 1070, 1072, 1082,<br class="">- /* 240 */ 1086, 1083, 1090, 1093, 1087, 1084, 1089, 1097, 1094, 1098,<br class="">- /* 250 */ 1105, 1101, 1107, 1102, 1108, 1112, 1109, 1113, 1115, 1117,<br class="">- /* 260 */ 1120, 1122, 1123, 1125, 1042, 1043, 1116, 1121, 1126, 1127,<br class="">- /* 270 */ 1130, 1134, 1131, 1139, 1132, 1133, 1135, 1138, 1142, 1143,<br class="">- /* 280 */ 1145, 1146, 1148, 1137, 1140, 1141, 1147,<br class="">+ /* 230 */ 1062, 1065, 1004, 1008, 1085, 1067, 1030, 1070, 1072, 1086,<br class="">+ /* 240 */ 1083, 1090, 1093, 1087, 1082, 1084, 1089, 1094, 1097, 1098,<br class="">+ /* 250 */ 1101, 1105, 1102, 1107, 1108, 1109, 1112, 1113, 1115, 1116,<br class="">+ /* 260 */ 1120, 1117, 1121, 1122, 1043, 1123, 1125, 1126, 1127, 1132,<br class="">+ /* 270 */ 1130, 1135, 1137, 1139, 1131, 1133, 1134, 1138, 1140, 1141,<br class="">+ /* 280 */ 1142, 1144, 1143, 1145, 1146, 1148,<br class=""> };<br class=""> static const YYACTIONTYPE yy_default[] = {<br class="">- /* 0 */ 1166, 1160, 1160, 1160, 1104, 1104, 1104, 1104, 1160, 1000,<br class="">- /* 10 */ 1027, 1027, 1208, 1208, 1208, 1208, 1208, 1208, 1103, 1208,<br class="">- /* 20 */ 1208, 1208, 1208, 1160, 1004, 1033, 1208, 1208, 1208, 1105,<br class="">- /* 30 */ 1106, 1208, 1208, 1208, 1138, 1043, 1042, 1041, 1040, 1014,<br class="">- /* 40 */ 1038, 1031, 1035, 1105, 1099, 1100, 1098, 1102, 1106, 1208,<br class="">- /* 50 */ 1034, 1068, 1083, 1067, 1208, 1208, 1208, 1208, 1208, 1208,<br class="">- /* 60 */ 1208, 1208, 1208, 1208, 1208, 1208, 1208, 1208, 1208, 1208,<br class="">- /* 70 */ 1208, 1208, 1208, 1208, 1208, 1208, 1208, 1208, 1208, 1208,<br class="">- /* 80 */ 1208, 1208, 1208, 1208, 1208, 1208, 1208, 1208, 1208, 1208,<br class="">- /* 90 */ 1208, 1208, 1208, 1208, 1208, 1208, 1077, 1082, 1089, 1081,<br class="">- /* 100 */ 1078, 1070, 1069, 1071, 1072, 971, 1208, 1208, 1073, 1208,<br class="">- /* 110 */ 1208, 1074, 1086, 1085, 1084, 1175, 1174, 1208, 1208, 1111,<br class="">- /* 120 */ 1208, 1208, 1208, 1208, 1160, 1208, 1208, 1208, 1208, 1208,<br class="">- /* 130 */ 1208, 1208, 1208, 1208, 1208, 1208, 1208, 1208, 1208, 1208,<br class="">- /* 140 */ 1208, 929, 1208, 1208, 1208, 929, 1208, 1160, 1160, 1160,<br class="">- /* 150 */ 1160, 1160, 1160, 1004, 995, 1208, 1208, 1208, 1208, 1208,<br class="">- /* 160 */ 1208, 1208, 1208, 1000, 1208, 1208, 1208, 1208, 1133, 1208,<br class="">- /* 170 */ 1208, 1000, 1000, 1000, 1208, 1002, 1208, 984, 994, 1208,<br class="">- /* 180 */ 1157, 1208, 1154, 1208, 1125, 1037, 1016, 1016, 1208, 1208,<br class="">- /* 190 */ 1207, 1037, 1208, 1207, 1208, 1208, 1208, 1208, 1208, 1208,<br class="">- /* 200 */ 946, 1208, 1186, 1208, 943, 1208, 1027, 1208, 1208, 1016,<br class="">- /* 210 */ 1208, 1101, 1027, 1027, 1208, 1208, 1208, 1001, 994, 1208,<br class="">- /* 220 */ 1208, 1208, 1208, 1208, 1169, 1048, 974, 1037, 980, 980,<br class="">- /* 230 */ 980, 980, 1137, 1204, 923, 1037, 1048, 974, 974, 1037,<br class="">- /* 240 */ 923, 1112, 923, 923, 1112, 972, 972, 972, 961, 1112,<br class="">- /* 250 */ 972, 946, 972, 961, 972, 972, 1020, 1015, 1020, 1015,<br class="">- /* 260 */ 1020, 1015, 1020, 1015, 1107, 1208, 1112, 1116, 1116, 1112,<br class="">- /* 270 */ 1032, 1021, 1030, 1028, 1037, 964, 1172, 1172, 1168, 1168,<br class="">- /* 280 */ 1168, 1168, 913, 1181, 948, 948, 1181, 1208, 1208, 1208,<br class="">- /* 290 */ 1176, 1119, 1208, 1208, 1208, 1208, 1208, 1208, 1208, 1208,<br class="">- /* 300 */ 1208, 1208, 1208, 1208, 1208, 1208, 1208, 1208, 1208, 1208,<br class="">- /* 310 */ 1054, 1208, 910, 1208, 1208, 1208, 1155, 1208, 1208, 1199,<br class="">- /* 320 */ 1208, 1208, 1208, 1208, 1208, 1208, 1208, 1136, 1135, 1208,<br class="">- /* 330 */ 1208, 1208, 1208, 1208, 1208, 1208, 1208, 1208, 1208, 1208,<br class="">- /* 340 */ 1208, 1208, 1206, 1208, 1208, 1208, 1208, 1208, 1208, 1208,<br class="">- /* 350 */ 1208, 1208, 1208, 1208, 1208, 1208, 1208, 1208, 1208, 1208,<br class="">- /* 360 */ 1208, 1208, 1208, 1208, 1208, 1208, 1208, 1208, 986, 1208,<br class="">- /* 370 */ 1208, 1208, 1190, 1208, 1208, 1208, 1208, 1208, 1208, 1208,<br class="">- /* 380 */ 1029, 1208, 1022, 1208, 1208, 1196, 1208, 1208, 1208, 1208,<br class="">- /* 390 */ 1208, 1208, 1208, 1208, 1208, 1208, 1208, 1162, 1208, 1208,<br class="">- /* 400 */ 1208, 1161, 1208, 1208, 1208, 1208, 1208, 1208, 1208, 917,<br class="">- /* 410 */ 1208, 1208,<br class="">+ /* 0 */ 1165, 1159, 1159, 1159, 1103, 1103, 1103, 1103, 1159, 999,<br class="">+ /* 10 */ 1026, 1026, 1207, 1207, 1207, 1207, 1207, 1207, 1102, 1207,<br class="">+ /* 20 */ 1207, 1207, 1207, 1159, 1003, 1032, 1207, 1207, 1207, 1104,<br class="">+ /* 30 */ 1105, 1207, 1207, 1207, 1137, 1042, 1041, 1040, 1039, 1013,<br class="">+ /* 40 */ 1037, 1030, 1034, 1104, 1098, 1099, 1097, 1101, 1105, 1207,<br class="">+ /* 50 */ 1033, 1067, 1082, 1066, 1207, 1207, 1207, 1207, 1207, 1207,<br class="">+ /* 60 */ 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207,<br class="">+ /* 70 */ 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207,<br class="">+ /* 80 */ 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207,<br class="">+ /* 90 */ 1207, 1207, 1207, 1207, 1207, 1207, 1076, 1081, 1088, 1080,<br class="">+ /* 100 */ 1077, 1069, 1068, 1070, 1071, 970, 1207, 1207, 1072, 1207,<br class="">+ /* 110 */ 1207, 1073, 1085, 1084, 1083, 1174, 1173, 1207, 1207, 1110,<br class="">+ /* 120 */ 1207, 1207, 1207, 1207, 1159, 1207, 1207, 1207, 1207, 1207,<br class="">+ /* 130 */ 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207,<br class="">+ /* 140 */ 1207, 928, 1207, 1207, 1207, 928, 1207, 1159, 1159, 1159,<br class="">+ /* 150 */ 1159, 1159, 1159, 1003, 994, 1207, 1207, 1207, 1207, 1207,<br class="">+ /* 160 */ 1207, 1207, 1207, 999, 1207, 1207, 1207, 1207, 1132, 1207,<br class="">+ /* 170 */ 1207, 999, 999, 999, 1207, 1001, 1207, 983, 993, 1207,<br class="">+ /* 180 */ 1156, 1207, 1153, 1207, 1124, 1036, 1015, 1015, 1207, 1207,<br class="">+ /* 190 */ 1206, 1036, 1207, 1206, 1207, 1207, 1207, 1207, 1207, 1207,<br class="">+ /* 200 */ 945, 1207, 1185, 1207, 942, 1207, 1026, 1207, 1207, 1015,<br class="">+ /* 210 */ 1207, 1100, 1026, 1026, 1207, 1207, 1207, 1000, 993, 1207,<br class="">+ /* 220 */ 1207, 1207, 1207, 1207, 1168, 1047, 973, 1036, 979, 979,<br class="">+ /* 230 */ 979, 979, 1136, 1203, 922, 1036, 1047, 973, 973, 922,<br class="">+ /* 240 */ 1111, 922, 922, 1111, 971, 971, 971, 960, 1111, 971,<br class="">+ /* 250 */ 945, 971, 960, 971, 971, 1019, 1014, 1019, 1014, 1019,<br class="">+ /* 260 */ 1014, 1019, 1014, 1106, 1207, 1111, 1115, 1115, 1111, 1031,<br class="">+ /* 270 */ 1020, 1029, 1027, 1036, 963, 1171, 1171, 1167, 1167, 1167,<br class="">+ /* 280 */ 1167, 912, 1180, 947, 947, 1180, 1207, 1207, 1207, 1175,<br class="">+ /* 290 */ 1118, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207,<br class="">+ /* 300 */ 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1053,<br class="">+ /* 310 */ 1207, 909, 1207, 1207, 1207, 1154, 1207, 1207, 1198, 1207,<br class="">+ /* 320 */ 1207, 1207, 1207, 1207, 1207, 1207, 1135, 1134, 1207, 1207,<br class="">+ /* 330 */ 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207,<br class="">+ /* 340 */ 1207, 1205, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207,<br class="">+ /* 350 */ 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207,<br class="">+ /* 360 */ 1207, 1207, 1207, 1207, 1207, 1207, 1207, 985, 1207, 1207,<br class="">+ /* 370 */ 1207, 1189, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1028,<br class="">+ /* 380 */ 1207, 1021, 1207, 1207, 1195, 1207, 1207, 1207, 1207, 1207,<br class="">+ /* 390 */ 1207, 1207, 1207, 1207, 1207, 1207, 1161, 1207, 1207, 1207,<br class="">+ /* 400 */ 1160, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 916, 1207,<br class="">+ /* 410 */ 1207,<br class=""> };<br class=""> /********** End of lemon-generated parsing tables *****************************/<br class=""><br class="">@@ -1254,7 +1258,7 @@ static const char *const yyRuleName[] = {<br class=""> /* 198 */ "nexprlist ::= expr",<br class=""> /* 199 */ "paren_exprlist ::=",<br class=""> /* 200 */ "paren_exprlist ::= LP exprlist RP",<br class="">- /* 201 */ "cmd ::= createkw uniqueflag INDEX ifnotexists nm ON nm LP sortlist RP where_opt",<br class="">+ /* 201 */ "cmd ::= createkw uniqueflag INDEX ifnotexists nm ON nm LP sortlist RP",<br class=""> /* 202 */ "uniqueflag ::= UNIQUE",<br class=""> /* 203 */ "uniqueflag ::=",<br class=""> /* 204 */ "eidlist_opt ::=",<br class="">@@ -1470,7 +1474,7 @@ static void yy_destructor(<br class=""> {<br class=""> #line 386 "parse.y"<br class=""> sqlite3SelectDelete(pParse->db, (yypminor->yy279));<br class="">-#line 1474 "parse.c"<br class="">+#line 1478 "parse.c"<br class=""> }<br class=""> break;<br class=""> case 160: /* term */<br class="">@@ -1478,7 +1482,7 @@ sqlite3SelectDelete(pParse->db, (yypminor->yy279));<br class=""> {<br class=""> #line 829 "parse.y"<br class=""> sqlite3ExprDelete(pParse->db, (yypminor->yy162).pExpr);<br class="">-#line 1482 "parse.c"<br class="">+#line 1486 "parse.c"<br class=""> }<br class=""> break;<br class=""> case 165: /* eidlist_opt */<br class="">@@ -1496,7 +1500,7 @@ sqlite3ExprDelete(pParse->db, (yypminor->yy162).pExpr);<br class=""> {<br class=""> #line 1261 "parse.y"<br class=""> sqlite3ExprListDelete(pParse->db, (yypminor->yy382));<br class="">-#line 1500 "parse.c"<br class="">+#line 1504 "parse.c"<br class=""> }<br class=""> break;<br class=""> case 181: /* fullname */<br class="">@@ -1506,7 +1510,7 @@ sqlite3ExprListDelete(pParse->db, (yypminor->yy382));<br class=""> {<br class=""> #line 613 "parse.y"<br class=""> sqlite3SrcListDelete(pParse->db, (yypminor->yy387));<br class="">-#line 1510 "parse.c"<br class="">+#line 1514 "parse.c"<br class=""> }<br class=""> break;<br class=""> case 184: /* with */<br class="">@@ -1514,7 +1518,7 @@ sqlite3SrcListDelete(pParse->db, (yypminor->yy387));<br class=""> {<br class=""> #line 1510 "parse.y"<br class=""> sqlite3WithDelete(pParse->db, (yypminor->yy151));<br class="">-#line 1518 "parse.c"<br class="">+#line 1522 "parse.c"<br class=""> }<br class=""> break;<br class=""> case 189: /* where_opt */<br class="">@@ -1526,7 +1530,7 @@ sqlite3WithDelete(pParse->db, (yypminor->yy151));<br class=""> {<br class=""> #line 738 "parse.y"<br class=""> sqlite3ExprDelete(pParse->db, (yypminor->yy362));<br class="">-#line 1530 "parse.c"<br class="">+#line 1534 "parse.c"<br class=""> }<br class=""> break;<br class=""> case 204: /* using_opt */<br class="">@@ -1535,7 +1539,7 @@ sqlite3ExprDelete(pParse->db, (yypminor->yy362));<br class=""> {<br class=""> #line 650 "parse.y"<br class=""> sqlite3IdListDelete(pParse->db, (yypminor->yy40));<br class="">-#line 1539 "parse.c"<br class="">+#line 1543 "parse.c"<br class=""> }<br class=""> break;<br class=""> case 221: /* trigger_cmd_list */<br class="">@@ -1543,14 +1547,14 @@ sqlite3IdListDelete(pParse->db, (yypminor->yy40));<br class=""> {<br class=""> #line 1384 "parse.y"<br class=""> sqlite3DeleteTriggerStep(pParse->db, (yypminor->yy427));<br class="">-#line 1547 "parse.c"<br class="">+#line 1551 "parse.c"<br class=""> }<br class=""> break;<br class=""> case 223: /* trigger_event */<br class=""> {<br class=""> #line 1370 "parse.y"<br class=""> sqlite3IdListDelete(pParse->db, (yypminor->yy10).b);<br class="">-#line 1554 "parse.c"<br class="">+#line 1558 "parse.c"<br class=""> }<br class=""> break;<br class=""> /********* End destructor definitions *****************************************/<br class="">@@ -1725,7 +1729,7 @@ static void yyStackOverflow(yyParser *yypParser){<br class=""> #line 41 "parse.y"<br class=""><br class=""> sqlite3ErrorMsg(pParse, "parser stack overflow");<br class="">-#line 1729 "parse.c"<br class="">+#line 1733 "parse.c"<br class=""> /******** End %stack_overflow code ********************************************/<br class=""> sqlite3ParserARG_STORE; /* Suppress warning about unused %extra_argument var */<br class=""> }<br class="">@@ -2000,7 +2004,7 @@ static const struct {<br class=""> { 195, 1 },<br class=""> { 213, 0 },<br class=""> { 213, 3 },<br class="">- { 140, 11 },<br class="">+ { 140, 10 },<br class=""> { 217, 1 },<br class=""> { 217, 0 },<br class=""> { 165, 0 },<br class="">@@ -2165,83 +2169,83 @@ static void yy_reduce(<br class=""> case 0: /* ecmd ::= explain cmdx SEMI */<br class=""> #line 111 "parse.y"<br class=""> { sqlite3FinishCoding(pParse); }<br class="">-#line 2169 "parse.c"<br class="">+#line 2173 "parse.c"<br class=""> break;<br class=""> case 1: /* ecmd ::= SEMI */<br class=""> #line 112 "parse.y"<br class=""> {<br class=""> sqlite3ErrorMsg(pParse, "syntax error: empty request");<br class=""> }<br class="">-#line 2176 "parse.c"<br class="">+#line 2180 "parse.c"<br class=""> break;<br class=""> case 2: /* explain ::= EXPLAIN */<br class=""> #line 117 "parse.y"<br class=""> { pParse->explain = 1; }<br class="">-#line 2181 "parse.c"<br class="">+#line 2185 "parse.c"<br class=""> break;<br class=""> case 3: /* explain ::= EXPLAIN QUERY PLAN */<br class=""> #line 118 "parse.y"<br class=""> { pParse->explain = 2; }<br class="">-#line 2186 "parse.c"<br class="">+#line 2190 "parse.c"<br class=""> break;<br class=""> case 4: /* cmd ::= BEGIN transtype trans_opt */<br class=""> #line 150 "parse.y"<br class=""> {sqlite3BeginTransaction(pParse, yymsp[-1].minor.yy52);}<br class="">-#line 2191 "parse.c"<br class="">+#line 2195 "parse.c"<br class=""> break;<br class=""> case 5: /* transtype ::= */<br class=""> #line 155 "parse.y"<br class=""> {yymsp[1].minor.yy52 = TK_DEFERRED;}<br class="">-#line 2196 "parse.c"<br class="">+#line 2200 "parse.c"<br class=""> break;<br class=""> case 6: /* transtype ::= DEFERRED */<br class=""> #line 156 "parse.y"<br class=""> {yymsp[0].minor.yy52 = yymsp[0].major; /*A-overwrites-X*/}<br class="">-#line 2201 "parse.c"<br class="">+#line 2205 "parse.c"<br class=""> break;<br class=""> case 7: /* cmd ::= COMMIT trans_opt */<br class=""> case 8: /* cmd ::= END trans_opt */ yytestcase(yyruleno==8);<br class=""> #line 157 "parse.y"<br class=""> {sqlite3CommitTransaction(pParse);}<br class="">-#line 2207 "parse.c"<br class="">+#line 2211 "parse.c"<br class=""> break;<br class=""> case 9: /* cmd ::= ROLLBACK trans_opt */<br class=""> #line 159 "parse.y"<br class=""> {sqlite3RollbackTransaction(pParse);}<br class="">-#line 2212 "parse.c"<br class="">+#line 2216 "parse.c"<br class=""> break;<br class=""> case 10: /* cmd ::= SAVEPOINT nm */<br class=""> #line 163 "parse.y"<br class=""> {<br class=""> sqlite3Savepoint(pParse, SAVEPOINT_BEGIN, &yymsp[0].minor.yy0);<br class=""> }<br class="">-#line 2219 "parse.c"<br class="">+#line 2223 "parse.c"<br class=""> break;<br class=""> case 11: /* cmd ::= RELEASE savepoint_opt nm */<br class=""> #line 166 "parse.y"<br class=""> {<br class=""> sqlite3Savepoint(pParse, SAVEPOINT_RELEASE, &yymsp[0].minor.yy0);<br class=""> }<br class="">-#line 2226 "parse.c"<br class="">+#line 2230 "parse.c"<br class=""> break;<br class=""> case 12: /* cmd ::= ROLLBACK trans_opt TO savepoint_opt nm */<br class=""> #line 169 "parse.y"<br class=""> {<br class=""> sqlite3Savepoint(pParse, SAVEPOINT_ROLLBACK, &yymsp[0].minor.yy0);<br class=""> }<br class="">-#line 2233 "parse.c"<br class="">+#line 2237 "parse.c"<br class=""> break;<br class=""> case 13: /* create_table ::= createkw TABLE ifnotexists nm */<br class=""> #line 176 "parse.y"<br class=""> {<br class=""> sqlite3StartTable(pParse,&yymsp[0].minor.yy0,yymsp[-1].minor.yy52);<br class=""> }<br class="">-#line 2240 "parse.c"<br class="">+#line 2244 "parse.c"<br class=""> break;<br class=""> case 14: /* createkw ::= CREATE */<br class=""> #line 179 "parse.y"<br class=""> {disableLookaside(pParse);}<br class="">-#line 2245 "parse.c"<br class="">+#line 2249 "parse.c"<br class=""> break;<br class=""> case 15: /* ifnotexists ::= */<br class=""> case 38: /* autoinc ::= */ yytestcase(yyruleno==38);<br class="">@@ -2252,19 +2256,19 @@ static void yy_reduce(<br class=""> case 208: /* collate ::= */ yytestcase(yyruleno==208);<br class=""> #line 182 "parse.y"<br class=""> {yymsp[1].minor.yy52 = 0;}<br class="">-#line 2256 "parse.c"<br class="">+#line 2260 "parse.c"<br class=""> break;<br class=""> case 16: /* ifnotexists ::= IF NOT EXISTS */<br class=""> #line 183 "parse.y"<br class=""> {yymsp[-2].minor.yy52 = 1;}<br class="">-#line 2261 "parse.c"<br class="">+#line 2265 "parse.c"<br class=""> break;<br class=""> case 17: /* create_table_args ::= LP columnlist conslist_opt RP */<br class=""> #line 185 "parse.y"<br class=""> {<br class=""> sqlite3EndTable(pParse,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy0,0,0);<br class=""> }<br class="">-#line 2268 "parse.c"<br class="">+#line 2272 "parse.c"<br class=""> break;<br class=""> case 18: /* create_table_args ::= AS select */<br class=""> #line 188 "parse.y"<br class="">@@ -2272,12 +2276,12 @@ static void yy_reduce(<br class=""> sqlite3EndTable(pParse,0,0,0,yymsp[0].minor.yy279);<br class=""> sqlite3SelectDelete(pParse->db, yymsp[0].minor.yy279);<br class=""> }<br class="">-#line 2276 "parse.c"<br class="">+#line 2280 "parse.c"<br class=""> break;<br class=""> case 19: /* columnname ::= nm typetoken */<br class=""> #line 194 "parse.y"<br class=""> {sqlite3AddColumn(pParse,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy0);}<br class="">-#line 2281 "parse.c"<br class="">+#line 2285 "parse.c"<br class=""> break;<br class=""> case 20: /* nm ::= ID|INDEXED */<br class=""> #line 225 "parse.y"<br class="">@@ -2286,50 +2290,50 @@ static void yy_reduce(<br class=""> sqlite3ErrorMsg(pParse, "keyword \"%T\" is reserved", &yymsp[0].minor.yy0);<br class=""> }<br class=""> }<br class="">-#line 2290 "parse.c"<br class="">+#line 2294 "parse.c"<br class=""> break;<br class=""> case 21: /* typetoken ::= */<br class=""> case 56: /* conslist_opt ::= */ yytestcase(yyruleno==56);<br class=""> case 92: /* as ::= */ yytestcase(yyruleno==92);<br class=""> #line 236 "parse.y"<br class=""> {yymsp[1].minor.yy0.n = 0; yymsp[1].minor.yy0.z = 0;}<br class="">-#line 2297 "parse.c"<br class="">+#line 2301 "parse.c"<br class=""> break;<br class=""> case 22: /* typetoken ::= typename LP signed RP */<br class=""> #line 238 "parse.y"<br class=""> {<br class=""> yymsp[-3].minor.yy0.n = (int)(&yymsp[0].minor.yy0.z[yymsp[0].minor.yy0.n] - yymsp[-3].minor.yy0.z);<br class=""> }<br class="">-#line 2304 "parse.c"<br class="">+#line 2308 "parse.c"<br class=""> break;<br class=""> case 23: /* typetoken ::= typename LP signed COMMA signed RP */<br class=""> #line 241 "parse.y"<br class=""> {<br class=""> yymsp[-5].minor.yy0.n = (int)(&yymsp[0].minor.yy0.z[yymsp[0].minor.yy0.n] - yymsp[-5].minor.yy0.z);<br class=""> }<br class="">-#line 2311 "parse.c"<br class="">+#line 2315 "parse.c"<br class=""> break;<br class=""> case 24: /* typename ::= typename ID|STRING */<br class=""> #line 246 "parse.y"<br class=""> {yymsp[-1].minor.yy0.n=yymsp[0].minor.yy0.n+(int)(yymsp[0].minor.yy0.z-yymsp[-1].minor.yy0.z);}<br class="">-#line 2316 "parse.c"<br class="">+#line 2320 "parse.c"<br class=""> break;<br class=""> case 25: /* ccons ::= CONSTRAINT nm */<br class=""> case 58: /* tcons ::= CONSTRAINT nm */ yytestcase(yyruleno==58);<br class=""> #line 255 "parse.y"<br class=""> {pParse->constraintName = yymsp[0].minor.yy0;}<br class="">-#line 2322 "parse.c"<br class="">+#line 2326 "parse.c"<br class=""> break;<br class=""> case 26: /* ccons ::= DEFAULT term */<br class=""> case 28: /* ccons ::= DEFAULT PLUS term */ yytestcase(yyruleno==28);<br class=""> #line 256 "parse.y"<br class=""> {sqlite3AddDefaultValue(pParse,&yymsp[0].minor.yy162);}<br class="">-#line 2328 "parse.c"<br class="">+#line 2332 "parse.c"<br class=""> break;<br class=""> case 27: /* ccons ::= DEFAULT LP expr RP */<br class=""> #line 257 "parse.y"<br class=""> {sqlite3AddDefaultValue(pParse,&yymsp[-1].minor.yy162);}<br class="">-#line 2333 "parse.c"<br class="">+#line 2337 "parse.c"<br class=""> break;<br class=""> case 29: /* ccons ::= DEFAULT MINUS term */<br class=""> #line 259 "parse.y"<br class="">@@ -2340,7 +2344,7 @@ static void yy_reduce(<br class=""> v.zEnd = yymsp[0].minor.yy162.zEnd;<br class=""> sqlite3AddDefaultValue(pParse,&v);<br class=""> }<br class="">-#line 2344 "parse.c"<br class="">+#line 2348 "parse.c"<br class=""> break;<br class=""> case 30: /* ccons ::= DEFAULT ID|INDEXED */<br class=""> #line 266 "parse.y"<br class="">@@ -2349,115 +2353,115 @@ static void yy_reduce(<br class=""> spanExpr(&v, pParse, TK_STRING, yymsp[0].minor.yy0);<br class=""> sqlite3AddDefaultValue(pParse,&v);<br class=""> }<br class="">-#line 2353 "parse.c"<br class="">+#line 2357 "parse.c"<br class=""> break;<br class=""> case 31: /* ccons ::= NOT NULL onconf */<br class=""> #line 276 "parse.y"<br class=""> {sqlite3AddNotNull(pParse, yymsp[0].minor.yy52);}<br class="">-#line 2358 "parse.c"<br class="">+#line 2362 "parse.c"<br class=""> break;<br class=""> case 32: /* ccons ::= PRIMARY KEY sortorder onconf autoinc */<br class=""> #line 278 "parse.y"<br class=""> {sqlite3AddPrimaryKey(pParse,0,yymsp[-1].minor.yy52,yymsp[0].minor.yy52,yymsp[-2].minor.yy52);}<br class="">-#line 2363 "parse.c"<br class="">+#line 2367 "parse.c"<br class=""> break;<br class=""> case 33: /* ccons ::= UNIQUE onconf */<br class=""> #line 279 "parse.y"<br class=""> {sqlite3CreateIndex(pParse,0,0,0,yymsp[0].minor.yy52,0,0,0,0,<br class=""> SQLITE_IDXTYPE_UNIQUE);}<br class="">-#line 2369 "parse.c"<br class="">+#line 2373 "parse.c"<br class=""> break;<br class=""> case 34: /* ccons ::= CHECK LP expr RP */<br class=""> #line 281 "parse.y"<br class=""> {sqlite3AddCheckConstraint(pParse,yymsp[-1].minor.yy162.pExpr);}<br class="">-#line 2374 "parse.c"<br class="">+#line 2378 "parse.c"<br class=""> break;<br class=""> case 35: /* ccons ::= REFERENCES nm eidlist_opt refargs */<br class=""> #line 283 "parse.y"<br class=""> {sqlite3CreateForeignKey(pParse,0,&yymsp[-2].minor.yy0,yymsp[-1].minor.yy382,yymsp[0].minor.yy52);}<br class="">-#line 2379 "parse.c"<br class="">+#line 2383 "parse.c"<br class=""> break;<br class=""> case 36: /* ccons ::= defer_subclause */<br class=""> #line 284 "parse.y"<br class=""> {sqlite3DeferForeignKey(pParse,yymsp[0].minor.yy52);}<br class="">-#line 2384 "parse.c"<br class="">+#line 2388 "parse.c"<br class=""> break;<br class=""> case 37: /* ccons ::= COLLATE ID|INDEXED */<br class=""> #line 285 "parse.y"<br class=""> {sqlite3AddCollateType(pParse, &yymsp[0].minor.yy0);}<br class="">-#line 2389 "parse.c"<br class="">+#line 2393 "parse.c"<br class=""> break;<br class=""> case 39: /* autoinc ::= AUTOINCR */<br class=""> #line 290 "parse.y"<br class=""> {yymsp[0].minor.yy52 = 1;}<br class="">-#line 2394 "parse.c"<br class="">+#line 2398 "parse.c"<br class=""> break;<br class=""> case 40: /* refargs ::= */<br class=""> #line 298 "parse.y"<br class=""> { yymsp[1].minor.yy52 = ON_CONFLICT_ACTION_NONE*0x0101; /* EV: R-19803-45884 */}<br class="">-#line 2399 "parse.c"<br class="">+#line 2403 "parse.c"<br class=""> break;<br class=""> case 41: /* refargs ::= refargs refarg */<br class=""> #line 299 "parse.y"<br class=""> { yymsp[-1].minor.yy52 = (yymsp[-1].minor.yy52 & ~yymsp[0].minor.yy107.mask) | yymsp[0].minor.yy107.value; }<br class="">-#line 2404 "parse.c"<br class="">+#line 2408 "parse.c"<br class=""> break;<br class=""> case 42: /* refarg ::= MATCH nm */<br class=""> #line 301 "parse.y"<br class=""> { yymsp[-1].minor.yy107.value = 0; yymsp[-1].minor.yy107.mask = 0x000000; }<br class="">-#line 2409 "parse.c"<br class="">+#line 2413 "parse.c"<br class=""> break;<br class=""> case 43: /* refarg ::= ON INSERT refact */<br class=""> #line 302 "parse.y"<br class=""> { yymsp[-2].minor.yy107.value = 0; yymsp[-2].minor.yy107.mask = 0x000000; }<br class="">-#line 2414 "parse.c"<br class="">+#line 2418 "parse.c"<br class=""> break;<br class=""> case 44: /* refarg ::= ON DELETE refact */<br class=""> #line 303 "parse.y"<br class=""> { yymsp[-2].minor.yy107.value = yymsp[0].minor.yy52; yymsp[-2].minor.yy107.mask = 0x0000ff; }<br class="">-#line 2419 "parse.c"<br class="">+#line 2423 "parse.c"<br class=""> break;<br class=""> case 45: /* refarg ::= ON UPDATE refact */<br class=""> #line 304 "parse.y"<br class=""> { yymsp[-2].minor.yy107.value = yymsp[0].minor.yy52<<8; yymsp[-2].minor.yy107.mask = 0x00ff00; }<br class="">-#line 2424 "parse.c"<br class="">+#line 2428 "parse.c"<br class=""> break;<br class=""> case 46: /* refact ::= SET NULL */<br class=""> #line 306 "parse.y"<br class=""> { yymsp[-1].minor.yy52 = OE_SetNull; /* EV: R-33326-45252 */}<br class="">-#line 2429 "parse.c"<br class="">+#line 2433 "parse.c"<br class=""> break;<br class=""> case 47: /* refact ::= SET DEFAULT */<br class=""> #line 307 "parse.y"<br class=""> { yymsp[-1].minor.yy52 = OE_SetDflt; /* EV: R-33326-45252 */}<br class="">-#line 2434 "parse.c"<br class="">+#line 2438 "parse.c"<br class=""> break;<br class=""> case 48: /* refact ::= CASCADE */<br class=""> #line 308 "parse.y"<br class=""> { yymsp[0].minor.yy52 = OE_Cascade; /* EV: R-33326-45252 */}<br class="">-#line 2439 "parse.c"<br class="">+#line 2443 "parse.c"<br class=""> break;<br class=""> case 49: /* refact ::= RESTRICT */<br class=""> #line 309 "parse.y"<br class=""> { yymsp[0].minor.yy52 = OE_Restrict; /* EV: R-33326-45252 */}<br class="">-#line 2444 "parse.c"<br class="">+#line 2448 "parse.c"<br class=""> break;<br class=""> case 50: /* refact ::= NO ACTION */<br class=""> #line 310 "parse.y"<br class=""> { yymsp[-1].minor.yy52 = ON_CONFLICT_ACTION_NONE; /* EV: R-33326-45252 */}<br class="">-#line 2449 "parse.c"<br class="">+#line 2453 "parse.c"<br class=""> break;<br class=""> case 51: /* defer_subclause ::= NOT DEFERRABLE init_deferred_pred_opt */<br class=""> #line 312 "parse.y"<br class=""> {yymsp[-2].minor.yy52 = 0;}<br class="">-#line 2454 "parse.c"<br class="">+#line 2458 "parse.c"<br class=""> break;<br class=""> case 52: /* defer_subclause ::= DEFERRABLE init_deferred_pred_opt */<br class=""> case 67: /* orconf ::= OR resolvetype */ yytestcase(yyruleno==67);<br class=""> case 138: /* insert_cmd ::= INSERT orconf */ yytestcase(yyruleno==138);<br class=""> #line 313 "parse.y"<br class=""> {yymsp[-1].minor.yy52 = yymsp[0].minor.yy52;}<br class="">-#line 2461 "parse.c"<br class="">+#line 2465 "parse.c"<br class=""> break;<br class=""> case 54: /* init_deferred_pred_opt ::= INITIALLY DEFERRED */<br class=""> case 71: /* ifexists ::= IF EXISTS */ yytestcase(yyruleno==71);<br class="">@@ -2466,33 +2470,33 @@ static void yy_reduce(<br class=""> case 209: /* collate ::= COLLATE ID|INDEXED */ yytestcase(yyruleno==209);<br class=""> #line 316 "parse.y"<br class=""> {yymsp[-1].minor.yy52 = 1;}<br class="">-#line 2470 "parse.c"<br class="">+#line 2474 "parse.c"<br class=""> break;<br class=""> case 55: /* init_deferred_pred_opt ::= INITIALLY IMMEDIATE */<br class=""> #line 317 "parse.y"<br class=""> {yymsp[-1].minor.yy52 = 0;}<br class="">-#line 2475 "parse.c"<br class="">+#line 2479 "parse.c"<br class=""> break;<br class=""> case 57: /* tconscomma ::= COMMA */<br class=""> #line 323 "parse.y"<br class=""> {pParse->constraintName.n = 0;}<br class="">-#line 2480 "parse.c"<br class="">+#line 2484 "parse.c"<br class=""> break;<br class=""> case 59: /* tcons ::= PRIMARY KEY LP sortlist autoinc RP onconf */<br class=""> #line 327 "parse.y"<br class=""> {sqlite3AddPrimaryKey(pParse,yymsp[-3].minor.yy382,yymsp[0].minor.yy52,yymsp[-2].minor.yy52,0);}<br class="">-#line 2485 "parse.c"<br class="">+#line 2489 "parse.c"<br class=""> break;<br class=""> case 60: /* tcons ::= UNIQUE LP sortlist RP onconf */<br class=""> #line 329 "parse.y"<br class=""> {sqlite3CreateIndex(pParse,0,0,yymsp[-2].minor.yy382,yymsp[0].minor.yy52,0,0,0,0,<br class=""> SQLITE_IDXTYPE_UNIQUE);}<br class="">-#line 2491 "parse.c"<br class="">+#line 2495 "parse.c"<br class=""> break;<br class=""> case 61: /* tcons ::= CHECK LP expr RP onconf */<br class=""> #line 332 "parse.y"<br class=""> {sqlite3AddCheckConstraint(pParse,yymsp[-2].minor.yy162.pExpr);}<br class="">-#line 2496 "parse.c"<br class="">+#line 2500 "parse.c"<br class=""> break;<br class=""> case 62: /* tcons ::= FOREIGN KEY LP eidlist RP REFERENCES nm eidlist_opt refargs defer_subclause_opt */<br class=""> #line 334 "parse.y"<br class="">@@ -2500,50 +2504,50 @@ static void yy_reduce(<br class=""> sqlite3CreateForeignKey(pParse, yymsp[-6].minor.yy382, &yymsp[-3].minor.yy0, yymsp[-2].minor.yy382, yymsp[-1].minor.yy52);<br class=""> sqlite3DeferForeignKey(pParse, yymsp[0].minor.yy52);<br class=""> }<br class="">-#line 2504 "parse.c"<br class="">+#line 2508 "parse.c"<br class=""> break;<br class=""> case 64: /* onconf ::= */<br class=""> case 66: /* orconf ::= */ yytestcase(yyruleno==66);<br class=""> #line 348 "parse.y"<br class=""> {yymsp[1].minor.yy52 = ON_CONFLICT_ACTION_DEFAULT;}<br class="">-#line 2510 "parse.c"<br class="">+#line 2514 "parse.c"<br class=""> break;<br class=""> case 65: /* onconf ::= ON CONFLICT resolvetype */<br class=""> #line 349 "parse.y"<br class=""> {yymsp[-2].minor.yy52 = yymsp[0].minor.yy52;}<br class="">-#line 2515 "parse.c"<br class="">+#line 2519 "parse.c"<br class=""> break;<br class=""> case 68: /* resolvetype ::= IGNORE */<br class=""> #line 353 "parse.y"<br class=""> {yymsp[0].minor.yy52 = ON_CONFLICT_ACTION_IGNORE;}<br class="">-#line 2520 "parse.c"<br class="">+#line 2524 "parse.c"<br class=""> break;<br class=""> case 69: /* resolvetype ::= REPLACE */<br class=""> case 139: /* insert_cmd ::= REPLACE */ yytestcase(yyruleno==139);<br class=""> #line 354 "parse.y"<br class=""> {yymsp[0].minor.yy52 = ON_CONFLICT_ACTION_REPLACE;}<br class="">-#line 2526 "parse.c"<br class="">+#line 2530 "parse.c"<br class=""> break;<br class=""> case 70: /* cmd ::= DROP TABLE ifexists fullname */<br class=""> #line 358 "parse.y"<br class=""> {<br class=""> sqlite3DropTable(pParse, yymsp[0].minor.yy387, 0, yymsp[-1].minor.yy52);<br class=""> }<br class="">-#line 2533 "parse.c"<br class="">+#line 2537 "parse.c"<br class=""> break;<br class=""> case 73: /* cmd ::= createkw VIEW ifnotexists nm eidlist_opt AS select */<br class=""> #line 369 "parse.y"<br class=""> {<br class=""> sqlite3CreateView(pParse, &yymsp[-6].minor.yy0, &yymsp[-3].minor.yy0, yymsp[-2].minor.yy382, yymsp[0].minor.yy279, yymsp[-4].minor.yy52);<br class=""> }<br class="">-#line 2540 "parse.c"<br class="">+#line 2544 "parse.c"<br class=""> break;<br class=""> case 74: /* cmd ::= DROP VIEW ifexists fullname */<br class=""> #line 372 "parse.y"<br class=""> {<br class=""> sqlite3DropTable(pParse, yymsp[0].minor.yy387, 1, yymsp[-1].minor.yy52);<br class=""> }<br class="">-#line 2547 "parse.c"<br class="">+#line 2551 "parse.c"<br class=""> break;<br class=""> case 75: /* cmd ::= select */<br class=""> #line 379 "parse.y"<br class="">@@ -2552,7 +2556,7 @@ static void yy_reduce(<br class=""> sqlite3Select(pParse, yymsp[0].minor.yy279, &dest);<br class=""> sqlite3SelectDelete(pParse->db, yymsp[0].minor.yy279);<br class=""> }<br class="">-#line 2556 "parse.c"<br class="">+#line 2560 "parse.c"<br class=""> break;<br class=""> case 76: /* select ::= with selectnowith */<br class=""> #line 416 "parse.y"<br class="">@@ -2566,7 +2570,7 @@ static void yy_reduce(<br class=""> }<br class=""> yymsp[-1].minor.yy279 = p; /*A-overwrites-W*/<br class=""> }<br class="">-#line 2570 "parse.c"<br class="">+#line 2574 "parse.c"<br class=""> break;<br class=""> case 77: /* selectnowith ::= selectnowith multiselect_op oneselect */<br class=""> #line 429 "parse.y"<br class="">@@ -2592,18 +2596,18 @@ static void yy_reduce(<br class=""> }<br class=""> yymsp[-2].minor.yy279 = pRhs;<br class=""> }<br class="">-#line 2596 "parse.c"<br class="">+#line 2600 "parse.c"<br class=""> break;<br class=""> case 78: /* multiselect_op ::= UNION */<br class=""> case 80: /* multiselect_op ::= EXCEPT|INTERSECT */ yytestcase(yyruleno==80);<br class=""> #line 452 "parse.y"<br class=""> {yymsp[0].minor.yy52 = yymsp[0].major; /*A-overwrites-OP*/}<br class="">-#line 2602 "parse.c"<br class="">+#line 2606 "parse.c"<br class=""> break;<br class=""> case 79: /* multiselect_op ::= UNION ALL */<br class=""> #line 453 "parse.y"<br class=""> {yymsp[-1].minor.yy52 = TK_ALL;}<br class="">-#line 2607 "parse.c"<br class="">+#line 2611 "parse.c"<br class=""> break;<br class=""> case 81: /* oneselect ::= SELECT distinct selcollist from where_opt groupby_opt having_opt orderby_opt limit_opt */<br class=""> #line 457 "parse.y"<br class="">@@ -2637,14 +2641,14 @@ static void yy_reduce(<br class=""> }<br class=""> #endif /* SELECTRACE_ENABLED */<br class=""> }<br class="">-#line 2641 "parse.c"<br class="">+#line 2645 "parse.c"<br class=""> break;<br class=""> case 82: /* values ::= VALUES LP nexprlist RP */<br class=""> #line 491 "parse.y"<br class=""> {<br class=""> yymsp[-3].minor.yy279 = sqlite3SelectNew(pParse,yymsp[-1].minor.yy382,0,0,0,0,0,SF_Values,0,0);<br class=""> }<br class="">-#line 2648 "parse.c"<br class="">+#line 2652 "parse.c"<br class=""> break;<br class=""> case 83: /* values ::= values COMMA LP exprlist RP */<br class=""> #line 494 "parse.y"<br class="">@@ -2660,17 +2664,17 @@ static void yy_reduce(<br class=""> yymsp[-4].minor.yy279 = pLeft;<br class=""> }<br class=""> }<br class="">-#line 2664 "parse.c"<br class="">+#line 2668 "parse.c"<br class=""> break;<br class=""> case 84: /* distinct ::= DISTINCT */<br class=""> #line 511 "parse.y"<br class=""> {yymsp[0].minor.yy52 = SF_Distinct;}<br class="">-#line 2669 "parse.c"<br class="">+#line 2673 "parse.c"<br class=""> break;<br class=""> case 85: /* distinct ::= ALL */<br class=""> #line 512 "parse.y"<br class=""> {yymsp[0].minor.yy52 = SF_All;}<br class="">-#line 2674 "parse.c"<br class="">+#line 2678 "parse.c"<br class=""> break;<br class=""> case 87: /* sclp ::= */<br class=""> case 113: /* orderby_opt ::= */ yytestcase(yyruleno==113);<br class="">@@ -2680,7 +2684,7 @@ static void yy_reduce(<br class=""> case 204: /* eidlist_opt ::= */ yytestcase(yyruleno==204);<br class=""> #line 525 "parse.y"<br class=""> {yymsp[1].minor.yy382 = 0;}<br class="">-#line 2684 "parse.c"<br class="">+#line 2688 "parse.c"<br class=""> break;<br class=""> case 88: /* selcollist ::= sclp expr as */<br class=""> #line 526 "parse.y"<br class="">@@ -2689,7 +2693,7 @@ static void yy_reduce(<br class=""> if( yymsp[0].minor.yy0.n>0 ) sqlite3ExprListSetName(pParse, yymsp[-2].minor.yy382, &yymsp[0].minor.yy0, 1);<br class=""> sqlite3ExprListSetSpan(pParse,yymsp[-2].minor.yy382,&yymsp[-1].minor.yy162);<br class=""> }<br class="">-#line 2693 "parse.c"<br class="">+#line 2697 "parse.c"<br class=""> break;<br class=""> case 89: /* selcollist ::= sclp STAR */<br class=""> #line 531 "parse.y"<br class="">@@ -2697,7 +2701,7 @@ static void yy_reduce(<br class=""> Expr *p = sqlite3Expr(pParse->db, TK_ASTERISK, 0);<br class=""> yymsp[-1].minor.yy382 = sqlite3ExprListAppend(pParse, yymsp[-1].minor.yy382, p);<br class=""> }<br class="">-#line 2701 "parse.c"<br class="">+#line 2705 "parse.c"<br class=""> break;<br class=""> case 90: /* selcollist ::= sclp nm DOT STAR */<br class=""> #line 535 "parse.y"<br class="">@@ -2707,19 +2711,19 @@ static void yy_reduce(<br class=""> Expr *pDot = sqlite3PExpr(pParse, TK_DOT, pLeft, pRight);<br class=""> yymsp[-3].minor.yy382 = sqlite3ExprListAppend(pParse,yymsp[-3].minor.yy382, pDot);<br class=""> }<br class="">-#line 2711 "parse.c"<br class="">+#line 2715 "parse.c"<br class=""> break;<br class=""> case 91: /* as ::= AS nm */<br class=""> case 218: /* plus_num ::= PLUS INTEGER|FLOAT */ yytestcase(yyruleno==218);<br class=""> case 219: /* minus_num ::= MINUS INTEGER|FLOAT */ yytestcase(yyruleno==219);<br class=""> #line 546 "parse.y"<br class=""> {yymsp[-1].minor.yy0 = yymsp[0].minor.yy0;}<br class="">-#line 2718 "parse.c"<br class="">+#line 2722 "parse.c"<br class=""> break;<br class=""> case 93: /* from ::= */<br class=""> #line 560 "parse.y"<br class=""> {yymsp[1].minor.yy387 = sqlite3DbMallocZero(pParse->db, sizeof(*yymsp[1].minor.yy387));}<br class="">-#line 2723 "parse.c"<br class="">+#line 2727 "parse.c"<br class=""> break;<br class=""> case 94: /* from ::= FROM seltablist */<br class=""> #line 561 "parse.y"<br class="">@@ -2727,19 +2731,19 @@ static void yy_reduce(<br class=""> yymsp[-1].minor.yy387 = yymsp[0].minor.yy387;<br class=""> sqlite3SrcListShiftJoinType(yymsp[-1].minor.yy387);<br class=""> }<br class="">-#line 2731 "parse.c"<br class="">+#line 2735 "parse.c"<br class=""> break;<br class=""> case 95: /* stl_prefix ::= seltablist joinop */<br class=""> #line 569 "parse.y"<br class=""> {<br class=""> if( ALWAYS(yymsp[-1].minor.yy387 && yymsp[-1].minor.yy387->nSrc>0) ) yymsp[-1].minor.yy387->a[yymsp[-1].minor.yy387->nSrc-1].fg.jointype = (u8)yymsp[0].minor.yy52;<br class=""> }<br class="">-#line 2738 "parse.c"<br class="">+#line 2742 "parse.c"<br class=""> break;<br class=""> case 96: /* stl_prefix ::= */<br class=""> #line 572 "parse.y"<br class=""> {yymsp[1].minor.yy387 = 0;}<br class="">-#line 2743 "parse.c"<br class="">+#line 2747 "parse.c"<br class=""> break;<br class=""> case 97: /* seltablist ::= stl_prefix nm as indexed_opt on_opt using_opt */<br class=""> #line 574 "parse.y"<br class="">@@ -2747,7 +2751,7 @@ static void yy_reduce(<br class=""> yymsp[-5].minor.yy387 = sqlite3SrcListAppendFromTerm(pParse,yymsp[-5].minor.yy387,&yymsp[-4].minor.yy0,&yymsp[-3].minor.yy0,0,yymsp[-1].minor.yy362,yymsp[0].minor.yy40);<br class=""> sqlite3SrcListIndexedBy(pParse, yymsp[-5].minor.yy387, &yymsp[-2].minor.yy0);<br class=""> }<br class="">-#line 2751 "parse.c"<br class="">+#line 2755 "parse.c"<br class=""> break;<br class=""> case 98: /* seltablist ::= stl_prefix nm LP exprlist RP as on_opt using_opt */<br class=""> #line 579 "parse.y"<br class="">@@ -2755,14 +2759,14 @@ static void yy_reduce(<br class=""> yymsp[-7].minor.yy387 = sqlite3SrcListAppendFromTerm(pParse,yymsp[-7].minor.yy387,&yymsp[-6].minor.yy0,&yymsp[-2].minor.yy0,0,yymsp[-1].minor.yy362,yymsp[0].minor.yy40);<br class=""> sqlite3SrcListFuncArgs(pParse, yymsp[-7].minor.yy387, yymsp[-4].minor.yy382);<br class=""> }<br class="">-#line 2759 "parse.c"<br class="">+#line 2763 "parse.c"<br class=""> break;<br class=""> case 99: /* seltablist ::= stl_prefix LP select RP as on_opt using_opt */<br class=""> #line 585 "parse.y"<br class=""> {<br class=""> yymsp[-6].minor.yy387 = sqlite3SrcListAppendFromTerm(pParse,yymsp[-6].minor.yy387,0,&yymsp[-2].minor.yy0,yymsp[-4].minor.yy279,yymsp[-1].minor.yy362,yymsp[0].minor.yy40);<br class=""> }<br class="">-#line 2766 "parse.c"<br class="">+#line 2770 "parse.c"<br class=""> break;<br class=""> case 100: /* seltablist ::= stl_prefix LP seltablist RP as on_opt using_opt */<br class=""> #line 589 "parse.y"<br class="">@@ -2787,32 +2791,32 @@ static void yy_reduce(<br class=""> yymsp[-6].minor.yy387 = sqlite3SrcListAppendFromTerm(pParse,yymsp[-6].minor.yy387,0,&yymsp[-2].minor.yy0,pSubquery,yymsp[-1].minor.yy362,yymsp[0].minor.yy40);<br class=""> }<br class=""> }<br class="">-#line 2791 "parse.c"<br class="">+#line 2795 "parse.c"<br class=""> break;<br class=""> case 101: /* fullname ::= nm */<br class=""> #line 615 "parse.y"<br class=""> {yymsp[0].minor.yy387 = sqlite3SrcListAppend(pParse->db,0,&yymsp[0].minor.yy0); /*A-overwrites-X*/}<br class="">-#line 2796 "parse.c"<br class="">+#line 2800 "parse.c"<br class=""> break;<br class=""> case 102: /* joinop ::= COMMA|JOIN */<br class=""> #line 621 "parse.y"<br class=""> { yymsp[0].minor.yy52 = JT_INNER; }<br class="">-#line 2801 "parse.c"<br class="">+#line 2805 "parse.c"<br class=""> break;<br class=""> case 103: /* joinop ::= JOIN_KW JOIN */<br class=""> #line 623 "parse.y"<br class=""> {yymsp[-1].minor.yy52 = sqlite3JoinType(pParse,&yymsp[-1].minor.yy0,0,0); /*X-overwrites-A*/}<br class="">-#line 2806 "parse.c"<br class="">+#line 2810 "parse.c"<br class=""> break;<br class=""> case 104: /* joinop ::= JOIN_KW join_nm JOIN */<br class=""> #line 625 "parse.y"<br class=""> {yymsp[-2].minor.yy52 = sqlite3JoinType(pParse,&yymsp[-2].minor.yy0,&yymsp[-1].minor.yy0,0); /*X-overwrites-A*/}<br class="">-#line 2811 "parse.c"<br class="">+#line 2815 "parse.c"<br class=""> break;<br class=""> case 105: /* joinop ::= JOIN_KW join_nm join_nm JOIN */<br class=""> #line 627 "parse.y"<br class=""> {yymsp[-3].minor.yy52 = sqlite3JoinType(pParse,&yymsp[-3].minor.yy0,&yymsp[-2].minor.yy0,&yymsp[-1].minor.yy0);/*X-overwrites-A*/}<br class="">-#line 2816 "parse.c"<br class="">+#line 2820 "parse.c"<br class=""> break;<br class=""> case 106: /* on_opt ::= ON expr */<br class=""> case 123: /* having_opt ::= HAVING expr */ yytestcase(yyruleno==123);<br class="">@@ -2820,7 +2824,7 @@ static void yy_reduce(<br class=""> case 192: /* case_else ::= ELSE expr */ yytestcase(yyruleno==192);<br class=""> #line 631 "parse.y"<br class=""> {yymsp[-1].minor.yy362 = yymsp[0].minor.yy162.pExpr;}<br class="">-#line 2824 "parse.c"<br class="">+#line 2828 "parse.c"<br class=""> break;<br class=""> case 107: /* on_opt ::= */<br class=""> case 122: /* having_opt ::= */ yytestcase(yyruleno==122);<br class="">@@ -2829,39 +2833,39 @@ static void yy_reduce(<br class=""> case 195: /* case_operand ::= */ yytestcase(yyruleno==195);<br class=""> #line 632 "parse.y"<br class=""> {yymsp[1].minor.yy362 = 0;}<br class="">-#line 2833 "parse.c"<br class="">+#line 2837 "parse.c"<br class=""> break;<br class=""> case 108: /* indexed_opt ::= */<br class=""> #line 645 "parse.y"<br class=""> {yymsp[1].minor.yy0.z=0; yymsp[1].minor.yy0.n=0;}<br class="">-#line 2838 "parse.c"<br class="">+#line 2842 "parse.c"<br class=""> break;<br class=""> case 109: /* indexed_opt ::= INDEXED BY nm */<br class=""> #line 646 "parse.y"<br class=""> {yymsp[-2].minor.yy0 = yymsp[0].minor.yy0;}<br class="">-#line 2843 "parse.c"<br class="">+#line 2847 "parse.c"<br class=""> break;<br class=""> case 110: /* indexed_opt ::= NOT INDEXED */<br class=""> #line 647 "parse.y"<br class=""> {yymsp[-1].minor.yy0.z=0; yymsp[-1].minor.yy0.n=1;}<br class="">-#line 2848 "parse.c"<br class="">+#line 2852 "parse.c"<br class=""> break;<br class=""> case 111: /* using_opt ::= USING LP idlist RP */<br class=""> #line 651 "parse.y"<br class=""> {yymsp[-3].minor.yy40 = yymsp[-1].minor.yy40;}<br class="">-#line 2853 "parse.c"<br class="">+#line 2857 "parse.c"<br class=""> break;<br class=""> case 112: /* using_opt ::= */<br class=""> case 140: /* idlist_opt ::= */ yytestcase(yyruleno==140);<br class=""> #line 652 "parse.y"<br class=""> {yymsp[1].minor.yy40 = 0;}<br class="">-#line 2859 "parse.c"<br class="">+#line 2863 "parse.c"<br class=""> break;<br class=""> case 114: /* orderby_opt ::= ORDER BY sortlist */<br class=""> case 121: /* groupby_opt ::= GROUP BY nexprlist */ yytestcase(yyruleno==121);<br class=""> #line 666 "parse.y"<br class=""> {yymsp[-2].minor.yy382 = yymsp[0].minor.yy382;}<br class="">-#line 2865 "parse.c"<br class="">+#line 2869 "parse.c"<br class=""> break;<br class=""> case 115: /* sortlist ::= sortlist COMMA expr sortorder */<br class=""> #line 667 "parse.y"<br class="">@@ -2869,7 +2873,7 @@ static void yy_reduce(<br class=""> yymsp[-3].minor.yy382 = sqlite3ExprListAppend(pParse,yymsp[-3].minor.yy382,yymsp[-1].minor.yy162.pExpr);<br class=""> sqlite3ExprListSetSortOrder(yymsp[-3].minor.yy382,yymsp[0].minor.yy52);<br class=""> }<br class="">-#line 2873 "parse.c"<br class="">+#line 2877 "parse.c"<br class=""> break;<br class=""> case 116: /* sortlist ::= expr sortorder */<br class=""> #line 671 "parse.y"<br class="">@@ -2877,42 +2881,42 @@ static void yy_reduce(<br class=""> yymsp[-1].minor.yy382 = sqlite3ExprListAppend(pParse,0,yymsp[-1].minor.yy162.pExpr); /*A-overwrites-Y*/<br class=""> sqlite3ExprListSetSortOrder(yymsp[-1].minor.yy382,yymsp[0].minor.yy52);<br class=""> }<br class="">-#line 2881 "parse.c"<br class="">+#line 2885 "parse.c"<br class=""> break;<br class=""> case 117: /* sortorder ::= ASC */<br class=""> #line 678 "parse.y"<br class=""> {yymsp[0].minor.yy52 = SQLITE_SO_ASC;}<br class="">-#line 2886 "parse.c"<br class="">+#line 2890 "parse.c"<br class=""> break;<br class=""> case 118: /* sortorder ::= DESC */<br class=""> #line 679 "parse.y"<br class=""> {yymsp[0].minor.yy52 = SQLITE_SO_DESC;}<br class="">-#line 2891 "parse.c"<br class="">+#line 2895 "parse.c"<br class=""> break;<br class=""> case 119: /* sortorder ::= */<br class=""> #line 680 "parse.y"<br class=""> {yymsp[1].minor.yy52 = SQLITE_SO_UNDEFINED;}<br class="">-#line 2896 "parse.c"<br class="">+#line 2900 "parse.c"<br class=""> break;<br class=""> case 124: /* limit_opt ::= */<br class=""> #line 705 "parse.y"<br class=""> {yymsp[1].minor.yy384.pLimit = 0; yymsp[1].minor.yy384.pOffset = 0;}<br class="">-#line 2901 "parse.c"<br class="">+#line 2905 "parse.c"<br class=""> break;<br class=""> case 125: /* limit_opt ::= LIMIT expr */<br class=""> #line 706 "parse.y"<br class=""> {yymsp[-1].minor.yy384.pLimit = yymsp[0].minor.yy162.pExpr; yymsp[-1].minor.yy384.pOffset = 0;}<br class="">-#line 2906 "parse.c"<br class="">+#line 2910 "parse.c"<br class=""> break;<br class=""> case 126: /* limit_opt ::= LIMIT expr OFFSET expr */<br class=""> #line 708 "parse.y"<br class=""> {yymsp[-3].minor.yy384.pLimit = yymsp[-2].minor.yy162.pExpr; yymsp[-3].minor.yy384.pOffset = yymsp[0].minor.yy162.pExpr;}<br class="">-#line 2911 "parse.c"<br class="">+#line 2915 "parse.c"<br class=""> break;<br class=""> case 127: /* limit_opt ::= LIMIT expr COMMA expr */<br class=""> #line 710 "parse.y"<br class=""> {yymsp[-3].minor.yy384.pOffset = yymsp[-2].minor.yy162.pExpr; yymsp[-3].minor.yy384.pLimit = yymsp[0].minor.yy162.pExpr;}<br class="">-#line 2916 "parse.c"<br class="">+#line 2920 "parse.c"<br class=""> break;<br class=""> case 128: /* cmd ::= with DELETE FROM fullname indexed_opt where_opt */<br class=""> #line 727 "parse.y"<br class="">@@ -2924,7 +2928,7 @@ static void yy_reduce(<br class=""> pParse->initiateTTrans = true;<br class=""> sqlite3DeleteFrom(pParse,yymsp[-2].minor.yy387,yymsp[0].minor.yy362);<br class=""> }<br class="">-#line 2928 "parse.c"<br class="">+#line 2932 "parse.c"<br class=""> break;<br class=""> case 131: /* cmd ::= with UPDATE orconf fullname indexed_opt SET setlist where_opt */<br class=""> #line 760 "parse.y"<br class="">@@ -2937,7 +2941,7 @@ static void yy_reduce(<br class=""> pParse->initiateTTrans = true;<br class=""> sqlite3Update(pParse,yymsp[-4].minor.yy387,yymsp[-1].minor.yy382,yymsp[0].minor.yy362,yymsp[-5].minor.yy52);<br class=""> }<br class="">-#line 2941 "parse.c"<br class="">+#line 2945 "parse.c"<br class=""> break;<br class=""> case 132: /* setlist ::= setlist COMMA nm EQ expr */<br class=""> #line 774 "parse.y"<br class="">@@ -2945,14 +2949,14 @@ static void yy_reduce(<br class=""> yymsp[-4].minor.yy382 = sqlite3ExprListAppend(pParse, yymsp[-4].minor.yy382, yymsp[0].minor.yy162.pExpr);<br class=""> sqlite3ExprListSetName(pParse, yymsp[-4].minor.yy382, &yymsp[-2].minor.yy0, 1);<br class=""> }<br class="">-#line 2949 "parse.c"<br class="">+#line 2953 "parse.c"<br class=""> break;<br class=""> case 133: /* setlist ::= setlist COMMA LP idlist RP EQ expr */<br class=""> #line 778 "parse.y"<br class=""> {<br class=""> yymsp[-6].minor.yy382 = sqlite3ExprListAppendVector(pParse, yymsp[-6].minor.yy382, yymsp[-3].minor.yy40, yymsp[0].minor.yy162.pExpr);<br class=""> }<br class="">-#line 2956 "parse.c"<br class="">+#line 2960 "parse.c"<br class=""> break;<br class=""> case 134: /* setlist ::= nm EQ expr */<br class=""> #line 781 "parse.y"<br class="">@@ -2960,7 +2964,7 @@ static void yy_reduce(<br class=""> yylhsminor.yy382 = sqlite3ExprListAppend(pParse, 0, yymsp[0].minor.yy162.pExpr);<br class=""> sqlite3ExprListSetName(pParse, yylhsminor.yy382, &yymsp[-2].minor.yy0, 1);<br class=""> }<br class="">-#line 2964 "parse.c"<br class="">+#line 2968 "parse.c"<br class=""> yymsp[-2].minor.yy382 = yylhsminor.yy382;<br class=""> break;<br class=""> case 135: /* setlist ::= LP idlist RP EQ expr */<br class="">@@ -2968,7 +2972,7 @@ static void yy_reduce(<br class=""> {<br class=""> yymsp[-4].minor.yy382 = sqlite3ExprListAppendVector(pParse, 0, yymsp[-3].minor.yy40, yymsp[0].minor.yy162.pExpr);<br class=""> }<br class="">-#line 2972 "parse.c"<br class="">+#line 2976 "parse.c"<br class=""> break;<br class=""> case 136: /* cmd ::= with insert_cmd INTO fullname idlist_opt select */<br class=""> #line 791 "parse.y"<br class="">@@ -2979,7 +2983,7 @@ static void yy_reduce(<br class=""> pParse->initiateTTrans = true;<br class=""> sqlite3Insert(pParse, yymsp[-2].minor.yy387, yymsp[0].minor.yy279, yymsp[-1].minor.yy40, yymsp[-4].minor.yy52);<br class=""> }<br class="">-#line 2983 "parse.c"<br class="">+#line 2987 "parse.c"<br class=""> break;<br class=""> case 137: /* cmd ::= with insert_cmd INTO fullname idlist_opt DEFAULT VALUES */<br class=""> #line 799 "parse.y"<br class="">@@ -2990,40 +2994,40 @@ static void yy_reduce(<br class=""> pParse->initiateTTrans = true;<br class=""> sqlite3Insert(pParse, yymsp[-3].minor.yy387, 0, yymsp[-2].minor.yy40, yymsp[-5].minor.yy52);<br class=""> }<br class="">-#line 2994 "parse.c"<br class="">+#line 2998 "parse.c"<br class=""> break;<br class=""> case 141: /* idlist_opt ::= LP idlist RP */<br class=""> #line 817 "parse.y"<br class=""> {yymsp[-2].minor.yy40 = yymsp[-1].minor.yy40;}<br class="">-#line 2999 "parse.c"<br class="">+#line 3003 "parse.c"<br class=""> break;<br class=""> case 142: /* idlist ::= idlist COMMA nm */<br class=""> #line 819 "parse.y"<br class=""> {yymsp[-2].minor.yy40 = sqlite3IdListAppend(pParse->db,yymsp[-2].minor.yy40,&yymsp[0].minor.yy0);}<br class="">-#line 3004 "parse.c"<br class="">+#line 3008 "parse.c"<br class=""> break;<br class=""> case 143: /* idlist ::= nm */<br class=""> #line 821 "parse.y"<br class=""> {yymsp[0].minor.yy40 = sqlite3IdListAppend(pParse->db,0,&yymsp[0].minor.yy0); /*A-overwrites-Y*/}<br class="">-#line 3009 "parse.c"<br class="">+#line 3013 "parse.c"<br class=""> break;<br class=""> case 144: /* expr ::= LP expr RP */<br class=""> #line 870 "parse.y"<br class=""> {spanSet(&yymsp[-2].minor.yy162,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy0); /*A-overwrites-B*/ yymsp[-2].minor.yy162.pExpr = yymsp[-1].minor.yy162.pExpr;}<br class="">-#line 3014 "parse.c"<br class="">+#line 3018 "parse.c"<br class=""> break;<br class=""> case 145: /* term ::= NULL */<br class=""> case 149: /* term ::= FLOAT|BLOB */ yytestcase(yyruleno==149);<br class=""> case 150: /* term ::= STRING */ yytestcase(yyruleno==150);<br class=""> #line 871 "parse.y"<br class=""> {spanExpr(&yymsp[0].minor.yy162,pParse,yymsp[0].major,yymsp[0].minor.yy0);/*A-overwrites-X*/}<br class="">-#line 3021 "parse.c"<br class="">+#line 3025 "parse.c"<br class=""> break;<br class=""> case 146: /* expr ::= ID|INDEXED */<br class=""> case 147: /* expr ::= JOIN_KW */ yytestcase(yyruleno==147);<br class=""> #line 872 "parse.y"<br class=""> {spanExpr(&yymsp[0].minor.yy162,pParse,TK_ID,yymsp[0].minor.yy0); /*A-overwrites-X*/}<br class="">-#line 3027 "parse.c"<br class="">+#line 3031 "parse.c"<br class=""> break;<br class=""> case 148: /* expr ::= nm DOT nm */<br class=""> #line 874 "parse.y"<br class="">@@ -3033,7 +3037,7 @@ static void yy_reduce(<br class=""> spanSet(&yymsp[-2].minor.yy162,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy0); /*A-overwrites-X*/<br class=""> yymsp[-2].minor.yy162.pExpr = sqlite3PExpr(pParse, TK_DOT, temp1, temp2);<br class=""> }<br class="">-#line 3037 "parse.c"<br class="">+#line 3041 "parse.c"<br class=""> break;<br class=""> case 151: /* term ::= INTEGER */<br class=""> #line 882 "parse.y"<br class="">@@ -3043,7 +3047,7 @@ static void yy_reduce(<br class=""> yylhsminor.yy162.zEnd = yymsp[0].minor.yy0.z + yymsp[0].minor.yy0.n;<br class=""> if( yylhsminor.yy162.pExpr ) yylhsminor.yy162.pExpr->flags |= EP_Leaf;<br class=""> }<br class="">-#line 3047 "parse.c"<br class="">+#line 3051 "parse.c"<br class=""> yymsp[0].minor.yy162 = yylhsminor.yy162;<br class=""> break;<br class=""> case 152: /* expr ::= VARIABLE */<br class="">@@ -3069,7 +3073,7 @@ static void yy_reduce(<br class=""> }<br class=""> }<br class=""> }<br class="">-#line 3073 "parse.c"<br class="">+#line 3077 "parse.c"<br class=""> break;<br class=""> case 153: /* expr ::= expr COLLATE ID|INDEXED */<br class=""> #line 909 "parse.y"<br class="">@@ -3077,7 +3081,7 @@ static void yy_reduce(<br class=""> yymsp[-2].minor.yy162.pExpr = sqlite3ExprAddCollateToken(pParse, yymsp[-2].minor.yy162.pExpr, &yymsp[0].minor.yy0, 1);<br class=""> yymsp[-2].minor.yy162.zEnd = &yymsp[0].minor.yy0.z[yymsp[0].minor.yy0.n];<br class=""> }<br class="">-#line 3081 "parse.c"<br class="">+#line 3085 "parse.c"<br class=""> break;<br class=""> case 154: /* expr ::= CAST LP expr AS typetoken RP */<br class=""> #line 914 "parse.y"<br class="">@@ -3086,7 +3090,7 @@ static void yy_reduce(<br class=""> yymsp[-5].minor.yy162.pExpr = sqlite3ExprAlloc(pParse->db, TK_CAST, &yymsp[-1].minor.yy0, 1);<br class=""> sqlite3ExprAttachSubtrees(pParse->db, yymsp[-5].minor.yy162.pExpr, yymsp[-3].minor.yy162.pExpr, 0);<br class=""> }<br class="">-#line 3090 "parse.c"<br class="">+#line 3094 "parse.c"<br class=""> break;<br class=""> case 155: /* expr ::= ID|INDEXED LP distinct exprlist RP */<br class=""> #line 920 "parse.y"<br class="">@@ -3100,7 +3104,7 @@ static void yy_reduce(<br class=""> yylhsminor.yy162.pExpr->flags |= EP_Distinct;<br class=""> }<br class=""> }<br class="">-#line 3104 "parse.c"<br class="">+#line 3108 "parse.c"<br class=""> yymsp[-4].minor.yy162 = yylhsminor.yy162;<br class=""> break;<br class=""> case 156: /* expr ::= ID|INDEXED LP STAR RP */<br class="">@@ -3109,7 +3113,7 @@ static void yy_reduce(<br class=""> yylhsminor.yy162.pExpr = sqlite3ExprFunction(pParse, 0, &yymsp[-3].minor.yy0);<br class=""> spanSet(&yylhsminor.yy162,&yymsp[-3].minor.yy0,&yymsp[0].minor.yy0);<br class=""> }<br class="">-#line 3113 "parse.c"<br class="">+#line 3117 "parse.c"<br class=""> yymsp[-3].minor.yy162 = yylhsminor.yy162;<br class=""> break;<br class=""> case 157: /* term ::= CTIME_KW */<br class="">@@ -3118,7 +3122,7 @@ static void yy_reduce(<br class=""> yylhsminor.yy162.pExpr = sqlite3ExprFunction(pParse, 0, &yymsp[0].minor.yy0);<br class=""> spanSet(&yylhsminor.yy162, &yymsp[0].minor.yy0, &yymsp[0].minor.yy0);<br class=""> }<br class="">-#line 3122 "parse.c"<br class="">+#line 3126 "parse.c"<br class=""> yymsp[0].minor.yy162 = yylhsminor.yy162;<br class=""> break;<br class=""> case 158: /* expr ::= LP nexprlist COMMA expr RP */<br class="">@@ -3133,7 +3137,7 @@ static void yy_reduce(<br class=""> sqlite3ExprListDelete(pParse->db, pList);<br class=""> }<br class=""> }<br class="">-#line 3137 "parse.c"<br class="">+#line 3141 "parse.c"<br class=""> yymsp[-4].minor.yy162 = yylhsminor.yy162;<br class=""> break;<br class=""> case 159: /* expr ::= expr AND expr */<br class="">@@ -3146,17 +3150,17 @@ static void yy_reduce(<br class=""> case 166: /* expr ::= expr CONCAT expr */ yytestcase(yyruleno==166);<br class=""> #line 974 "parse.y"<br class=""> {spanBinaryExpr(pParse,yymsp[-1].major,&yymsp[-2].minor.yy162,&yymsp[0].minor.yy162);}<br class="">-#line 3150 "parse.c"<br class="">+#line 3154 "parse.c"<br class=""> break;<br class=""> case 167: /* likeop ::= LIKE_KW|MATCH */<br class=""> #line 987 "parse.y"<br class=""> {yymsp[0].minor.yy0=yymsp[0].minor.yy0;/*A-overwrites-X*/}<br class="">-#line 3155 "parse.c"<br class="">+#line 3159 "parse.c"<br class=""> break;<br class=""> case 168: /* likeop ::= NOT LIKE_KW|MATCH */<br class=""> #line 988 "parse.y"<br class=""> {yymsp[-1].minor.yy0=yymsp[0].minor.yy0; yymsp[-1].minor.yy0.n|=0x80000000; /*yymsp[-1].minor.yy0-overwrite-yymsp[0].minor.yy0*/}<br class="">-#line 3160 "parse.c"<br class="">+#line 3164 "parse.c"<br class=""> break;<br class=""> case 169: /* expr ::= expr likeop expr */<br class=""> #line 989 "parse.y"<br class="">@@ -3171,7 +3175,7 @@ static void yy_reduce(<br class=""> yymsp[-2].minor.yy162.zEnd = yymsp[0].minor.yy162.zEnd;<br class=""> if( yymsp[-2].minor.yy162.pExpr ) yymsp[-2].minor.yy162.pExpr->flags |= EP_InfixFunc;<br class=""> }<br class="">-#line 3175 "parse.c"<br class="">+#line 3179 "parse.c"<br class=""> break;<br class=""> case 170: /* expr ::= expr likeop expr ESCAPE expr */<br class=""> #line 1000 "parse.y"<br class="">@@ -3187,17 +3191,17 @@ static void yy_reduce(<br class=""> yymsp[-4].minor.yy162.zEnd = yymsp[0].minor.yy162.zEnd;<br class=""> if( yymsp[-4].minor.yy162.pExpr ) yymsp[-4].minor.yy162.pExpr->flags |= EP_InfixFunc;<br class=""> }<br class="">-#line 3191 "parse.c"<br class="">+#line 3195 "parse.c"<br class=""> break;<br class=""> case 171: /* expr ::= expr ISNULL|NOTNULL */<br class=""> #line 1027 "parse.y"<br class=""> {spanUnaryPostfix(pParse,yymsp[0].major,&yymsp[-1].minor.yy162,&yymsp[0].minor.yy0);}<br class="">-#line 3196 "parse.c"<br class="">+#line 3200 "parse.c"<br class=""> break;<br class=""> case 172: /* expr ::= expr NOT NULL */<br class=""> #line 1028 "parse.y"<br class=""> {spanUnaryPostfix(pParse,TK_NOTNULL,&yymsp[-2].minor.yy162,&yymsp[0].minor.yy0);}<br class="">-#line 3201 "parse.c"<br class="">+#line 3205 "parse.c"<br class=""> break;<br class=""> case 173: /* expr ::= expr IS expr */<br class=""> #line 1049 "parse.y"<br class="">@@ -3205,7 +3209,7 @@ static void yy_reduce(<br class=""> spanBinaryExpr(pParse,TK_IS,&yymsp[-2].minor.yy162,&yymsp[0].minor.yy162);<br class=""> binaryToUnaryIfNull(pParse, yymsp[0].minor.yy162.pExpr, yymsp[-2].minor.yy162.pExpr, TK_ISNULL);<br class=""> }<br class="">-#line 3209 "parse.c"<br class="">+#line 3213 "parse.c"<br class=""> break;<br class=""> case 174: /* expr ::= expr IS NOT expr */<br class=""> #line 1053 "parse.y"<br class="">@@ -3213,29 +3217,29 @@ static void yy_reduce(<br class=""> spanBinaryExpr(pParse,TK_ISNOT,&yymsp[-3].minor.yy162,&yymsp[0].minor.yy162);<br class=""> binaryToUnaryIfNull(pParse, yymsp[0].minor.yy162.pExpr, yymsp[-3].minor.yy162.pExpr, TK_NOTNULL);<br class=""> }<br class="">-#line 3217 "parse.c"<br class="">+#line 3221 "parse.c"<br class=""> break;<br class=""> case 175: /* expr ::= NOT expr */<br class=""> case 176: /* expr ::= BITNOT expr */ yytestcase(yyruleno==176);<br class=""> #line 1077 "parse.y"<br class=""> {spanUnaryPrefix(&yymsp[-1].minor.yy162,pParse,yymsp[-1].major,&yymsp[0].minor.yy162,&yymsp[-1].minor.yy0);/*A-overwrites-B*/}<br class="">-#line 3223 "parse.c"<br class="">+#line 3227 "parse.c"<br class=""> break;<br class=""> case 177: /* expr ::= MINUS expr */<br class=""> #line 1081 "parse.y"<br class=""> {spanUnaryPrefix(&yymsp[-1].minor.yy162,pParse,TK_UMINUS,&yymsp[0].minor.yy162,&yymsp[-1].minor.yy0);/*A-overwrites-B*/}<br class="">-#line 3228 "parse.c"<br class="">+#line 3232 "parse.c"<br class=""> break;<br class=""> case 178: /* expr ::= PLUS expr */<br class=""> #line 1083 "parse.y"<br class=""> {spanUnaryPrefix(&yymsp[-1].minor.yy162,pParse,TK_UPLUS,&yymsp[0].minor.yy162,&yymsp[-1].minor.yy0);/*A-overwrites-B*/}<br class="">-#line 3233 "parse.c"<br class="">+#line 3237 "parse.c"<br class=""> break;<br class=""> case 179: /* between_op ::= BETWEEN */<br class=""> case 182: /* in_op ::= IN */ yytestcase(yyruleno==182);<br class=""> #line 1086 "parse.y"<br class=""> {yymsp[0].minor.yy52 = 0;}<br class="">-#line 3239 "parse.c"<br class="">+#line 3243 "parse.c"<br class=""> break;<br class=""> case 181: /* expr ::= expr between_op expr AND expr */<br class=""> #line 1088 "parse.y"<br class="">@@ -3251,7 +3255,7 @@ static void yy_reduce(<br class=""> exprNot(pParse, yymsp[-3].minor.yy52, &yymsp[-4].minor.yy162);<br class=""> yymsp[-4].minor.yy162.zEnd = yymsp[0].minor.yy162.zEnd;<br class=""> }<br class="">-#line 3255 "parse.c"<br class="">+#line 3259 "parse.c"<br class=""> break;<br class=""> case 184: /* expr ::= expr in_op LP exprlist RP */<br class=""> #line 1104 "parse.y"<br class="">@@ -3306,7 +3310,7 @@ static void yy_reduce(<br class=""> }<br class=""> yymsp[-4].minor.yy162.zEnd = &yymsp[0].minor.yy0.z[yymsp[0].minor.yy0.n];<br class=""> }<br class="">-#line 3310 "parse.c"<br class="">+#line 3314 "parse.c"<br class=""> break;<br class=""> case 185: /* expr ::= LP select RP */<br class=""> #line 1155 "parse.y"<br class="">@@ -3315,7 +3319,7 @@ static void yy_reduce(<br class=""> yymsp[-2].minor.yy162.pExpr = sqlite3PExpr(pParse, TK_SELECT, 0, 0);<br class=""> sqlite3PExprAddSelect(pParse, yymsp[-2].minor.yy162.pExpr, yymsp[-1].minor.yy279);<br class=""> }<br class="">-#line 3319 "parse.c"<br class="">+#line 3323 "parse.c"<br class=""> break;<br class=""> case 186: /* expr ::= expr in_op LP select RP */<br class=""> #line 1160 "parse.y"<br class="">@@ -3325,7 +3329,7 @@ static void yy_reduce(<br class=""> exprNot(pParse, yymsp[-3].minor.yy52, &yymsp[-4].minor.yy162);<br class=""> yymsp[-4].minor.yy162.zEnd = &yymsp[0].minor.yy0.z[yymsp[0].minor.yy0.n];<br class=""> }<br class="">-#line 3329 "parse.c"<br class="">+#line 3333 "parse.c"<br class=""> break;<br class=""> case 187: /* expr ::= expr in_op nm paren_exprlist */<br class=""> #line 1166 "parse.y"<br class="">@@ -3338,7 +3342,7 @@ static void yy_reduce(<br class=""> exprNot(pParse, yymsp[-2].minor.yy52, &yymsp[-3].minor.yy162);<br class=""> yymsp[-3].minor.yy162.zEnd = &yymsp[-1].minor.yy0.z[yymsp[-1].minor.yy0.n];<br class=""> }<br class="">-#line 3342 "parse.c"<br class="">+#line 3346 "parse.c"<br class=""> break;<br class=""> case 188: /* expr ::= EXISTS LP select RP */<br class=""> #line 1175 "parse.y"<br class="">@@ -3348,7 +3352,7 @@ static void yy_reduce(<br class=""> p = yymsp[-3].minor.yy162.pExpr = sqlite3PExpr(pParse, TK_EXISTS, 0, 0);<br class=""> sqlite3PExprAddSelect(pParse, p, yymsp[-1].minor.yy279);<br class=""> }<br class="">-#line 3352 "parse.c"<br class="">+#line 3356 "parse.c"<br class=""> break;<br class=""> case 189: /* expr ::= CASE case_operand case_exprlist case_else END */<br class=""> #line 1184 "parse.y"<br class="">@@ -3363,7 +3367,7 @@ static void yy_reduce(<br class=""> sqlite3ExprDelete(pParse->db, yymsp[-1].minor.yy362);<br class=""> }<br class=""> }<br class="">-#line 3367 "parse.c"<br class="">+#line 3371 "parse.c"<br class=""> break;<br class=""> case 190: /* case_exprlist ::= case_exprlist WHEN expr THEN expr */<br class=""> #line 1197 "parse.y"<br class="">@@ -3371,7 +3375,7 @@ static void yy_reduce(<br class=""> yymsp[-4].minor.yy382 = sqlite3ExprListAppend(pParse,yymsp[-4].minor.yy382, yymsp[-2].minor.yy162.pExpr);<br class=""> yymsp[-4].minor.yy382 = sqlite3ExprListAppend(pParse,yymsp[-4].minor.yy382, yymsp[0].minor.yy162.pExpr);<br class=""> }<br class="">-#line 3375 "parse.c"<br class="">+#line 3379 "parse.c"<br class=""> break;<br class=""> case 191: /* case_exprlist ::= WHEN expr THEN expr */<br class=""> #line 1201 "parse.y"<br class="">@@ -3379,118 +3383,118 @@ static void yy_reduce(<br class=""> yymsp[-3].minor.yy382 = sqlite3ExprListAppend(pParse,0, yymsp[-2].minor.yy162.pExpr);<br class=""> yymsp[-3].minor.yy382 = sqlite3ExprListAppend(pParse,yymsp[-3].minor.yy382, yymsp[0].minor.yy162.pExpr);<br class=""> }<br class="">-#line 3383 "parse.c"<br class="">+#line 3387 "parse.c"<br class=""> break;<br class=""> case 194: /* case_operand ::= expr */<br class=""> #line 1211 "parse.y"<br class=""> {yymsp[0].minor.yy362 = yymsp[0].minor.yy162.pExpr; /*A-overwrites-X*/}<br class="">-#line 3388 "parse.c"<br class="">+#line 3392 "parse.c"<br class=""> break;<br class=""> case 197: /* nexprlist ::= nexprlist COMMA expr */<br class=""> #line 1222 "parse.y"<br class=""> {yymsp[-2].minor.yy382 = sqlite3ExprListAppend(pParse,yymsp[-2].minor.yy382,yymsp[0].minor.yy162.pExpr);}<br class="">-#line 3393 "parse.c"<br class="">+#line 3397 "parse.c"<br class=""> break;<br class=""> case 198: /* nexprlist ::= expr */<br class=""> #line 1224 "parse.y"<br class=""> {yymsp[0].minor.yy382 = sqlite3ExprListAppend(pParse,0,yymsp[0].minor.yy162.pExpr); /*A-overwrites-Y*/}<br class="">-#line 3398 "parse.c"<br class="">+#line 3402 "parse.c"<br class=""> break;<br class=""> case 200: /* paren_exprlist ::= LP exprlist RP */<br class=""> case 205: /* eidlist_opt ::= LP eidlist RP */ yytestcase(yyruleno==205);<br class=""> #line 1232 "parse.y"<br class=""> {yymsp[-2].minor.yy382 = yymsp[-1].minor.yy382;}<br class="">-#line 3404 "parse.c"<br class="">+#line 3408 "parse.c"<br class=""> break;<br class="">- case 201: /* cmd ::= createkw uniqueflag INDEX ifnotexists nm ON nm LP sortlist RP where_opt */<br class="">+ case 201: /* cmd ::= createkw uniqueflag INDEX ifnotexists nm ON nm LP sortlist RP */<br class=""> #line 1239 "parse.y"<br class=""> {<br class="">- sqlite3CreateIndex(pParse, &yymsp[-6].minor.yy0, <br class="">- sqlite3SrcListAppend(pParse->db,0,&yymsp[-4].minor.yy0), yymsp[-2].minor.yy382, yymsp[-9].minor.yy52,<br class="">- &yymsp[-10].minor.yy0, yymsp[0].minor.yy362, SQLITE_SO_ASC, yymsp[-7].minor.yy52, SQLITE_IDXTYPE_APPDEF);<br class="">+ sqlite3CreateIndex(pParse, &yymsp[-5].minor.yy0, <br class="">+ sqlite3SrcListAppend(pParse->db,0,&yymsp[-3].minor.yy0), yymsp[-1].minor.yy382, yymsp[-8].minor.yy52,<br class="">+ &yymsp[-9].minor.yy0, 0, SQLITE_SO_ASC, yymsp[-6].minor.yy52, SQLITE_IDXTYPE_APPDEF);<br class=""> }<br class="">-#line 3413 "parse.c"<br class="">+#line 3417 "parse.c"<br class=""> break;<br class=""> case 202: /* uniqueflag ::= UNIQUE */<br class=""> case 243: /* raisetype ::= ABORT */ yytestcase(yyruleno==243);<br class=""> #line 1246 "parse.y"<br class=""> {yymsp[0].minor.yy52 = ON_CONFLICT_ACTION_ABORT;}<br class="">-#line 3419 "parse.c"<br class="">+#line 3423 "parse.c"<br class=""> break;<br class=""> case 203: /* uniqueflag ::= */<br class=""> #line 1247 "parse.y"<br class=""> {yymsp[1].minor.yy52 = ON_CONFLICT_ACTION_NONE;}<br class="">-#line 3424 "parse.c"<br class="">+#line 3428 "parse.c"<br class=""> break;<br class=""> case 206: /* eidlist ::= eidlist COMMA nm collate sortorder */<br class=""> #line 1290 "parse.y"<br class=""> {<br class=""> yymsp[-4].minor.yy382 = parserAddExprIdListTerm(pParse, yymsp[-4].minor.yy382, &yymsp[-2].minor.yy0, yymsp[-1].minor.yy52, yymsp[0].minor.yy52);<br class=""> }<br class="">-#line 3431 "parse.c"<br class="">+#line 3435 "parse.c"<br class=""> break;<br class=""> case 207: /* eidlist ::= nm collate sortorder */<br class=""> #line 1293 "parse.y"<br class=""> {<br class=""> yymsp[-2].minor.yy382 = parserAddExprIdListTerm(pParse, 0, &yymsp[-2].minor.yy0, yymsp[-1].minor.yy52, yymsp[0].minor.yy52); /*A-overwrites-Y*/<br class=""> }<br class="">-#line 3438 "parse.c"<br class="">+#line 3442 "parse.c"<br class=""> break;<br class=""> case 210: /* cmd ::= DROP INDEX ifexists fullname ON nm */<br class=""> #line 1304 "parse.y"<br class=""> {<br class=""> sqlite3DropIndex(pParse, yymsp[-2].minor.yy387, &yymsp[0].minor.yy0, yymsp[-3].minor.yy52);<br class=""> }<br class="">-#line 3445 "parse.c"<br class="">+#line 3449 "parse.c"<br class=""> break;<br class=""> case 211: /* cmd ::= PRAGMA nm */<br class=""> #line 1311 "parse.y"<br class=""> {<br class=""> sqlite3Pragma(pParse,&yymsp[0].minor.yy0,0,0,0,0);<br class=""> }<br class="">-#line 3452 "parse.c"<br class="">+#line 3456 "parse.c"<br class=""> break;<br class=""> case 212: /* cmd ::= PRAGMA nm EQ nmnum */<br class=""> #line 1314 "parse.y"<br class=""> {<br class=""> sqlite3Pragma(pParse,&yymsp[-2].minor.yy0,0,&yymsp[0].minor.yy0,0,0);<br class=""> }<br class="">-#line 3459 "parse.c"<br class="">+#line 3463 "parse.c"<br class=""> break;<br class=""> case 213: /* cmd ::= PRAGMA nm LP nmnum RP */<br class=""> #line 1317 "parse.y"<br class=""> {<br class=""> sqlite3Pragma(pParse,&yymsp[-3].minor.yy0,0,&yymsp[-1].minor.yy0,0,0);<br class=""> }<br class="">-#line 3466 "parse.c"<br class="">+#line 3470 "parse.c"<br class=""> break;<br class=""> case 214: /* cmd ::= PRAGMA nm EQ minus_num */<br class=""> #line 1320 "parse.y"<br class=""> {<br class=""> sqlite3Pragma(pParse,&yymsp[-2].minor.yy0,0,&yymsp[0].minor.yy0,0,1);<br class=""> }<br class="">-#line 3473 "parse.c"<br class="">+#line 3477 "parse.c"<br class=""> break;<br class=""> case 215: /* cmd ::= PRAGMA nm LP minus_num RP */<br class=""> #line 1323 "parse.y"<br class=""> {<br class=""> sqlite3Pragma(pParse,&yymsp[-3].minor.yy0,0,&yymsp[-1].minor.yy0,0,1);<br class=""> }<br class="">-#line 3480 "parse.c"<br class="">+#line 3484 "parse.c"<br class=""> break;<br class=""> case 216: /* cmd ::= PRAGMA nm EQ nm DOT nm */<br class=""> #line 1326 "parse.y"<br class=""> {<br class=""> sqlite3Pragma(pParse,&yymsp[-4].minor.yy0,0,&yymsp[0].minor.yy0,&yymsp[-2].minor.yy0,0);<br class=""> }<br class="">-#line 3487 "parse.c"<br class="">+#line 3491 "parse.c"<br class=""> break;<br class=""> case 217: /* cmd ::= PRAGMA */<br class=""> #line 1329 "parse.y"<br class=""> {<br class=""> sqlite3Pragma(pParse, 0,0,0,0,0);<br class=""> }<br class="">-#line 3494 "parse.c"<br class="">+#line 3498 "parse.c"<br class=""> break;<br class=""> case 220: /* cmd ::= createkw trigger_decl BEGIN trigger_cmd_list END */<br class=""> #line 1349 "parse.y"<br class="">@@ -3500,7 +3504,7 @@ static void yy_reduce(<br class=""> all.n = (int)(yymsp[0].minor.yy0.z - yymsp[-3].minor.yy0.z) + yymsp[0].minor.yy0.n;<br class=""> sqlite3FinishTrigger(pParse, yymsp[-1].minor.yy427, &all);<br class=""> }<br class="">-#line 3504 "parse.c"<br class="">+#line 3508 "parse.c"<br class=""> break;<br class=""> case 221: /* trigger_decl ::= TRIGGER ifnotexists nm trigger_time trigger_event ON fullname foreach_clause when_clause */<br class=""> #line 1358 "parse.y"<br class="">@@ -3508,48 +3512,48 @@ static void yy_reduce(<br class=""> sqlite3BeginTrigger(pParse, &yymsp[-6].minor.yy0, yymsp[-5].minor.yy52, yymsp[-4].minor.yy10.a, yymsp[-4].minor.yy10.b, yymsp[-2].minor.yy387, yymsp[0].minor.yy362, yymsp[-7].minor.yy52);<br class=""> yymsp[-8].minor.yy0 = yymsp[-6].minor.yy0; /*yymsp[-8].minor.yy0-overwrites-T*/<br class=""> }<br class="">-#line 3512 "parse.c"<br class="">+#line 3516 "parse.c"<br class=""> break;<br class=""> case 222: /* trigger_time ::= BEFORE */<br class=""> #line 1364 "parse.y"<br class=""> { yymsp[0].minor.yy52 = TK_BEFORE; }<br class="">-#line 3517 "parse.c"<br class="">+#line 3521 "parse.c"<br class=""> break;<br class=""> case 223: /* trigger_time ::= AFTER */<br class=""> #line 1365 "parse.y"<br class=""> { yymsp[0].minor.yy52 = TK_AFTER; }<br class="">-#line 3522 "parse.c"<br class="">+#line 3526 "parse.c"<br class=""> break;<br class=""> case 224: /* trigger_time ::= INSTEAD OF */<br class=""> #line 1366 "parse.y"<br class=""> { yymsp[-1].minor.yy52 = TK_INSTEAD;}<br class="">-#line 3527 "parse.c"<br class="">+#line 3531 "parse.c"<br class=""> break;<br class=""> case 225: /* trigger_time ::= */<br class=""> #line 1367 "parse.y"<br class=""> { yymsp[1].minor.yy52 = TK_BEFORE; }<br class="">-#line 3532 "parse.c"<br class="">+#line 3536 "parse.c"<br class=""> break;<br class=""> case 226: /* trigger_event ::= DELETE|INSERT */<br class=""> case 227: /* trigger_event ::= UPDATE */ yytestcase(yyruleno==227);<br class=""> #line 1371 "parse.y"<br class=""> {yymsp[0].minor.yy10.a = yymsp[0].major; /*A-overwrites-X*/ yymsp[0].minor.yy10.b = 0;}<br class="">-#line 3538 "parse.c"<br class="">+#line 3542 "parse.c"<br class=""> break;<br class=""> case 228: /* trigger_event ::= UPDATE OF idlist */<br class=""> #line 1373 "parse.y"<br class=""> {yymsp[-2].minor.yy10.a = TK_UPDATE; yymsp[-2].minor.yy10.b = yymsp[0].minor.yy40;}<br class="">-#line 3543 "parse.c"<br class="">+#line 3547 "parse.c"<br class=""> break;<br class=""> case 229: /* when_clause ::= */<br class=""> #line 1380 "parse.y"<br class=""> { yymsp[1].minor.yy362 = 0; }<br class="">-#line 3548 "parse.c"<br class="">+#line 3552 "parse.c"<br class=""> break;<br class=""> case 230: /* when_clause ::= WHEN expr */<br class=""> #line 1381 "parse.y"<br class=""> { yymsp[-1].minor.yy362 = yymsp[0].minor.yy162.pExpr; }<br class="">-#line 3553 "parse.c"<br class="">+#line 3557 "parse.c"<br class=""> break;<br class=""> case 231: /* trigger_cmd_list ::= trigger_cmd_list trigger_cmd SEMI */<br class=""> #line 1385 "parse.y"<br class="">@@ -3558,7 +3562,7 @@ static void yy_reduce(<br class=""> yymsp[-2].minor.yy427->pLast->pNext = yymsp[-1].minor.yy427;<br class=""> yymsp[-2].minor.yy427->pLast = yymsp[-1].minor.yy427;<br class=""> }<br class="">-#line 3562 "parse.c"<br class="">+#line 3566 "parse.c"<br class=""> break;<br class=""> case 232: /* trigger_cmd_list ::= trigger_cmd SEMI */<br class=""> #line 1390 "parse.y"<br class="">@@ -3566,7 +3570,7 @@ static void yy_reduce(<br class=""> assert( yymsp[-1].minor.yy427!=0 );<br class=""> yymsp[-1].minor.yy427->pLast = yymsp[-1].minor.yy427;<br class=""> }<br class="">-#line 3570 "parse.c"<br class="">+#line 3574 "parse.c"<br class=""> break;<br class=""> case 233: /* trnm ::= nm DOT nm */<br class=""> #line 1401 "parse.y"<br class="">@@ -3576,7 +3580,7 @@ static void yy_reduce(<br class=""> "qualified table names are not allowed on INSERT, UPDATE, and DELETE "<br class=""> "statements within triggers");<br class=""> }<br class="">-#line 3580 "parse.c"<br class="">+#line 3584 "parse.c"<br class=""> break;<br class=""> case 234: /* tridxby ::= INDEXED BY nm */<br class=""> #line 1413 "parse.y"<br class="">@@ -3585,7 +3589,7 @@ static void yy_reduce(<br class=""> "the INDEXED BY clause is not allowed on UPDATE or DELETE statements "<br class=""> "within triggers");<br class=""> }<br class="">-#line 3589 "parse.c"<br class="">+#line 3593 "parse.c"<br class=""> break;<br class=""> case 235: /* tridxby ::= NOT INDEXED */<br class=""> #line 1418 "parse.y"<br class="">@@ -3594,27 +3598,27 @@ static void yy_reduce(<br class=""> "the NOT INDEXED clause is not allowed on UPDATE or DELETE statements "<br class=""> "within triggers");<br class=""> }<br class="">-#line 3598 "parse.c"<br class="">+#line 3602 "parse.c"<br class=""> break;<br class=""> case 236: /* trigger_cmd ::= UPDATE orconf trnm tridxby SET setlist where_opt */<br class=""> #line 1431 "parse.y"<br class=""> {yymsp[-6].minor.yy427 = sqlite3TriggerUpdateStep(pParse->db, &yymsp[-4].minor.yy0, yymsp[-1].minor.yy382, yymsp[0].minor.yy362, yymsp[-5].minor.yy52);}<br class="">-#line 3603 "parse.c"<br class="">+#line 3607 "parse.c"<br class=""> break;<br class=""> case 237: /* trigger_cmd ::= insert_cmd INTO trnm idlist_opt select */<br class=""> #line 1435 "parse.y"<br class=""> {yymsp[-4].minor.yy427 = sqlite3TriggerInsertStep(pParse->db, &yymsp[-2].minor.yy0, yymsp[-1].minor.yy40, yymsp[0].minor.yy279, yymsp[-4].minor.yy52);/*A-overwrites-R*/}<br class="">-#line 3608 "parse.c"<br class="">+#line 3612 "parse.c"<br class=""> break;<br class=""> case 238: /* trigger_cmd ::= DELETE FROM trnm tridxby where_opt */<br class=""> #line 1439 "parse.y"<br class=""> {yymsp[-4].minor.yy427 = sqlite3TriggerDeleteStep(pParse->db, &yymsp[-2].minor.yy0, yymsp[0].minor.yy362);}<br class="">-#line 3613 "parse.c"<br class="">+#line 3617 "parse.c"<br class=""> break;<br class=""> case 239: /* trigger_cmd ::= select */<br class=""> #line 1443 "parse.y"<br class=""> {yymsp[0].minor.yy427 = sqlite3TriggerSelectStep(pParse->db, yymsp[0].minor.yy279); /*A-overwrites-X*/}<br class="">-#line 3618 "parse.c"<br class="">+#line 3622 "parse.c"<br class=""> break;<br class=""> case 240: /* expr ::= RAISE LP IGNORE RP */<br class=""> #line 1446 "parse.y"<br class="">@@ -3625,7 +3629,7 @@ static void yy_reduce(<br class=""> yymsp[-3].minor.yy162.pExpr->affinity = ON_CONFLICT_ACTION_IGNORE;<br class=""> }<br class=""> }<br class="">-#line 3629 "parse.c"<br class="">+#line 3633 "parse.c"<br class=""> break;<br class=""> case 241: /* expr ::= RAISE LP raisetype COMMA STRING RP */<br class=""> #line 1453 "parse.y"<br class="">@@ -3636,85 +3640,85 @@ static void yy_reduce(<br class=""> yymsp[-5].minor.yy162.pExpr->affinity = (char)yymsp[-3].minor.yy52;<br class=""> }<br class=""> }<br class="">-#line 3640 "parse.c"<br class="">+#line 3644 "parse.c"<br class=""> break;<br class=""> case 242: /* raisetype ::= ROLLBACK */<br class=""> #line 1463 "parse.y"<br class=""> {yymsp[0].minor.yy52 = ON_CONFLICT_ACTION_ROLLBACK;}<br class="">-#line 3645 "parse.c"<br class="">+#line 3649 "parse.c"<br class=""> break;<br class=""> case 244: /* raisetype ::= FAIL */<br class=""> #line 1465 "parse.y"<br class=""> {yymsp[0].minor.yy52 = ON_CONFLICT_ACTION_FAIL;}<br class="">-#line 3650 "parse.c"<br class="">+#line 3654 "parse.c"<br class=""> break;<br class=""> case 245: /* cmd ::= DROP TRIGGER ifexists fullname */<br class=""> #line 1470 "parse.y"<br class=""> {<br class=""> sqlite3DropTrigger(pParse,yymsp[0].minor.yy387,yymsp[-1].minor.yy52);<br class=""> }<br class="">-#line 3657 "parse.c"<br class="">+#line 3661 "parse.c"<br class=""> break;<br class=""> case 246: /* cmd ::= REINDEX */<br class=""> #line 1477 "parse.y"<br class=""> {sqlite3Reindex(pParse, 0, 0);}<br class="">-#line 3662 "parse.c"<br class="">+#line 3666 "parse.c"<br class=""> break;<br class=""> case 247: /* cmd ::= REINDEX nm */<br class=""> #line 1478 "parse.y"<br class=""> {sqlite3Reindex(pParse, &yymsp[0].minor.yy0, 0);}<br class="">-#line 3667 "parse.c"<br class="">+#line 3671 "parse.c"<br class=""> break;<br class=""> case 248: /* cmd ::= REINDEX nm ON nm */<br class=""> #line 1479 "parse.y"<br class=""> {sqlite3Reindex(pParse, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);}<br class="">-#line 3672 "parse.c"<br class="">+#line 3676 "parse.c"<br class=""> break;<br class=""> case 249: /* cmd ::= ANALYZE */<br class=""> #line 1484 "parse.y"<br class=""> {sqlite3Analyze(pParse, 0);}<br class="">-#line 3677 "parse.c"<br class="">+#line 3681 "parse.c"<br class=""> break;<br class=""> case 250: /* cmd ::= ANALYZE nm */<br class=""> #line 1485 "parse.y"<br class=""> {sqlite3Analyze(pParse, &yymsp[0].minor.yy0);}<br class="">-#line 3682 "parse.c"<br class="">+#line 3686 "parse.c"<br class=""> break;<br class=""> case 251: /* cmd ::= ALTER TABLE fullname RENAME TO nm */<br class=""> #line 1490 "parse.y"<br class=""> {<br class=""> sqlite3AlterRenameTable(pParse,yymsp[-3].minor.yy387,&yymsp[0].minor.yy0);<br class=""> }<br class="">-#line 3689 "parse.c"<br class="">+#line 3693 "parse.c"<br class=""> break;<br class=""> case 252: /* with ::= */<br class=""> #line 1513 "parse.y"<br class=""> {yymsp[1].minor.yy151 = 0;}<br class="">-#line 3694 "parse.c"<br class="">+#line 3698 "parse.c"<br class=""> break;<br class=""> case 253: /* with ::= WITH wqlist */<br class=""> #line 1515 "parse.y"<br class=""> { yymsp[-1].minor.yy151 = yymsp[0].minor.yy151; }<br class="">-#line 3699 "parse.c"<br class="">+#line 3703 "parse.c"<br class=""> break;<br class=""> case 254: /* with ::= WITH RECURSIVE wqlist */<br class=""> #line 1516 "parse.y"<br class=""> { yymsp[-2].minor.yy151 = yymsp[0].minor.yy151; }<br class="">-#line 3704 "parse.c"<br class="">+#line 3708 "parse.c"<br class=""> break;<br class=""> case 255: /* wqlist ::= nm eidlist_opt AS LP select RP */<br class=""> #line 1518 "parse.y"<br class=""> {<br class=""> yymsp[-5].minor.yy151 = sqlite3WithAdd(pParse, 0, &yymsp[-5].minor.yy0, yymsp[-4].minor.yy382, yymsp[-1].minor.yy279); /*A-overwrites-X*/<br class=""> }<br class="">-#line 3711 "parse.c"<br class="">+#line 3715 "parse.c"<br class=""> break;<br class=""> case 256: /* wqlist ::= wqlist COMMA nm eidlist_opt AS LP select RP */<br class=""> #line 1521 "parse.y"<br class=""> {<br class=""> yymsp[-7].minor.yy151 = sqlite3WithAdd(pParse, yymsp[-7].minor.yy151, &yymsp[-5].minor.yy0, yymsp[-4].minor.yy382, yymsp[-1].minor.yy279);<br class=""> }<br class="">-#line 3718 "parse.c"<br class="">+#line 3722 "parse.c"<br class=""> break;<br class=""> default:<br class=""> /* (257) input ::= ecmd */ yytestcase(yyruleno==257);<br class="">@@ -3825,7 +3829,7 @@ static void yy_syntax_error(<br class=""> } else {<br class=""> sqlite3ErrorMsg(pParse, "near \"%T\": syntax error", &TOKEN);<br class=""> }<br class="">-#line 3829 "parse.c"<br class="">+#line 3833 "parse.c"<br class=""> /************ End %syntax_error code ******************************************/<br class=""> sqlite3ParserARG_STORE; /* Suppress warning about unused %extra_argument variable */<br class=""> }<br class="">diff --git a/src/box/sql/parse.y b/src/box/sql/parse.y<br class="">index 914fc53..5fb2c89 100644<br class="">--- a/src/box/sql/parse.y<br class="">+++ b/src/box/sql/parse.y<br class="">@@ -1236,10 +1236,10 @@ paren_exprlist(A) ::= LP exprlist(X) RP. {A = X;}<br class=""> ///////////////////////////// The CREATE INDEX command ///////////////////////<br class=""> //<br class=""> cmd ::= createkw(S) uniqueflag(U) INDEX ifnotexists(NE) nm(X)<br class="">- ON nm(Y) LP sortlist(Z) RP where_opt(W). {<br class="">+ ON nm(Y) LP sortlist(Z) RP. {<br class=""> sqlite3CreateIndex(pParse, &X, <br class=""> sqlite3SrcListAppend(pParse->db,0,&Y), Z, U,<br class="">- &S, W, SQLITE_SO_ASC, NE, SQLITE_IDXTYPE_APPDEF);<br class="">+ &S, 0, SQLITE_SO_ASC, NE, SQLITE_IDXTYPE_APPDEF);<br class=""> }<br class=""><br class=""> %type uniqueflag {int}<br class="">diff --git a/test/sql-tap/analyze9.test.lua b/test/sql-tap/analyze9.test.lua<br class="">index 4ce575e..e8b8cc6 100755<br class="">--- a/test/sql-tap/analyze9.test.lua<br class="">+++ b/test/sql-tap/analyze9.test.lua<br class="">@@ -1,6 +1,6 @@<br class=""> #!/usr/bin/env tarantool<br class=""> test = require("sqltester")<br class="">-test:plan(124)<br class="">+test:plan(118)<br class=""><br class=""> testprefix = "analyze9"<br class=""><br class="">@@ -209,7 +209,7 @@ test:do_execsql_test(<br class=""> INSERT INTO t1 SELECT a+2,3,'three'||substr(c,4) FROM t1 WHERE c GLOB 'one-*';<br class=""> INSERT INTO t1 SELECT a+3,4,'four'||substr(c,4) FROM t1 WHERE c GLOB 'one-*';<br class=""> INSERT INTO t1 SELECT a+4,5,'five'||substr(c,4) FROM t1 WHERE c GLOB 'one-*';<br class="">- INSERT INTO t1 SELECT a+5,6,'six'||substr(c,4) FROM t1 WHERE c GLOB 'one-*';<span class="Apple-tab-span" style="white-space:pre"> </span><br class="">+ INSERT INTO t1 SELECT a+5,6,'six'||substr(c,4) FROM t1 WHERE c GLOB 'one-*’; <br class=""></div></div></blockquote><div><br class=""></div><div>This is redundant diff, I guess.</div><br class=""><blockquote type="cite" class=""><div class=""><div class=""> CREATE INDEX t1b ON t1(b);<br class=""> ANALYZE;<br class=""> SELECT c FROM t1 WHERE b=3 AND a BETWEEN 30 AND 60;<br class="">@@ -1105,82 +1105,82 @@ test:do_execsql_test(<br class=""> ---------------------------------------------------------------------------<br class=""> -- Test that stat4 data may be used with partial indexes.<br class=""> --<br class="">-test:do_test(<br class="">- 17.1,<br class="">- function()<br class="">- test:execsql([[<br class="">- DROP TABLE IF EXISTS t1;<br class="">- CREATE TABLE t1(id INTEGER PRIMARY KEY AUTOINCREMENT, a, b, c, d);<br class="">- CREATE INDEX i1 ON t1(a, b) WHERE d IS NOT NULL;<br class="">- INSERT INTO t1 VALUES(null, -1, -1, -1, NULL);<br class="">- INSERT INTO t1 SELECT null, 2*a,2*b,2*c,d FROM t1;<br class="">- INSERT INTO t1 SELECT null, 2*a,2*b,2*c,d FROM t1;<br class="">- INSERT INTO t1 SELECT null, 2*a,2*b,2*c,d FROM t1;<br class="">- INSERT INTO t1 SELECT null, 2*a,2*b,2*c,d FROM t1;<br class="">- INSERT INTO t1 SELECT null, 2*a,2*b,2*c,d FROM t1;<br class="">- INSERT INTO t1 SELECT null, 2*a,2*b,2*c,d FROM t1;<br class="">- ]])<br class="">- local b = 0<br class="">- for i = 0, 31 do<br class="">- if (i < 8) then<br class="">- b = 0<br class="">- else<br class="">- b = i<br class="">- end<br class="">- test:execsql(string.format(" INSERT INTO t1 VALUES(null, %s%%2, %s, %s/2, 'abc') ", i, b, i))<br class="">- end<br class="">- return test:execsql("ANALYZE")<br class="">- end, {<br class="">- -- <17.1><br class="">- -- </17.1><br class="">- })<br class="">+--test:do_test(<br class="">+-- 17.1,<br class="">+-- function()<br class="">+-- test:execsql([[<br class="">+-- DROP TABLE IF EXISTS t1;<br class="">+-- CREATE TABLE t1(id INTEGER PRIMARY KEY AUTOINCREMENT, a, b, c, d);<br class="">+-- CREATE INDEX i1 ON t1(a, b) WHERE d IS NOT NULL;<br class="">+-- INSERT INTO t1 VALUES(null, -1, -1, -1, NULL);<br class="">+-- INSERT INTO t1 SELECT null, 2*a,2*b,2*c,d FROM t1;<br class="">+-- INSERT INTO t1 SELECT null, 2*a,2*b,2*c,d FROM t1;<br class="">+-- INSERT INTO t1 SELECT null, 2*a,2*b,2*c,d FROM t1;<br class="">+-- INSERT INTO t1 SELECT null, 2*a,2*b,2*c,d FROM t1;<br class="">+-- INSERT INTO t1 SELECT null, 2*a,2*b,2*c,d FROM t1;<br class="">+-- INSERT INTO t1 SELECT null, 2*a,2*b,2*c,d FROM t1;<br class="">+-- ]])<br class="">+-- local b = 0<br class="">+-- for i = 0, 31 do<br class="">+-- if (i < 8) then<br class="">+-- b = 0<br class="">+-- else<br class="">+-- b = i<br class="">+-- end<br class="">+-- test:execsql(string.format(" INSERT INTO t1 VALUES(null, %s%%2, %s, %s/2, 'abc') ", i, b, i))<br class="">+-- end<br class="">+-- return test:execsql("ANALYZE")<br class="">+-- end, {<br class="">+-- -- <17.1><br class="">+-- -- </17.1><br class="">+-- })<br class=""><br class="">-test:do_execsql_test(<br class="">- 17.2,<br class="">- [[<br class="">- EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE d IS NOT NULL AND a=0 AND b=10 AND c=10;<br class="">- ]], {<br class="">- -- <17.2><br class="">- 0, 0, 0, 'SEARCH TABLE T1 USING COVERING INDEX I1 (A=? AND B=?)'<br class="">- -- </17.2><br class="">- })<br class="">+--test:do_execsql_test(<br class="">+-- 17.2,<br class="">+-- [[<br class="">+-- EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE d IS NOT NULL AND a=0 AND b=10 AND c=10;<br class="">+-- ]], {<br class="">+-- -- <17.2><br class="">+-- 0, 0, 0, 'SEARCH TABLE T1 USING COVERING INDEX I1 (A=? AND B=?)'<br class="">+-- -- </17.2><br class="">+-- })<br class=""><br class="">-test:do_execsql_test(<br class="">- 17.3,<br class="">- [[<br class="">- EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE d IS NOT NULL AND a=0 AND b=0 AND c=10;<br class="">- ]], {<br class="">- -- <17.3><br class="">- 0, 0, 0, "SEARCH TABLE T1 USING COVERING INDEX I1 (A=? AND B=?)"<br class="">- -- </17.3><br class="">- })<br class="">+--test:do_execsql_test(<br class="">+-- 17.3,<br class="">+-- [[<br class="">+-- EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE d IS NOT NULL AND a=0 AND b=0 AND c=10;<br class="">+-- ]], {<br class="">+-- -- <17.3><br class="">+-- 0, 0, 0, "SEARCH TABLE T1 USING COVERING INDEX I1 (A=? AND B=?)"<br class="">+-- -- </17.3><br class="">+-- })<br class=""><br class="">-test:do_execsql_test(<br class="">- 17.4,<br class="">- [[<br class="">- CREATE INDEX i2 ON t1(c, d);<br class="">- ANALYZE;<br class="">- ]])<br class="">+--test:do_execsql_test(<br class="">+-- 17.4,<br class="">+-- [[<br class="">+-- CREATE INDEX i2 ON t1(c, d);<br class="">+-- ANALYZE;<br class="">+-- ]])<br class=""><br class="">-test:do_execsql_test(<br class="">- 17.5,<br class="">- [[<br class="">- EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE d IS NOT NULL AND a=0 AND b=10 AND c=10;<br class="">- ]], {<br class="">- -- <17.5><br class="">- 0, 0, 0, "SEARCH TABLE T1 USING COVERING INDEX I2 (C=? AND D>?)"<br class="">- -- </17.5><br class="">- })<br class="">+--test:do_execsql_test(<br class="">+-- 17.5,<br class="">+-- [[<br class="">+-- EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE d IS NOT NULL AND a=0 AND b=10 AND c=10;<br class="">+-- ]], {<br class="">+-- -- <17.5><br class="">+-- 0, 0, 0, "SEARCH TABLE T1 USING COVERING INDEX I2 (C=? AND D>?)"<br class="">+-- -- </17.5><br class="">+-- })<br class=""><br class="">-test:do_execsql_test(<br class="">- 17.6,<br class="">- [[<br class="">- EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE d IS NOT NULL AND a=0 AND b=0 AND c=10;<br class="">- ]], {<br class="">- -- <17.6><br class="">- 0, 0, 0, "SEARCH TABLE T1 USING COVERING INDEX I2 (C=? AND D>?)"<br class="">- -- </17.6><br class="">- })<br class="">+--test:do_execsql_test(<br class="">+-- 17.6,<br class="">+-- [[<br class="">+-- EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE d IS NOT NULL AND a=0 AND b=0 AND c=10;<br class="">+-- ]], {<br class="">+-- -- <17.6><br class="">+-- 0, 0, 0, "SEARCH TABLE T1 USING COVERING INDEX I2 (C=? AND D>?)"<br class="">+-- -- </17.6><br class="">+-- })<br class=""></div></div></blockquote><div><br class=""></div><div>Actually, I am against turning off these tests cases only due to the fact that</div><div>partial index is used to fill this table. You can easily rewrite 17.1 test</div><div>without it. </div><br class=""><blockquote type="cite" class=""><div class=""><div class=""><br class=""> ---------------------------------------------------------------------------<br class=""><br class="">diff --git a/test/sql-tap/autoindex4.test.lua b/test/sql-tap/autoindex4.test.lua<br class="">index 45bae48..c19639a 100755<br class="">--- a/test/sql-tap/autoindex4.test.lua<br class="">+++ b/test/sql-tap/autoindex4.test.lua<br class="">@@ -1,6 +1,6 @@<br class=""> #!/usr/bin/env tarantool<br class=""> test = require("sqltester")<br class="">-test:plan(7)<br class="">+test:plan(6)<br class=""><br class=""> --!./tcltestrunner.lua<br class=""> -- 2014-10-24<br class="">@@ -108,22 +108,21 @@ test:do_execsql_test(<br class=""> -- </autoindex4-3.0><br class=""> })<br class=""><br class="">-test:do_execsql_test(<br class="">- "autoindex4-3.1",<br class="">- [[<br class="">- CREATE INDEX Items_x1 ON Items(ItemName,Name) WHERE ItemName = 'dummy';<br class="">-<br class="">- SELECT Items.ItemName<br class="">- FROM Items<br class="">- LEFT JOIN A ON (A.Name = Items.ItemName and Items.ItemName = 'dummy')<br class="">- LEFT JOIN B ON (B.Name = Items.ItemName)<br class="">- WHERE Items.Name = 'Parent'<br class="">- ORDER BY Items.ItemName;<br class="">- ]], {<br class="">- -- <autoindex4-3.1><br class="">- "Item1", "Item2"<br class="">- -- </autoindex4-3.1><br class="">- })<br class="">+--test:do_execsql_test(<br class="">+-- "autoindex4-3.1",<br class="">+-- [[<br class="">+-- CREATE INDEX Items_x1 ON Items(ItemName,Name) WHERE ItemName = 'dummy';<br class="">+--<br class="">+-- SELECT Items.ItemName<br class="">+-- FROM Items<br class="">+-- LEFT JOIN A ON (A.Name = Items.ItemName and Items.ItemName = 'dummy')<br class="">+-- LEFT JOIN B ON (B.Name = Items.ItemName)<br class="">+-- WHERE Items.Name = 'Parent'<br class="">+-- ORDER BY Items.ItemName;<br class="">+-- ]], {<br class="">+-- -- <autoindex4-3.1><br class="">+-- "Item1", "Item2"<br class="">+-- -- </autoindex4-3.1><br class="">+-- })<br class=""><br class=""> test:finish_test()<br class="">-<br class="">diff --git a/test/sql-tap/fkey1.test.lua b/test/sql-tap/fkey1.test.lua<br class="">index 8749e1f..fb84968 100755<br class="">--- a/test/sql-tap/fkey1.test.lua<br class="">+++ b/test/sql-tap/fkey1.test.lua<br class="">@@ -1,6 +1,6 @@<br class=""> #!/usr/bin/env tarantool<br class=""> test = require("sqltester")<br class="">-test:plan(19)<br class="">+test:plan(16)<br class=""><br class=""> -- This file implements regression tests for foreign keys.<br class=""><br class="">@@ -208,36 +208,36 @@ test:do_execsql_test(<br class=""> -- </fkey1-5.6><br class=""> })<br class=""><br class="">-test:do_execsql_test(<br class="">- "fkey1-6.1",<br class="">- [[<br class="">- CREATE TABLE p1(id PRIMARY KEY, x, y);<br class="">- CREATE UNIQUE INDEX p1x ON p1(x) WHERE y<2;<br class="">- INSERT INTO p1 VALUES(1, 1, 1);<br class="">- CREATE TABLE c1(a PRIMARY KEY REFERENCES p1(x));<br class="">- ]], {<br class="">- -- <fkey1-6.1><br class="">- -- </fkey1-6.1><br class="">- })<br class="">-<br class="">-test:do_catchsql_test(<br class="">- "fkey1-6.2",<br class="">- [[<br class="">- INSERT INTO c1 VALUES(1);<br class="">- ]], {<br class="">- -- <fkey1-6.2><br class="">- 1, "foreign key mismatch - \"C1\" referencing \"P1\""<br class="">- -- </fkey1-6.2><br class="">- })<br class="">-<br class="">-test:do_execsql_test(<br class="">- "fkey1-6.3",<br class="">- [[<br class="">- CREATE UNIQUE INDEX p1x2 ON p1(x);<br class="">- INSERT INTO c1 VALUES(1);<br class="">- ]], {<br class="">- -- <fkey1-6.3><br class="">- -- </fkey1-6.3><br class="">- })<br class="">+--test:do_execsql_test(<br class="">+-- "fkey1-6.1",<br class="">+-- [[<br class="">+-- CREATE TABLE p1(id PRIMARY KEY, x, y);<br class="">+-- CREATE UNIQUE INDEX p1x ON p1(x) WHERE y<2;<br class="">+-- INSERT INTO p1 VALUES(1, 1, 1);<br class="">+-- CREATE TABLE c1(a PRIMARY KEY REFERENCES p1(x));<br class="">+-- ]], {<br class="">+-- -- <fkey1-6.1><br class="">+-- -- </fkey1-6.1><br class="">+-- })<br class="">+<br class="">+--test:do_catchsql_test(<br class="">+-- "fkey1-6.2",<br class="">+-- [[<br class="">+-- INSERT INTO c1 VALUES(1);<br class="">+-- ]], {<br class="">+-- -- <fkey1-6.2><br class="">+-- 1, "foreign key mismatch - \"C1\" referencing \"P1\""<br class="">+-- -- </fkey1-6.2><br class="">+-- })<br class="">+<br class="">+--test:do_execsql_test(<br class="">+-- "fkey1-6.3",<br class="">+-- [[<br class="">+-- CREATE UNIQUE INDEX p1x2 ON p1(x);<br class="">+-- INSERT INTO c1 VALUES(1);<br class="">+-- ]], {<br class="">+-- -- <fkey1-6.3><br class="">+-- -- </fkey1-6.3><br class="">+-- })<br class=""></div></div></blockquote><div><br class=""></div><div><div>The same is here: it is test suit for foreign keys and it shouldn’t</div><div>be turned off only due to unavailability of partial indexes.</div><div>Please, don’t comment them but refactor without using partial indexes. </div><div class=""><br class=""></div></div><blockquote type="cite" class=""><div class=""><div class=""><br class=""> test:finish_test()<br class="">diff --git a/test/sql-tap/gh-2165-remove-support-partial-indexes.test.lua b/test/sql-tap/gh-2165-remove-support-partial-indexes.test.lua<br class="">new file mode 100755<br class="">index 0000000..d8210fc<br class="">--- /dev/null<br class="">+++ b/test/sql-tap/gh-2165-remove-support-partial-indexes.test.lua<br class="">@@ -0,0 +1,17 @@<br class="">+#!/usr/bin/env tarantool<br class="">+test = require("sqltester")<br class="">+<br class="">+test:plan(1)<br class="">+<br class="">+<br class="">+test:do_catchsql_test(<br class="">+ "partial-index-1",<br class="">+ [[<br class="">+ CREATE TABLE t1 (a INTEGER PRIMARY KEY, b INTEGER)<br class="">+ CREATE UNIQUE INDEX i ON t1 (a) WHERE a = 3;<br class="">+ ]], {<br class="">+ 1, "keyword \"CREATE\" is reserved"<br class="">+ })<br class="">+<br class="">+--This test intended to be deleted in #2626<br class="">+test:finish_test()<br class="">diff --git a/test/sql-tap/index7.test.lua b/test/sql-tap/index7.test.lua<br class="">index c8f56eb..c294732 100755<br class="">--- a/test/sql-tap/index7.test.lua<br class="">+++ b/test/sql-tap/index7.test.lua<br class="">@@ -1,6 +1,6 @@<br class=""> #!/usr/bin/env tarantool<br class=""> test = require("sqltester")<br class="">-test:plan(5)<br class="">+test:plan(1)<br class=""><br class=""> --!./tcltestrunner.lua<br class=""> -- 2013-11-04<br class="">@@ -258,47 +258,47 @@ test:do_execsql_test(<br class=""> -- </index7-6.1><br class=""> })<br class=""><br class="">-test:do_execsql_test(<br class="">- "index7-6.2",<br class="">- [[<br class="">- CREATE INDEX i4 ON t4(c) WHERE d='xyz';<br class="">- SELECT a,b,c,d FROM (SELECT a,b FROM t5 WHERE a=1 AND b='xyz'), t4 WHERE c='abc';<br class="">- ]], {<br class="">- -- <index7-6.2><br class="">- 1, "xyz", "abc", "not xyz"<br class="">- -- </index7-6.2><br class="">- })<br class="">+--test:do_execsql_test(<br class="">+-- "index7-6.2",<br class="">+-- [[<br class="">+-- CREATE INDEX i4 ON t4(c) WHERE d='xyz';<br class="">+-- SELECT a,b,c,d FROM (SELECT a,b FROM t5 WHERE a=1 AND b='xyz'), t4 WHERE c='abc';<br class="">+-- ]], {<br class="">+-- -- <index7-6.2><br class="">+-- 1, "xyz", "abc", "not xyz"<br class="">+-- -- </index7-6.2><br class="">+-- })<br class=""><br class="">-test:do_execsql_test(<br class="">- "index7-6.3",<br class="">- [[<br class="">- CREATE VIEW v4 AS SELECT c,d FROM t4;<br class="">- INSERT INTO t4 VALUES(2, 'def', 'xyz');<br class="">- SELECT * FROM v4 WHERE d='xyz' AND c='def'<br class="">- ]], {<br class="">- -- <index7-6.3><br class="">- "def", "xyz"<br class="">- -- </index7-6.3><br class="">- })<br class="">+--test:do_execsql_test(<br class="">+-- "index7-6.3",<br class="">+-- [[<br class="">+-- CREATE VIEW v4 AS SELECT c,d FROM t4;<br class="">+-- INSERT INTO t4 VALUES(2, 'def', 'xyz');<br class="">+-- SELECT * FROM v4 WHERE d='xyz' AND c='def'<br class="">+-- ]], {<br class="">+-- -- <index7-6.3><br class="">+-- "def", "xyz"<br class="">+-- -- </index7-6.3><br class="">+-- })<br class=""><br class="">-test:do_eqp_test(<br class="">- "index7-6.4",<br class="">- [[<br class="">- SELECT * FROM v4 WHERE d='xyz' AND c='def'<br class="">- ]], {<br class="">- -- <index7-6.4><br class="">- {0, 0, 0, "SEARCH TABLE T4 USING COVERING INDEX I4 (C=?)"}<br class="">- -- </index7-6.4><br class="">- })<br class="">+--test:do_eqp_test(<br class="">+-- "index7-6.4",<br class="">+-- [[<br class="">+-- SELECT * FROM v4 WHERE d='xyz' AND c='def'<br class="">+-- ]], {<br class="">+-- -- <index7-6.4><br class="">+-- {0, 0, 0, "SEARCH TABLE T4 USING COVERING INDEX I4 (C=?)"}<br class="">+-- -- </index7-6.4><br class="">+-- })<br class=""><br class="">-test:do_catchsql_test(<br class="">- "index7-6.5",<br class="">- [[<br class="">- CREATE INDEX t5a ON t5(a) WHERE a=#1;<br class="">- ]], {<br class="">- -- <index7-6.5><br class="">- 1, [[near "#1": syntax error]]<br class="">- -- </index7-6.5><br class="">- })<br class="">+--test:do_catchsql_test(<br class="">+-- "index7-6.5",<br class="">+-- [[<br class="">+-- CREATE INDEX t5a ON t5(a) WHERE a=#1;<br class="">+-- ]], {<br class="">+-- -- <index7-6.5><br class="">+-- 1, [[near "#1": syntax error]]<br class="">+-- -- </index7-6.5><br class="">+-- })<br class=""><br class=""> test:finish_test()<br class="">diff --git a/test/sql-tap/suite.ini b/test/sql-tap/suite.ini<br class="">index 0bc9e83..d29c1b0 100644<br class="">--- a/test/sql-tap/suite.ini<br class="">+++ b/test/sql-tap/suite.ini<br class="">@@ -3,3 +3,4 @@ core = app<br class=""> description = Database tests with #! using TAP<br class=""> lua_libs = lua/sqltester.lua ../sql/lua/sql_tokenizer.lua ../box/lua/identifier.lua<br class=""> is_parallel = True<br class="">+disabled = index6.test.lua ; to be enabled after #2626<br class="">-- <br class="">2.7.4<br class=""><br class=""><br class=""></div></div></blockquote></div><br class=""></body></html>