diff --git a/frontend-hyrise/sample-queries.sql b/frontend-hyrise/sample-queries.sql index 2694181..9b1184f 100644 --- a/frontend-hyrise/sample-queries.sql +++ b/frontend-hyrise/sample-queries.sql @@ -8,7 +8,7 @@ SELECT * FROM students WHERE grade <= 2.0; # SUB-SELECT SELECT name, city, grade FROM (SELECT * FROM students WHERE city = 'Potsdam') t1 WHERE grade <= 1.5 OR grade >= 3.5; # GROUP -SELECT city, AVG(grade) AS average|, MIN(grade) AS best, MAX(grade) AS worst FROM students GROUP BY city; +SELECT city, AVG(grade) AS average, MIN(grade) AS best, MAX(grade) AS worst FROM students GROUP BY city; # UNION SELECT * FROM students WHERE grade = 1.3 UNION SELECT * FROM students WHERE grade = 3.7; # JOIN diff --git a/src/Makefile b/src/Makefile index c00873e..96b80a8 100644 --- a/src/Makefile +++ b/src/Makefile @@ -6,7 +6,7 @@ BIN_DIR = ../bin CC = g++ CFLAGS = -O3 -I./ -Ilib/ -Ilib/statements/ -Iparser/ -std=c++11 -pthread -Wall -g -LIB_HEADERS = $(shell find lib/ -name '*.h') parser/bison_parser.h parser/flex_lexer.h parser/SQLParser.h +LIB_HEADERS = $(shell find lib/ -name '*.h') parser/bison_parser.h parser/flex_lexer.h parser/SQLParser.h parser/parser_typedef.h LIB_SOURCES = $(shell find lib/ -name '*.cpp') parser/bison_parser.cpp parser/flex_lexer.cpp parser/SQLParser.cpp TEST_SOURCES = $(shell find tests/ -name '*.cpp')