From 2316e07d522e0479bab5cd1398d2c1c76b0fd0f0 Mon Sep 17 00:00:00 2001
From: Tim Zimmermann <tim.zimmermann@student.hpi.de>
Date: Tue, 5 Sep 2017 10:24:13 +0000
Subject: [PATCH 1/5] Do not allow deprecated features for flex

---
 Makefile                    |   2 +-
 src/parser/bison_parser.cpp | 496 ++++++++++++++++++------------------
 src/parser/bison_parser.h   |   8 +-
 src/parser/flex_lexer.cpp   | 242 ++++++++++--------
 src/parser/flex_lexer.h     |  46 ++--
 5 files changed, 403 insertions(+), 391 deletions(-)

diff --git a/Makefile b/Makefile
index bef6562..6083533 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ $(LIB_BUILD): $(LIB_OBJ)
 	$(CXX) $(LIB_LFLAGS) -o $(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 -Wno-deprecated-register
+	$(CXX) $(LIB_CFLAGS) -c -o $@ $< -Wno-sign-compare -Wno-unneeded-internal-declaration
 
 %.o: %.cpp $(PARSER_CPP) $(LIB_H)
 	$(CXX) $(LIB_CFLAGS) -c -o $@ $<
diff --git a/src/parser/bison_parser.cpp b/src/parser/bison_parser.cpp
index 4c1a629..70f0566 100644
--- a/src/parser/bison_parser.cpp
+++ b/src/parser/bison_parser.cpp
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.0.2.  */
+/* A Bison parser, made by GNU Bison 3.0.4.  */
 
 /* Bison implementation for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "3.0.2"
+#define YYBISON_VERSION "3.0.4"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -303,7 +303,7 @@ extern int hsql_debug;
 
 /* Value type.  */
 #if ! defined HSQL_STYPE && ! defined HSQL_STYPE_IS_DECLARED
-typedef union HSQL_STYPE HSQL_STYPE;
+
 union HSQL_STYPE
 {
 #line 93 "bison_parser.y" /* yacc.c:355  */
@@ -346,6 +346,8 @@ union HSQL_STYPE
 
 #line 348 "bison_parser.cpp" /* yacc.c:355  */
 };
+
+typedef union HSQL_STYPE HSQL_STYPE;
 # define HSQL_STYPE_IS_TRIVIAL 1
 # define HSQL_STYPE_IS_DECLARED 1
 #endif
@@ -372,7 +374,7 @@ int hsql_parse (hsql::SQLParserResult* result, yyscan_t scanner);
 
 /* Copy the second part of user declarations.  */
 
-#line 376 "bison_parser.cpp" /* yacc.c:358  */
+#line 378 "bison_parser.cpp" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -1613,25 +1615,25 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio
           case 3: /* IDENTIFIER  */
 #line 136 "bison_parser.y" /* yacc.c:1257  */
       { free( (((*yyvaluep).sval)) ); }
-#line 1617 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1619 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 4: /* STRING  */
 #line 136 "bison_parser.y" /* yacc.c:1257  */
       { free( (((*yyvaluep).sval)) ); }
-#line 1623 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1625 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 5: /* FLOATVAL  */
 #line 135 "bison_parser.y" /* yacc.c:1257  */
       { }
-#line 1629 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1631 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 6: /* INTVAL  */
 #line 135 "bison_parser.y" /* yacc.c:1257  */
       { }
-#line 1635 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1637 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 153: /* statement_list  */
@@ -1644,19 +1646,19 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio
 	}
 	delete (((*yyvaluep).stmt_vec));
 }
-#line 1648 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1650 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 154: /* statement  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).statement)); }
-#line 1654 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1656 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 155: /* preparable_statement  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).statement)); }
-#line 1660 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1662 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 156: /* opt_hints  */
@@ -1669,7 +1671,7 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio
 	}
 	delete (((*yyvaluep).expr_vec));
 }
-#line 1673 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1675 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 157: /* hint_list  */
@@ -1682,67 +1684,67 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio
 	}
 	delete (((*yyvaluep).expr_vec));
 }
-#line 1686 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1688 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 158: /* hint  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).expr)); }
-#line 1692 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1694 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 159: /* prepare_statement  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).prep_stmt)); }
-#line 1698 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1700 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 160: /* prepare_target_query  */
 #line 136 "bison_parser.y" /* yacc.c:1257  */
       { free( (((*yyvaluep).sval)) ); }
-#line 1704 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1706 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 161: /* execute_statement  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).exec_stmt)); }
-#line 1710 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1712 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 162: /* import_statement  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).import_stmt)); }
-#line 1716 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1718 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 163: /* import_file_type  */
 #line 135 "bison_parser.y" /* yacc.c:1257  */
       { }
-#line 1722 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1724 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 164: /* file_path  */
 #line 136 "bison_parser.y" /* yacc.c:1257  */
       { free( (((*yyvaluep).sval)) ); }
-#line 1728 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1730 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 165: /* show_statement  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).show_stmt)); }
-#line 1734 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1736 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 166: /* create_statement  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).create_stmt)); }
-#line 1740 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1742 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 167: /* opt_not_exists  */
 #line 135 "bison_parser.y" /* yacc.c:1257  */
       { }
-#line 1746 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1748 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 168: /* column_def_commalist  */
@@ -1755,43 +1757,43 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio
 	}
 	delete (((*yyvaluep).column_vec));
 }
-#line 1759 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1761 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 169: /* column_def  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).column_t)); }
-#line 1765 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1767 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 170: /* column_type  */
 #line 135 "bison_parser.y" /* yacc.c:1257  */
       { }
-#line 1771 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1773 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 171: /* drop_statement  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).drop_stmt)); }
-#line 1777 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1779 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 172: /* delete_statement  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).delete_stmt)); }
-#line 1783 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1785 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 173: /* truncate_statement  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).delete_stmt)); }
-#line 1789 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1791 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 174: /* insert_statement  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).insert_stmt)); }
-#line 1795 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1797 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 175: /* opt_column_list  */
@@ -1804,13 +1806,13 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio
 	}
 	delete (((*yyvaluep).str_vec));
 }
-#line 1808 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1810 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 176: /* update_statement  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).update_stmt)); }
-#line 1814 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1816 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 177: /* update_clause_commalist  */
@@ -1823,49 +1825,49 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio
 	}
 	delete (((*yyvaluep).update_vec));
 }
-#line 1827 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1829 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 178: /* update_clause  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).update_t)); }
-#line 1833 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1835 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 179: /* select_statement  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).select_stmt)); }
-#line 1839 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1841 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 180: /* select_with_paren  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).select_stmt)); }
-#line 1845 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1847 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 181: /* select_paren_or_clause  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).select_stmt)); }
-#line 1851 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1853 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 182: /* select_no_paren  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).select_stmt)); }
-#line 1857 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1859 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 186: /* select_clause  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).select_stmt)); }
-#line 1863 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1865 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 187: /* opt_distinct  */
 #line 135 "bison_parser.y" /* yacc.c:1257  */
       { }
-#line 1869 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1871 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 188: /* select_list  */
@@ -1878,31 +1880,31 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio
 	}
 	delete (((*yyvaluep).expr_vec));
 }
-#line 1882 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1884 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 189: /* from_clause  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).table)); }
-#line 1888 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1890 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 190: /* opt_where  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).expr)); }
-#line 1894 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1896 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 191: /* opt_group  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).group_t)); }
-#line 1900 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1902 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 192: /* opt_having  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).expr)); }
-#line 1906 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1908 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 193: /* opt_order  */
@@ -1915,7 +1917,7 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio
 	}
 	delete (((*yyvaluep).order_vec));
 }
-#line 1919 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1921 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 194: /* order_list  */
@@ -1928,31 +1930,31 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio
 	}
 	delete (((*yyvaluep).order_vec));
 }
-#line 1932 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1934 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 195: /* order_desc  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).order)); }
-#line 1938 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1940 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 196: /* opt_order_type  */
 #line 135 "bison_parser.y" /* yacc.c:1257  */
       { }
-#line 1944 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1946 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 197: /* opt_top  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).limit)); }
-#line 1950 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1952 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 198: /* opt_limit  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).limit)); }
-#line 1956 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1958 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 199: /* expr_list  */
@@ -1965,7 +1967,7 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio
 	}
 	delete (((*yyvaluep).expr_vec));
 }
-#line 1969 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1971 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 200: /* literal_list  */
@@ -1978,157 +1980,157 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio
 	}
 	delete (((*yyvaluep).expr_vec));
 }
-#line 1982 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1984 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 201: /* expr_alias  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).expr)); }
-#line 1988 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1990 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 202: /* expr  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).expr)); }
-#line 1994 "bison_parser.cpp" /* yacc.c:1257  */
+#line 1996 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 203: /* operand  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).expr)); }
-#line 2000 "bison_parser.cpp" /* yacc.c:1257  */
+#line 2002 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 204: /* scalar_expr  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).expr)); }
-#line 2006 "bison_parser.cpp" /* yacc.c:1257  */
+#line 2008 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 205: /* unary_expr  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).expr)); }
-#line 2012 "bison_parser.cpp" /* yacc.c:1257  */
+#line 2014 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 206: /* binary_expr  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).expr)); }
-#line 2018 "bison_parser.cpp" /* yacc.c:1257  */
+#line 2020 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 207: /* logic_expr  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).expr)); }
-#line 2024 "bison_parser.cpp" /* yacc.c:1257  */
+#line 2026 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 208: /* in_expr  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).expr)); }
-#line 2030 "bison_parser.cpp" /* yacc.c:1257  */
+#line 2032 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 209: /* case_expr  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).expr)); }
-#line 2036 "bison_parser.cpp" /* yacc.c:1257  */
+#line 2038 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 210: /* exists_expr  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).expr)); }
-#line 2042 "bison_parser.cpp" /* yacc.c:1257  */
+#line 2044 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 211: /* comp_expr  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).expr)); }
-#line 2048 "bison_parser.cpp" /* yacc.c:1257  */
+#line 2050 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 212: /* function_expr  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).expr)); }
-#line 2054 "bison_parser.cpp" /* yacc.c:1257  */
+#line 2056 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 213: /* array_expr  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).expr)); }
-#line 2060 "bison_parser.cpp" /* yacc.c:1257  */
+#line 2062 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 214: /* array_index  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).expr)); }
-#line 2066 "bison_parser.cpp" /* yacc.c:1257  */
+#line 2068 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 215: /* between_expr  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).expr)); }
-#line 2072 "bison_parser.cpp" /* yacc.c:1257  */
+#line 2074 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 216: /* column_name  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).expr)); }
-#line 2078 "bison_parser.cpp" /* yacc.c:1257  */
+#line 2080 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 217: /* literal  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).expr)); }
-#line 2084 "bison_parser.cpp" /* yacc.c:1257  */
+#line 2086 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 218: /* string_literal  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).expr)); }
-#line 2090 "bison_parser.cpp" /* yacc.c:1257  */
+#line 2092 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 219: /* num_literal  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).expr)); }
-#line 2096 "bison_parser.cpp" /* yacc.c:1257  */
+#line 2098 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 220: /* int_literal  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).expr)); }
-#line 2102 "bison_parser.cpp" /* yacc.c:1257  */
+#line 2104 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 221: /* null_literal  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).expr)); }
-#line 2108 "bison_parser.cpp" /* yacc.c:1257  */
+#line 2110 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 222: /* param_expr  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).expr)); }
-#line 2114 "bison_parser.cpp" /* yacc.c:1257  */
+#line 2116 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 223: /* table_ref  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).table)); }
-#line 2120 "bison_parser.cpp" /* yacc.c:1257  */
+#line 2122 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 224: /* table_ref_atomic  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).table)); }
-#line 2126 "bison_parser.cpp" /* yacc.c:1257  */
+#line 2128 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 225: /* nonjoin_table_ref_atomic  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).table)); }
-#line 2132 "bison_parser.cpp" /* yacc.c:1257  */
+#line 2134 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 226: /* table_ref_commalist  */
@@ -2141,55 +2143,55 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio
 	}
 	delete (((*yyvaluep).table_vec));
 }
-#line 2145 "bison_parser.cpp" /* yacc.c:1257  */
+#line 2147 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 227: /* table_ref_name  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).table)); }
-#line 2151 "bison_parser.cpp" /* yacc.c:1257  */
+#line 2153 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 228: /* table_ref_name_no_alias  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).table)); }
-#line 2157 "bison_parser.cpp" /* yacc.c:1257  */
+#line 2159 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 229: /* table_name  */
 #line 136 "bison_parser.y" /* yacc.c:1257  */
       { free( (((*yyvaluep).sval)) ); }
-#line 2163 "bison_parser.cpp" /* yacc.c:1257  */
+#line 2165 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 230: /* alias  */
 #line 136 "bison_parser.y" /* yacc.c:1257  */
       { free( (((*yyvaluep).sval)) ); }
-#line 2169 "bison_parser.cpp" /* yacc.c:1257  */
+#line 2171 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 231: /* opt_alias  */
 #line 136 "bison_parser.y" /* yacc.c:1257  */
       { free( (((*yyvaluep).sval)) ); }
-#line 2175 "bison_parser.cpp" /* yacc.c:1257  */
+#line 2177 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 232: /* join_clause  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).table)); }
-#line 2181 "bison_parser.cpp" /* yacc.c:1257  */
+#line 2183 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 233: /* opt_join_type  */
 #line 135 "bison_parser.y" /* yacc.c:1257  */
       { }
-#line 2187 "bison_parser.cpp" /* yacc.c:1257  */
+#line 2189 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 234: /* join_condition  */
 #line 145 "bison_parser.y" /* yacc.c:1257  */
       { delete (((*yyvaluep).expr)); }
-#line 2193 "bison_parser.cpp" /* yacc.c:1257  */
+#line 2195 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
     case 236: /* ident_commalist  */
@@ -2202,7 +2204,7 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio
 	}
 	delete (((*yyvaluep).str_vec));
 }
-#line 2206 "bison_parser.cpp" /* yacc.c:1257  */
+#line 2208 "bison_parser.cpp" /* yacc.c:1257  */
         break;
 
 
@@ -2320,7 +2322,7 @@ YYLTYPE yylloc = yyloc_default;
 	yylloc.total_column = 0;
 }
 
-#line 2324 "bison_parser.cpp" /* yacc.c:1429  */
+#line 2326 "bison_parser.cpp" /* yacc.c:1429  */
   yylsp[0] = yylloc;
   goto yysetstate;
 
@@ -2525,19 +2527,19 @@ yyreduce:
 			}
 			delete (yyvsp[-1].stmt_vec);
 		}
-#line 2529 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2531 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 3:
 #line 263 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.stmt_vec) = new std::vector<SQLStatement*>(); (yyval.stmt_vec)->push_back((yyvsp[0].statement)); }
-#line 2535 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2537 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 4:
 #line 264 "bison_parser.y" /* yacc.c:1646  */
     { (yyvsp[-2].stmt_vec)->push_back((yyvsp[0].statement)); (yyval.stmt_vec) = (yyvsp[-2].stmt_vec); }
-#line 2541 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2543 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 5:
@@ -2546,7 +2548,7 @@ yyreduce:
 			(yyval.statement) = (yyvsp[-1].prep_stmt);
 			(yyval.statement)->hints = (yyvsp[0].expr_vec);
 		}
-#line 2550 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2552 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 6:
@@ -2555,7 +2557,7 @@ yyreduce:
 			(yyval.statement) = (yyvsp[-1].statement);
 			(yyval.statement)->hints = (yyvsp[0].expr_vec);
 		}
-#line 2559 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2561 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 7:
@@ -2563,85 +2565,85 @@ yyreduce:
     {
 			(yyval.statement) = (yyvsp[0].show_stmt);
 		}
-#line 2567 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2569 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 8:
 #line 283 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.statement) = (yyvsp[0].select_stmt); }
-#line 2573 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2575 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 9:
 #line 284 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.statement) = (yyvsp[0].import_stmt); }
-#line 2579 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2581 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 10:
 #line 285 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.statement) = (yyvsp[0].create_stmt); }
-#line 2585 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2587 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 11:
 #line 286 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.statement) = (yyvsp[0].insert_stmt); }
-#line 2591 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2593 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 12:
 #line 287 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.statement) = (yyvsp[0].delete_stmt); }
-#line 2597 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2599 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 13:
 #line 288 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.statement) = (yyvsp[0].delete_stmt); }
-#line 2603 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2605 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 14:
 #line 289 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.statement) = (yyvsp[0].update_stmt); }
-#line 2609 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2611 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 15:
 #line 290 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.statement) = (yyvsp[0].drop_stmt); }
-#line 2615 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2617 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 16:
 #line 291 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.statement) = (yyvsp[0].exec_stmt); }
-#line 2621 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2623 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 17:
 #line 300 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr_vec) = (yyvsp[-1].expr_vec); }
-#line 2627 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2629 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 18:
 #line 301 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr_vec) = nullptr; }
-#line 2633 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2635 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 19:
 #line 306 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr_vec) = new std::vector<Expr*>(); (yyval.expr_vec)->push_back((yyvsp[0].expr)); }
-#line 2639 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2641 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 20:
 #line 307 "bison_parser.y" /* yacc.c:1646  */
     { (yyvsp[-2].expr_vec)->push_back((yyvsp[0].expr)); (yyval.expr_vec) = (yyvsp[-2].expr_vec); }
-#line 2645 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2647 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 21:
@@ -2650,7 +2652,7 @@ yyreduce:
 			(yyval.expr) = Expr::make(kExprHint);
 			(yyval.expr)->name = (yyvsp[0].sval);
 		}
-#line 2654 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2656 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 22:
@@ -2660,7 +2662,7 @@ yyreduce:
 			(yyval.expr)->name = (yyvsp[-3].sval);
 			(yyval.expr)->exprList = (yyvsp[-1].expr_vec);
 		}
-#line 2664 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2666 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 23:
@@ -2670,7 +2672,7 @@ yyreduce:
 			(yyval.prep_stmt)->name = (yyvsp[-2].sval);
 			(yyval.prep_stmt)->query = (yyvsp[0].sval);
 		}
-#line 2674 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2676 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 25:
@@ -2679,7 +2681,7 @@ yyreduce:
 			(yyval.exec_stmt) = new ExecuteStatement();
 			(yyval.exec_stmt)->name = (yyvsp[0].sval);
 		}
-#line 2683 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2685 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 26:
@@ -2689,7 +2691,7 @@ yyreduce:
 			(yyval.exec_stmt)->name = (yyvsp[-3].sval);
 			(yyval.exec_stmt)->parameters = (yyvsp[-1].expr_vec);
 		}
-#line 2693 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2695 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 27:
@@ -2699,19 +2701,19 @@ yyreduce:
 			(yyval.import_stmt)->filePath = (yyvsp[-2].sval);
 			(yyval.import_stmt)->tableName = (yyvsp[0].sval);
 		}
-#line 2703 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2705 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 28:
 #line 361 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.uval) = kImportCSV; }
-#line 2709 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2711 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 29:
 #line 365 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.sval) = strdup((yyvsp[0].expr)->name); delete (yyvsp[0].expr); }
-#line 2715 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2717 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 30:
@@ -2719,7 +2721,7 @@ yyreduce:
     {
 			(yyval.show_stmt) = new ShowStatement(kShowTables);
 		}
-#line 2723 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2725 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 31:
@@ -2728,7 +2730,7 @@ yyreduce:
 			(yyval.show_stmt) = new ShowStatement(kShowColumns);
 			(yyval.show_stmt)->name = (yyvsp[0].sval);
 		}
-#line 2732 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2734 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 32:
@@ -2739,7 +2741,7 @@ yyreduce:
 			(yyval.create_stmt)->tableName = (yyvsp[-4].sval);
 			(yyval.create_stmt)->filePath = (yyvsp[0].sval);
 		}
-#line 2743 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2745 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 33:
@@ -2750,7 +2752,7 @@ yyreduce:
 			(yyval.create_stmt)->tableName = (yyvsp[-3].sval);
 			(yyval.create_stmt)->columns = (yyvsp[-1].column_vec);
 		}
-#line 2754 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2756 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 34:
@@ -2762,31 +2764,31 @@ yyreduce:
 			(yyval.create_stmt)->viewColumns = (yyvsp[-2].str_vec);
 			(yyval.create_stmt)->select = (yyvsp[0].select_stmt);
 		}
-#line 2766 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2768 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 35:
 #line 413 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.bval) = true; }
-#line 2772 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2774 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 36:
 #line 414 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.bval) = false; }
-#line 2778 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2780 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 37:
 #line 418 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.column_vec) = new std::vector<ColumnDefinition*>(); (yyval.column_vec)->push_back((yyvsp[0].column_t)); }
-#line 2784 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2786 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 38:
 #line 419 "bison_parser.y" /* yacc.c:1646  */
     { (yyvsp[-2].column_vec)->push_back((yyvsp[0].column_t)); (yyval.column_vec) = (yyvsp[-2].column_vec); }
-#line 2790 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2792 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 39:
@@ -2794,31 +2796,31 @@ yyreduce:
     {
 			(yyval.column_t) = new ColumnDefinition((yyvsp[-1].sval), (ColumnDefinition::DataType) (yyvsp[0].uval));
 		}
-#line 2798 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2800 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 40:
 #line 430 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.uval) = ColumnDefinition::INT; }
-#line 2804 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2806 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 41:
 #line 431 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.uval) = ColumnDefinition::INT; }
-#line 2810 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2812 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 42:
 #line 432 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.uval) = ColumnDefinition::DOUBLE; }
-#line 2816 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2818 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 43:
 #line 433 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.uval) = ColumnDefinition::TEXT; }
-#line 2822 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2824 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 44:
@@ -2827,7 +2829,7 @@ yyreduce:
 			(yyval.drop_stmt) = new DropStatement(kDropTable);
 			(yyval.drop_stmt)->name = (yyvsp[0].sval);
 		}
-#line 2831 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2833 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 45:
@@ -2836,7 +2838,7 @@ yyreduce:
 			(yyval.drop_stmt) = new DropStatement(kDropView);
 			(yyval.drop_stmt)->name = (yyvsp[0].sval);
 		}
-#line 2840 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2842 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 46:
@@ -2845,7 +2847,7 @@ yyreduce:
 			(yyval.drop_stmt) = new DropStatement(kDropPreparedStatement);
 			(yyval.drop_stmt)->name = (yyvsp[0].sval);
 		}
-#line 2849 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2851 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 47:
@@ -2855,7 +2857,7 @@ yyreduce:
 			(yyval.delete_stmt)->tableName = (yyvsp[-1].sval);
 			(yyval.delete_stmt)->expr = (yyvsp[0].expr);
 		}
-#line 2859 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2861 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 48:
@@ -2864,7 +2866,7 @@ yyreduce:
 			(yyval.delete_stmt) = new DeleteStatement();
 			(yyval.delete_stmt)->tableName = (yyvsp[0].sval);
 		}
-#line 2868 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2870 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 49:
@@ -2875,7 +2877,7 @@ yyreduce:
 			(yyval.insert_stmt)->columns = (yyvsp[-4].str_vec);
 			(yyval.insert_stmt)->values = (yyvsp[-1].expr_vec);
 		}
-#line 2879 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2881 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 50:
@@ -2886,19 +2888,19 @@ yyreduce:
 			(yyval.insert_stmt)->columns = (yyvsp[-1].str_vec);
 			(yyval.insert_stmt)->select = (yyvsp[0].select_stmt);
 		}
-#line 2890 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2892 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 51:
 #line 499 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.str_vec) = (yyvsp[-1].str_vec); }
-#line 2896 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2898 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 52:
 #line 500 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.str_vec) = nullptr; }
-#line 2902 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2904 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 53:
@@ -2909,19 +2911,19 @@ yyreduce:
 		(yyval.update_stmt)->updates = (yyvsp[-1].update_vec);
 		(yyval.update_stmt)->where = (yyvsp[0].expr);
 	}
-#line 2913 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2915 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 54:
 #line 519 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.update_vec) = new std::vector<UpdateClause*>(); (yyval.update_vec)->push_back((yyvsp[0].update_t)); }
-#line 2919 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2921 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 55:
 #line 520 "bison_parser.y" /* yacc.c:1646  */
     { (yyvsp[-2].update_vec)->push_back((yyvsp[0].update_t)); (yyval.update_vec) = (yyvsp[-2].update_vec); }
-#line 2925 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2927 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 56:
@@ -2931,7 +2933,7 @@ yyreduce:
 			(yyval.update_t)->column = (yyvsp[-2].sval);
 			(yyval.update_t)->value = (yyvsp[0].expr);
 		}
-#line 2935 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2937 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 59:
@@ -2950,19 +2952,19 @@ yyreduce:
 				(yyval.select_stmt)->limit = (yyvsp[0].limit);
 			}
 		}
-#line 2954 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2956 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 60:
 #line 555 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.select_stmt) = (yyvsp[-1].select_stmt); }
-#line 2960 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2962 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 61:
 #line 556 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.select_stmt) = (yyvsp[-1].select_stmt); }
-#line 2966 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2968 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 64:
@@ -2977,7 +2979,7 @@ yyreduce:
 				(yyval.select_stmt)->limit = (yyvsp[0].limit);
 			}
 		}
-#line 2981 "bison_parser.cpp" /* yacc.c:1646  */
+#line 2983 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 65:
@@ -2996,7 +2998,7 @@ yyreduce:
 				(yyval.select_stmt)->limit = (yyvsp[0].limit);
 			}
 		}
-#line 3000 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3002 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 72:
@@ -3010,37 +3012,37 @@ yyreduce:
 			(yyval.select_stmt)->whereClause = (yyvsp[-1].expr);
 			(yyval.select_stmt)->groupBy = (yyvsp[0].group_t);
 		}
-#line 3014 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3016 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 73:
 #line 619 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.bval) = true; }
-#line 3020 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3022 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 74:
 #line 620 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.bval) = false; }
-#line 3026 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3028 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 76:
 #line 628 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.table) = (yyvsp[0].table); }
-#line 3032 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3034 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 77:
 #line 633 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = (yyvsp[0].expr); }
-#line 3038 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3040 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 78:
 #line 634 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = nullptr; }
-#line 3044 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3046 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 79:
@@ -3050,127 +3052,127 @@ yyreduce:
 			(yyval.group_t)->columns = (yyvsp[-1].expr_vec);
 			(yyval.group_t)->having = (yyvsp[0].expr);
 		}
-#line 3054 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3056 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 80:
 #line 643 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.group_t) = nullptr; }
-#line 3060 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3062 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 81:
 #line 647 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = (yyvsp[0].expr); }
-#line 3066 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3068 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 82:
 #line 648 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = nullptr; }
-#line 3072 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3074 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 83:
 #line 651 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.order_vec) = (yyvsp[0].order_vec); }
-#line 3078 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3080 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 84:
 #line 652 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.order_vec) = nullptr; }
-#line 3084 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3086 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 85:
 #line 656 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.order_vec) = new std::vector<OrderDescription*>(); (yyval.order_vec)->push_back((yyvsp[0].order)); }
-#line 3090 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3092 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 86:
 #line 657 "bison_parser.y" /* yacc.c:1646  */
     { (yyvsp[-2].order_vec)->push_back((yyvsp[0].order)); (yyval.order_vec) = (yyvsp[-2].order_vec); }
-#line 3096 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3098 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 87:
 #line 661 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.order) = new OrderDescription((yyvsp[0].order_type), (yyvsp[-1].expr)); }
-#line 3102 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3104 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 88:
 #line 665 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.order_type) = kOrderAsc; }
-#line 3108 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3110 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 89:
 #line 666 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.order_type) = kOrderDesc; }
-#line 3114 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3116 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 90:
 #line 667 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.order_type) = kOrderAsc; }
-#line 3120 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3122 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 91:
 #line 673 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.limit) = new LimitDescription((yyvsp[0].expr)->ival, kNoOffset); delete (yyvsp[0].expr); }
-#line 3126 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3128 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 92:
 #line 674 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.limit) = nullptr; }
-#line 3132 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3134 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 93:
 #line 678 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.limit) = new LimitDescription((yyvsp[0].expr)->ival, kNoOffset); delete (yyvsp[0].expr); }
-#line 3138 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3140 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 94:
 #line 679 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.limit) = new LimitDescription((yyvsp[-2].expr)->ival, (yyvsp[0].expr)->ival); delete (yyvsp[-2].expr); delete (yyvsp[0].expr); }
-#line 3144 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3146 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 95:
 #line 680 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.limit) = nullptr; }
-#line 3150 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3152 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 96:
 #line 687 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr_vec) = new std::vector<Expr*>(); (yyval.expr_vec)->push_back((yyvsp[0].expr)); }
-#line 3156 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3158 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 97:
 #line 688 "bison_parser.y" /* yacc.c:1646  */
     { (yyvsp[-2].expr_vec)->push_back((yyvsp[0].expr)); (yyval.expr_vec) = (yyvsp[-2].expr_vec); }
-#line 3162 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3164 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 98:
 #line 692 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr_vec) = new std::vector<Expr*>(); (yyval.expr_vec)->push_back((yyvsp[0].expr)); }
-#line 3168 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3170 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 99:
 #line 693 "bison_parser.y" /* yacc.c:1646  */
     { (yyvsp[-2].expr_vec)->push_back((yyvsp[0].expr)); (yyval.expr_vec) = (yyvsp[-2].expr_vec); }
-#line 3174 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3176 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 100:
@@ -3179,283 +3181,283 @@ yyreduce:
 			(yyval.expr) = (yyvsp[-1].expr);
 			(yyval.expr)->alias = (yyvsp[0].sval);
 		}
-#line 3183 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3185 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 106:
 #line 712 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = (yyvsp[-1].expr); }
-#line 3189 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3191 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 114:
 #line 720 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeSelect((yyvsp[-1].select_stmt)); }
-#line 3195 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3197 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 117:
 #line 729 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeOpUnary(kOpUnaryMinus, (yyvsp[0].expr)); }
-#line 3201 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3203 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 118:
 #line 730 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeOpUnary(kOpNot, (yyvsp[0].expr)); }
-#line 3207 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3209 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 119:
 #line 731 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeOpUnary(kOpIsNull, (yyvsp[-1].expr)); }
-#line 3213 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3215 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 120:
 #line 732 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeOpUnary(kOpIsNull, (yyvsp[-2].expr)); }
-#line 3219 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3221 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 121:
 #line 733 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeOpUnary(kOpNot, Expr::makeOpUnary(kOpIsNull, (yyvsp[-3].expr))); }
-#line 3225 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3227 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 123:
 #line 738 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpMinus, (yyvsp[0].expr)); }
-#line 3231 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3233 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 124:
 #line 739 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpPlus, (yyvsp[0].expr)); }
-#line 3237 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3239 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 125:
 #line 740 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpSlash, (yyvsp[0].expr)); }
-#line 3243 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3245 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 126:
 #line 741 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpAsterisk, (yyvsp[0].expr)); }
-#line 3249 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3251 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 127:
 #line 742 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpPercentage, (yyvsp[0].expr)); }
-#line 3255 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3257 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 128:
 #line 743 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpCaret, (yyvsp[0].expr)); }
-#line 3261 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3263 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 129:
 #line 744 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpLike, (yyvsp[0].expr)); }
-#line 3267 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3269 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 130:
 #line 745 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeOpBinary((yyvsp[-3].expr), kOpNotLike, (yyvsp[0].expr)); }
-#line 3273 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3275 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 131:
 #line 746 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpILike, (yyvsp[0].expr)); }
-#line 3279 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3281 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 132:
 #line 747 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpConcat, (yyvsp[0].expr)); }
-#line 3285 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3287 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 133:
 #line 751 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpAnd, (yyvsp[0].expr)); }
-#line 3291 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3293 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 134:
 #line 752 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpOr, (yyvsp[0].expr)); }
-#line 3297 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3299 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 135:
 #line 756 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeInOperator((yyvsp[-4].expr), (yyvsp[-1].expr_vec)); }
-#line 3303 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3305 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 136:
 #line 757 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeOpUnary(kOpNot, Expr::makeInOperator((yyvsp[-5].expr), (yyvsp[-1].expr_vec))); }
-#line 3309 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3311 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 137:
 #line 758 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeInOperator((yyvsp[-4].expr), (yyvsp[-1].select_stmt)); }
-#line 3315 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3317 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 138:
 #line 759 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeOpUnary(kOpNot, Expr::makeInOperator((yyvsp[-5].expr), (yyvsp[-1].select_stmt))); }
-#line 3321 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3323 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 139:
 #line 764 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeCase((yyvsp[-3].expr), (yyvsp[-1].expr)); }
-#line 3327 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3329 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 140:
 #line 766 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeCase((yyvsp[-5].expr), (yyvsp[-3].expr), (yyvsp[-1].expr)); }
-#line 3333 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3335 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 141:
 #line 770 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeExists((yyvsp[-1].select_stmt)); }
-#line 3339 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3341 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 142:
 #line 771 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeOpUnary(kOpNot, Expr::makeExists((yyvsp[-1].select_stmt))); }
-#line 3345 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3347 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 143:
 #line 775 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpEquals, (yyvsp[0].expr)); }
-#line 3351 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3353 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 144:
 #line 776 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpNotEquals, (yyvsp[0].expr)); }
-#line 3357 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3359 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 145:
 #line 777 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpLess, (yyvsp[0].expr)); }
-#line 3363 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3365 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 146:
 #line 778 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpGreater, (yyvsp[0].expr)); }
-#line 3369 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3371 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 147:
 #line 779 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpLessEq, (yyvsp[0].expr)); }
-#line 3375 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3377 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 148:
 #line 780 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpGreaterEq, (yyvsp[0].expr)); }
-#line 3381 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3383 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 149:
 #line 784 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeFunctionRef((yyvsp[-2].sval), new std::vector<Expr*>(), false); }
-#line 3387 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3389 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 150:
 #line 785 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeFunctionRef((yyvsp[-4].sval), (yyvsp[-1].expr_vec), (yyvsp[-2].bval)); }
-#line 3393 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3395 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 151:
 #line 789 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeArray((yyvsp[-1].expr_vec)); }
-#line 3399 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3401 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 152:
 #line 793 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeArrayIndex((yyvsp[-3].expr), (yyvsp[-1].expr)->ival); }
-#line 3405 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3407 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 153:
 #line 797 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeBetween((yyvsp[-4].expr), (yyvsp[-2].expr), (yyvsp[0].expr)); }
-#line 3411 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3413 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 154:
 #line 801 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeColumnRef((yyvsp[0].sval)); }
-#line 3417 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3419 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 155:
 #line 802 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeColumnRef((yyvsp[-2].sval), (yyvsp[0].sval)); }
-#line 3423 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3425 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 156:
 #line 803 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeStar(); }
-#line 3429 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3431 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 157:
 #line 804 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeStar((yyvsp[-2].sval)); }
-#line 3435 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3437 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 162:
 #line 815 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeLiteral((yyvsp[0].sval)); }
-#line 3441 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3443 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 163:
 #line 820 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeLiteral((yyvsp[0].fval)); }
-#line 3447 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3449 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 165:
 #line 825 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeLiteral((yyvsp[0].ival)); }
-#line 3453 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3455 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 166:
 #line 829 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.expr) = Expr::makeNullLiteral(); }
-#line 3459 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3461 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 167:
@@ -3465,7 +3467,7 @@ yyreduce:
 			(yyval.expr)->ival2 = yyloc.param_list.size();
 			yyloc.param_list.push_back((yyval.expr));
 		}
-#line 3469 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3471 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 169:
@@ -3476,7 +3478,7 @@ yyreduce:
 			tbl->list = (yyvsp[0].table_vec);
 			(yyval.table) = tbl;
 		}
-#line 3480 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3482 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 173:
@@ -3487,19 +3489,19 @@ yyreduce:
 			tbl->alias = (yyvsp[0].sval);
 			(yyval.table) = tbl;
 		}
-#line 3491 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3493 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 174:
 #line 871 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.table_vec) = new std::vector<TableRef*>(); (yyval.table_vec)->push_back((yyvsp[0].table)); }
-#line 3497 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3499 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 175:
 #line 872 "bison_parser.y" /* yacc.c:1646  */
     { (yyvsp[-2].table_vec)->push_back((yyvsp[0].table)); (yyval.table_vec) = (yyvsp[-2].table_vec); }
-#line 3503 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3505 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 176:
@@ -3510,7 +3512,7 @@ yyreduce:
 			tbl->alias = (yyvsp[0].sval);
 			(yyval.table) = tbl;
 		}
-#line 3514 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3516 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 177:
@@ -3519,25 +3521,25 @@ yyreduce:
 			(yyval.table) = new TableRef(kTableName);
 			(yyval.table)->name = (yyvsp[0].sval);
 		}
-#line 3523 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3525 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 179:
 #line 896 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.sval) = (yyvsp[0].sval); }
-#line 3529 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3531 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 180:
 #line 901 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.sval) = (yyvsp[0].sval); }
-#line 3535 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3537 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 183:
 #line 907 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.sval) = nullptr; }
-#line 3541 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3543 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 184:
@@ -3549,7 +3551,7 @@ yyreduce:
 			(yyval.table)->join->left = (yyvsp[-3].table);
 			(yyval.table)->join->right = (yyvsp[0].table);
 		}
-#line 3553 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3555 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 185:
@@ -3562,7 +3564,7 @@ yyreduce:
 			(yyval.table)->join->right = (yyvsp[-2].table);
 			(yyval.table)->join->condition = (yyvsp[0].expr);
 		}
-#line 3566 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3568 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 186:
@@ -3582,71 +3584,71 @@ yyreduce:
 			(yyval.table)->join->condition = Expr::makeOpBinary(left_col, kOpEquals, right_col);
 			delete (yyvsp[-1].expr);
 		}
-#line 3586 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3588 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 187:
 #line 952 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.uval) = kJoinInner; }
-#line 3592 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3594 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 188:
 #line 953 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.uval) = kJoinOuter; }
-#line 3598 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3600 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 189:
 #line 954 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.uval) = kJoinLeftOuter; }
-#line 3604 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3606 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 190:
 #line 955 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.uval) = kJoinRightOuter; }
-#line 3610 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3612 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 191:
 #line 956 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.uval) = kJoinLeft; }
-#line 3616 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3618 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 192:
 #line 957 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.uval) = kJoinRight; }
-#line 3622 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3624 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 193:
 #line 958 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.uval) = kJoinCross; }
-#line 3628 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3630 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 194:
 #line 959 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.uval) = kJoinInner; }
-#line 3634 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3636 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 198:
 #line 979 "bison_parser.y" /* yacc.c:1646  */
     { (yyval.str_vec) = new std::vector<char*>(); (yyval.str_vec)->push_back((yyvsp[0].sval)); }
-#line 3640 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3642 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 199:
 #line 980 "bison_parser.y" /* yacc.c:1646  */
     { (yyvsp[-2].str_vec)->push_back((yyvsp[0].sval)); (yyval.str_vec) = (yyvsp[-2].str_vec); }
-#line 3646 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3648 "bison_parser.cpp" /* yacc.c:1646  */
     break;
 
 
-#line 3650 "bison_parser.cpp" /* yacc.c:1646  */
+#line 3652 "bison_parser.cpp" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
diff --git a/src/parser/bison_parser.h b/src/parser/bison_parser.h
index 8a5d89d..c2a852d 100644
--- a/src/parser/bison_parser.h
+++ b/src/parser/bison_parser.h
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.0.2.  */
+/* A Bison parser, made by GNU Bison 3.0.4.  */
 
 /* Bison interface for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -214,7 +214,7 @@ extern int hsql_debug;
 
 /* Value type.  */
 #if ! defined HSQL_STYPE && ! defined HSQL_STYPE_IS_DECLARED
-typedef union HSQL_STYPE HSQL_STYPE;
+
 union HSQL_STYPE
 {
 #line 93 "bison_parser.y" /* yacc.c:1909  */
@@ -257,6 +257,8 @@ union HSQL_STYPE
 
 #line 259 "bison_parser.h" /* yacc.c:1909  */
 };
+
+typedef union HSQL_STYPE HSQL_STYPE;
 # define HSQL_STYPE_IS_TRIVIAL 1
 # define HSQL_STYPE_IS_DECLARED 1
 #endif
diff --git a/src/parser/flex_lexer.cpp b/src/parser/flex_lexer.cpp
index 2af46f3..094f831 100644
--- a/src/parser/flex_lexer.cpp
+++ b/src/parser/flex_lexer.cpp
@@ -8,8 +8,8 @@
 
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 35
+#define YY_FLEX_MINOR_VERSION 6
+#define YY_FLEX_SUBMINOR_VERSION 1
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -88,25 +88,13 @@ typedef unsigned int flex_uint32_t;
 
 #endif /* ! FLEXINT_H */
 
-#ifdef __cplusplus
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else	/* ! __cplusplus */
-
-/* C99 requires __STDC__ to be defined as 1. */
-#if defined (__STDC__)
-
-#define YY_USE_CONST
-
-#endif	/* defined (__STDC__) */
-#endif	/* ! __cplusplus */
-
-#ifdef YY_USE_CONST
+/* TODO: this is always defined, so inline it */
 #define yyconst const
+
+#if defined(__GNUC__) && __GNUC__ >= 3
+#define yynoreturn __attribute__((__noreturn__))
 #else
-#define yyconst
+#define yynoreturn
 #endif
 
 /* Returned upon end-of-file. */
@@ -179,11 +167,17 @@ typedef void* yyscan_t;
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
 #endif
 
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
 #define EOB_ACT_CONTINUE_SCAN 0
 #define EOB_ACT_END_OF_FILE 1
 #define EOB_ACT_LAST_MATCH 2
 
     #define YY_LESS_LINENO(n)
+    #define YY_LINENO_REWIND_TO(ptr)
     
 /* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
@@ -201,11 +195,6 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
 
 #define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner )
 
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
-
 #ifndef YY_STRUCT_YY_BUFFER_STATE
 #define YY_STRUCT_YY_BUFFER_STATE
 struct yy_buffer_state
@@ -218,7 +207,7 @@ struct yy_buffer_state
 	/* Size of input buffer in bytes, not including room for EOB
 	 * characters.
 	 */
-	yy_size_t yy_buf_size;
+	int yy_buf_size;
 
 	/* Number of characters read into yy_ch_buf, not including EOB
 	 * characters.
@@ -246,7 +235,7 @@ struct yy_buffer_state
 
     int yy_bs_lineno; /**< The line count. */
     int yy_bs_column; /**< The column count. */
-    
+
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
 	 */
@@ -334,7 +323,7 @@ void hsql_free (void * ,yyscan_t yyscanner );
 
 /* Begin user sect3 */
 
-#define hsql_wrap(n) 1
+#define hsql_wrap(yyscanner) (/*CONSTCOND*/1)
 #define YY_SKIP_YYWRAP
 
 typedef unsigned char YY_CHAR;
@@ -346,14 +335,14 @@ typedef int yy_state_type;
 static yy_state_type yy_get_previous_state (yyscan_t yyscanner );
 static yy_state_type yy_try_NUL_trans (yy_state_type current_state  ,yyscan_t yyscanner);
 static int yy_get_next_buffer (yyscan_t yyscanner );
-static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner );
+static void yynoreturn yy_fatal_error (yyconst char* msg ,yyscan_t yyscanner );
 
 /* Done after the current pattern has been matched and before the
  * corresponding action - sets up yytext.
  */
 #define YY_DO_BEFORE_ACTION \
 	yyg->yytext_ptr = yy_bp; \
-	yyleng = (size_t) (yy_cp - yy_bp); \
+	yyleng = (int) (yy_cp - yy_bp); \
 	yyg->yy_hold_char = *yy_cp; \
 	*yy_cp = '\0'; \
 	yyg->yy_c_buf_p = yy_cp;
@@ -474,7 +463,7 @@ static yyconst flex_int16_t yy_accept[938] =
         2,    2,    5,    6,    2,    2,    0
     } ;
 
-static yyconst flex_int32_t yy_ec[256] =
+static yyconst YY_CHAR yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -506,7 +495,7 @@ static yyconst flex_int32_t yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int32_t yy_meta[68] =
+static yyconst YY_CHAR yy_meta[68] =
     {   0,
         1,    1,    2,    1,    3,    1,    1,    1,    1,    4,
         1,    1,    1,    4,    4,    4,    4,    4,    4,    4,
@@ -517,7 +506,7 @@ static yyconst flex_int32_t yy_meta[68] =
         4,    4,    4,    4,    4,    4,    1
     } ;
 
-static yyconst flex_int16_t yy_base[945] =
+static yyconst flex_uint16_t yy_base[945] =
     {   0,
         0,    0,   67,    0,  433, 3713,  133,  135,  418,    0,
      3713,  410,  131,  401,  133,  132,  384,  129,  129,  137,
@@ -733,7 +722,7 @@ static yyconst flex_int16_t yy_def[945] =
       937,  937,  937,  937
     } ;
 
-static yyconst flex_int16_t yy_nxt[3781] =
+static yyconst flex_uint16_t yy_nxt[3781] =
     {   0,
         6,    7,    8,    9,   10,   11,   12,   13,   14,   15,
        16,   11,   17,   18,   19,   20,   21,   22,   23,   24,
@@ -1607,7 +1596,7 @@ static yyconst flex_int16_t yy_chk[3781] =
 /***************************
  ** Section 3: Rules
  ***************************/
-#line 1611 "flex_lexer.cpp"
+#line 1600 "flex_lexer.cpp"
 
 #define INITIAL 0
 #define COMMENT 1
@@ -1689,19 +1678,23 @@ void hsql_set_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner );
 
 FILE *hsql_get_in (yyscan_t yyscanner );
 
-void hsql_set_in  (FILE * in_str ,yyscan_t yyscanner );
+void hsql_set_in  (FILE * _in_str ,yyscan_t yyscanner );
 
 FILE *hsql_get_out (yyscan_t yyscanner );
 
-void hsql_set_out  (FILE * out_str ,yyscan_t yyscanner );
+void hsql_set_out  (FILE * _out_str ,yyscan_t yyscanner );
 
-int hsql_get_leng (yyscan_t yyscanner );
+			int hsql_get_leng (yyscan_t yyscanner );
 
 char *hsql_get_text (yyscan_t yyscanner );
 
 int hsql_get_lineno (yyscan_t yyscanner );
 
-void hsql_set_lineno (int line_number ,yyscan_t yyscanner );
+void hsql_set_lineno (int _line_number ,yyscan_t yyscanner );
+
+int hsql_get_column  (yyscan_t yyscanner );
+
+void hsql_set_column (int _column_no ,yyscan_t yyscanner );
 
 YYSTYPE * hsql_get_lval (yyscan_t yyscanner );
 
@@ -1723,6 +1716,10 @@ extern int hsql_wrap (yyscan_t yyscanner );
 #endif
 #endif
 
+#ifndef YY_NO_UNPUT
+    
+#endif
+
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner);
 #endif
@@ -1756,7 +1753,7 @@ static int input (yyscan_t yyscanner );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
+#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0)
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -1780,7 +1777,7 @@ static int input (yyscan_t yyscanner );
 	else \
 		{ \
 		errno=0; \
-		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
+		while ( (result = (int) fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
 			{ \
 			if( errno != EINTR) \
 				{ \
@@ -1837,7 +1834,7 @@ extern int hsql_lex \
 
 /* Code executed at the end of each rule. */
 #ifndef YY_BREAK
-#define YY_BREAK break;
+#define YY_BREAK /*LINTED*/break;
 #endif
 
 #define YY_RULE_SETUP \
@@ -1847,16 +1844,11 @@ extern int hsql_lex \
  */
 YY_DECL
 {
-	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
-	register int yy_act;
+	yy_state_type yy_current_state;
+	char *yy_cp, *yy_bp;
+	int yy_act;
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
-#line 51 "flex_lexer.l"
-
-
-#line 1859 "flex_lexer.cpp"
-
     yylval = yylval_param;
 
     yylloc = yylloc_param;
@@ -1887,7 +1879,13 @@ YY_DECL
 		hsql__load_buffer_state(yyscanner );
 		}
 
-	while ( 1 )		/* loops until end-of-file is reached */
+	{
+#line 51 "flex_lexer.l"
+
+
+#line 1887 "flex_lexer.cpp"
+
+	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
 		yy_cp = yyg->yy_c_buf_p;
 
@@ -1903,7 +1901,7 @@ YY_DECL
 yy_match:
 		do
 			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+			YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
 			if ( yy_accept[yy_current_state] )
 				{
 				yyg->yy_last_accepting_state = yy_current_state;
@@ -1915,7 +1913,7 @@ yy_match:
 				if ( yy_current_state >= 938 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
-			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+			yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c];
 			++yy_cp;
 			}
 		while ( yy_current_state != 937 );
@@ -2634,7 +2632,7 @@ YY_RULE_SETUP
 #line 217 "flex_lexer.l"
 ECHO;
 	YY_BREAK
-#line 2638 "flex_lexer.cpp"
+#line 2636 "flex_lexer.cpp"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(COMMENT):
 	yyterminate();
@@ -2767,6 +2765,7 @@ case YY_STATE_EOF(COMMENT):
 			"fatal flex scanner internal error--no action found" );
 	} /* end of action switch */
 		} /* end of scanning one token */
+	} /* end of user's declarations */
 } /* end of hsql_lex */
 
 /* yy_get_next_buffer - try to read in a new buffer
@@ -2779,9 +2778,9 @@ case YY_STATE_EOF(COMMENT):
 static int yy_get_next_buffer (yyscan_t yyscanner)
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-	register char *source = yyg->yytext_ptr;
-	register int number_to_move, i;
+	char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	char *source = yyg->yytext_ptr;
+	int number_to_move, i;
 	int ret_val;
 
 	if ( yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] )
@@ -2810,7 +2809,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 	/* Try to read more data. */
 
 	/* First move last chars to start of buffer. */
-	number_to_move = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr) - 1;
+	number_to_move = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr - 1);
 
 	for ( i = 0; i < number_to_move; ++i )
 		*(dest++) = *(source++);
@@ -2830,7 +2829,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 			{ /* Not enough room in the buffer - grow it. */
 
 			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
+			YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
 
 			int yy_c_buf_p_offset =
 				(int) (yyg->yy_c_buf_p - b->yy_ch_buf);
@@ -2850,7 +2849,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 				}
 			else
 				/* Can't grow it, we don't own it. */
-				b->yy_ch_buf = 0;
+				b->yy_ch_buf = NULL;
 
 			if ( ! b->yy_ch_buf )
 				YY_FATAL_ERROR(
@@ -2868,7 +2867,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 
 		/* Read in more data. */
 		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-			yyg->yy_n_chars, (size_t) num_to_read );
+			yyg->yy_n_chars, num_to_read );
 
 		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
 		}
@@ -2892,9 +2891,9 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 	else
 		ret_val = EOB_ACT_CONTINUE_SCAN;
 
-	if ((yy_size_t) (yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+	if ((yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
 		/* Extend the array by 50%, plus the number we really need. */
-		yy_size_t new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1);
+		int new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1);
 		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) hsql_realloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ,yyscanner );
 		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
 			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
@@ -2913,15 +2912,15 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 
     static yy_state_type yy_get_previous_state (yyscan_t yyscanner)
 {
-	register yy_state_type yy_current_state;
-	register char *yy_cp;
+	yy_state_type yy_current_state;
+	char *yy_cp;
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
 	yy_current_state = yyg->yy_start;
 
 	for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp )
 		{
-		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
 		if ( yy_accept[yy_current_state] )
 			{
 			yyg->yy_last_accepting_state = yy_current_state;
@@ -2933,7 +2932,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 			if ( yy_current_state >= 938 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
-		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+		yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c];
 		}
 
 	return yy_current_state;
@@ -2946,11 +2945,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
  */
     static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state , yyscan_t yyscanner)
 {
-	register int yy_is_jam;
+	int yy_is_jam;
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be unused depending upon options. */
-	register char *yy_cp = yyg->yy_c_buf_p;
+	char *yy_cp = yyg->yy_c_buf_p;
 
-	register YY_CHAR yy_c = 1;
+	YY_CHAR yy_c = 1;
 	if ( yy_accept[yy_current_state] )
 		{
 		yyg->yy_last_accepting_state = yy_current_state;
@@ -2962,12 +2961,17 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 		if ( yy_current_state >= 938 )
 			yy_c = yy_meta[(unsigned int) yy_c];
 		}
-	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+	yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c];
 	yy_is_jam = (yy_current_state == 937);
 
+	(void)yyg;
 	return yy_is_jam ? 0 : yy_current_state;
 }
 
+#ifndef YY_NO_UNPUT
+
+#endif
+
 #ifndef YY_NO_INPUT
 #ifdef __cplusplus
     static int yyinput (yyscan_t yyscanner)
@@ -3017,7 +3021,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 				case EOB_ACT_END_OF_FILE:
 					{
 					if ( hsql_wrap(yyscanner ) )
-						return EOF;
+						return 0;
 
 					if ( ! yyg->yy_did_buffer_switch_on_eof )
 						YY_NEW_FILE;
@@ -3121,7 +3125,7 @@ static void hsql__load_buffer_state  (yyscan_t yyscanner)
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in hsql__create_buffer()" );
 
-	b->yy_buf_size = size;
+	b->yy_buf_size = (yy_size_t)size;
 
 	/* yy_ch_buf has to be 2 characters longer than the size given because
 	 * we need to put in 2 end-of-buffer characters.
@@ -3282,15 +3286,15 @@ static void hsql_ensure_buffer_stack (yyscan_t yyscanner)
 		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
 		 * immediate realloc on the next call.
          */
-		num_to_alloc = 1;
+      num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */
 		yyg->yy_buffer_stack = (struct yy_buffer_state**)hsql_alloc
 								(num_to_alloc * sizeof(struct yy_buffer_state*)
 								, yyscanner);
 		if ( ! yyg->yy_buffer_stack )
 			YY_FATAL_ERROR( "out of dynamic memory in hsql_ensure_buffer_stack()" );
-								  
+
 		memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-				
+
 		yyg->yy_buffer_stack_max = num_to_alloc;
 		yyg->yy_buffer_stack_top = 0;
 		return;
@@ -3299,7 +3303,7 @@ static void hsql_ensure_buffer_stack (yyscan_t yyscanner)
 	if (yyg->yy_buffer_stack_top >= (yyg->yy_buffer_stack_max) - 1){
 
 		/* Increase the buffer to prepare for a possible push. */
-		int grow_size = 8 /* arbitrary grow size */;
+		yy_size_t grow_size = 8 /* arbitrary grow size */;
 
 		num_to_alloc = yyg->yy_buffer_stack_max + grow_size;
 		yyg->yy_buffer_stack = (struct yy_buffer_state**)hsql_realloc
@@ -3319,7 +3323,7 @@ static void hsql_ensure_buffer_stack (yyscan_t yyscanner)
  * @param base the character buffer
  * @param size the size in bytes of the character buffer
  * @param yyscanner The scanner object.
- * @return the newly allocated buffer state object. 
+ * @return the newly allocated buffer state object.
  */
 YY_BUFFER_STATE hsql__scan_buffer  (char * base, yy_size_t  size , yyscan_t yyscanner)
 {
@@ -3329,7 +3333,7 @@ YY_BUFFER_STATE hsql__scan_buffer  (char * base, yy_size_t  size , yyscan_t yysc
 	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
 	     base[size-1] != YY_END_OF_BUFFER_CHAR )
 		/* They forgot to leave room for the EOB's. */
-		return 0;
+		return NULL;
 
 	b = (YY_BUFFER_STATE) hsql_alloc(sizeof( struct yy_buffer_state ) ,yyscanner );
 	if ( ! b )
@@ -3338,7 +3342,7 @@ YY_BUFFER_STATE hsql__scan_buffer  (char * base, yy_size_t  size , yyscan_t yysc
 	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
 	b->yy_buf_pos = b->yy_ch_buf = base;
 	b->yy_is_our_buffer = 0;
-	b->yy_input_file = 0;
+	b->yy_input_file = NULL;
 	b->yy_n_chars = b->yy_buf_size;
 	b->yy_is_interactive = 0;
 	b->yy_at_bol = 1;
@@ -3361,7 +3365,7 @@ YY_BUFFER_STATE hsql__scan_buffer  (char * base, yy_size_t  size , yyscan_t yysc
 YY_BUFFER_STATE hsql__scan_string (yyconst char * yystr , yyscan_t yyscanner)
 {
     
-	return hsql__scan_bytes(yystr,strlen(yystr) ,yyscanner);
+	return hsql__scan_bytes(yystr,(int) strlen(yystr) ,yyscanner);
 }
 
 /** Setup the input buffer state to scan the given bytes. The next call to hsql_lex() will
@@ -3379,7 +3383,7 @@ YY_BUFFER_STATE hsql__scan_bytes  (yyconst char * yybytes, int  _yybytes_len , y
 	int i;
     
 	/* Get memory for full buffer, including space for trailing EOB's. */
-	n = _yybytes_len + 2;
+	n = (yy_size_t) (_yybytes_len + 2);
 	buf = (char *) hsql_alloc(n ,yyscanner );
 	if ( ! buf )
 		YY_FATAL_ERROR( "out of dynamic memory in hsql__scan_bytes()" );
@@ -3405,9 +3409,11 @@ YY_BUFFER_STATE hsql__scan_bytes  (yyconst char * yybytes, int  _yybytes_len , y
 #define YY_EXIT_FAILURE 2
 #endif
 
-static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner)
+static void yynoreturn yy_fatal_error (yyconst char* msg , yyscan_t yyscanner)
 {
-    	(void) fprintf( stderr, "%s\n", msg );
+	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+	(void)yyg;
+	(void) fprintf( stderr, "%s\n", msg );
 	exit( YY_EXIT_FAILURE );
 }
 
@@ -3445,7 +3451,7 @@ YY_EXTRA_TYPE hsql_get_extra  (yyscan_t yyscanner)
 int hsql_get_lineno  (yyscan_t yyscanner)
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    
+
         if (! YY_CURRENT_BUFFER)
             return 0;
     
@@ -3458,7 +3464,7 @@ int hsql_get_lineno  (yyscan_t yyscanner)
 int hsql_get_column  (yyscan_t yyscanner)
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    
+
         if (! YY_CURRENT_BUFFER)
             return 0;
     
@@ -3513,51 +3519,51 @@ void hsql_set_extra (YY_EXTRA_TYPE  user_defined , yyscan_t yyscanner)
 }
 
 /** Set the current line number.
- * @param line_number
+ * @param _line_number line number
  * @param yyscanner The scanner object.
  */
-void hsql_set_lineno (int  line_number , yyscan_t yyscanner)
+void hsql_set_lineno (int  _line_number , yyscan_t yyscanner)
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
         /* lineno is only valid if an input buffer exists. */
         if (! YY_CURRENT_BUFFER )
-           yy_fatal_error( "hsql_set_lineno called with no buffer" , yyscanner); 
+           YY_FATAL_ERROR( "hsql_set_lineno called with no buffer" );
     
-    yylineno = line_number;
+    yylineno = _line_number;
 }
 
 /** Set the current column.
- * @param line_number
+ * @param _column_no column number
  * @param yyscanner The scanner object.
  */
-void hsql_set_column (int  column_no , yyscan_t yyscanner)
+void hsql_set_column (int  _column_no , yyscan_t yyscanner)
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
         /* column is only valid if an input buffer exists. */
         if (! YY_CURRENT_BUFFER )
-           yy_fatal_error( "hsql_set_column called with no buffer" , yyscanner); 
+           YY_FATAL_ERROR( "hsql_set_column called with no buffer" );
     
-    yycolumn = column_no;
+    yycolumn = _column_no;
 }
 
 /** Set the input stream. This does not discard the current
  * input buffer.
- * @param in_str A readable stream.
+ * @param _in_str A readable stream.
  * @param yyscanner The scanner object.
  * @see hsql__switch_to_buffer
  */
-void hsql_set_in (FILE *  in_str , yyscan_t yyscanner)
+void hsql_set_in (FILE *  _in_str , yyscan_t yyscanner)
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    yyin = in_str ;
+    yyin = _in_str ;
 }
 
-void hsql_set_out (FILE *  out_str , yyscan_t yyscanner)
+void hsql_set_out (FILE *  _out_str , yyscan_t yyscanner)
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    yyout = out_str ;
+    yyout = _out_str ;
 }
 
 int hsql_get_debug  (yyscan_t yyscanner)
@@ -3566,10 +3572,10 @@ int hsql_get_debug  (yyscan_t yyscanner)
     return yy_flex_debug;
 }
 
-void hsql_set_debug (int  bdebug , yyscan_t yyscanner)
+void hsql_set_debug (int  _bdebug , yyscan_t yyscanner)
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    yy_flex_debug = bdebug ;
+    yy_flex_debug = _bdebug ;
 }
 
 /* Accessor methods for yylval and yylloc */
@@ -3645,20 +3651,20 @@ int hsql_lex_init_extra(YY_EXTRA_TYPE yy_user_defined,yyscan_t* ptr_yy_globals )
         errno = EINVAL;
         return 1;
     }
-	
+
     *ptr_yy_globals = (yyscan_t) hsql_alloc ( sizeof( struct yyguts_t ), &dummy_yyguts );
-	
+
     if (*ptr_yy_globals == NULL){
         errno = ENOMEM;
         return 1;
     }
-    
+
     /* By setting to 0xAA, we expose bugs in
     yy_init_globals. Leave at 0x00 for releases. */
     memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t));
-    
+
     hsql_set_extra (yy_user_defined, *ptr_yy_globals);
-    
+
     return yy_init_globals ( *ptr_yy_globals );
 }
 
@@ -3669,10 +3675,10 @@ static int yy_init_globals (yyscan_t yyscanner)
      * This function is called from hsql_lex_destroy(), so don't allocate here.
      */
 
-    yyg->yy_buffer_stack = 0;
+    yyg->yy_buffer_stack = NULL;
     yyg->yy_buffer_stack_top = 0;
     yyg->yy_buffer_stack_max = 0;
-    yyg->yy_c_buf_p = (char *) 0;
+    yyg->yy_c_buf_p = NULL;
     yyg->yy_init = 0;
     yyg->yy_start = 0;
 
@@ -3685,8 +3691,8 @@ static int yy_init_globals (yyscan_t yyscanner)
     yyin = stdin;
     yyout = stdout;
 #else
-    yyin = (FILE *) 0;
-    yyout = (FILE *) 0;
+    yyin = NULL;
+    yyout = NULL;
 #endif
 
     /* For future reference: Set errno on error, since we are called by
@@ -3732,7 +3738,10 @@ int hsql_lex_destroy  (yyscan_t yyscanner)
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yyscanner)
 {
-	register int i;
+	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+	(void)yyg;
+
+	int i;
 	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
 }
@@ -3741,7 +3750,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yysca
 #ifdef YY_NEED_STRLEN
 static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner)
 {
-	register int n;
+	int n;
 	for ( n = 0; s[n]; ++n )
 		;
 
@@ -3751,11 +3760,16 @@ static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner)
 
 void *hsql_alloc (yy_size_t  size , yyscan_t yyscanner)
 {
-	return (void *) malloc( size );
+	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+	(void)yyg;
+	return malloc(size);
 }
 
 void *hsql_realloc  (void * ptr, yy_size_t  size , yyscan_t yyscanner)
 {
+	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+	(void)yyg;
+
 	/* The cast to (char *) in the following accommodates both
 	 * implementations that use char* generic pointers, and those
 	 * that use void* generic pointers.  It works with the latter
@@ -3763,11 +3777,13 @@ void *hsql_realloc  (void * ptr, yy_size_t  size , yyscan_t yyscanner)
 	 * any pointer type to void*, and deal with argument conversions
 	 * as though doing an assignment.
 	 */
-	return (void *) realloc( (char *) ptr, size );
+	return realloc(ptr, size);
 }
 
 void hsql_free (void * ptr , yyscan_t yyscanner)
 {
+	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+	(void)yyg;
 	free( (char *) ptr );	/* see hsql_realloc() for (char *) cast */
 }
 
diff --git a/src/parser/flex_lexer.h b/src/parser/flex_lexer.h
index d729bfc..cedea38 100644
--- a/src/parser/flex_lexer.h
+++ b/src/parser/flex_lexer.h
@@ -12,8 +12,8 @@
 
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 35
+#define YY_FLEX_MINOR_VERSION 6
+#define YY_FLEX_SUBMINOR_VERSION 1
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -92,25 +92,13 @@ typedef unsigned int flex_uint32_t;
 
 #endif /* ! FLEXINT_H */
 
-#ifdef __cplusplus
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else	/* ! __cplusplus */
-
-/* C99 requires __STDC__ to be defined as 1. */
-#if defined (__STDC__)
-
-#define YY_USE_CONST
-
-#endif	/* defined (__STDC__) */
-#endif	/* ! __cplusplus */
-
-#ifdef YY_USE_CONST
+/* TODO: this is always defined, so inline it */
 #define yyconst const
+
+#if defined(__GNUC__) && __GNUC__ >= 3
+#define yynoreturn __attribute__((__noreturn__))
 #else
-#define yyconst
+#define yynoreturn
 #endif
 
 /* An opaque pointer. */
@@ -165,7 +153,7 @@ struct yy_buffer_state
 	/* Size of input buffer in bytes, not including room for EOB
 	 * characters.
 	 */
-	yy_size_t yy_buf_size;
+	int yy_buf_size;
 
 	/* Number of characters read into yy_ch_buf, not including EOB
 	 * characters.
@@ -193,7 +181,7 @@ struct yy_buffer_state
 
     int yy_bs_lineno; /**< The line count. */
     int yy_bs_column; /**< The column count. */
-    
+
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
 	 */
@@ -222,7 +210,7 @@ void hsql_free (void * ,yyscan_t yyscanner );
 
 /* Begin user sect3 */
 
-#define hsql_wrap(n) 1
+#define hsql_wrap(yyscanner) (/*CONSTCOND*/1)
 #define YY_SKIP_YYWRAP
 
 #define yytext_ptr yytext_r
@@ -264,19 +252,23 @@ void hsql_set_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner );
 
 FILE *hsql_get_in (yyscan_t yyscanner );
 
-void hsql_set_in  (FILE * in_str ,yyscan_t yyscanner );
+void hsql_set_in  (FILE * _in_str ,yyscan_t yyscanner );
 
 FILE *hsql_get_out (yyscan_t yyscanner );
 
-void hsql_set_out  (FILE * out_str ,yyscan_t yyscanner );
+void hsql_set_out  (FILE * _out_str ,yyscan_t yyscanner );
 
-int hsql_get_leng (yyscan_t yyscanner );
+			int hsql_get_leng (yyscan_t yyscanner );
 
 char *hsql_get_text (yyscan_t yyscanner );
 
 int hsql_get_lineno (yyscan_t yyscanner );
 
-void hsql_set_lineno (int line_number ,yyscan_t yyscanner );
+void hsql_set_lineno (int _line_number ,yyscan_t yyscanner );
+
+int hsql_get_column  (yyscan_t yyscanner );
+
+void hsql_set_column (int _column_no ,yyscan_t yyscanner );
 
 YYSTYPE * hsql_get_lval (yyscan_t yyscanner );
 
@@ -355,6 +347,6 @@ extern int hsql_lex \
 #line 217 "flex_lexer.l"
 
 
-#line 359 "flex_lexer.h"
+#line 351 "flex_lexer.h"
 #undef hsql_IN_HEADER
 #endif /* hsql_HEADER_H */

From 5346810e67623f24bebed9c0b343cb9417d47a2b Mon Sep 17 00:00:00 2001
From: Tim Zimmermann <tim.zimmermann@student.hpi.de>
Date: Tue, 5 Sep 2017 10:55:46 +0000
Subject: [PATCH 2/5] Switch to C++1z

---
 Makefile         | 4 ++--
 example/Makefile | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 6083533..06359fd 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@ PARSER_CPP = $(SRCPARSER)/bison_parser.cpp  $(SRCPARSER)/flex_lexer.cpp
 PARSER_H   = $(SRCPARSER)/bison_parser.h    $(SRCPARSER)/flex_lexer.h
 
 LIB_BUILD  = libsqlparser.so
-LIB_CFLAGS  = -std=c++11 -Wall -Werror -fPIC $(OPT_FLAG)
+LIB_CFLAGS  = -std=c++1z -Wall -Werror -fPIC $(OPT_FLAG)
 LIB_LFLAGS = -shared $(OPT_FLAG)
 LIB_CPP    = $(shell find $(SRC) -name '*.cpp' -not -path "$(SRCPARSER)/*") $(PARSER_CPP)
 LIB_H      = $(shell find $(SRC) -name '*.h' -not -path "$(SRCPARSER)/*") $(PARSER_H)
@@ -110,7 +110,7 @@ $(BM_BUILD): $(BM_ALL) $(LIB_BUILD)
 ############ Test & Example ############
 ########################################
 TEST_BUILD   = $(BIN)/tests
-TEST_CFLAGS   = -std=c++11 -Wall -Werror -Isrc/ -Itest/ -L./ $(OPT_FLAG)
+TEST_CFLAGS   = -std=c++1z -Wall -Werror -Isrc/ -Itest/ -L./ $(OPT_FLAG)
 TEST_CPP     = $(shell find test/ -name '*.cpp')
 TEST_ALL     = $(shell find test/ -name '*.cpp') $(shell find test/ -name '*.h')
 EXAMPLE_SRC  = $(shell find example/ -name '*.cpp') $(shell find example/ -name '*.h')
diff --git a/example/Makefile b/example/Makefile
index 8e241c1..387b553 100644
--- a/example/Makefile
+++ b/example/Makefile
@@ -1,5 +1,5 @@
 
-CFLAGS = -std=c++11 -lstdc++ -Wall -Werror -I../src/ -L../
+CFLAGS = -std=c++1z -lstdc++ -Wall -Werror -I../src/ -L../
 
 all:
 	$(CXX) $(CFLAGS) example.cpp -o example -lsqlparser

From daf5250df68304cc3d1b2b7a2d56da229a64a7e2 Mon Sep 17 00:00:00 2001
From: Tim Zimmermann <tim.zimmermann@student.hpi.de>
Date: Wed, 6 Sep 2017 13:03:32 +0000
Subject: [PATCH 3/5] Switch to gcc5, provide stdlib for clang builds

Trying to fix CI
---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b6fd166..8a08b6c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ language: cpp
 install:
   - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
   - sudo apt-get -qq update
-  - sudo apt-get install -y g++-4.8 libstdc++-4.8-dev
+  - sudo apt-get install -y g++-5 libstdc++-5-dev
   - sudo apt-get install -y flex valgrind
   - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90
   - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 90
@@ -22,6 +22,7 @@ install:
   - bison --version
   - flex --version
   - valgrind --version
+  - if [ "$CXX" = "clang++" ]; then export CXXFLAGS="-stdlib=libc++"; fi
 
 compiler:
   - gcc

From cace5319b98b9fd4f628efc4c390234bb02425a5 Mon Sep 17 00:00:00 2001
From: Tim Zimmermann <tim.zimmermann@student.hpi.de>
Date: Wed, 6 Sep 2017 13:10:25 +0000
Subject: [PATCH 4/5] Link binaries

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8a08b6c..a2c1f38 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,10 +4,10 @@ language: cpp
 install:
   - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
   - sudo apt-get -qq update
-  - sudo apt-get install -y g++-5 libstdc++-5-dev
+  - sudo apt-get install -y g++-6 libstdc++-6-dev
   - sudo apt-get install -y flex valgrind
-  - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90
-  - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 90
+  - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-6 90
+  - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 90
 
   # Install bison 3.0.4.
   - wget http://ftp.gnu.org/gnu/bison/bison-3.0.4.tar.gz

From f5f7f8b4081e5545a8716cfd9331a65637d57223 Mon Sep 17 00:00:00 2001
From: Tim Zimmermann <tim.zimmermann@student.hpi.de>
Date: Wed, 6 Sep 2017 13:22:03 +0000
Subject: [PATCH 5/5] Build flex with current version

---
 .travis.yml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a2c1f38..4bbbb59 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ install:
   - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
   - sudo apt-get -qq update
   - sudo apt-get install -y g++-6 libstdc++-6-dev
-  - sudo apt-get install -y flex valgrind
+  - sudo apt-get install -y valgrind
   - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-6 90
   - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 90
 
@@ -16,6 +16,13 @@ install:
   - ./configure && make && sudo make install
   - cd ..
 
+  # Install flex 2.6.4
+  - wget https://github.com/westes/flex/releases/download/v2.6.4/flex-2.6.4.tar.gz
+  - tar -xvzf flex-2.6.4.tar.gz
+  - cd flex-2.6.4
+  - ./configure && make && sudo make install
+  - cd ..
+
   # Show installed versions.
   - which g++
   - g++ -v
@@ -29,9 +36,14 @@ compiler:
   - clang
 
 script:
+  # bi build with flex/bison files checked into repo
+  - make -j4
+  - make test
+  - make test_example
+
+  # build flex/bison files in CI
   - make cleanall
   - make -j4
-
   - make test
   - make test_example