From 75ee778e7e8087ce4b6425cbd34997b17d134da6 Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jeff@bloq.com>
Date: Sat, 5 Jan 2019 01:33:36 -0500
Subject: [PATCH] Fix minor bugs: some int-to-boolean JSON conversions were
 missed.

---
 Makefile.am |  8 +++++++-
 exec.c      | 23 +++++++++++++++++------
 fail5.sql   |  1 +
 ok7.sql     |  1 +
 ok8.sql     |  1 +
 5 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100644 fail5.sql
 create mode 100644 ok7.sql
 create mode 100644 ok8.sql

diff --git a/Makefile.am b/Makefile.am
index 0e9a89d..15637bc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,12 +13,18 @@ pkgconfig_DATA = libsqlpars.pc
 EXTRA_DIST = sql.y sql.l \
 	test-ok.sh test-fail.sh \
 	fail1.sql \
-	xfail2.sql \
 	fail3.sql \
 	fail4.sql \
+	fail5.sql \
+	xfail2.sql \
 	ok1.sql \
 	ok2.sql \
 	ok3.sql \
+	ok4.sql \
+	ok5.sql \
+	ok6.sql \
+	ok7.sql \
+	ok8.sql \
 	tst-create-db.sql \
 	tst-create-table1.sql
 
diff --git a/exec.c b/exec.c
index 0c73538..561b82e 100644
--- a/exec.c
+++ b/exec.c
@@ -99,6 +99,17 @@ static void opii(const char *op_name,
 	print_and_free(obj);
 }
 
+static void opib(const char *op_name,
+		 const char *i1_name, int i1_val,
+		 const char *bool_name, int bool_val)
+{
+	json_t *obj = json_object();
+	json_object_set_new(obj, "op", json_string(op_name));
+	json_object_set_new(obj, i1_name, json_integer(i1_val));
+	json_object_set_new(obj, bool_name, json_boolean(bool_val));
+	print_and_free(obj);
+}
+
 static void strout(const char *str_name, const char *str_val)
 {
 	json_t *obj = json_object();
@@ -160,7 +171,7 @@ void sqlp_assign_at(struct psql_state *pstate, const char *name)
 
 void sqlp_bool(struct psql_state *pstate, int val)
 {
-	intout("BOOL", val);
+	boolout("BOOL", val);
 }
 
 void sqlp_call(struct psql_state *pstate, int n_args, const char *name)
@@ -188,12 +199,12 @@ void sqlp_call_trim_opts(struct psql_state *pstate, int trim_opts)
 
 void sqlp_case(struct psql_state *pstate, int n_list, int have_else)
 {
-	opii("CASE", "n_list", n_list, "have_else", have_else);
+	opib("CASE", "n_list", n_list, "have_else", have_else);
 }
 
 void sqlp_caseval(struct psql_state *pstate, int n_list, int have_else)
 {
-	opii("CASEVAL", "n_list", n_list, "have_else", have_else);
+	opib("CASEVAL", "n_list", n_list, "have_else", have_else);
 }
 
 void sqlp_col_attr(struct psql_state *pstate, enum sqlp_col_attribs attr)
@@ -346,7 +357,7 @@ void sqlp_drop_db(struct psql_state *pstate, int if_exists, const char *name)
 {
 	json_t *obj = json_object();
 	json_object_set_new(obj, "op", json_string("DROP-DB"));
-	json_object_set_new(obj, "if_exists", json_integer(if_exists));
+	json_object_set_new(obj, "if_exists", json_boolean(if_exists));
 	json_object_set_new(obj, "name", json_string(name));
 	print_and_free(obj);
 }
@@ -355,8 +366,8 @@ void sqlp_drop_table(struct psql_state *pstate, int temp, int if_exists, int n_t
 {
 	json_t *obj = json_object();
 	json_object_set_new(obj, "op", json_string("DROP-TABLE"));
-	json_object_set_new(obj, "temp", json_integer(temp));
-	json_object_set_new(obj, "if_exists", json_integer(if_exists));
+	json_object_set_new(obj, "temp", json_boolean(temp));
+	json_object_set_new(obj, "if_exists", json_boolean(if_exists));
 	json_object_set_new(obj, "n_tables", json_integer(n_tables));
 	print_and_free(obj);
 }
diff --git a/fail5.sql b/fail5.sql
new file mode 100644
index 0000000..9ccf681
--- /dev/null
+++ b/fail5.sql
@@ -0,0 +1 @@
+select count(*) from badgers where honey > 
diff --git a/ok7.sql b/ok7.sql
new file mode 100644
index 0000000..77f6628
--- /dev/null
+++ b/ok7.sql
@@ -0,0 +1 @@
+select count(*) from badgers where honey > 0;
diff --git a/ok8.sql b/ok8.sql
new file mode 100644
index 0000000..1520386
--- /dev/null
+++ b/ok8.sql
@@ -0,0 +1 @@
+select * from mytable where a_time > now();