Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch mistake Excluding Merge-Ins
This is equivalent to a diff from b5354f19f2 to cfc7117a17
2015-12-11
| ||
12:50 | Fix [http://www.sqlite.org/src/info/96d3e99ffe59b528|96d3e99ffe59b528]: Memory allocation bug. I saw crashes on 32-bit Linux (Ubuntu 14.04), so it's not only win32 which was affected by this bug. check-in: b85b159bee user: jan.nijtmans tags: trunk | |
12:39 | Fix [http://www.sqlite.org/src/info/96d3e99ffe59b528|96d3e99ffe59b528]: Memory allocation bug. I saw crashes on 32-bit Linux (Ubuntu 14.04), so it's not only win32 which was affected by this bug. Closed-Leaf check-in: cfc7117a17 user: jan.nijtmans tags: mistake | |
2015-12-10
| ||
13:11 | Improved documentation for cloning, including mentioning the use of %40 for "@" characters in the userid. check-in: b5354f19f2 user: drh tags: trunk | |
2015-12-08
| ||
12:45 | Add the ".changes ON|OFF" command to the "fossil sqlite" command-line shell check-in: 1e723a12d3 user: jan.nijtmans tags: trunk | |
Changes to src/sqlite3.c.
︙ | ︙ | |||
68856 68857 68858 68859 68860 68861 68862 68863 68864 68865 68866 68867 68868 68869 | resolveP2Values(p, &nArg); p->usesStmtJournal = (u8)(pParse->isMultiWrite && pParse->mayAbort); if( pParse->explain && nMem<10 ){ nMem = 10; } memset(zCsr, 0, nFree); zCsr += (zCsr - (u8*)0)&7; assert( EIGHT_BYTE_ALIGNMENT(zCsr) ); p->expired = 0; /* Memory for registers, parameters, cursor, etc, is allocated in two ** passes. On the first pass, we try to reuse unused space at the ** end of the opcode array. If we are unable to satisfy all memory | > | 68856 68857 68858 68859 68860 68861 68862 68863 68864 68865 68866 68867 68868 68869 68870 | resolveP2Values(p, &nArg); p->usesStmtJournal = (u8)(pParse->isMultiWrite && pParse->mayAbort); if( pParse->explain && nMem<10 ){ nMem = 10; } memset(zCsr, 0, nFree); nFree -= (zCsr - (u8*)0)&7; zCsr += (zCsr - (u8*)0)&7; assert( EIGHT_BYTE_ALIGNMENT(zCsr) ); p->expired = 0; /* Memory for registers, parameters, cursor, etc, is allocated in two ** passes. On the first pass, we try to reuse unused space at the ** end of the opcode array. If we are unable to satisfy all memory |
︙ | ︙ | |||
127201 127202 127203 127204 127205 127206 127207 | #define YYSTACKDEPTH 100 #endif #define sqlite3ParserARG_SDECL Parse *pParse; #define sqlite3ParserARG_PDECL ,Parse *pParse #define sqlite3ParserARG_FETCH Parse *pParse = yypParser->pParse #define sqlite3ParserARG_STORE yypParser->pParse = pParse #define YYFALLBACK 1 | | | | | | | | | | | 127202 127203 127204 127205 127206 127207 127208 127209 127210 127211 127212 127213 127214 127215 127216 127217 127218 127219 127220 127221 127222 127223 127224 127225 | #define YYSTACKDEPTH 100 #endif #define sqlite3ParserARG_SDECL Parse *pParse; #define sqlite3ParserARG_PDECL ,Parse *pParse #define sqlite3ParserARG_FETCH Parse *pParse = yypParser->pParse #define sqlite3ParserARG_STORE yypParser->pParse = pParse #define YYFALLBACK 1 #define YYNSTATE 440 #define YYNRULE 328 #define YY_MAX_SHIFT 439 #define YY_MIN_SHIFTREDUCE 653 #define YY_MAX_SHIFTREDUCE 980 #define YY_MIN_REDUCE 981 #define YY_MAX_REDUCE 1308 #define YY_ERROR_ACTION 1309 #define YY_ACCEPT_ACTION 1310 #define YY_NO_ACTION 1311 /************* End control #defines *******************************************/ /* The yyzerominor constant is used to initialize instances of ** YYMINORTYPE objects to zero. */ static const YYMINORTYPE yyzerominor = { 0 }; /* Define the yytestcase() macro to be a no-op if is not already defined |
︙ | ︙ | |||
127282 127283 127284 127285 127286 127287 127288 | ** yy_shift_ofst[] For each state, the offset into yy_action for ** shifting terminals. ** yy_reduce_ofst[] For each state, the offset into yy_action for ** shifting non-terminals after a reduce. ** yy_default[] Default action for each state. ** *********** Begin parsing tables **********************************************/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > > > > > < < < < < | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 127283 127284 127285 127286 127287 127288 127289 127290 127291 127292 127293 127294 127295 127296 127297 127298 127299 127300 127301 127302 127303 127304 127305 127306 127307 127308 127309 127310 127311 127312 127313 127314 127315 127316 127317 127318 127319 127320 127321 127322 127323 127324 127325 127326 127327 127328 127329 127330 127331 127332 127333 127334 127335 127336 127337 127338 127339 127340 127341 127342 127343 127344 127345 127346 127347 127348 127349 127350 127351 127352 127353 127354 127355 127356 127357 127358 127359 127360 127361 127362 127363 127364 127365 127366 127367 127368 127369 127370 127371 127372 127373 127374 127375 127376 127377 127378 127379 127380 127381 127382 127383 127384 127385 127386 127387 127388 127389 127390 127391 127392 127393 127394 127395 127396 127397 127398 127399 127400 127401 127402 127403 127404 127405 127406 127407 127408 127409 127410 127411 127412 127413 127414 127415 127416 127417 127418 127419 127420 127421 127422 127423 127424 127425 127426 127427 127428 127429 127430 127431 127432 127433 127434 127435 127436 127437 127438 127439 127440 127441 127442 127443 127444 127445 127446 127447 127448 127449 | ** yy_shift_ofst[] For each state, the offset into yy_action for ** shifting terminals. ** yy_reduce_ofst[] For each state, the offset into yy_action for ** shifting non-terminals after a reduce. ** yy_default[] Default action for each state. ** *********** Begin parsing tables **********************************************/ #define YY_ACTTAB_COUNT (1507) static const YYACTIONTYPE yy_action[] = { /* 0 */ 315, 1310, 145, 655, 2, 192, 656, 342, 784, 92, /* 10 */ 92, 92, 92, 85, 90, 90, 90, 90, 89, 89, /* 20 */ 88, 88, 88, 87, 339, 88, 88, 88, 87, 339, /* 30 */ 331, 860, 860, 92, 92, 92, 92, 701, 90, 90, /* 40 */ 90, 90, 89, 89, 88, 88, 88, 87, 339, 76, /* 50 */ 811, 74, 93, 94, 84, 872, 875, 864, 864, 91, /* 60 */ 91, 92, 92, 92, 92, 339, 90, 90, 90, 90, /* 70 */ 89, 89, 88, 88, 88, 87, 339, 315, 784, 90, /* 80 */ 90, 90, 90, 89, 89, 88, 88, 88, 87, 339, /* 90 */ 360, 812, 780, 705, 693, 693, 86, 83, 166, 261, /* 100 */ 813, 719, 434, 86, 83, 166, 328, 701, 860, 860, /* 110 */ 201, 158, 280, 391, 275, 390, 188, 693, 693, 832, /* 120 */ 86, 83, 166, 273, 837, 49, 123, 87, 339, 93, /* 130 */ 94, 84, 872, 875, 864, 864, 91, 91, 92, 92, /* 140 */ 92, 92, 239, 90, 90, 90, 90, 89, 89, 88, /* 150 */ 88, 88, 87, 339, 315, 767, 337, 336, 216, 412, /* 160 */ 398, 69, 231, 397, 694, 695, 400, 914, 255, 358, /* 170 */ 254, 292, 319, 434, 912, 434, 913, 89, 89, 88, /* 180 */ 88, 88, 87, 339, 395, 860, 860, 694, 695, 183, /* 190 */ 95, 123, 388, 385, 384, 837, 31, 837, 49, 916, /* 200 */ 916, 755, 756, 383, 123, 315, 93, 94, 84, 872, /* 210 */ 875, 864, 864, 91, 91, 92, 92, 92, 92, 114, /* 220 */ 90, 90, 90, 90, 89, 89, 88, 88, 88, 87, /* 230 */ 339, 434, 412, 403, 439, 661, 860, 860, 350, 57, /* 240 */ 232, 832, 109, 708, 370, 693, 693, 367, 829, 764, /* 250 */ 97, 753, 756, 837, 49, 712, 712, 93, 94, 84, /* 260 */ 872, 875, 864, 864, 91, 91, 92, 92, 92, 92, /* 270 */ 427, 90, 90, 90, 90, 89, 89, 88, 88, 88, /* 280 */ 87, 339, 315, 114, 22, 365, 692, 58, 412, 394, /* 290 */ 255, 353, 242, 213, 766, 693, 693, 851, 689, 115, /* 300 */ 365, 231, 397, 693, 693, 400, 183, 693, 693, 388, /* 310 */ 385, 384, 365, 860, 860, 694, 695, 160, 159, 223, /* 320 */ 383, 742, 25, 810, 711, 845, 143, 693, 693, 839, /* 330 */ 396, 343, 770, 770, 93, 94, 84, 872, 875, 864, /* 340 */ 864, 91, 91, 92, 92, 92, 92, 918, 90, 90, /* 350 */ 90, 90, 89, 89, 88, 88, 88, 87, 339, 315, /* 360 */ 844, 844, 844, 270, 261, 694, 695, 782, 710, 86, /* 370 */ 83, 166, 219, 694, 695, 741, 1, 694, 695, 693, /* 380 */ 693, 693, 693, 434, 86, 83, 166, 253, 692, 941, /* 390 */ 860, 860, 431, 703, 704, 832, 302, 694, 695, 221, /* 400 */ 690, 115, 123, 948, 799, 837, 48, 346, 309, 974, /* 410 */ 851, 93, 94, 84, 872, 875, 864, 864, 91, 91, /* 420 */ 92, 92, 92, 92, 114, 90, 90, 90, 90, 89, /* 430 */ 89, 88, 88, 88, 87, 339, 315, 944, 845, 683, /* 440 */ 717, 433, 839, 434, 255, 358, 254, 359, 292, 694, /* 450 */ 695, 694, 695, 289, 945, 344, 975, 291, 210, 23, /* 460 */ 174, 797, 836, 434, 357, 837, 10, 860, 860, 24, /* 470 */ 946, 151, 757, 844, 844, 844, 798, 972, 1294, 325, /* 480 */ 402, 1294, 360, 356, 758, 837, 49, 939, 93, 94, /* 490 */ 84, 872, 875, 864, 864, 91, 91, 92, 92, 92, /* 500 */ 92, 434, 90, 90, 90, 90, 89, 89, 88, 88, /* 510 */ 88, 87, 339, 315, 380, 114, 911, 709, 434, 911, /* 520 */ 332, 894, 114, 837, 10, 970, 434, 861, 861, 324, /* 530 */ 189, 163, 836, 165, 434, 910, 348, 327, 910, 908, /* 540 */ 837, 10, 969, 310, 860, 860, 187, 423, 837, 10, /* 550 */ 220, 873, 876, 836, 222, 407, 837, 49, 1223, 797, /* 560 */ 68, 941, 410, 249, 66, 93, 94, 84, 872, 875, /* 570 */ 864, 864, 91, 91, 92, 92, 92, 92, 865, 90, /* 580 */ 90, 90, 90, 89, 89, 88, 88, 88, 87, 339, /* 590 */ 315, 408, 213, 766, 838, 349, 114, 944, 906, 372, /* 600 */ 731, 5, 320, 192, 400, 776, 784, 273, 230, 246, /* 610 */ 775, 248, 401, 164, 945, 389, 123, 351, 55, 359, /* 620 */ 333, 860, 860, 732, 337, 336, 692, 972, 1295, 728, /* 630 */ 946, 1295, 417, 214, 837, 9, 366, 290, 959, 115, /* 640 */ 722, 315, 93, 94, 84, 872, 875, 864, 864, 91, /* 650 */ 91, 92, 92, 92, 92, 434, 90, 90, 90, 90, /* 660 */ 89, 89, 88, 88, 88, 87, 339, 916, 916, 1304, /* 670 */ 1304, 762, 860, 860, 329, 970, 784, 837, 35, 751, /* 680 */ 724, 338, 703, 704, 981, 656, 342, 247, 749, 924, /* 690 */ 924, 373, 187, 93, 94, 84, 872, 875, 864, 864, /* 700 */ 91, 91, 92, 92, 92, 92, 114, 90, 90, 90, /* 710 */ 90, 89, 89, 88, 88, 88, 87, 339, 315, 434, /* 720 */ 958, 434, 112, 314, 434, 697, 321, 702, 404, 434, /* 730 */ 797, 363, 434, 1021, 434, 192, 434, 405, 784, 434, /* 740 */ 364, 837, 36, 837, 12, 434, 837, 27, 320, 860, /* 750 */ 860, 837, 37, 20, 837, 38, 837, 39, 837, 28, /* 760 */ 72, 837, 29, 667, 668, 669, 268, 837, 40, 234, /* 770 */ 93, 94, 84, 872, 875, 864, 864, 91, 91, 92, /* 780 */ 92, 92, 92, 434, 90, 90, 90, 90, 89, 89, /* 790 */ 88, 88, 88, 87, 339, 315, 434, 702, 434, 921, /* 800 */ 147, 434, 165, 920, 279, 837, 41, 434, 784, 434, /* 810 */ 21, 434, 263, 434, 266, 278, 434, 371, 837, 42, /* 820 */ 837, 11, 434, 837, 43, 235, 860, 860, 797, 837, /* 830 */ 99, 837, 44, 837, 45, 837, 32, 75, 837, 46, /* 840 */ 309, 971, 261, 261, 837, 47, 315, 93, 94, 84, /* 850 */ 872, 875, 864, 864, 91, 91, 92, 92, 92, 92, /* 860 */ 434, 90, 90, 90, 90, 89, 89, 88, 88, 88, /* 870 */ 87, 339, 434, 186, 185, 184, 238, 860, 860, 654, /* 880 */ 2, 1068, 837, 33, 743, 217, 218, 261, 975, 261, /* 890 */ 430, 321, 261, 778, 837, 117, 261, 315, 93, 94, /* 900 */ 84, 872, 875, 864, 864, 91, 91, 92, 92, 92, /* 910 */ 92, 434, 90, 90, 90, 90, 89, 89, 88, 88, /* 920 */ 88, 87, 339, 434, 322, 124, 212, 163, 860, 860, /* 930 */ 947, 904, 902, 837, 118, 763, 730, 729, 261, 759, /* 940 */ 293, 293, 737, 738, 965, 837, 119, 686, 315, 93, /* 950 */ 82, 84, 872, 875, 864, 864, 91, 91, 92, 92, /* 960 */ 92, 92, 434, 90, 90, 90, 90, 89, 89, 88, /* 970 */ 88, 88, 87, 339, 434, 720, 250, 326, 335, 860, /* 980 */ 860, 260, 114, 361, 837, 53, 812, 917, 917, 936, /* 990 */ 156, 420, 424, 428, 934, 813, 837, 34, 368, 315, /* 1000 */ 257, 94, 84, 872, 875, 864, 864, 91, 91, 92, /* 1010 */ 92, 92, 92, 434, 90, 90, 90, 90, 89, 89, /* 1020 */ 88, 88, 88, 87, 339, 434, 114, 114, 114, 964, /* 1030 */ 860, 860, 311, 262, 834, 837, 100, 191, 256, 381, /* 1040 */ 271, 68, 197, 68, 265, 720, 773, 837, 50, 71, /* 1050 */ 915, 915, 267, 84, 872, 875, 864, 864, 91, 91, /* 1060 */ 92, 92, 92, 92, 434, 90, 90, 90, 90, 89, /* 1070 */ 89, 88, 88, 88, 87, 339, 80, 429, 806, 3, /* 1080 */ 1218, 191, 434, 269, 340, 340, 837, 101, 745, 80, /* 1090 */ 429, 901, 3, 727, 726, 432, 725, 340, 340, 434, /* 1100 */ 897, 274, 434, 197, 837, 102, 434, 804, 432, 434, /* 1110 */ 699, 434, 847, 111, 418, 434, 788, 413, 434, 835, /* 1120 */ 434, 837, 98, 123, 837, 116, 851, 418, 837, 49, /* 1130 */ 783, 837, 113, 837, 106, 226, 123, 837, 105, 851, /* 1140 */ 837, 103, 837, 104, 795, 415, 77, 78, 294, 416, /* 1150 */ 434, 295, 114, 79, 436, 435, 393, 434, 839, 77, /* 1160 */ 78, 901, 843, 412, 414, 434, 79, 436, 435, 376, /* 1170 */ 707, 839, 837, 52, 434, 80, 429, 434, 3, 837, /* 1180 */ 54, 776, 847, 340, 340, 688, 775, 837, 51, 844, /* 1190 */ 844, 844, 846, 19, 432, 676, 837, 26, 675, 837, /* 1200 */ 30, 677, 844, 844, 844, 846, 19, 207, 665, 282, /* 1210 */ 308, 148, 284, 418, 286, 252, 362, 241, 386, 6, /* 1220 */ 352, 161, 277, 80, 429, 851, 3, 938, 899, 724, /* 1230 */ 898, 340, 340, 300, 157, 419, 245, 288, 678, 962, /* 1240 */ 194, 957, 432, 955, 952, 77, 78, 781, 323, 56, /* 1250 */ 59, 135, 79, 436, 435, 96, 411, 839, 146, 826, /* 1260 */ 240, 418, 121, 128, 66, 823, 244, 243, 354, 130, /* 1270 */ 107, 355, 131, 851, 132, 133, 940, 70, 429, 379, /* 1280 */ 3, 173, 138, 831, 149, 340, 340, 369, 844, 844, /* 1290 */ 844, 846, 19, 77, 78, 178, 432, 893, 62, 375, /* 1300 */ 79, 436, 435, 919, 259, 839, 796, 208, 179, 144, /* 1310 */ 377, 264, 180, 392, 679, 418, 181, 312, 748, 747, /* 1320 */ 746, 330, 716, 735, 313, 722, 406, 851, 792, 715, /* 1330 */ 65, 281, 283, 276, 793, 791, 844, 844, 844, 846, /* 1340 */ 19, 714, 713, 734, 285, 193, 287, 77, 78, 880, /* 1350 */ 790, 73, 227, 422, 79, 436, 435, 334, 426, 839, /* 1360 */ 215, 67, 409, 228, 298, 307, 306, 305, 204, 303, /* 1370 */ 229, 771, 680, 296, 297, 299, 202, 685, 7, 437, /* 1380 */ 673, 203, 206, 205, 660, 438, 317, 168, 671, 237, /* 1390 */ 844, 844, 844, 846, 19, 670, 662, 110, 236, 318, /* 1400 */ 125, 224, 341, 120, 155, 233, 167, 345, 108, 909, /* 1410 */ 907, 170, 830, 126, 127, 760, 129, 251, 171, 172, /* 1420 */ 932, 123, 169, 134, 60, 61, 136, 137, 937, 175, /* 1430 */ 176, 931, 8, 13, 177, 922, 258, 139, 191, 928, /* 1440 */ 374, 140, 150, 682, 378, 278, 182, 382, 141, 122, /* 1450 */ 63, 14, 733, 769, 272, 15, 387, 64, 225, 850, /* 1460 */ 849, 878, 16, 882, 774, 4, 162, 209, 399, 316, /* 1470 */ 211, 142, 800, 805, 71, 190, 68, 879, 877, 943, /* 1480 */ 199, 942, 17, 195, 196, 421, 979, 18, 152, 153, /* 1490 */ 198, 980, 154, 425, 881, 848, 347, 700, 81, 200, /* 1500 */ 301, 1023, 304, 657, 983, 983, 1022, }; static const YYCODETYPE yy_lookahead[] = { /* 0 */ 19, 144, 145, 146, 147, 24, 1, 2, 27, 80, /* 10 */ 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, /* 20 */ 91, 92, 93, 94, 95, 91, 92, 93, 94, 95, /* 30 */ 19, 50, 51, 80, 81, 82, 83, 27, 85, 86, /* 40 */ 87, 88, 89, 90, 91, 92, 93, 94, 95, 137, |
︙ | ︙ | |||
127562 127563 127564 127565 127566 127567 127568 | /* 1180 */ 175, 116, 97, 27, 28, 152, 121, 174, 175, 132, /* 1190 */ 133, 134, 135, 136, 38, 152, 174, 175, 152, 174, /* 1200 */ 175, 152, 132, 133, 134, 135, 136, 234, 152, 212, /* 1210 */ 150, 199, 212, 57, 212, 240, 240, 203, 178, 200, /* 1220 */ 216, 186, 177, 19, 20, 69, 22, 203, 177, 182, /* 1230 */ 177, 27, 28, 202, 200, 228, 216, 216, 155, 39, /* 1240 */ 122, 159, 38, 159, 41, 89, 90, 91, 159, 241, | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 127563 127564 127565 127566 127567 127568 127569 127570 127571 127572 127573 127574 127575 127576 127577 127578 127579 127580 127581 127582 127583 127584 127585 127586 127587 127588 127589 127590 127591 127592 127593 127594 127595 127596 127597 127598 127599 127600 127601 127602 127603 127604 127605 127606 127607 | /* 1180 */ 175, 116, 97, 27, 28, 152, 121, 174, 175, 132, /* 1190 */ 133, 134, 135, 136, 38, 152, 174, 175, 152, 174, /* 1200 */ 175, 152, 132, 133, 134, 135, 136, 234, 152, 212, /* 1210 */ 150, 199, 212, 57, 212, 240, 240, 203, 178, 200, /* 1220 */ 216, 186, 177, 19, 20, 69, 22, 203, 177, 182, /* 1230 */ 177, 27, 28, 202, 200, 228, 216, 216, 155, 39, /* 1240 */ 122, 159, 38, 159, 41, 89, 90, 91, 159, 241, /* 1250 */ 241, 22, 96, 97, 98, 129, 126, 101, 222, 207, /* 1260 */ 206, 57, 71, 191, 130, 207, 203, 206, 18, 194, /* 1270 */ 244, 159, 194, 69, 194, 194, 203, 19, 20, 18, /* 1280 */ 22, 158, 191, 191, 222, 27, 28, 159, 132, 133, /* 1290 */ 134, 135, 136, 89, 90, 158, 38, 203, 137, 46, /* 1300 */ 96, 97, 98, 237, 236, 101, 159, 159, 158, 22, /* 1310 */ 179, 159, 158, 107, 159, 57, 158, 179, 176, 176, /* 1320 */ 176, 48, 176, 184, 179, 106, 125, 69, 218, 178, /* 1330 */ 107, 217, 217, 176, 218, 218, 132, 133, 134, 135, /* 1340 */ 136, 176, 176, 184, 217, 159, 217, 89, 90, 159, /* 1350 */ 218, 137, 227, 179, 96, 97, 98, 95, 179, 101, /* 1360 */ 5, 128, 127, 230, 204, 10, 11, 12, 13, 14, /* 1370 */ 230, 207, 17, 206, 205, 203, 25, 162, 26, 161, /* 1380 */ 13, 153, 6, 153, 4, 151, 250, 32, 151, 34, /* 1390 */ 132, 133, 134, 135, 136, 151, 151, 180, 43, 250, /* 1400 */ 247, 180, 3, 167, 22, 142, 15, 68, 16, 23, /* 1410 */ 23, 56, 120, 131, 111, 20, 123, 16, 63, 125, /* 1420 */ 1, 66, 67, 123, 79, 79, 131, 111, 28, 36, /* 1430 */ 122, 1, 5, 22, 107, 54, 140, 54, 26, 61, /* 1440 */ 44, 107, 24, 20, 19, 112, 105, 53, 22, 40, /* 1450 */ 22, 22, 30, 116, 23, 22, 53, 22, 53, 23, /* 1460 */ 23, 23, 22, 11, 23, 22, 122, 23, 26, 114, /* 1470 */ 23, 22, 124, 28, 26, 36, 26, 23, 23, 23, /* 1480 */ 122, 23, 36, 26, 22, 24, 23, 36, 22, 22, /* 1490 */ 26, 23, 22, 24, 23, 23, 141, 23, 22, 122, /* 1500 */ 23, 122, 15, 1, 252, 252, 122, }; #define YY_SHIFT_USE_DFLT (-89) #define YY_SHIFT_COUNT (439) #define YY_SHIFT_MIN (-88) #define YY_SHIFT_MAX (1502) static const short yy_shift_ofst[] = { /* 0 */ 5, 1057, 1355, 1070, 1204, 1204, 1204, 90, 60, -19, /* 10 */ 58, 58, 186, 1204, 1204, 1204, 1204, 1204, 1204, 1204, /* 20 */ 67, 67, 182, 336, 218, 550, 135, 263, 340, 417, /* 30 */ 494, 571, 622, 699, 776, 827, 827, 827, 827, 827, /* 40 */ 827, 827, 827, 827, 827, 827, 827, 827, 827, 827, /* 50 */ 878, 827, 929, 980, 980, 1156, 1204, 1204, 1204, 1204, |
︙ | ︙ | |||
127618 127619 127620 127621 127622 127623 127624 | /* 170 */ 218, 218, 218, 218, 218, 218, 218, 218, 218, 218, /* 180 */ 218, 218, 218, 218, 563, 563, 563, 218, 218, 435, /* 190 */ 218, 218, 218, 579, 218, 218, 585, 218, 218, 218, /* 200 */ 218, 218, 218, 218, 218, 218, 218, 581, 768, 711, /* 210 */ 711, 711, 704, 215, 1065, 756, 434, 709, 709, 712, /* 220 */ 434, 712, 534, 858, 641, 953, 709, -88, 953, 953, /* 230 */ 867, 489, 447, 1200, 1118, 1118, 1203, 1203, 1118, 1229, | | | | | | | | | | | | | | | | | | | | | | | | 127619 127620 127621 127622 127623 127624 127625 127626 127627 127628 127629 127630 127631 127632 127633 127634 127635 127636 127637 127638 127639 127640 127641 127642 127643 127644 127645 127646 127647 127648 127649 127650 127651 127652 127653 127654 127655 127656 127657 | /* 170 */ 218, 218, 218, 218, 218, 218, 218, 218, 218, 218, /* 180 */ 218, 218, 218, 218, 563, 563, 563, 218, 218, 435, /* 190 */ 218, 218, 218, 579, 218, 218, 585, 218, 218, 218, /* 200 */ 218, 218, 218, 218, 218, 218, 218, 581, 768, 711, /* 210 */ 711, 711, 704, 215, 1065, 756, 434, 709, 709, 712, /* 220 */ 434, 712, 534, 858, 641, 953, 709, -88, 953, 953, /* 230 */ 867, 489, 447, 1200, 1118, 1118, 1203, 1203, 1118, 1229, /* 240 */ 1126, 1130, 1191, 1126, 1130, 1134, 1250, 1250, 1250, 1250, /* 250 */ 1118, 1261, 1134, 1229, 1191, 1191, 1134, 1118, 1261, 1161, /* 260 */ 1253, 1118, 1118, 1261, 1287, 1118, 1261, 1118, 1261, 1287, /* 270 */ 1206, 1206, 1206, 1273, 1287, 1206, 1219, 1206, 1273, 1206, /* 280 */ 1206, 1201, 1223, 1201, 1223, 1201, 1223, 1201, 1223, 1118, /* 290 */ 1118, 1214, 1287, 1262, 1262, 1287, 1126, 1130, 1233, 1235, /* 300 */ 1134, 1351, 1352, 1367, 1367, 1376, 1376, 1376, 1376, -89, /* 310 */ -89, -89, -89, -89, -89, 477, 547, 386, 818, 750, /* 320 */ 765, 700, 1006, 731, 1011, 1015, 1016, 1017, 948, 836, /* 330 */ 935, 703, 1023, 1055, 1064, 1077, 855, 918, 1087, 1085, /* 340 */ 611, 1380, 1399, 1382, 1263, 1391, 1339, 1392, 1386, 1387, /* 350 */ 1292, 1282, 1303, 1293, 1395, 1294, 1401, 1419, 1300, 1295, /* 360 */ 1345, 1346, 1316, 1400, 1393, 1308, 1430, 1427, 1411, 1327, /* 370 */ 1296, 1381, 1412, 1383, 1378, 1396, 1334, 1418, 1423, 1425, /* 380 */ 1333, 1341, 1426, 1394, 1428, 1429, 1431, 1433, 1403, 1422, /* 390 */ 1435, 1405, 1409, 1436, 1437, 1438, 1337, 1440, 1441, 1443, /* 400 */ 1442, 1344, 1444, 1447, 1445, 1439, 1449, 1348, 1448, 1446, /* 410 */ 1450, 1451, 1448, 1454, 1455, 1456, 1457, 1458, 1462, 1452, /* 420 */ 1463, 1466, 1461, 1464, 1468, 1467, 1469, 1464, 1471, 1470, /* 430 */ 1472, 1474, 1476, 1358, 1377, 1379, 1384, 1477, 1487, 1502, }; #define YY_REDUCE_USE_DFLT (-144) #define YY_REDUCE_COUNT (314) #define YY_REDUCE_MIN (-143) #define YY_REDUCE_MAX (1245) static const short yy_reduce_ofst[] = { /* 0 */ -143, 954, 86, 21, -50, 23, 79, 134, 226, -120, /* 10 */ -127, 146, 161, 291, 349, 366, 311, 382, 374, 231, /* 20 */ 364, 367, 396, 398, 236, 317, -103, -103, -103, -103, /* 30 */ -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, /* 40 */ -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, /* 50 */ -103, -103, -103, -103, -103, 460, 503, 567, 569, 572, |
︙ | ︙ | |||
127668 127669 127670 127671 127672 127673 127674 | /* 170 */ 724, 779, 792, 824, 831, 837, 842, 846, 848, 881, /* 180 */ 892, 900, 931, 936, 446, 910, 911, 944, 949, 901, /* 190 */ 955, 967, 978, 923, 992, 993, 956, 996, 999, 1010, /* 200 */ 289, 1018, 1033, 1043, 1046, 1049, 1056, 934, 973, 997, /* 210 */ 1000, 1002, 901, 1012, 1019, 1060, 1014, 1004, 1020, 975, /* 220 */ 1024, 976, 1040, 1035, 1047, 1045, 1021, 1007, 1051, 1053, /* 230 */ 1031, 1034, 1083, 1026, 1082, 1084, 1008, 1009, 1089, 1036, | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 127669 127670 127671 127672 127673 127674 127675 127676 127677 127678 127679 127680 127681 127682 127683 127684 127685 127686 127687 127688 127689 127690 127691 127692 127693 127694 127695 127696 127697 127698 127699 127700 127701 127702 127703 127704 127705 127706 127707 127708 127709 127710 127711 127712 127713 127714 127715 127716 127717 127718 127719 127720 127721 127722 127723 127724 127725 127726 127727 127728 127729 127730 127731 127732 127733 127734 127735 127736 | /* 170 */ 724, 779, 792, 824, 831, 837, 842, 846, 848, 881, /* 180 */ 892, 900, 931, 936, 446, 910, 911, 944, 949, 901, /* 190 */ 955, 967, 978, 923, 992, 993, 956, 996, 999, 1010, /* 200 */ 289, 1018, 1033, 1043, 1046, 1049, 1056, 934, 973, 997, /* 210 */ 1000, 1002, 901, 1012, 1019, 1060, 1014, 1004, 1020, 975, /* 220 */ 1024, 976, 1040, 1035, 1047, 1045, 1021, 1007, 1051, 1053, /* 230 */ 1031, 1034, 1083, 1026, 1082, 1084, 1008, 1009, 1089, 1036, /* 240 */ 1052, 1054, 1072, 1058, 1061, 1063, 1075, 1078, 1080, 1081, /* 250 */ 1112, 1123, 1073, 1062, 1091, 1092, 1094, 1128, 1137, 1066, /* 260 */ 1068, 1147, 1148, 1150, 1131, 1152, 1154, 1155, 1158, 1138, /* 270 */ 1142, 1143, 1144, 1139, 1145, 1146, 1151, 1157, 1159, 1165, /* 280 */ 1166, 1110, 1114, 1116, 1115, 1117, 1127, 1132, 1129, 1186, /* 290 */ 1190, 1125, 1174, 1133, 1140, 1179, 1164, 1167, 1169, 1160, /* 300 */ 1172, 1215, 1218, 1228, 1230, 1234, 1237, 1244, 1245, 1136, /* 310 */ 1149, 1153, 1217, 1221, 1236, }; static const YYACTIONTYPE yy_default[] = { /* 0 */ 986, 1304, 1304, 1304, 1218, 1218, 1218, 1309, 1304, 1113, /* 10 */ 1142, 1142, 1278, 1309, 1309, 1309, 1309, 1309, 1309, 1216, /* 20 */ 1309, 1309, 1309, 1304, 1309, 1117, 1148, 1309, 1309, 1309, /* 30 */ 1309, 1309, 1309, 1309, 1309, 1277, 1279, 1156, 1155, 1258, /* 40 */ 1129, 1153, 1146, 1150, 1219, 1212, 1213, 1211, 1215, 1220, /* 50 */ 1309, 1149, 1181, 1196, 1180, 1309, 1309, 1309, 1309, 1309, /* 60 */ 1309, 1309, 1309, 1309, 1309, 1309, 1309, 1309, 1309, 1309, /* 70 */ 1309, 1309, 1309, 1309, 1309, 1309, 1309, 1309, 1309, 1309, /* 80 */ 1309, 1309, 1309, 1309, 1309, 1309, 1309, 1309, 1309, 1309, /* 90 */ 1309, 1309, 1309, 1309, 1309, 1309, 1309, 1309, 1190, 1195, /* 100 */ 1202, 1194, 1191, 1183, 1182, 1184, 1185, 1309, 1309, 1012, /* 110 */ 1078, 1309, 1309, 1186, 1309, 1024, 1187, 1199, 1198, 1197, /* 120 */ 1019, 1309, 1309, 1309, 1309, 1309, 1309, 1309, 1309, 1309, /* 130 */ 1309, 1309, 1309, 1309, 1309, 1309, 1309, 1309, 1309, 1309, /* 140 */ 1309, 1309, 1309, 1309, 1309, 986, 1304, 1309, 1309, 1304, /* 150 */ 1304, 1304, 1304, 1304, 1304, 1296, 1117, 1107, 1309, 1309, /* 160 */ 1309, 1309, 1309, 1309, 1309, 1309, 1309, 1309, 1284, 1282, /* 170 */ 1309, 1231, 1309, 1309, 1309, 1309, 1309, 1309, 1309, 1309, /* 180 */ 1309, 1309, 1309, 1309, 1309, 1309, 1309, 1309, 1309, 1309, /* 190 */ 1309, 1309, 1309, 1113, 1309, 1309, 1309, 1309, 1309, 1309, /* 200 */ 1309, 1309, 1309, 1309, 1309, 1309, 992, 1309, 1251, 1113, /* 210 */ 1113, 1113, 1115, 1093, 1105, 994, 1152, 1131, 1131, 1263, /* 220 */ 1152, 1263, 1049, 1072, 1046, 1142, 1131, 1214, 1142, 1142, /* 230 */ 1114, 1105, 1309, 1289, 1122, 1122, 1281, 1281, 1122, 1161, /* 240 */ 1147, 1136, 1082, 1147, 1136, 1152, 1089, 1089, 1089, 1089, /* 250 */ 1122, 1009, 1152, 1161, 1082, 1082, 1152, 1122, 1009, 1257, /* 260 */ 1255, 1122, 1122, 1009, 1224, 1122, 1009, 1122, 1009, 1224, /* 270 */ 1080, 1080, 1080, 1064, 1224, 1080, 1049, 1080, 1064, 1080, /* 280 */ 1080, 1135, 1130, 1135, 1130, 1135, 1130, 1135, 1130, 1122, /* 290 */ 1122, 1309, 1224, 1228, 1228, 1224, 1147, 1136, 1145, 1143, /* 300 */ 1152, 1015, 1067, 1002, 1002, 991, 991, 991, 991, 1301, /* 310 */ 1301, 1296, 1051, 1051, 1034, 1309, 1309, 1309, 1309, 1309, /* 320 */ 1309, 1026, 1309, 1233, 1309, 1309, 1309, 1309, 1309, 1309, /* 330 */ 1309, 1309, 1309, 1309, 1309, 1309, 1309, 1309, 1309, 1309, /* 340 */ 1168, 1309, 987, 1291, 1309, 1309, 1288, 1309, 1309, 1309, /* 350 */ 1309, 1309, 1309, 1309, 1309, 1309, 1309, 1309, 1309, 1309, /* 360 */ 1309, 1309, 1309, 1309, 1309, 1261, 1309, 1309, 1309, 1309, /* 370 */ 1309, 1309, 1254, 1253, 1309, 1309, 1309, 1309, 1309, 1309, /* 380 */ 1309, 1309, 1309, 1309, 1309, 1309, 1309, 1309, 1309, 1309, /* 390 */ 1309, 1309, 1309, 1309, 1309, 1309, 1096, 1309, 1309, 1309, /* 400 */ 1100, 1309, 1309, 1309, 1309, 1309, 1309, 1309, 1144, 1309, /* 410 */ 1137, 1309, 1217, 1309, 1309, 1309, 1309, 1309, 1309, 1309, /* 420 */ 1309, 1309, 1309, 1306, 1309, 1309, 1309, 1305, 1309, 1309, /* 430 */ 1309, 1309, 1309, 1170, 1309, 1169, 1173, 1309, 1000, 1309, }; /********** End of lemon-generated parsing tables *****************************/ /* The next table maps tokens (terminal symbols) into fallback tokens. ** If a construct like the following: ** ** %fallback ID X Y Z. |
︙ | ︙ | |||
128133 128134 128135 128136 128137 128138 128139 | /* 163 */ "groupby_opt ::= GROUP BY nexprlist", /* 164 */ "having_opt ::=", /* 165 */ "having_opt ::= HAVING expr", /* 166 */ "limit_opt ::=", /* 167 */ "limit_opt ::= LIMIT expr", /* 168 */ "limit_opt ::= LIMIT expr OFFSET expr", /* 169 */ "limit_opt ::= LIMIT expr COMMA expr", | | | | 128134 128135 128136 128137 128138 128139 128140 128141 128142 128143 128144 128145 128146 128147 128148 128149 128150 128151 | /* 163 */ "groupby_opt ::= GROUP BY nexprlist", /* 164 */ "having_opt ::=", /* 165 */ "having_opt ::= HAVING expr", /* 166 */ "limit_opt ::=", /* 167 */ "limit_opt ::= LIMIT expr", /* 168 */ "limit_opt ::= LIMIT expr OFFSET expr", /* 169 */ "limit_opt ::= LIMIT expr COMMA expr", /* 170 */ "cmd ::= with DELETE FROM fullname indexed_opt where_opt orderby_opt limit_opt", /* 171 */ "where_opt ::=", /* 172 */ "where_opt ::= WHERE expr", /* 173 */ "cmd ::= with UPDATE orconf fullname indexed_opt SET setlist where_opt orderby_opt limit_opt", /* 174 */ "setlist ::= setlist COMMA nm EQ expr", /* 175 */ "setlist ::= nm EQ expr", /* 176 */ "cmd ::= with insert_cmd INTO fullname idlist_opt select", /* 177 */ "cmd ::= with insert_cmd INTO fullname idlist_opt DEFAULT VALUES", /* 178 */ "insert_cmd ::= INSERT orconf", /* 179 */ "insert_cmd ::= REPLACE", /* 180 */ "idlist_opt ::=", |
︙ | ︙ | |||
128864 128865 128866 128867 128868 128869 128870 | { 204, 3 }, { 205, 0 }, { 205, 2 }, { 207, 0 }, { 207, 2 }, { 207, 4 }, { 207, 4 }, | | | | 128865 128866 128867 128868 128869 128870 128871 128872 128873 128874 128875 128876 128877 128878 128879 128880 128881 128882 | { 204, 3 }, { 205, 0 }, { 205, 2 }, { 207, 0 }, { 207, 2 }, { 207, 4 }, { 207, 4 }, { 149, 8 }, { 203, 0 }, { 203, 2 }, { 149, 10 }, { 220, 5 }, { 220, 3 }, { 149, 6 }, { 149, 7 }, { 221, 2 }, { 221, 1 }, { 222, 0 }, |
︙ | ︙ | |||
129634 129635 129636 129637 129638 129639 129640 | break; case 168: /* limit_opt ::= LIMIT expr OFFSET expr */ {yygotominor.yy292.pLimit = yymsp[-2].minor.yy118.pExpr; yygotominor.yy292.pOffset = yymsp[0].minor.yy118.pExpr;} break; case 169: /* limit_opt ::= LIMIT expr COMMA expr */ {yygotominor.yy292.pOffset = yymsp[-2].minor.yy118.pExpr; yygotominor.yy292.pLimit = yymsp[0].minor.yy118.pExpr;} break; | | < < < < < < < > > > > > > > > | > | | 129635 129636 129637 129638 129639 129640 129641 129642 129643 129644 129645 129646 129647 129648 129649 129650 129651 129652 129653 129654 129655 129656 129657 129658 129659 129660 129661 129662 129663 | break; case 168: /* limit_opt ::= LIMIT expr OFFSET expr */ {yygotominor.yy292.pLimit = yymsp[-2].minor.yy118.pExpr; yygotominor.yy292.pOffset = yymsp[0].minor.yy118.pExpr;} break; case 169: /* limit_opt ::= LIMIT expr COMMA expr */ {yygotominor.yy292.pOffset = yymsp[-2].minor.yy118.pExpr; yygotominor.yy292.pLimit = yymsp[0].minor.yy118.pExpr;} break; case 170: /* cmd ::= with DELETE FROM fullname indexed_opt where_opt orderby_opt limit_opt */ { sqlite3WithPush(pParse, yymsp[-7].minor.yy451, 1); sqlite3SrcListIndexedBy(pParse, yymsp[-4].minor.yy259, &yymsp[-3].minor.yy0); yymsp[-2].minor.yy314 = sqlite3LimitWhere(pParse, yymsp[-4].minor.yy259, yymsp[-2].minor.yy314, yymsp[-1].minor.yy322, yymsp[0].minor.yy292.pLimit, yymsp[0].minor.yy292.pOffset, "DELETE"); sqlite3DeleteFrom(pParse,yymsp[-4].minor.yy259,yymsp[-2].minor.yy314); } break; case 173: /* cmd ::= with UPDATE orconf fullname indexed_opt SET setlist where_opt orderby_opt limit_opt */ { sqlite3WithPush(pParse, yymsp[-9].minor.yy451, 1); sqlite3SrcListIndexedBy(pParse, yymsp[-6].minor.yy259, &yymsp[-5].minor.yy0); sqlite3ExprListCheckLength(pParse,yymsp[-3].minor.yy322,"set list"); yymsp[-2].minor.yy314 = sqlite3LimitWhere(pParse, yymsp[-6].minor.yy259, yymsp[-2].minor.yy314, yymsp[-1].minor.yy322, yymsp[0].minor.yy292.pLimit, yymsp[0].minor.yy292.pOffset, "UPDATE"); sqlite3Update(pParse,yymsp[-6].minor.yy259,yymsp[-3].minor.yy322,yymsp[-2].minor.yy314,yymsp[-7].minor.yy4); } break; case 174: /* setlist ::= setlist COMMA nm EQ expr */ { yygotominor.yy322 = sqlite3ExprListAppend(pParse, yymsp[-4].minor.yy322, yymsp[0].minor.yy118.pExpr); sqlite3ExprListSetName(pParse, yygotominor.yy322, &yymsp[-2].minor.yy0, 1); } |
︙ | ︙ | |||
181772 181773 181774 181775 181776 181777 181778 | */ static void fts5SourceIdFunc( sqlite3_context *pCtx, /* Function call context */ int nArg, /* Number of args */ sqlite3_value **apVal /* Function arguments */ ){ assert( nArg==0 ); | | | 181775 181776 181777 181778 181779 181780 181781 181782 181783 181784 181785 181786 181787 181788 181789 | */ static void fts5SourceIdFunc( sqlite3_context *pCtx, /* Function call context */ int nArg, /* Number of args */ sqlite3_value **apVal /* Function arguments */ ){ assert( nArg==0 ); sqlite3_result_text(pCtx, "fts5: 2015-12-07 18:18:33 e7ae120d04cffafd9bc2b4ecd68571c17e05ed72", -1, SQLITE_TRANSIENT); } static int fts5Init(sqlite3 *db){ static const sqlite3_module fts5Mod = { /* iVersion */ 2, /* xCreate */ fts5CreateMethod, /* xConnect */ fts5ConnectMethod, |
︙ | ︙ |