From 77e396703f1090485748b02ac70256a38efffa87 Mon Sep 17 00:00:00 2001 From: Lawrence Date: Wed, 17 Jan 2018 15:43:38 +0100 Subject: [PATCH] Add stringLength information to hsql::Statement --- Makefile | 2 +- src/parser/Makefile | 8 +- src/parser/bison_parser.cpp | 1052 ++++++++++++++++++----------------- src/parser/bison_parser.h | 11 +- src/parser/bison_parser.y | 24 +- src/parser/parser_typedef.h | 3 + src/sql/SQLStatement.h | 3 + test/sql_tests.cpp | 11 + 8 files changed, 579 insertions(+), 535 deletions(-) diff --git a/Makefile b/Makefile index 2f3d90e..5a9d3b7 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,7 @@ $(LIB_BUILD): $(LIB_OBJ) $(LIBLINKER) $(LIB_LFLAGS) $(LIB_BUILD) $(LIB_OBJ) $(SRCPARSER)/flex_lexer.o: $(SRCPARSER)/flex_lexer.cpp $(SRCPARSER)/bison_parser.cpp - $(CXX) $(LIB_CFLAGS) -c -o $@ $< -Wno-sign-compare -Wno-unneeded-internal-declaration + $(CXX) $(LIB_CFLAGS) -c -o $@ $< -Wno-sign-compare -Wno-unneeded-internal-declaration -Wno-register %.o: %.cpp $(PARSER_CPP) $(LIB_H) $(CXX) $(LIB_CFLAGS) -c -o $@ $< diff --git a/src/parser/Makefile b/src/parser/Makefile index d8482b9..0494dce 100644 --- a/src/parser/Makefile +++ b/src/parser/Makefile @@ -1,9 +1,11 @@ +# bison's version is too old OSX, allow user to pass in custom path +BISON?=bison all: bison_parser.cpp flex_lexer.cpp bison_parser.cpp: bison_parser.y - @bison --version | head -n 1 - bison bison_parser.y --output=bison_parser.cpp --defines=bison_parser.h --verbose + @$(BISON) --version | head -n 1 + $(BISON) bison_parser.y --output=bison_parser.cpp --defines=bison_parser.h --verbose flex_lexer.cpp: flex_lexer.l @flex --version @@ -14,4 +16,4 @@ clean: # Tests if the parser builds correctly and doesn't contain conflicts. test: - ! bison bison_parser.y -v --output=conflict_test.cpp 2>&1 | grep "conflict" >&2 + ! $(BISON) bison_parser.y -v --output=conflict_test.cpp 2>&1 | grep "conflict" >&2 diff --git a/src/parser/bison_parser.cpp b/src/parser/bison_parser.cpp index 8aafc9b..e8fc289 100644 --- a/src/parser/bison_parser.cpp +++ b/src/parser/bison_parser.cpp @@ -151,6 +151,7 @@ extern int hsql_debug; yylloc->first_column = yylloc->last_column; \ for(int i = 0; yytext[i] != '\0'; i++) { \ yylloc->total_column++; \ + yylloc->string_length++; \ if(yytext[i] == '\n') { \ yylloc->last_line++; \ yylloc->last_column = 0; \ @@ -160,7 +161,7 @@ extern int hsql_debug; } \ } -#line 164 "bison_parser.cpp" /* yacc.c:355 */ +#line 165 "bison_parser.cpp" /* yacc.c:355 */ /* Token type. */ #ifndef HSQL_TOKENTYPE @@ -306,7 +307,7 @@ extern int hsql_debug; union HSQL_STYPE { -#line 93 "bison_parser.y" /* yacc.c:355 */ +#line 95 "bison_parser.y" /* yacc.c:355 */ double fval; int64_t ival; @@ -325,7 +326,7 @@ union HSQL_STYPE hsql::PrepareStatement* prep_stmt; hsql::ExecuteStatement* exec_stmt; hsql::ShowStatement* show_stmt; - + hsql::TableName table_name; hsql::TableRef* table; hsql::Expr* expr; @@ -345,7 +346,7 @@ union HSQL_STYPE std::vector* expr_vec; std::vector* order_vec; -#line 349 "bison_parser.cpp" /* yacc.c:355 */ +#line 350 "bison_parser.cpp" /* yacc.c:355 */ }; typedef union HSQL_STYPE HSQL_STYPE; @@ -375,7 +376,7 @@ int hsql_parse (hsql::SQLParserResult* result, yyscan_t scanner); /* Copy the second part of user declarations. */ -#line 379 "bison_parser.cpp" /* yacc.c:358 */ +#line 380 "bison_parser.cpp" /* yacc.c:358 */ #ifdef short # undef short @@ -687,27 +688,27 @@ static const yytype_uint8 yytranslate[] = /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 245, 245, 266, 267, 271, 275, 279, 286, 287, - 288, 289, 290, 291, 292, 293, 294, 303, 304, 309, - 310, 314, 318, 330, 337, 340, 344, 356, 365, 369, - 379, 382, 396, 403, 410, 421, 422, 426, 427, 431, - 438, 439, 440, 441, 451, 457, 463, 471, 472, 481, - 490, 503, 510, 521, 522, 532, 541, 542, 546, 558, - 559, 560, 577, 578, 582, 583, 587, 597, 614, 618, - 619, 620, 624, 625, 629, 641, 642, 646, 650, 655, - 656, 660, 665, 669, 670, 673, 674, 678, 679, 683, - 687, 688, 689, 695, 696, 700, 701, 702, 709, 710, - 714, 715, 719, 726, 727, 728, 729, 730, 734, 735, - 736, 737, 738, 739, 740, 741, 742, 746, 747, 751, - 752, 753, 754, 755, 759, 760, 761, 762, 763, 764, - 765, 766, 767, 768, 769, 773, 774, 778, 779, 780, - 781, 786, 788, 792, 793, 797, 798, 799, 800, 801, - 802, 806, 807, 811, 815, 819, 823, 824, 825, 826, - 830, 831, 832, 833, 837, 842, 843, 847, 851, 855, - 867, 868, 878, 879, 883, 884, 893, 894, 899, 910, - 919, 920, 925, 926, 930, 931, 939, 947, 957, 976, - 977, 978, 979, 980, 981, 982, 983, 988, 997, 998, - 1003, 1004 + 0, 247, 247, 268, 274, 283, 287, 291, 298, 299, + 300, 301, 302, 303, 304, 305, 306, 315, 316, 321, + 322, 326, 330, 342, 349, 352, 356, 368, 377, 381, + 391, 394, 408, 415, 422, 433, 434, 438, 439, 443, + 450, 451, 452, 453, 463, 469, 475, 483, 484, 493, + 502, 515, 522, 533, 534, 544, 553, 554, 558, 570, + 571, 572, 589, 590, 594, 595, 599, 609, 626, 630, + 631, 632, 636, 637, 641, 653, 654, 658, 662, 667, + 668, 672, 677, 681, 682, 685, 686, 690, 691, 695, + 699, 700, 701, 707, 708, 712, 713, 714, 721, 722, + 726, 727, 731, 738, 739, 740, 741, 742, 746, 747, + 748, 749, 750, 751, 752, 753, 754, 758, 759, 763, + 764, 765, 766, 767, 771, 772, 773, 774, 775, 776, + 777, 778, 779, 780, 781, 785, 786, 790, 791, 792, + 793, 798, 800, 804, 805, 809, 810, 811, 812, 813, + 814, 818, 819, 823, 827, 831, 835, 836, 837, 838, + 842, 843, 844, 845, 849, 854, 855, 859, 863, 867, + 879, 880, 890, 891, 895, 896, 905, 906, 911, 922, + 931, 932, 937, 938, 942, 943, 951, 959, 969, 988, + 989, 990, 991, 992, 993, 994, 995, 1000, 1009, 1010, + 1015, 1016 }; #endif @@ -1624,31 +1625,31 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio switch (yytype) { case 3: /* IDENTIFIER */ -#line 138 "bison_parser.y" /* yacc.c:1257 */ +#line 140 "bison_parser.y" /* yacc.c:1257 */ { free( (((*yyvaluep).sval)) ); } -#line 1630 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1631 "bison_parser.cpp" /* yacc.c:1257 */ break; case 4: /* STRING */ -#line 138 "bison_parser.y" /* yacc.c:1257 */ +#line 140 "bison_parser.y" /* yacc.c:1257 */ { free( (((*yyvaluep).sval)) ); } -#line 1636 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1637 "bison_parser.cpp" /* yacc.c:1257 */ break; case 5: /* FLOATVAL */ -#line 136 "bison_parser.y" /* yacc.c:1257 */ +#line 138 "bison_parser.y" /* yacc.c:1257 */ { } -#line 1642 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1643 "bison_parser.cpp" /* yacc.c:1257 */ break; case 6: /* INTVAL */ -#line 136 "bison_parser.y" /* yacc.c:1257 */ +#line 138 "bison_parser.y" /* yacc.c:1257 */ { } -#line 1648 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1649 "bison_parser.cpp" /* yacc.c:1257 */ break; case 153: /* statement_list */ -#line 139 "bison_parser.y" /* yacc.c:1257 */ +#line 141 "bison_parser.y" /* yacc.c:1257 */ { if ((((*yyvaluep).stmt_vec)) != nullptr) { for (auto ptr : *(((*yyvaluep).stmt_vec))) { @@ -1657,23 +1658,23 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio } delete (((*yyvaluep).stmt_vec)); } -#line 1661 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1662 "bison_parser.cpp" /* yacc.c:1257 */ break; case 154: /* statement */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).statement)); } -#line 1667 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1668 "bison_parser.cpp" /* yacc.c:1257 */ break; case 155: /* preparable_statement */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).statement)); } -#line 1673 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1674 "bison_parser.cpp" /* yacc.c:1257 */ break; case 156: /* opt_hints */ -#line 139 "bison_parser.y" /* yacc.c:1257 */ +#line 141 "bison_parser.y" /* yacc.c:1257 */ { if ((((*yyvaluep).expr_vec)) != nullptr) { for (auto ptr : *(((*yyvaluep).expr_vec))) { @@ -1682,11 +1683,11 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio } delete (((*yyvaluep).expr_vec)); } -#line 1686 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1687 "bison_parser.cpp" /* yacc.c:1257 */ break; case 157: /* hint_list */ -#line 139 "bison_parser.y" /* yacc.c:1257 */ +#line 141 "bison_parser.y" /* yacc.c:1257 */ { if ((((*yyvaluep).expr_vec)) != nullptr) { for (auto ptr : *(((*yyvaluep).expr_vec))) { @@ -1695,71 +1696,71 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio } delete (((*yyvaluep).expr_vec)); } -#line 1699 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1700 "bison_parser.cpp" /* yacc.c:1257 */ break; case 158: /* hint */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 1705 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1706 "bison_parser.cpp" /* yacc.c:1257 */ break; case 159: /* prepare_statement */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).prep_stmt)); } -#line 1711 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1712 "bison_parser.cpp" /* yacc.c:1257 */ break; case 160: /* prepare_target_query */ -#line 138 "bison_parser.y" /* yacc.c:1257 */ +#line 140 "bison_parser.y" /* yacc.c:1257 */ { free( (((*yyvaluep).sval)) ); } -#line 1717 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1718 "bison_parser.cpp" /* yacc.c:1257 */ break; case 161: /* execute_statement */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).exec_stmt)); } -#line 1723 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1724 "bison_parser.cpp" /* yacc.c:1257 */ break; case 162: /* import_statement */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).import_stmt)); } -#line 1729 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1730 "bison_parser.cpp" /* yacc.c:1257 */ break; case 163: /* import_file_type */ -#line 136 "bison_parser.y" /* yacc.c:1257 */ +#line 138 "bison_parser.y" /* yacc.c:1257 */ { } -#line 1735 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1736 "bison_parser.cpp" /* yacc.c:1257 */ break; case 164: /* file_path */ -#line 138 "bison_parser.y" /* yacc.c:1257 */ +#line 140 "bison_parser.y" /* yacc.c:1257 */ { free( (((*yyvaluep).sval)) ); } -#line 1741 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1742 "bison_parser.cpp" /* yacc.c:1257 */ break; case 165: /* show_statement */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).show_stmt)); } -#line 1747 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1748 "bison_parser.cpp" /* yacc.c:1257 */ break; case 166: /* create_statement */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).create_stmt)); } -#line 1753 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1754 "bison_parser.cpp" /* yacc.c:1257 */ break; case 167: /* opt_not_exists */ -#line 136 "bison_parser.y" /* yacc.c:1257 */ +#line 138 "bison_parser.y" /* yacc.c:1257 */ { } -#line 1759 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1760 "bison_parser.cpp" /* yacc.c:1257 */ break; case 168: /* column_def_commalist */ -#line 139 "bison_parser.y" /* yacc.c:1257 */ +#line 141 "bison_parser.y" /* yacc.c:1257 */ { if ((((*yyvaluep).column_vec)) != nullptr) { for (auto ptr : *(((*yyvaluep).column_vec))) { @@ -1768,53 +1769,53 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio } delete (((*yyvaluep).column_vec)); } -#line 1772 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1773 "bison_parser.cpp" /* yacc.c:1257 */ break; case 169: /* column_def */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).column_t)); } -#line 1778 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1779 "bison_parser.cpp" /* yacc.c:1257 */ break; case 170: /* column_type */ -#line 136 "bison_parser.y" /* yacc.c:1257 */ +#line 138 "bison_parser.y" /* yacc.c:1257 */ { } -#line 1784 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1785 "bison_parser.cpp" /* yacc.c:1257 */ break; case 171: /* drop_statement */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).drop_stmt)); } -#line 1790 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1791 "bison_parser.cpp" /* yacc.c:1257 */ break; case 172: /* opt_exists */ -#line 136 "bison_parser.y" /* yacc.c:1257 */ +#line 138 "bison_parser.y" /* yacc.c:1257 */ { } -#line 1796 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1797 "bison_parser.cpp" /* yacc.c:1257 */ break; case 173: /* delete_statement */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).delete_stmt)); } -#line 1802 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1803 "bison_parser.cpp" /* yacc.c:1257 */ break; case 174: /* truncate_statement */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).delete_stmt)); } -#line 1808 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1809 "bison_parser.cpp" /* yacc.c:1257 */ break; case 175: /* insert_statement */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).insert_stmt)); } -#line 1814 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1815 "bison_parser.cpp" /* yacc.c:1257 */ break; case 176: /* opt_column_list */ -#line 139 "bison_parser.y" /* yacc.c:1257 */ +#line 141 "bison_parser.y" /* yacc.c:1257 */ { if ((((*yyvaluep).str_vec)) != nullptr) { for (auto ptr : *(((*yyvaluep).str_vec))) { @@ -1823,17 +1824,17 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio } delete (((*yyvaluep).str_vec)); } -#line 1827 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1828 "bison_parser.cpp" /* yacc.c:1257 */ break; case 177: /* update_statement */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).update_stmt)); } -#line 1833 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1834 "bison_parser.cpp" /* yacc.c:1257 */ break; case 178: /* update_clause_commalist */ -#line 139 "bison_parser.y" /* yacc.c:1257 */ +#line 141 "bison_parser.y" /* yacc.c:1257 */ { if ((((*yyvaluep).update_vec)) != nullptr) { for (auto ptr : *(((*yyvaluep).update_vec))) { @@ -1842,53 +1843,53 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio } delete (((*yyvaluep).update_vec)); } -#line 1846 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1847 "bison_parser.cpp" /* yacc.c:1257 */ break; case 179: /* update_clause */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).update_t)); } -#line 1852 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1853 "bison_parser.cpp" /* yacc.c:1257 */ break; case 180: /* select_statement */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).select_stmt)); } -#line 1858 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1859 "bison_parser.cpp" /* yacc.c:1257 */ break; case 181: /* select_with_paren */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).select_stmt)); } -#line 1864 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1865 "bison_parser.cpp" /* yacc.c:1257 */ break; case 182: /* select_paren_or_clause */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).select_stmt)); } -#line 1870 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1871 "bison_parser.cpp" /* yacc.c:1257 */ break; case 183: /* select_no_paren */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).select_stmt)); } -#line 1876 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1877 "bison_parser.cpp" /* yacc.c:1257 */ break; case 187: /* select_clause */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).select_stmt)); } -#line 1882 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1883 "bison_parser.cpp" /* yacc.c:1257 */ break; case 188: /* opt_distinct */ -#line 136 "bison_parser.y" /* yacc.c:1257 */ +#line 138 "bison_parser.y" /* yacc.c:1257 */ { } -#line 1888 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1889 "bison_parser.cpp" /* yacc.c:1257 */ break; case 189: /* select_list */ -#line 139 "bison_parser.y" /* yacc.c:1257 */ +#line 141 "bison_parser.y" /* yacc.c:1257 */ { if ((((*yyvaluep).expr_vec)) != nullptr) { for (auto ptr : *(((*yyvaluep).expr_vec))) { @@ -1897,35 +1898,35 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio } delete (((*yyvaluep).expr_vec)); } -#line 1901 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1902 "bison_parser.cpp" /* yacc.c:1257 */ break; case 190: /* from_clause */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).table)); } -#line 1907 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1908 "bison_parser.cpp" /* yacc.c:1257 */ break; case 191: /* opt_where */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 1913 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1914 "bison_parser.cpp" /* yacc.c:1257 */ break; case 192: /* opt_group */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).group_t)); } -#line 1919 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1920 "bison_parser.cpp" /* yacc.c:1257 */ break; case 193: /* opt_having */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 1925 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1926 "bison_parser.cpp" /* yacc.c:1257 */ break; case 194: /* opt_order */ -#line 139 "bison_parser.y" /* yacc.c:1257 */ +#line 141 "bison_parser.y" /* yacc.c:1257 */ { if ((((*yyvaluep).order_vec)) != nullptr) { for (auto ptr : *(((*yyvaluep).order_vec))) { @@ -1934,11 +1935,11 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio } delete (((*yyvaluep).order_vec)); } -#line 1938 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1939 "bison_parser.cpp" /* yacc.c:1257 */ break; case 195: /* order_list */ -#line 139 "bison_parser.y" /* yacc.c:1257 */ +#line 141 "bison_parser.y" /* yacc.c:1257 */ { if ((((*yyvaluep).order_vec)) != nullptr) { for (auto ptr : *(((*yyvaluep).order_vec))) { @@ -1947,35 +1948,35 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio } delete (((*yyvaluep).order_vec)); } -#line 1951 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1952 "bison_parser.cpp" /* yacc.c:1257 */ break; case 196: /* order_desc */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).order)); } -#line 1957 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1958 "bison_parser.cpp" /* yacc.c:1257 */ break; case 197: /* opt_order_type */ -#line 136 "bison_parser.y" /* yacc.c:1257 */ +#line 138 "bison_parser.y" /* yacc.c:1257 */ { } -#line 1963 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1964 "bison_parser.cpp" /* yacc.c:1257 */ break; case 198: /* opt_top */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).limit)); } -#line 1969 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1970 "bison_parser.cpp" /* yacc.c:1257 */ break; case 199: /* opt_limit */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).limit)); } -#line 1975 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1976 "bison_parser.cpp" /* yacc.c:1257 */ break; case 200: /* expr_list */ -#line 139 "bison_parser.y" /* yacc.c:1257 */ +#line 141 "bison_parser.y" /* yacc.c:1257 */ { if ((((*yyvaluep).expr_vec)) != nullptr) { for (auto ptr : *(((*yyvaluep).expr_vec))) { @@ -1984,11 +1985,11 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio } delete (((*yyvaluep).expr_vec)); } -#line 1988 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1989 "bison_parser.cpp" /* yacc.c:1257 */ break; case 201: /* literal_list */ -#line 139 "bison_parser.y" /* yacc.c:1257 */ +#line 141 "bison_parser.y" /* yacc.c:1257 */ { if ((((*yyvaluep).expr_vec)) != nullptr) { for (auto ptr : *(((*yyvaluep).expr_vec))) { @@ -1997,161 +1998,161 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio } delete (((*yyvaluep).expr_vec)); } -#line 2001 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2002 "bison_parser.cpp" /* yacc.c:1257 */ break; case 202: /* expr_alias */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2007 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2008 "bison_parser.cpp" /* yacc.c:1257 */ break; case 203: /* expr */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2013 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2014 "bison_parser.cpp" /* yacc.c:1257 */ break; case 204: /* operand */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2019 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2020 "bison_parser.cpp" /* yacc.c:1257 */ break; case 205: /* scalar_expr */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2025 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2026 "bison_parser.cpp" /* yacc.c:1257 */ break; case 206: /* unary_expr */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2031 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2032 "bison_parser.cpp" /* yacc.c:1257 */ break; case 207: /* binary_expr */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2037 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2038 "bison_parser.cpp" /* yacc.c:1257 */ break; case 208: /* logic_expr */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2043 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2044 "bison_parser.cpp" /* yacc.c:1257 */ break; case 209: /* in_expr */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2049 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2050 "bison_parser.cpp" /* yacc.c:1257 */ break; case 210: /* case_expr */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2055 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2056 "bison_parser.cpp" /* yacc.c:1257 */ break; case 211: /* exists_expr */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2061 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2062 "bison_parser.cpp" /* yacc.c:1257 */ break; case 212: /* comp_expr */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2067 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2068 "bison_parser.cpp" /* yacc.c:1257 */ break; case 213: /* function_expr */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2073 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2074 "bison_parser.cpp" /* yacc.c:1257 */ break; case 214: /* array_expr */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2079 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2080 "bison_parser.cpp" /* yacc.c:1257 */ break; case 215: /* array_index */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2085 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2086 "bison_parser.cpp" /* yacc.c:1257 */ break; case 216: /* between_expr */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2091 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2092 "bison_parser.cpp" /* yacc.c:1257 */ break; case 217: /* column_name */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2097 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2098 "bison_parser.cpp" /* yacc.c:1257 */ break; case 218: /* literal */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2103 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2104 "bison_parser.cpp" /* yacc.c:1257 */ break; case 219: /* string_literal */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2109 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2110 "bison_parser.cpp" /* yacc.c:1257 */ break; case 220: /* num_literal */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2115 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2116 "bison_parser.cpp" /* yacc.c:1257 */ break; case 221: /* int_literal */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2121 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2122 "bison_parser.cpp" /* yacc.c:1257 */ break; case 222: /* null_literal */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2127 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2128 "bison_parser.cpp" /* yacc.c:1257 */ break; case 223: /* param_expr */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2133 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2134 "bison_parser.cpp" /* yacc.c:1257 */ break; case 224: /* table_ref */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).table)); } -#line 2139 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2140 "bison_parser.cpp" /* yacc.c:1257 */ break; case 225: /* table_ref_atomic */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).table)); } -#line 2145 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2146 "bison_parser.cpp" /* yacc.c:1257 */ break; case 226: /* nonjoin_table_ref_atomic */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).table)); } -#line 2151 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2152 "bison_parser.cpp" /* yacc.c:1257 */ break; case 227: /* table_ref_commalist */ -#line 139 "bison_parser.y" /* yacc.c:1257 */ +#line 141 "bison_parser.y" /* yacc.c:1257 */ { if ((((*yyvaluep).table_vec)) != nullptr) { for (auto ptr : *(((*yyvaluep).table_vec))) { @@ -2160,59 +2161,59 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio } delete (((*yyvaluep).table_vec)); } -#line 2164 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2165 "bison_parser.cpp" /* yacc.c:1257 */ break; case 228: /* table_ref_name */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).table)); } -#line 2170 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2171 "bison_parser.cpp" /* yacc.c:1257 */ break; case 229: /* table_ref_name_no_alias */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).table)); } -#line 2176 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2177 "bison_parser.cpp" /* yacc.c:1257 */ break; case 230: /* table_name */ -#line 137 "bison_parser.y" /* yacc.c:1257 */ +#line 139 "bison_parser.y" /* yacc.c:1257 */ { free( (((*yyvaluep).table_name).name) ); free( (((*yyvaluep).table_name).schema) ); } -#line 2182 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2183 "bison_parser.cpp" /* yacc.c:1257 */ break; case 231: /* alias */ -#line 138 "bison_parser.y" /* yacc.c:1257 */ +#line 140 "bison_parser.y" /* yacc.c:1257 */ { free( (((*yyvaluep).sval)) ); } -#line 2188 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2189 "bison_parser.cpp" /* yacc.c:1257 */ break; case 232: /* opt_alias */ -#line 138 "bison_parser.y" /* yacc.c:1257 */ +#line 140 "bison_parser.y" /* yacc.c:1257 */ { free( (((*yyvaluep).sval)) ); } -#line 2194 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2195 "bison_parser.cpp" /* yacc.c:1257 */ break; case 233: /* join_clause */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).table)); } -#line 2200 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2201 "bison_parser.cpp" /* yacc.c:1257 */ break; case 234: /* opt_join_type */ -#line 136 "bison_parser.y" /* yacc.c:1257 */ +#line 138 "bison_parser.y" /* yacc.c:1257 */ { } -#line 2206 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2207 "bison_parser.cpp" /* yacc.c:1257 */ break; case 235: /* join_condition */ -#line 147 "bison_parser.y" /* yacc.c:1257 */ +#line 149 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2212 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2213 "bison_parser.cpp" /* yacc.c:1257 */ break; case 237: /* ident_commalist */ -#line 139 "bison_parser.y" /* yacc.c:1257 */ +#line 141 "bison_parser.y" /* yacc.c:1257 */ { if ((((*yyvaluep).str_vec)) != nullptr) { for (auto ptr : *(((*yyvaluep).str_vec))) { @@ -2221,7 +2222,7 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio } delete (((*yyvaluep).str_vec)); } -#line 2225 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2226 "bison_parser.cpp" /* yacc.c:1257 */ break; @@ -2329,7 +2330,7 @@ YYLTYPE yylloc = yyloc_default; yychar = YYEMPTY; /* Cause a token to be read. */ /* User initialization code. */ -#line 72 "bison_parser.y" /* yacc.c:1429 */ +#line 73 "bison_parser.y" /* yacc.c:1436 */ { // Initialize yylloc.first_column = 0; @@ -2337,9 +2338,10 @@ YYLTYPE yylloc = yyloc_default; yylloc.first_line = 0; yylloc.last_line = 0; yylloc.total_column = 0; + yylloc.string_length = 0; } -#line 2343 "bison_parser.cpp" /* yacc.c:1429 */ +#line 2345 "bison_parser.cpp" /* yacc.c:1436 */ yylsp[0] = yylloc; goto yysetstate; @@ -2526,7 +2528,7 @@ yyreduce: switch (yyn) { case 2: -#line 245 "bison_parser.y" /* yacc.c:1646 */ +#line 247 "bison_parser.y" /* yacc.c:1661 */ { for (SQLStatement* stmt : *(yyvsp[-1].stmt_vec)) { // Transfers ownership of the statement. @@ -2544,216 +2546,226 @@ yyreduce: } delete (yyvsp[-1].stmt_vec); } -#line 2548 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2550 "bison_parser.cpp" /* yacc.c:1661 */ break; case 3: -#line 266 "bison_parser.y" /* yacc.c:1646 */ - { (yyval.stmt_vec) = new std::vector(); (yyval.stmt_vec)->push_back((yyvsp[0].statement)); } -#line 2554 "bison_parser.cpp" /* yacc.c:1646 */ +#line 268 "bison_parser.y" /* yacc.c:1661 */ + { + (yyvsp[0].statement)->stringLength = yylloc.string_length; + yylloc.string_length = 0; + (yyval.stmt_vec) = new std::vector(); + (yyval.stmt_vec)->push_back((yyvsp[0].statement)); + } +#line 2561 "bison_parser.cpp" /* yacc.c:1661 */ break; case 4: -#line 267 "bison_parser.y" /* yacc.c:1646 */ - { (yyvsp[-2].stmt_vec)->push_back((yyvsp[0].statement)); (yyval.stmt_vec) = (yyvsp[-2].stmt_vec); } -#line 2560 "bison_parser.cpp" /* yacc.c:1646 */ +#line 274 "bison_parser.y" /* yacc.c:1661 */ + { + (yyvsp[0].statement)->stringLength = yylloc.string_length; + yylloc.string_length = 0; + (yyvsp[-2].stmt_vec)->push_back((yyvsp[0].statement)); + (yyval.stmt_vec) = (yyvsp[-2].stmt_vec); + } +#line 2572 "bison_parser.cpp" /* yacc.c:1661 */ break; case 5: -#line 271 "bison_parser.y" /* yacc.c:1646 */ +#line 283 "bison_parser.y" /* yacc.c:1661 */ { (yyval.statement) = (yyvsp[-1].prep_stmt); (yyval.statement)->hints = (yyvsp[0].expr_vec); } -#line 2569 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2581 "bison_parser.cpp" /* yacc.c:1661 */ break; case 6: -#line 275 "bison_parser.y" /* yacc.c:1646 */ +#line 287 "bison_parser.y" /* yacc.c:1661 */ { (yyval.statement) = (yyvsp[-1].statement); (yyval.statement)->hints = (yyvsp[0].expr_vec); } -#line 2578 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2590 "bison_parser.cpp" /* yacc.c:1661 */ break; case 7: -#line 279 "bison_parser.y" /* yacc.c:1646 */ +#line 291 "bison_parser.y" /* yacc.c:1661 */ { (yyval.statement) = (yyvsp[0].show_stmt); } -#line 2586 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2598 "bison_parser.cpp" /* yacc.c:1661 */ break; case 8: -#line 286 "bison_parser.y" /* yacc.c:1646 */ +#line 298 "bison_parser.y" /* yacc.c:1661 */ { (yyval.statement) = (yyvsp[0].select_stmt); } -#line 2592 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2604 "bison_parser.cpp" /* yacc.c:1661 */ break; case 9: -#line 287 "bison_parser.y" /* yacc.c:1646 */ +#line 299 "bison_parser.y" /* yacc.c:1661 */ { (yyval.statement) = (yyvsp[0].import_stmt); } -#line 2598 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2610 "bison_parser.cpp" /* yacc.c:1661 */ break; case 10: -#line 288 "bison_parser.y" /* yacc.c:1646 */ +#line 300 "bison_parser.y" /* yacc.c:1661 */ { (yyval.statement) = (yyvsp[0].create_stmt); } -#line 2604 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2616 "bison_parser.cpp" /* yacc.c:1661 */ break; case 11: -#line 289 "bison_parser.y" /* yacc.c:1646 */ +#line 301 "bison_parser.y" /* yacc.c:1661 */ { (yyval.statement) = (yyvsp[0].insert_stmt); } -#line 2610 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2622 "bison_parser.cpp" /* yacc.c:1661 */ break; case 12: -#line 290 "bison_parser.y" /* yacc.c:1646 */ +#line 302 "bison_parser.y" /* yacc.c:1661 */ { (yyval.statement) = (yyvsp[0].delete_stmt); } -#line 2616 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2628 "bison_parser.cpp" /* yacc.c:1661 */ break; case 13: -#line 291 "bison_parser.y" /* yacc.c:1646 */ +#line 303 "bison_parser.y" /* yacc.c:1661 */ { (yyval.statement) = (yyvsp[0].delete_stmt); } -#line 2622 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2634 "bison_parser.cpp" /* yacc.c:1661 */ break; case 14: -#line 292 "bison_parser.y" /* yacc.c:1646 */ +#line 304 "bison_parser.y" /* yacc.c:1661 */ { (yyval.statement) = (yyvsp[0].update_stmt); } -#line 2628 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2640 "bison_parser.cpp" /* yacc.c:1661 */ break; case 15: -#line 293 "bison_parser.y" /* yacc.c:1646 */ +#line 305 "bison_parser.y" /* yacc.c:1661 */ { (yyval.statement) = (yyvsp[0].drop_stmt); } -#line 2634 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2646 "bison_parser.cpp" /* yacc.c:1661 */ break; case 16: -#line 294 "bison_parser.y" /* yacc.c:1646 */ +#line 306 "bison_parser.y" /* yacc.c:1661 */ { (yyval.statement) = (yyvsp[0].exec_stmt); } -#line 2640 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2652 "bison_parser.cpp" /* yacc.c:1661 */ break; case 17: -#line 303 "bison_parser.y" /* yacc.c:1646 */ +#line 315 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr_vec) = (yyvsp[-1].expr_vec); } -#line 2646 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2658 "bison_parser.cpp" /* yacc.c:1661 */ break; case 18: -#line 304 "bison_parser.y" /* yacc.c:1646 */ +#line 316 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr_vec) = nullptr; } -#line 2652 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2664 "bison_parser.cpp" /* yacc.c:1661 */ break; case 19: -#line 309 "bison_parser.y" /* yacc.c:1646 */ +#line 321 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr_vec) = new std::vector(); (yyval.expr_vec)->push_back((yyvsp[0].expr)); } -#line 2658 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2670 "bison_parser.cpp" /* yacc.c:1661 */ break; case 20: -#line 310 "bison_parser.y" /* yacc.c:1646 */ +#line 322 "bison_parser.y" /* yacc.c:1661 */ { (yyvsp[-2].expr_vec)->push_back((yyvsp[0].expr)); (yyval.expr_vec) = (yyvsp[-2].expr_vec); } -#line 2664 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2676 "bison_parser.cpp" /* yacc.c:1661 */ break; case 21: -#line 314 "bison_parser.y" /* yacc.c:1646 */ +#line 326 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::make(kExprHint); (yyval.expr)->name = (yyvsp[0].sval); } -#line 2673 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2685 "bison_parser.cpp" /* yacc.c:1661 */ break; case 22: -#line 318 "bison_parser.y" /* yacc.c:1646 */ +#line 330 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::make(kExprHint); (yyval.expr)->name = (yyvsp[-3].sval); (yyval.expr)->exprList = (yyvsp[-1].expr_vec); } -#line 2683 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2695 "bison_parser.cpp" /* yacc.c:1661 */ break; case 23: -#line 330 "bison_parser.y" /* yacc.c:1646 */ +#line 342 "bison_parser.y" /* yacc.c:1661 */ { (yyval.prep_stmt) = new PrepareStatement(); (yyval.prep_stmt)->name = (yyvsp[-2].sval); (yyval.prep_stmt)->query = (yyvsp[0].sval); } -#line 2693 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2705 "bison_parser.cpp" /* yacc.c:1661 */ break; case 25: -#line 340 "bison_parser.y" /* yacc.c:1646 */ +#line 352 "bison_parser.y" /* yacc.c:1661 */ { (yyval.exec_stmt) = new ExecuteStatement(); (yyval.exec_stmt)->name = (yyvsp[0].sval); } -#line 2702 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2714 "bison_parser.cpp" /* yacc.c:1661 */ break; case 26: -#line 344 "bison_parser.y" /* yacc.c:1646 */ +#line 356 "bison_parser.y" /* yacc.c:1661 */ { (yyval.exec_stmt) = new ExecuteStatement(); (yyval.exec_stmt)->name = (yyvsp[-3].sval); (yyval.exec_stmt)->parameters = (yyvsp[-1].expr_vec); } -#line 2712 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2724 "bison_parser.cpp" /* yacc.c:1661 */ break; case 27: -#line 356 "bison_parser.y" /* yacc.c:1646 */ +#line 368 "bison_parser.y" /* yacc.c:1661 */ { (yyval.import_stmt) = new ImportStatement((ImportType) (yyvsp[-4].uval)); (yyval.import_stmt)->filePath = (yyvsp[-2].sval); (yyval.import_stmt)->schema = (yyvsp[0].table_name).schema; (yyval.import_stmt)->tableName = (yyvsp[0].table_name).name; } -#line 2723 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2735 "bison_parser.cpp" /* yacc.c:1661 */ break; case 28: -#line 365 "bison_parser.y" /* yacc.c:1646 */ +#line 377 "bison_parser.y" /* yacc.c:1661 */ { (yyval.uval) = kImportCSV; } -#line 2729 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2741 "bison_parser.cpp" /* yacc.c:1661 */ break; case 29: -#line 369 "bison_parser.y" /* yacc.c:1646 */ +#line 381 "bison_parser.y" /* yacc.c:1661 */ { (yyval.sval) = strdup((yyvsp[0].expr)->name); delete (yyvsp[0].expr); } -#line 2735 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2747 "bison_parser.cpp" /* yacc.c:1661 */ break; case 30: -#line 379 "bison_parser.y" /* yacc.c:1646 */ +#line 391 "bison_parser.y" /* yacc.c:1661 */ { (yyval.show_stmt) = new ShowStatement(kShowTables); } -#line 2743 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2755 "bison_parser.cpp" /* yacc.c:1661 */ break; case 31: -#line 382 "bison_parser.y" /* yacc.c:1646 */ +#line 394 "bison_parser.y" /* yacc.c:1661 */ { (yyval.show_stmt) = new ShowStatement(kShowColumns); (yyval.show_stmt)->schema = (yyvsp[0].table_name).schema; (yyval.show_stmt)->name = (yyvsp[0].table_name).name; } -#line 2753 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2765 "bison_parser.cpp" /* yacc.c:1661 */ break; case 32: -#line 396 "bison_parser.y" /* yacc.c:1646 */ +#line 408 "bison_parser.y" /* yacc.c:1661 */ { (yyval.create_stmt) = new CreateStatement(kCreateTableFromTbl); (yyval.create_stmt)->ifNotExists = (yyvsp[-5].bval); @@ -2761,11 +2773,11 @@ yyreduce: (yyval.create_stmt)->tableName = (yyvsp[-4].table_name).name; (yyval.create_stmt)->filePath = (yyvsp[0].sval); } -#line 2765 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2777 "bison_parser.cpp" /* yacc.c:1661 */ break; case 33: -#line 403 "bison_parser.y" /* yacc.c:1646 */ +#line 415 "bison_parser.y" /* yacc.c:1661 */ { (yyval.create_stmt) = new CreateStatement(kCreateTable); (yyval.create_stmt)->ifNotExists = (yyvsp[-4].bval); @@ -2773,11 +2785,11 @@ yyreduce: (yyval.create_stmt)->tableName = (yyvsp[-3].table_name).name; (yyval.create_stmt)->columns = (yyvsp[-1].column_vec); } -#line 2777 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2789 "bison_parser.cpp" /* yacc.c:1661 */ break; case 34: -#line 410 "bison_parser.y" /* yacc.c:1646 */ +#line 422 "bison_parser.y" /* yacc.c:1661 */ { (yyval.create_stmt) = new CreateStatement(kCreateView); (yyval.create_stmt)->ifNotExists = (yyvsp[-4].bval); @@ -2786,132 +2798,132 @@ yyreduce: (yyval.create_stmt)->viewColumns = (yyvsp[-2].str_vec); (yyval.create_stmt)->select = (yyvsp[0].select_stmt); } -#line 2790 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2802 "bison_parser.cpp" /* yacc.c:1661 */ break; case 35: -#line 421 "bison_parser.y" /* yacc.c:1646 */ +#line 433 "bison_parser.y" /* yacc.c:1661 */ { (yyval.bval) = true; } -#line 2796 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2808 "bison_parser.cpp" /* yacc.c:1661 */ break; case 36: -#line 422 "bison_parser.y" /* yacc.c:1646 */ +#line 434 "bison_parser.y" /* yacc.c:1661 */ { (yyval.bval) = false; } -#line 2802 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2814 "bison_parser.cpp" /* yacc.c:1661 */ break; case 37: -#line 426 "bison_parser.y" /* yacc.c:1646 */ +#line 438 "bison_parser.y" /* yacc.c:1661 */ { (yyval.column_vec) = new std::vector(); (yyval.column_vec)->push_back((yyvsp[0].column_t)); } -#line 2808 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2820 "bison_parser.cpp" /* yacc.c:1661 */ break; case 38: -#line 427 "bison_parser.y" /* yacc.c:1646 */ +#line 439 "bison_parser.y" /* yacc.c:1661 */ { (yyvsp[-2].column_vec)->push_back((yyvsp[0].column_t)); (yyval.column_vec) = (yyvsp[-2].column_vec); } -#line 2814 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2826 "bison_parser.cpp" /* yacc.c:1661 */ break; case 39: -#line 431 "bison_parser.y" /* yacc.c:1646 */ +#line 443 "bison_parser.y" /* yacc.c:1661 */ { (yyval.column_t) = new ColumnDefinition((yyvsp[-1].sval), (ColumnDefinition::DataType) (yyvsp[0].uval)); } -#line 2822 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2834 "bison_parser.cpp" /* yacc.c:1661 */ break; case 40: -#line 438 "bison_parser.y" /* yacc.c:1646 */ +#line 450 "bison_parser.y" /* yacc.c:1661 */ { (yyval.uval) = ColumnDefinition::INT; } -#line 2828 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2840 "bison_parser.cpp" /* yacc.c:1661 */ break; case 41: -#line 439 "bison_parser.y" /* yacc.c:1646 */ +#line 451 "bison_parser.y" /* yacc.c:1661 */ { (yyval.uval) = ColumnDefinition::INT; } -#line 2834 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2846 "bison_parser.cpp" /* yacc.c:1661 */ break; case 42: -#line 440 "bison_parser.y" /* yacc.c:1646 */ +#line 452 "bison_parser.y" /* yacc.c:1661 */ { (yyval.uval) = ColumnDefinition::DOUBLE; } -#line 2840 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2852 "bison_parser.cpp" /* yacc.c:1661 */ break; case 43: -#line 441 "bison_parser.y" /* yacc.c:1646 */ +#line 453 "bison_parser.y" /* yacc.c:1661 */ { (yyval.uval) = ColumnDefinition::TEXT; } -#line 2846 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2858 "bison_parser.cpp" /* yacc.c:1661 */ break; case 44: -#line 451 "bison_parser.y" /* yacc.c:1646 */ +#line 463 "bison_parser.y" /* yacc.c:1661 */ { (yyval.drop_stmt) = new DropStatement(kDropTable); (yyval.drop_stmt)->ifExists = (yyvsp[-1].bval); (yyval.drop_stmt)->schema = (yyvsp[0].table_name).schema; (yyval.drop_stmt)->name = (yyvsp[0].table_name).name; } -#line 2857 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2869 "bison_parser.cpp" /* yacc.c:1661 */ break; case 45: -#line 457 "bison_parser.y" /* yacc.c:1646 */ +#line 469 "bison_parser.y" /* yacc.c:1661 */ { (yyval.drop_stmt) = new DropStatement(kDropView); (yyval.drop_stmt)->ifExists = (yyvsp[-1].bval); (yyval.drop_stmt)->schema = (yyvsp[0].table_name).schema; (yyval.drop_stmt)->name = (yyvsp[0].table_name).name; } -#line 2868 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2880 "bison_parser.cpp" /* yacc.c:1661 */ break; case 46: -#line 463 "bison_parser.y" /* yacc.c:1646 */ +#line 475 "bison_parser.y" /* yacc.c:1661 */ { (yyval.drop_stmt) = new DropStatement(kDropPreparedStatement); (yyval.drop_stmt)->ifExists = false; (yyval.drop_stmt)->name = (yyvsp[0].sval); } -#line 2878 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2890 "bison_parser.cpp" /* yacc.c:1661 */ break; case 47: -#line 471 "bison_parser.y" /* yacc.c:1646 */ +#line 483 "bison_parser.y" /* yacc.c:1661 */ { (yyval.bval) = true; } -#line 2884 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2896 "bison_parser.cpp" /* yacc.c:1661 */ break; case 48: -#line 472 "bison_parser.y" /* yacc.c:1646 */ +#line 484 "bison_parser.y" /* yacc.c:1661 */ { (yyval.bval) = false; } -#line 2890 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2902 "bison_parser.cpp" /* yacc.c:1661 */ break; case 49: -#line 481 "bison_parser.y" /* yacc.c:1646 */ +#line 493 "bison_parser.y" /* yacc.c:1661 */ { (yyval.delete_stmt) = new DeleteStatement(); (yyval.delete_stmt)->schema = (yyvsp[-1].table_name).schema; (yyval.delete_stmt)->tableName = (yyvsp[-1].table_name).name; (yyval.delete_stmt)->expr = (yyvsp[0].expr); } -#line 2901 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2913 "bison_parser.cpp" /* yacc.c:1661 */ break; case 50: -#line 490 "bison_parser.y" /* yacc.c:1646 */ +#line 502 "bison_parser.y" /* yacc.c:1661 */ { (yyval.delete_stmt) = new DeleteStatement(); (yyval.delete_stmt)->schema = (yyvsp[0].table_name).schema; (yyval.delete_stmt)->tableName = (yyvsp[0].table_name).name; } -#line 2911 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2923 "bison_parser.cpp" /* yacc.c:1661 */ break; case 51: -#line 503 "bison_parser.y" /* yacc.c:1646 */ +#line 515 "bison_parser.y" /* yacc.c:1661 */ { (yyval.insert_stmt) = new InsertStatement(kInsertValues); (yyval.insert_stmt)->schema = (yyvsp[-5].table_name).schema; @@ -2919,11 +2931,11 @@ yyreduce: (yyval.insert_stmt)->columns = (yyvsp[-4].str_vec); (yyval.insert_stmt)->values = (yyvsp[-1].expr_vec); } -#line 2923 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2935 "bison_parser.cpp" /* yacc.c:1661 */ break; case 52: -#line 510 "bison_parser.y" /* yacc.c:1646 */ +#line 522 "bison_parser.y" /* yacc.c:1661 */ { (yyval.insert_stmt) = new InsertStatement(kInsertSelect); (yyval.insert_stmt)->schema = (yyvsp[-2].table_name).schema; @@ -2931,56 +2943,56 @@ yyreduce: (yyval.insert_stmt)->columns = (yyvsp[-1].str_vec); (yyval.insert_stmt)->select = (yyvsp[0].select_stmt); } -#line 2935 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2947 "bison_parser.cpp" /* yacc.c:1661 */ break; case 53: -#line 521 "bison_parser.y" /* yacc.c:1646 */ +#line 533 "bison_parser.y" /* yacc.c:1661 */ { (yyval.str_vec) = (yyvsp[-1].str_vec); } -#line 2941 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2953 "bison_parser.cpp" /* yacc.c:1661 */ break; case 54: -#line 522 "bison_parser.y" /* yacc.c:1646 */ +#line 534 "bison_parser.y" /* yacc.c:1661 */ { (yyval.str_vec) = nullptr; } -#line 2947 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2959 "bison_parser.cpp" /* yacc.c:1661 */ break; case 55: -#line 532 "bison_parser.y" /* yacc.c:1646 */ +#line 544 "bison_parser.y" /* yacc.c:1661 */ { (yyval.update_stmt) = new UpdateStatement(); (yyval.update_stmt)->table = (yyvsp[-3].table); (yyval.update_stmt)->updates = (yyvsp[-1].update_vec); (yyval.update_stmt)->where = (yyvsp[0].expr); } -#line 2958 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2970 "bison_parser.cpp" /* yacc.c:1661 */ break; case 56: -#line 541 "bison_parser.y" /* yacc.c:1646 */ +#line 553 "bison_parser.y" /* yacc.c:1661 */ { (yyval.update_vec) = new std::vector(); (yyval.update_vec)->push_back((yyvsp[0].update_t)); } -#line 2964 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2976 "bison_parser.cpp" /* yacc.c:1661 */ break; case 57: -#line 542 "bison_parser.y" /* yacc.c:1646 */ +#line 554 "bison_parser.y" /* yacc.c:1661 */ { (yyvsp[-2].update_vec)->push_back((yyvsp[0].update_t)); (yyval.update_vec) = (yyvsp[-2].update_vec); } -#line 2970 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2982 "bison_parser.cpp" /* yacc.c:1661 */ break; case 58: -#line 546 "bison_parser.y" /* yacc.c:1646 */ +#line 558 "bison_parser.y" /* yacc.c:1661 */ { (yyval.update_t) = new UpdateClause(); (yyval.update_t)->column = (yyvsp[-2].sval); (yyval.update_t)->value = (yyvsp[0].expr); } -#line 2980 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2992 "bison_parser.cpp" /* yacc.c:1661 */ break; case 61: -#line 560 "bison_parser.y" /* yacc.c:1646 */ +#line 572 "bison_parser.y" /* yacc.c:1661 */ { // TODO: allow multiple unions (through linked list) // TODO: capture type of set_operator @@ -2995,23 +3007,23 @@ yyreduce: (yyval.select_stmt)->limit = (yyvsp[0].limit); } } -#line 2999 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3011 "bison_parser.cpp" /* yacc.c:1661 */ break; case 62: -#line 577 "bison_parser.y" /* yacc.c:1646 */ +#line 589 "bison_parser.y" /* yacc.c:1661 */ { (yyval.select_stmt) = (yyvsp[-1].select_stmt); } -#line 3005 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3017 "bison_parser.cpp" /* yacc.c:1661 */ break; case 63: -#line 578 "bison_parser.y" /* yacc.c:1646 */ +#line 590 "bison_parser.y" /* yacc.c:1661 */ { (yyval.select_stmt) = (yyvsp[-1].select_stmt); } -#line 3011 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3023 "bison_parser.cpp" /* yacc.c:1661 */ break; case 66: -#line 587 "bison_parser.y" /* yacc.c:1646 */ +#line 599 "bison_parser.y" /* yacc.c:1661 */ { (yyval.select_stmt) = (yyvsp[-2].select_stmt); (yyval.select_stmt)->order = (yyvsp[-1].order_vec); @@ -3022,11 +3034,11 @@ yyreduce: (yyval.select_stmt)->limit = (yyvsp[0].limit); } } -#line 3026 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3038 "bison_parser.cpp" /* yacc.c:1661 */ break; case 67: -#line 597 "bison_parser.y" /* yacc.c:1646 */ +#line 609 "bison_parser.y" /* yacc.c:1661 */ { // TODO: allow multiple unions (through linked list) // TODO: capture type of set_operator @@ -3041,11 +3053,11 @@ yyreduce: (yyval.select_stmt)->limit = (yyvsp[0].limit); } } -#line 3045 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3057 "bison_parser.cpp" /* yacc.c:1661 */ break; case 74: -#line 629 "bison_parser.y" /* yacc.c:1646 */ +#line 641 "bison_parser.y" /* yacc.c:1661 */ { (yyval.select_stmt) = new SelectStatement(); (yyval.select_stmt)->limit = (yyvsp[-5].limit); @@ -3055,500 +3067,500 @@ yyreduce: (yyval.select_stmt)->whereClause = (yyvsp[-1].expr); (yyval.select_stmt)->groupBy = (yyvsp[0].group_t); } -#line 3059 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3071 "bison_parser.cpp" /* yacc.c:1661 */ break; case 75: -#line 641 "bison_parser.y" /* yacc.c:1646 */ +#line 653 "bison_parser.y" /* yacc.c:1661 */ { (yyval.bval) = true; } -#line 3065 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3077 "bison_parser.cpp" /* yacc.c:1661 */ break; case 76: -#line 642 "bison_parser.y" /* yacc.c:1646 */ +#line 654 "bison_parser.y" /* yacc.c:1661 */ { (yyval.bval) = false; } -#line 3071 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3083 "bison_parser.cpp" /* yacc.c:1661 */ break; case 78: -#line 650 "bison_parser.y" /* yacc.c:1646 */ +#line 662 "bison_parser.y" /* yacc.c:1661 */ { (yyval.table) = (yyvsp[0].table); } -#line 3077 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3089 "bison_parser.cpp" /* yacc.c:1661 */ break; case 79: -#line 655 "bison_parser.y" /* yacc.c:1646 */ +#line 667 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = (yyvsp[0].expr); } -#line 3083 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3095 "bison_parser.cpp" /* yacc.c:1661 */ break; case 80: -#line 656 "bison_parser.y" /* yacc.c:1646 */ +#line 668 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = nullptr; } -#line 3089 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3101 "bison_parser.cpp" /* yacc.c:1661 */ break; case 81: -#line 660 "bison_parser.y" /* yacc.c:1646 */ +#line 672 "bison_parser.y" /* yacc.c:1661 */ { (yyval.group_t) = new GroupByDescription(); (yyval.group_t)->columns = (yyvsp[-1].expr_vec); (yyval.group_t)->having = (yyvsp[0].expr); } -#line 3099 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3111 "bison_parser.cpp" /* yacc.c:1661 */ break; case 82: -#line 665 "bison_parser.y" /* yacc.c:1646 */ +#line 677 "bison_parser.y" /* yacc.c:1661 */ { (yyval.group_t) = nullptr; } -#line 3105 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3117 "bison_parser.cpp" /* yacc.c:1661 */ break; case 83: -#line 669 "bison_parser.y" /* yacc.c:1646 */ +#line 681 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = (yyvsp[0].expr); } -#line 3111 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3123 "bison_parser.cpp" /* yacc.c:1661 */ break; case 84: -#line 670 "bison_parser.y" /* yacc.c:1646 */ +#line 682 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = nullptr; } -#line 3117 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3129 "bison_parser.cpp" /* yacc.c:1661 */ break; case 85: -#line 673 "bison_parser.y" /* yacc.c:1646 */ +#line 685 "bison_parser.y" /* yacc.c:1661 */ { (yyval.order_vec) = (yyvsp[0].order_vec); } -#line 3123 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3135 "bison_parser.cpp" /* yacc.c:1661 */ break; case 86: -#line 674 "bison_parser.y" /* yacc.c:1646 */ +#line 686 "bison_parser.y" /* yacc.c:1661 */ { (yyval.order_vec) = nullptr; } -#line 3129 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3141 "bison_parser.cpp" /* yacc.c:1661 */ break; case 87: -#line 678 "bison_parser.y" /* yacc.c:1646 */ +#line 690 "bison_parser.y" /* yacc.c:1661 */ { (yyval.order_vec) = new std::vector(); (yyval.order_vec)->push_back((yyvsp[0].order)); } -#line 3135 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3147 "bison_parser.cpp" /* yacc.c:1661 */ break; case 88: -#line 679 "bison_parser.y" /* yacc.c:1646 */ +#line 691 "bison_parser.y" /* yacc.c:1661 */ { (yyvsp[-2].order_vec)->push_back((yyvsp[0].order)); (yyval.order_vec) = (yyvsp[-2].order_vec); } -#line 3141 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3153 "bison_parser.cpp" /* yacc.c:1661 */ break; case 89: -#line 683 "bison_parser.y" /* yacc.c:1646 */ +#line 695 "bison_parser.y" /* yacc.c:1661 */ { (yyval.order) = new OrderDescription((yyvsp[0].order_type), (yyvsp[-1].expr)); } -#line 3147 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3159 "bison_parser.cpp" /* yacc.c:1661 */ break; case 90: -#line 687 "bison_parser.y" /* yacc.c:1646 */ +#line 699 "bison_parser.y" /* yacc.c:1661 */ { (yyval.order_type) = kOrderAsc; } -#line 3153 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3165 "bison_parser.cpp" /* yacc.c:1661 */ break; case 91: -#line 688 "bison_parser.y" /* yacc.c:1646 */ +#line 700 "bison_parser.y" /* yacc.c:1661 */ { (yyval.order_type) = kOrderDesc; } -#line 3159 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3171 "bison_parser.cpp" /* yacc.c:1661 */ break; case 92: -#line 689 "bison_parser.y" /* yacc.c:1646 */ +#line 701 "bison_parser.y" /* yacc.c:1661 */ { (yyval.order_type) = kOrderAsc; } -#line 3165 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3177 "bison_parser.cpp" /* yacc.c:1661 */ break; case 93: -#line 695 "bison_parser.y" /* yacc.c:1646 */ +#line 707 "bison_parser.y" /* yacc.c:1661 */ { (yyval.limit) = new LimitDescription((yyvsp[0].expr)->ival, kNoOffset); delete (yyvsp[0].expr); } -#line 3171 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3183 "bison_parser.cpp" /* yacc.c:1661 */ break; case 94: -#line 696 "bison_parser.y" /* yacc.c:1646 */ +#line 708 "bison_parser.y" /* yacc.c:1661 */ { (yyval.limit) = nullptr; } -#line 3177 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3189 "bison_parser.cpp" /* yacc.c:1661 */ break; case 95: -#line 700 "bison_parser.y" /* yacc.c:1646 */ +#line 712 "bison_parser.y" /* yacc.c:1661 */ { (yyval.limit) = new LimitDescription((yyvsp[0].expr)->ival, kNoOffset); delete (yyvsp[0].expr); } -#line 3183 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3195 "bison_parser.cpp" /* yacc.c:1661 */ break; case 96: -#line 701 "bison_parser.y" /* yacc.c:1646 */ +#line 713 "bison_parser.y" /* yacc.c:1661 */ { (yyval.limit) = new LimitDescription((yyvsp[-2].expr)->ival, (yyvsp[0].expr)->ival); delete (yyvsp[-2].expr); delete (yyvsp[0].expr); } -#line 3189 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3201 "bison_parser.cpp" /* yacc.c:1661 */ break; case 97: -#line 702 "bison_parser.y" /* yacc.c:1646 */ +#line 714 "bison_parser.y" /* yacc.c:1661 */ { (yyval.limit) = nullptr; } -#line 3195 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3207 "bison_parser.cpp" /* yacc.c:1661 */ break; case 98: -#line 709 "bison_parser.y" /* yacc.c:1646 */ +#line 721 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr_vec) = new std::vector(); (yyval.expr_vec)->push_back((yyvsp[0].expr)); } -#line 3201 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3213 "bison_parser.cpp" /* yacc.c:1661 */ break; case 99: -#line 710 "bison_parser.y" /* yacc.c:1646 */ +#line 722 "bison_parser.y" /* yacc.c:1661 */ { (yyvsp[-2].expr_vec)->push_back((yyvsp[0].expr)); (yyval.expr_vec) = (yyvsp[-2].expr_vec); } -#line 3207 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3219 "bison_parser.cpp" /* yacc.c:1661 */ break; case 100: -#line 714 "bison_parser.y" /* yacc.c:1646 */ +#line 726 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr_vec) = new std::vector(); (yyval.expr_vec)->push_back((yyvsp[0].expr)); } -#line 3213 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3225 "bison_parser.cpp" /* yacc.c:1661 */ break; case 101: -#line 715 "bison_parser.y" /* yacc.c:1646 */ +#line 727 "bison_parser.y" /* yacc.c:1661 */ { (yyvsp[-2].expr_vec)->push_back((yyvsp[0].expr)); (yyval.expr_vec) = (yyvsp[-2].expr_vec); } -#line 3219 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3231 "bison_parser.cpp" /* yacc.c:1661 */ break; case 102: -#line 719 "bison_parser.y" /* yacc.c:1646 */ +#line 731 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = (yyvsp[-1].expr); (yyval.expr)->alias = (yyvsp[0].sval); } -#line 3228 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3240 "bison_parser.cpp" /* yacc.c:1661 */ break; case 108: -#line 734 "bison_parser.y" /* yacc.c:1646 */ +#line 746 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = (yyvsp[-1].expr); } -#line 3234 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3246 "bison_parser.cpp" /* yacc.c:1661 */ break; case 116: -#line 742 "bison_parser.y" /* yacc.c:1646 */ +#line 754 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeSelect((yyvsp[-1].select_stmt)); } -#line 3240 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3252 "bison_parser.cpp" /* yacc.c:1661 */ break; case 119: -#line 751 "bison_parser.y" /* yacc.c:1646 */ +#line 763 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeOpUnary(kOpUnaryMinus, (yyvsp[0].expr)); } -#line 3246 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3258 "bison_parser.cpp" /* yacc.c:1661 */ break; case 120: -#line 752 "bison_parser.y" /* yacc.c:1646 */ +#line 764 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeOpUnary(kOpNot, (yyvsp[0].expr)); } -#line 3252 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3264 "bison_parser.cpp" /* yacc.c:1661 */ break; case 121: -#line 753 "bison_parser.y" /* yacc.c:1646 */ +#line 765 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeOpUnary(kOpIsNull, (yyvsp[-1].expr)); } -#line 3258 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3270 "bison_parser.cpp" /* yacc.c:1661 */ break; case 122: -#line 754 "bison_parser.y" /* yacc.c:1646 */ +#line 766 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeOpUnary(kOpIsNull, (yyvsp[-2].expr)); } -#line 3264 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3276 "bison_parser.cpp" /* yacc.c:1661 */ break; case 123: -#line 755 "bison_parser.y" /* yacc.c:1646 */ +#line 767 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeOpUnary(kOpNot, Expr::makeOpUnary(kOpIsNull, (yyvsp[-3].expr))); } -#line 3270 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3282 "bison_parser.cpp" /* yacc.c:1661 */ break; case 125: -#line 760 "bison_parser.y" /* yacc.c:1646 */ +#line 772 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpMinus, (yyvsp[0].expr)); } -#line 3276 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3288 "bison_parser.cpp" /* yacc.c:1661 */ break; case 126: -#line 761 "bison_parser.y" /* yacc.c:1646 */ +#line 773 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpPlus, (yyvsp[0].expr)); } -#line 3282 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3294 "bison_parser.cpp" /* yacc.c:1661 */ break; case 127: -#line 762 "bison_parser.y" /* yacc.c:1646 */ +#line 774 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpSlash, (yyvsp[0].expr)); } -#line 3288 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3300 "bison_parser.cpp" /* yacc.c:1661 */ break; case 128: -#line 763 "bison_parser.y" /* yacc.c:1646 */ +#line 775 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpAsterisk, (yyvsp[0].expr)); } -#line 3294 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3306 "bison_parser.cpp" /* yacc.c:1661 */ break; case 129: -#line 764 "bison_parser.y" /* yacc.c:1646 */ +#line 776 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpPercentage, (yyvsp[0].expr)); } -#line 3300 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3312 "bison_parser.cpp" /* yacc.c:1661 */ break; case 130: -#line 765 "bison_parser.y" /* yacc.c:1646 */ +#line 777 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpCaret, (yyvsp[0].expr)); } -#line 3306 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3318 "bison_parser.cpp" /* yacc.c:1661 */ break; case 131: -#line 766 "bison_parser.y" /* yacc.c:1646 */ +#line 778 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpLike, (yyvsp[0].expr)); } -#line 3312 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3324 "bison_parser.cpp" /* yacc.c:1661 */ break; case 132: -#line 767 "bison_parser.y" /* yacc.c:1646 */ +#line 779 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeOpBinary((yyvsp[-3].expr), kOpNotLike, (yyvsp[0].expr)); } -#line 3318 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3330 "bison_parser.cpp" /* yacc.c:1661 */ break; case 133: -#line 768 "bison_parser.y" /* yacc.c:1646 */ +#line 780 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpILike, (yyvsp[0].expr)); } -#line 3324 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3336 "bison_parser.cpp" /* yacc.c:1661 */ break; case 134: -#line 769 "bison_parser.y" /* yacc.c:1646 */ +#line 781 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpConcat, (yyvsp[0].expr)); } -#line 3330 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3342 "bison_parser.cpp" /* yacc.c:1661 */ break; case 135: -#line 773 "bison_parser.y" /* yacc.c:1646 */ +#line 785 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpAnd, (yyvsp[0].expr)); } -#line 3336 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3348 "bison_parser.cpp" /* yacc.c:1661 */ break; case 136: -#line 774 "bison_parser.y" /* yacc.c:1646 */ +#line 786 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpOr, (yyvsp[0].expr)); } -#line 3342 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3354 "bison_parser.cpp" /* yacc.c:1661 */ break; case 137: -#line 778 "bison_parser.y" /* yacc.c:1646 */ +#line 790 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeInOperator((yyvsp[-4].expr), (yyvsp[-1].expr_vec)); } -#line 3348 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3360 "bison_parser.cpp" /* yacc.c:1661 */ break; case 138: -#line 779 "bison_parser.y" /* yacc.c:1646 */ +#line 791 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeOpUnary(kOpNot, Expr::makeInOperator((yyvsp[-5].expr), (yyvsp[-1].expr_vec))); } -#line 3354 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3366 "bison_parser.cpp" /* yacc.c:1661 */ break; case 139: -#line 780 "bison_parser.y" /* yacc.c:1646 */ +#line 792 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeInOperator((yyvsp[-4].expr), (yyvsp[-1].select_stmt)); } -#line 3360 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3372 "bison_parser.cpp" /* yacc.c:1661 */ break; case 140: -#line 781 "bison_parser.y" /* yacc.c:1646 */ +#line 793 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeOpUnary(kOpNot, Expr::makeInOperator((yyvsp[-5].expr), (yyvsp[-1].select_stmt))); } -#line 3366 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3378 "bison_parser.cpp" /* yacc.c:1661 */ break; case 141: -#line 786 "bison_parser.y" /* yacc.c:1646 */ +#line 798 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeCase((yyvsp[-3].expr), (yyvsp[-1].expr)); } -#line 3372 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3384 "bison_parser.cpp" /* yacc.c:1661 */ break; case 142: -#line 788 "bison_parser.y" /* yacc.c:1646 */ +#line 800 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeCase((yyvsp[-5].expr), (yyvsp[-3].expr), (yyvsp[-1].expr)); } -#line 3378 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3390 "bison_parser.cpp" /* yacc.c:1661 */ break; case 143: -#line 792 "bison_parser.y" /* yacc.c:1646 */ +#line 804 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeExists((yyvsp[-1].select_stmt)); } -#line 3384 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3396 "bison_parser.cpp" /* yacc.c:1661 */ break; case 144: -#line 793 "bison_parser.y" /* yacc.c:1646 */ +#line 805 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeOpUnary(kOpNot, Expr::makeExists((yyvsp[-1].select_stmt))); } -#line 3390 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3402 "bison_parser.cpp" /* yacc.c:1661 */ break; case 145: -#line 797 "bison_parser.y" /* yacc.c:1646 */ +#line 809 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpEquals, (yyvsp[0].expr)); } -#line 3396 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3408 "bison_parser.cpp" /* yacc.c:1661 */ break; case 146: -#line 798 "bison_parser.y" /* yacc.c:1646 */ +#line 810 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpNotEquals, (yyvsp[0].expr)); } -#line 3402 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3414 "bison_parser.cpp" /* yacc.c:1661 */ break; case 147: -#line 799 "bison_parser.y" /* yacc.c:1646 */ +#line 811 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpLess, (yyvsp[0].expr)); } -#line 3408 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3420 "bison_parser.cpp" /* yacc.c:1661 */ break; case 148: -#line 800 "bison_parser.y" /* yacc.c:1646 */ +#line 812 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpGreater, (yyvsp[0].expr)); } -#line 3414 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3426 "bison_parser.cpp" /* yacc.c:1661 */ break; case 149: -#line 801 "bison_parser.y" /* yacc.c:1646 */ +#line 813 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpLessEq, (yyvsp[0].expr)); } -#line 3420 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3432 "bison_parser.cpp" /* yacc.c:1661 */ break; case 150: -#line 802 "bison_parser.y" /* yacc.c:1646 */ +#line 814 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpGreaterEq, (yyvsp[0].expr)); } -#line 3426 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3438 "bison_parser.cpp" /* yacc.c:1661 */ break; case 151: -#line 806 "bison_parser.y" /* yacc.c:1646 */ +#line 818 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeFunctionRef((yyvsp[-2].sval), new std::vector(), false); } -#line 3432 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3444 "bison_parser.cpp" /* yacc.c:1661 */ break; case 152: -#line 807 "bison_parser.y" /* yacc.c:1646 */ +#line 819 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeFunctionRef((yyvsp[-4].sval), (yyvsp[-1].expr_vec), (yyvsp[-2].bval)); } -#line 3438 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3450 "bison_parser.cpp" /* yacc.c:1661 */ break; case 153: -#line 811 "bison_parser.y" /* yacc.c:1646 */ +#line 823 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeArray((yyvsp[-1].expr_vec)); } -#line 3444 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3456 "bison_parser.cpp" /* yacc.c:1661 */ break; case 154: -#line 815 "bison_parser.y" /* yacc.c:1646 */ +#line 827 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeArrayIndex((yyvsp[-3].expr), (yyvsp[-1].expr)->ival); } -#line 3450 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3462 "bison_parser.cpp" /* yacc.c:1661 */ break; case 155: -#line 819 "bison_parser.y" /* yacc.c:1646 */ +#line 831 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeBetween((yyvsp[-4].expr), (yyvsp[-2].expr), (yyvsp[0].expr)); } -#line 3456 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3468 "bison_parser.cpp" /* yacc.c:1661 */ break; case 156: -#line 823 "bison_parser.y" /* yacc.c:1646 */ +#line 835 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeColumnRef((yyvsp[0].sval)); } -#line 3462 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3474 "bison_parser.cpp" /* yacc.c:1661 */ break; case 157: -#line 824 "bison_parser.y" /* yacc.c:1646 */ +#line 836 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeColumnRef((yyvsp[-2].sval), (yyvsp[0].sval)); } -#line 3468 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3480 "bison_parser.cpp" /* yacc.c:1661 */ break; case 158: -#line 825 "bison_parser.y" /* yacc.c:1646 */ +#line 837 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeStar(); } -#line 3474 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3486 "bison_parser.cpp" /* yacc.c:1661 */ break; case 159: -#line 826 "bison_parser.y" /* yacc.c:1646 */ +#line 838 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeStar((yyvsp[-2].sval)); } -#line 3480 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3492 "bison_parser.cpp" /* yacc.c:1661 */ break; case 164: -#line 837 "bison_parser.y" /* yacc.c:1646 */ +#line 849 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeLiteral((yyvsp[0].sval)); } -#line 3486 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3498 "bison_parser.cpp" /* yacc.c:1661 */ break; case 165: -#line 842 "bison_parser.y" /* yacc.c:1646 */ +#line 854 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeLiteral((yyvsp[0].fval)); } -#line 3492 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3504 "bison_parser.cpp" /* yacc.c:1661 */ break; case 167: -#line 847 "bison_parser.y" /* yacc.c:1646 */ +#line 859 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeLiteral((yyvsp[0].ival)); } -#line 3498 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3510 "bison_parser.cpp" /* yacc.c:1661 */ break; case 168: -#line 851 "bison_parser.y" /* yacc.c:1646 */ +#line 863 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeNullLiteral(); } -#line 3504 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3516 "bison_parser.cpp" /* yacc.c:1661 */ break; case 169: -#line 855 "bison_parser.y" /* yacc.c:1646 */ +#line 867 "bison_parser.y" /* yacc.c:1661 */ { (yyval.expr) = Expr::makeParameter(yylloc.total_column); (yyval.expr)->ival2 = yyloc.param_list.size(); yyloc.param_list.push_back((yyval.expr)); } -#line 3514 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3526 "bison_parser.cpp" /* yacc.c:1661 */ break; case 171: -#line 868 "bison_parser.y" /* yacc.c:1646 */ +#line 880 "bison_parser.y" /* yacc.c:1661 */ { (yyvsp[0].table_vec)->push_back((yyvsp[-2].table)); auto tbl = new TableRef(kTableCrossProduct); tbl->list = (yyvsp[0].table_vec); (yyval.table) = tbl; } -#line 3525 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3537 "bison_parser.cpp" /* yacc.c:1661 */ break; case 175: -#line 884 "bison_parser.y" /* yacc.c:1646 */ +#line 896 "bison_parser.y" /* yacc.c:1661 */ { auto tbl = new TableRef(kTableSelect); tbl->select = (yyvsp[-2].select_stmt); tbl->alias = (yyvsp[0].sval); (yyval.table) = tbl; } -#line 3536 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3548 "bison_parser.cpp" /* yacc.c:1661 */ break; case 176: -#line 893 "bison_parser.y" /* yacc.c:1646 */ +#line 905 "bison_parser.y" /* yacc.c:1661 */ { (yyval.table_vec) = new std::vector(); (yyval.table_vec)->push_back((yyvsp[0].table)); } -#line 3542 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3554 "bison_parser.cpp" /* yacc.c:1661 */ break; case 177: -#line 894 "bison_parser.y" /* yacc.c:1646 */ +#line 906 "bison_parser.y" /* yacc.c:1661 */ { (yyvsp[-2].table_vec)->push_back((yyvsp[0].table)); (yyval.table_vec) = (yyvsp[-2].table_vec); } -#line 3548 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3560 "bison_parser.cpp" /* yacc.c:1661 */ break; case 178: -#line 899 "bison_parser.y" /* yacc.c:1646 */ +#line 911 "bison_parser.y" /* yacc.c:1661 */ { auto tbl = new TableRef(kTableName); tbl->schema = (yyvsp[-1].table_name).schema; @@ -3556,45 +3568,45 @@ yyreduce: tbl->alias = (yyvsp[0].sval); (yyval.table) = tbl; } -#line 3560 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3572 "bison_parser.cpp" /* yacc.c:1661 */ break; case 179: -#line 910 "bison_parser.y" /* yacc.c:1646 */ +#line 922 "bison_parser.y" /* yacc.c:1661 */ { (yyval.table) = new TableRef(kTableName); (yyval.table)->schema = (yyvsp[0].table_name).schema; (yyval.table)->name = (yyvsp[0].table_name).name; } -#line 3570 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3582 "bison_parser.cpp" /* yacc.c:1661 */ break; case 180: -#line 919 "bison_parser.y" /* yacc.c:1646 */ +#line 931 "bison_parser.y" /* yacc.c:1661 */ { (yyval.table_name).schema = nullptr; (yyval.table_name).name = (yyvsp[0].sval);} -#line 3576 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3588 "bison_parser.cpp" /* yacc.c:1661 */ break; case 181: -#line 920 "bison_parser.y" /* yacc.c:1646 */ +#line 932 "bison_parser.y" /* yacc.c:1661 */ { (yyval.table_name).schema = (yyvsp[-2].sval); (yyval.table_name).name = (yyvsp[0].sval); } -#line 3582 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3594 "bison_parser.cpp" /* yacc.c:1661 */ break; case 182: -#line 925 "bison_parser.y" /* yacc.c:1646 */ +#line 937 "bison_parser.y" /* yacc.c:1661 */ { (yyval.sval) = (yyvsp[0].sval); } -#line 3588 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3600 "bison_parser.cpp" /* yacc.c:1661 */ break; case 185: -#line 931 "bison_parser.y" /* yacc.c:1646 */ +#line 943 "bison_parser.y" /* yacc.c:1661 */ { (yyval.sval) = nullptr; } -#line 3594 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3606 "bison_parser.cpp" /* yacc.c:1661 */ break; case 186: -#line 940 "bison_parser.y" /* yacc.c:1646 */ +#line 952 "bison_parser.y" /* yacc.c:1661 */ { (yyval.table) = new TableRef(kTableJoin); (yyval.table)->join = new JoinDefinition(); @@ -3602,11 +3614,11 @@ yyreduce: (yyval.table)->join->left = (yyvsp[-3].table); (yyval.table)->join->right = (yyvsp[0].table); } -#line 3606 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3618 "bison_parser.cpp" /* yacc.c:1661 */ break; case 187: -#line 948 "bison_parser.y" /* yacc.c:1646 */ +#line 960 "bison_parser.y" /* yacc.c:1661 */ { (yyval.table) = new TableRef(kTableJoin); (yyval.table)->join = new JoinDefinition(); @@ -3615,11 +3627,11 @@ yyreduce: (yyval.table)->join->right = (yyvsp[-2].table); (yyval.table)->join->condition = (yyvsp[0].expr); } -#line 3619 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3631 "bison_parser.cpp" /* yacc.c:1661 */ break; case 188: -#line 958 "bison_parser.y" /* yacc.c:1646 */ +#line 970 "bison_parser.y" /* yacc.c:1661 */ { (yyval.table) = new TableRef(kTableJoin); (yyval.table)->join = new JoinDefinition(); @@ -3635,71 +3647,71 @@ yyreduce: (yyval.table)->join->condition = Expr::makeOpBinary(left_col, kOpEquals, right_col); delete (yyvsp[-1].expr); } -#line 3639 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3651 "bison_parser.cpp" /* yacc.c:1661 */ break; case 189: -#line 976 "bison_parser.y" /* yacc.c:1646 */ +#line 988 "bison_parser.y" /* yacc.c:1661 */ { (yyval.uval) = kJoinInner; } -#line 3645 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3657 "bison_parser.cpp" /* yacc.c:1661 */ break; case 190: -#line 977 "bison_parser.y" /* yacc.c:1646 */ +#line 989 "bison_parser.y" /* yacc.c:1661 */ { (yyval.uval) = kJoinOuter; } -#line 3651 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3663 "bison_parser.cpp" /* yacc.c:1661 */ break; case 191: -#line 978 "bison_parser.y" /* yacc.c:1646 */ +#line 990 "bison_parser.y" /* yacc.c:1661 */ { (yyval.uval) = kJoinLeftOuter; } -#line 3657 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3669 "bison_parser.cpp" /* yacc.c:1661 */ break; case 192: -#line 979 "bison_parser.y" /* yacc.c:1646 */ +#line 991 "bison_parser.y" /* yacc.c:1661 */ { (yyval.uval) = kJoinRightOuter; } -#line 3663 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3675 "bison_parser.cpp" /* yacc.c:1661 */ break; case 193: -#line 980 "bison_parser.y" /* yacc.c:1646 */ +#line 992 "bison_parser.y" /* yacc.c:1661 */ { (yyval.uval) = kJoinLeft; } -#line 3669 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3681 "bison_parser.cpp" /* yacc.c:1661 */ break; case 194: -#line 981 "bison_parser.y" /* yacc.c:1646 */ +#line 993 "bison_parser.y" /* yacc.c:1661 */ { (yyval.uval) = kJoinRight; } -#line 3675 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3687 "bison_parser.cpp" /* yacc.c:1661 */ break; case 195: -#line 982 "bison_parser.y" /* yacc.c:1646 */ +#line 994 "bison_parser.y" /* yacc.c:1661 */ { (yyval.uval) = kJoinCross; } -#line 3681 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3693 "bison_parser.cpp" /* yacc.c:1661 */ break; case 196: -#line 983 "bison_parser.y" /* yacc.c:1646 */ +#line 995 "bison_parser.y" /* yacc.c:1661 */ { (yyval.uval) = kJoinInner; } -#line 3687 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3699 "bison_parser.cpp" /* yacc.c:1661 */ break; case 200: -#line 1003 "bison_parser.y" /* yacc.c:1646 */ +#line 1015 "bison_parser.y" /* yacc.c:1661 */ { (yyval.str_vec) = new std::vector(); (yyval.str_vec)->push_back((yyvsp[0].sval)); } -#line 3693 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3705 "bison_parser.cpp" /* yacc.c:1661 */ break; case 201: -#line 1004 "bison_parser.y" /* yacc.c:1646 */ +#line 1016 "bison_parser.y" /* yacc.c:1661 */ { (yyvsp[-2].str_vec)->push_back((yyvsp[0].sval)); (yyval.str_vec) = (yyvsp[-2].str_vec); } -#line 3699 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3711 "bison_parser.cpp" /* yacc.c:1661 */ break; -#line 3703 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3715 "bison_parser.cpp" /* yacc.c:1661 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -3934,7 +3946,7 @@ yyreturn: #endif return yyresult; } -#line 1007 "bison_parser.y" /* yacc.c:1906 */ +#line 1019 "bison_parser.y" /* yacc.c:1906 */ /********************************* ** Section 4: Additional C code diff --git a/src/parser/bison_parser.h b/src/parser/bison_parser.h index 314283e..7b6edc9 100644 --- a/src/parser/bison_parser.h +++ b/src/parser/bison_parser.h @@ -48,7 +48,7 @@ extern int hsql_debug; #endif /* "%code requires" blocks. */ -#line 35 "bison_parser.y" /* yacc.c:1909 */ +#line 35 "bison_parser.y" /* yacc.c:1915 */ // %code requires block @@ -62,6 +62,7 @@ extern int hsql_debug; yylloc->first_column = yylloc->last_column; \ for(int i = 0; yytext[i] != '\0'; i++) { \ yylloc->total_column++; \ + yylloc->string_length++; \ if(yytext[i] == '\n') { \ yylloc->last_line++; \ yylloc->last_column = 0; \ @@ -71,7 +72,7 @@ extern int hsql_debug; } \ } -#line 75 "bison_parser.h" /* yacc.c:1909 */ +#line 76 "bison_parser.h" /* yacc.c:1915 */ /* Token type. */ #ifndef HSQL_TOKENTYPE @@ -217,7 +218,7 @@ extern int hsql_debug; union HSQL_STYPE { -#line 93 "bison_parser.y" /* yacc.c:1909 */ +#line 95 "bison_parser.y" /* yacc.c:1915 */ double fval; int64_t ival; @@ -236,7 +237,7 @@ union HSQL_STYPE hsql::PrepareStatement* prep_stmt; hsql::ExecuteStatement* exec_stmt; hsql::ShowStatement* show_stmt; - + hsql::TableName table_name; hsql::TableRef* table; hsql::Expr* expr; @@ -256,7 +257,7 @@ union HSQL_STYPE std::vector* expr_vec; std::vector* order_vec; -#line 260 "bison_parser.h" /* yacc.c:1909 */ +#line 261 "bison_parser.h" /* yacc.c:1915 */ }; typedef union HSQL_STYPE HSQL_STYPE; diff --git a/src/parser/bison_parser.y b/src/parser/bison_parser.y index 7d280a9..b0dbc7b 100755 --- a/src/parser/bison_parser.y +++ b/src/parser/bison_parser.y @@ -45,6 +45,7 @@ int yyerror(YYLTYPE* llocp, SQLParserResult* result, yyscan_t scanner, const cha yylloc->first_column = yylloc->last_column; \ for(int i = 0; yytext[i] != '\0'; i++) { \ yylloc->total_column++; \ + yylloc->string_length++; \ if(yytext[i] == '\n') { \ yylloc->last_line++; \ yylloc->last_column = 0; \ @@ -76,6 +77,7 @@ int yyerror(YYLTYPE* llocp, SQLParserResult* result, yyscan_t scanner, const cha @$.first_line = 0; @$.last_line = 0; @$.total_column = 0; + @$.string_length = 0; }; @@ -108,7 +110,7 @@ int yyerror(YYLTYPE* llocp, SQLParserResult* result, yyscan_t scanner, const cha hsql::PrepareStatement* prep_stmt; hsql::ExecuteStatement* exec_stmt; hsql::ShowStatement* show_stmt; - + hsql::TableName table_name; hsql::TableRef* table; hsql::Expr* expr; @@ -133,7 +135,7 @@ int yyerror(YYLTYPE* llocp, SQLParserResult* result, yyscan_t scanner, const cha /********************************* ** Descrutor symbols *********************************/ -%destructor { } +%destructor { } %destructor { free( ($$.name) ); free( ($$.schema) ); } %destructor { free( ($$) ); } %destructor { @@ -185,7 +187,7 @@ int yyerror(YYLTYPE* llocp, SQLParserResult* result, yyscan_t scanner, const cha %type delete_statement truncate_statement %type update_statement %type drop_statement -%type show_statement +%type show_statement %type table_name %type opt_alias alias file_path prepare_target_query %type opt_not_exists opt_exists opt_distinct @@ -263,8 +265,18 @@ input: statement_list: - statement { $$ = new std::vector(); $$->push_back($1); } - | statement_list ';' statement { $1->push_back($3); $$ = $1; } + statement { + $1->stringLength = yylloc.string_length; + yylloc.string_length = 0; + $$ = new std::vector(); + $$->push_back($1); + } + | statement_list ';' statement { + $3->stringLength = yylloc.string_length; + yylloc.string_length = 0; + $1->push_back($3); + $$ = $1; + } ; statement: @@ -471,7 +483,7 @@ opt_exists: IF EXISTS { $$ = true; } | /* empty */ { $$ = false; } ; - + /****************************** * Delete Statement / Truncate statement * DELETE FROM students WHERE grade > 3.0 diff --git a/src/parser/parser_typedef.h b/src/parser/parser_typedef.h index a16770e..de4854a 100644 --- a/src/parser/parser_typedef.h +++ b/src/parser/parser_typedef.h @@ -22,6 +22,9 @@ struct HSQL_CUST_LTYPE { int total_column; + // Length of the string in the SQL query string + int string_length; + // Parameters. // int param_id; std::vector param_list; diff --git a/src/sql/SQLStatement.h b/src/sql/SQLStatement.h index db7cbf1..c2c71fb 100644 --- a/src/sql/SQLStatement.h +++ b/src/sql/SQLStatement.h @@ -37,6 +37,9 @@ namespace hsql { // Shorthand for isType(type). bool is(StatementType type) const; + // Length of the string in the SQL query string + size_t stringLength; + std::vector* hints; private: diff --git a/test/sql_tests.cpp b/test/sql_tests.cpp index fd07aa9..e935fa5 100644 --- a/test/sql_tests.cpp +++ b/test/sql_tests.cpp @@ -213,4 +213,15 @@ TEST(HintTest) { ASSERT_EQ(10, stmt->hints->at(1)->exprList->at(0)->ival); } +TEST(StringLengthTest) { + TEST_PARSE_SQL_QUERY( + "SELECT * FROM bar; INSERT INTO foo VALUES (4);\t\n SELECT * FROM foo;", + result, + 3); + + ASSERT_EQ(result.getStatement(0)->stringLength, 18); + ASSERT_EQ(result.getStatement(1)->stringLength, 28); + ASSERT_EQ(result.getStatement(2)->stringLength, 21); +} + TEST_MAIN();