Merge branch 'master' into master

This commit is contained in:
leecher1337
2017-12-03 17:02:15 +01:00
committed by GitHub
18 changed files with 291 additions and 50 deletions

View File

@@ -42,7 +42,7 @@ static MdbSQL *g_sql;
%token <name> IDENT NAME PATH STRING NUMBER
%token SELECT FROM WHERE CONNECT DISCONNECT TO LIST TABLES AND OR NOT COUNT STRPTIME
%token SELECT FROM WHERE CONNECT DISCONNECT TO LIST TABLES AND OR NOT LIMIT COUNT STRPTIME
%token DESCRIBE TABLE
%token LTEQ GTEQ LIKE IS NUL
@@ -60,7 +60,7 @@ stmt:
;
query:
SELECT column_list FROM table where_clause {
SELECT column_list FROM table where_clause limit_clause {
mdb_sql_select(_mdb_sql(NULL));
}
| CONNECT TO database {
@@ -82,6 +82,11 @@ where_clause:
| WHERE sarg_list
;
limit_clause:
/* empty */
| LIMIT NUMBER { mdb_sql_add_limit(_mdb_sql(NULL), $2); free($2); }
;
sarg_list:
sarg
| '(' sarg_list ')'