From 2b27b275541af9f9ba2886bd10b532129e70967a Mon Sep 17 00:00:00 2001
From: Nan Xiao <nan@chinadtrace.org>
Date: Fri, 28 Jul 2017 15:49:38 +0800
Subject: [PATCH 1/3] Support build static library in Makefile.

---
 Makefile | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index bef6562..ca23eeb 100644
--- a/Makefile
+++ b/Makefile
@@ -33,12 +33,22 @@ GMAKE = make mode=$(mode)
 #######################################
 ############### Library ###############
 #######################################
+NAME := sqlparser
 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_LFLAGS = -shared $(OPT_FLAG)
+static ?= no
+ifeq ($(static), yes)
+	LIB_BUILD  = lib$(NAME).a
+	LIBLINKER = $(AR)
+	LIB_CFLAGS  = -std=c++11 -Wall -Werror $(OPT_FLAG)
+	LIB_LFLAGS = rs
+else
+	LIB_BUILD  = lib$(NAME).so
+	LIBLINKER = $(CXX)
+	LIB_CFLAGS  = -std=c++11 -Wall -Werror -fPIC $(OPT_FLAG)
+	LIB_LFLAGS = -shared -o
+endif
 LIB_CPP    = $(shell find $(SRC) -name '*.cpp' -not -path "$(SRCPARSER)/*") $(PARSER_CPP)
 LIB_H      = $(shell find $(SRC) -name '*.h' -not -path "$(SRCPARSER)/*") $(PARSER_H)
 LIB_ALL    = $(shell find $(SRC) -name '*.cpp' -not -path "$(SRCPARSER)/*") $(shell find $(SRC) -name '*.h' -not -path "$(SRCPARSER)/*")
@@ -47,7 +57,7 @@ LIB_OBJ    = $(LIB_CPP:%.cpp=%.o)
 library: $(LIB_BUILD)
 
 $(LIB_BUILD): $(LIB_OBJ)
-	$(CXX) $(LIB_LFLAGS) -o $(LIB_BUILD) $(LIB_OBJ)
+	$(LIBLINKER) $(LIB_LFLAGS) $(LIB_BUILD) $(LIB_OBJ)
 
 $(SRCPARSER)/flex_lexer.o: $(SRCPARSER)/flex_lexer.cpp $(SRCPARSER)/bison_parser.cpp
 	$(CXX) $(LIB_CFLAGS) -c -o $@ $< -Wno-sign-compare -Wno-unneeded-internal-declaration -Wno-deprecated-register
@@ -65,7 +75,7 @@ $(SRCPARSER)/bison_parser.h: $(SRCPARSER)/bison_parser.cpp
 $(SRCPARSER)/flex_lexer.h: $(SRCPARSER)/flex_lexer.cpp
 
 clean:
-	rm -f $(LIB_BUILD)
+	rm -f lib$(NAME).a lib$(NAME).so
 	rm -rf $(BIN)
 	find $(SRC) -type f -name '*.o' -delete
 

From e7c2833e436dd3846c877045460c735e15ef1fed Mon Sep 17 00:00:00 2001
From: Nan Xiao <nan@chinadtrace.org>
Date: Tue, 1 Aug 2017 13:58:22 +0800
Subject: [PATCH 2/3] Initialize all fields in Expr struct

---
 src/sql/Expr.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/sql/Expr.cpp b/src/sql/Expr.cpp
index ca566ef..51632e3 100644
--- a/src/sql/Expr.cpp
+++ b/src/sql/Expr.cpp
@@ -14,7 +14,12 @@ namespace hsql {
       select(nullptr),
       name(nullptr),
       table(nullptr),
-      alias(nullptr) {};
+      alias(nullptr),
+      fval(0),
+      ival(0),
+      ival2(0),
+      opType(kOpNone),
+      distinct(false) {};
 
   Expr::~Expr() {
     delete expr;

From 0d59785ec840a40f07cb6d8d448e5029755c4b60 Mon Sep 17 00:00:00 2001
From: Moritz Eyssen <Moritz.Eyssen@student.hpi.de>
Date: Fri, 13 Oct 2017 11:25:40 +0200
Subject: [PATCH 3/3] refactor makefile a bit

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index ca23eeb..3553cd7 100644
--- a/Makefile
+++ b/Makefile
@@ -36,17 +36,17 @@ GMAKE = make mode=$(mode)
 NAME := sqlparser
 PARSER_CPP = $(SRCPARSER)/bison_parser.cpp  $(SRCPARSER)/flex_lexer.cpp
 PARSER_H   = $(SRCPARSER)/bison_parser.h    $(SRCPARSER)/flex_lexer.h
+LIB_CFLAGS = -std=c++11 -Wall -Werror $(OPT_FLAG)
 
 static ?= no
 ifeq ($(static), yes)
 	LIB_BUILD  = lib$(NAME).a
 	LIBLINKER = $(AR)
-	LIB_CFLAGS  = -std=c++11 -Wall -Werror $(OPT_FLAG)
 	LIB_LFLAGS = rs
 else
 	LIB_BUILD  = lib$(NAME).so
 	LIBLINKER = $(CXX)
-	LIB_CFLAGS  = -std=c++11 -Wall -Werror -fPIC $(OPT_FLAG)
+	LIB_CFLAGS  +=  -fPIC
 	LIB_LFLAGS = -shared -o
 endif
 LIB_CPP    = $(shell find $(SRC) -name '*.cpp' -not -path "$(SRCPARSER)/*") $(PARSER_CPP)