Merge pull request #8 from jgarzik/fix

Fix

Makefile.am

@@ -12,7 +12,7 @@ pkgconfig_DATA = libsqlpars.pc
 # noinst_PROGRAMS = $(TESTS)
 EXTRA_DIST = sql.y sql.l \
 	pscan.js \
-	test-ok.sh test-fail.sh \
+	test-ok.sh test-tst.sh test-fail.sh \
 	fail1.sql \
 	fail3.sql \
 	fail4.sql \
@@ -27,7 +27,16 @@ EXTRA_DIST = sql.y sql.l \
 	ok7.sql \
 	ok8.sql \
 	ok9.sql \
-	ok10.sql
+	ok10.sql \
+	tst-create-db.sql \
+	tst-create-table.sql \
+	tst-delete.sql \
+	tst-drop-db.sql \
+	tst-drop-table.sql \
+	tst-insert.sql \
+	tst-select-null.sql \
+	tst-select-null2.sql \
+	tst-select-null3.sql
 
 sql_SOURCES = exec.c lib.c main.c sql-parser.h yyl.h
 sql_LDADD = @JANSSON_LIBS@
@@ -42,5 +51,5 @@ sql.tab.c sql.tab.h:   sql.y Makefile
 sql.c sql.lex.h: sql.l Makefile
 	${LEX} -o $@ $<
 
-TESTS = test-ok.sh test-fail.sh
+TESTS = test-ok.sh test-fail.sh test-tst.sh
 

exec.c

@@ -174,6 +174,11 @@ void sqlp_bool(struct psql_state *pstate, int val)
 	boolout("BOOL", val);
 }
 
+void sqlp_null(struct psql_state *pstate)
+{
+	strout("CONST", "NULL"); /* probably this should be a different func */
+}
+
 void sqlp_call(struct psql_state *pstate, int n_args, const char *name)
 {
 	json_t *obj = json_object();
@@ -397,6 +402,11 @@ void sqlp_expr_is_in(struct psql_state *pstate, int val)
 	boolout("EXPR-IS-IN", val);
 }
 
+void sqlp_expr_paren(struct psql_state *pstate)
+{
+	opout("PARENS"); /* probably this should be a different function */
+}
+
 void sqlp_expr_op(struct psql_state *pstate, enum sqlp_expr_ops op)
 {
 	strout("EXPR-OP", op_names[op]);

sql-parser.h

@@ -67,6 +67,7 @@ extern void sqlp_alias(struct psql_state *pstate, const char *alias);
 extern void sqlp_assign(struct psql_state *pstate, const char *db_name, const char *name);
 extern void sqlp_assign_at(struct psql_state *pstate, const char *name);
 extern void sqlp_bool(struct psql_state *pstate, int val);
+extern void sqlp_null(struct psql_state *pstate);
 extern void sqlp_call(struct psql_state *pstate, int n_args, const char *name);
 extern void sqlp_call_date(struct psql_state *pstate, int n_args, enum sqlp_expr_ops op);
 extern void sqlp_call_trim_opts(struct psql_state *pstate, int trim_opts);
@@ -99,6 +100,7 @@ extern void sqlp_delete_multi(struct psql_state *pstate, int opts, int n_del, in
 extern void sqlp_drop_db(struct psql_state *pstate, int if_exists, const char *name);
 extern void sqlp_drop_table(struct psql_state *pstate, int temp, int if_exists, int n_tables);
 extern void sqlp_enum_val(struct psql_state *pstate, const char *val);
+extern void sqlp_expr_paren(struct psql_state *pstate);
 extern void sqlp_expr_op(struct psql_state *pstate, enum sqlp_expr_ops op);
 extern void sqlp_expr_cmp(struct psql_state *pstate, int comp);
 extern void sqlp_expr_cmp_sel(struct psql_state *pstate, int sel_type, int comp);

sql.y

@@ -850,6 +850,7 @@ expr: NAME          { sqlp_name(pstate, $1); free($1); }
    | INTNUM        { sqlp_number(pstate, $1); }
    | APPROXNUM     { sqlp_float(pstate, $1); }
    | BOOL          { sqlp_bool(pstate, $1); }
+   | NULLX         { sqlp_null(pstate); }
    ;
 
 expr: expr '+' expr { sqlp_expr_op(pstate, SEO_ADD); }
@@ -961,6 +962,9 @@ expr: CURRENT_TIMESTAMP { sqlp_now(pstate); };
 expr: BINARY expr %prec UMINUS { sqlp_expr_op(pstate, SEO_STRTOBIN); }
    ;
 
+expr: '(' expr ')'      { sqlp_expr_paren(pstate); }
+   ;
+
 %%
 
 void

test-tst.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+for testfn in $srcdir/tst-*.sql
+do
+	cat $testfn | ./sql
+	if [ $? -ne 0 ]
+	then
+		echo "Failed on $testfn"
+		exit 1
+	fi
+done
+

tst-select-null.sql

@@ -0,0 +1 @@
+select null from t;

tst-select-null2.sql

@@ -0,0 +1 @@
+select (1) from t;

tst-select-null3.sql

@@ -0,0 +1 @@
+select ((1+2) + (2+3)) from t;