code improvement

Author: Kirill

src/sql/parser.cpp

@@ -109,13 +109,19 @@ AST<Expr> Parser::parse_expr(std::string_view ctxt, Tok::Prec cur_prec) {
 
     while (true) {
         if (accept(Tok::Tag::K_NOT)){
-            if(accept(Tok::Tag::K_LIKE)){
-                auto rhs = parse_expr("right-hand side of binary expression with NOT in front of operator", *Tok::bin_prec(Tok::Tag::K_LIKE));
-                lhs      = ast<BinExprWithPreTag>(track, std::move(lhs), Tok::Tag::K_NOT, Tok::Tag::K_LIKE, std::move(rhs));
-            } else if(accept(Tok::Tag::K_BETWEEN)){
-                auto rhs = parse_expr("right-hand side of binary expression with NOT in front of operator", *Tok::bin_prec(Tok::Tag::K_BETWEEN));
-                lhs      = ast<BinExprWithPreTag>(track, std::move(lhs), Tok::Tag::K_NOT, Tok::Tag::K_BETWEEN, std::move(rhs));
+            switch(ahead().tag()){
+                case Tok::Tag::K_LIKE:
+                case Tok::Tag::K_BETWEEN: {
+                    auto tag = lex().tag();
+                    auto rhs = parse_expr("right-hand side of binary expression with NOT in front of operator", *Tok::bin_prec(tag));
+                    lhs      = ast<BinExprWithPreTag>(track, std::move(lhs), Tok::Tag::K_NOT, tag, std::move(rhs));
+                    break;
+                }
+                default:
+                err("binary expr with NOT", ctxt);
+                return nullptr;
             }
+            
         } else
         if (auto prec = Tok::bin_prec(ahead().tag())) {
             if (*prec < cur_prec) break;

test/select.sql

@@ -1,3 +1,17 @@
-SELECT note
-FROM company_type
-WHERE production_year between 2005 and 2010;
+SELECT MIN(mc.note) AS production_note, 
+       MIN(t.title) AS movie_title, 
+       MIN(t.production_year) AS movie_year 
+FROM company_type AS ct, 
+     info_type AS it, 
+     movie_companies AS mc, 
+     movie_info_idx AS mi_idx, 
+     title AS t 
+WHERE ct.kind = 'production companies' AND 
+      it.info = 'bottom 10 rank' AND 
+      mc.note  not like '%(as Metro-Goldwyn-Mayer Pictures)%' AND 
+      t.production_year between 2005 and 2010 AND 
+      ct.id = mc.company_type_id AND 
+      t.id = mc.movie_id AND 
+      t.id = mi_idx.movie_id AND 
+      mc.movie_id = mi_idx.movie_id 
+      AND it.id = mi_idx.info_type_id;