[Libreoffice-commits] .: 2 commits - connectivity/source

[Lionel Elie Mamane]

 connectivity/source/parse/sqlbison.y |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 00e26baaf5cca36a7e78036aa5694196ccbf7402
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Fri Feb 17 07:26:29 2012 +0100

    fdo#46206 accept an arbitrary query for INSERT

diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index 4b85d65..c9d92a9 100755
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -770,7 +770,7 @@ fetch_statement:
 	;
 
 insert_statement:
-		SQL_TOKEN_INSERT SQL_TOKEN_INTO table_node opt_column_commalist values_or_query_spec
+		SQL_TOKEN_INSERT SQL_TOKEN_INTO table_node opt_column_commalist query_exp
 			{$$ = SQL_NEW_RULE;
 			$$->append($1);
 			$$->append($2);
commit 6f3ebfc4c78da67f72befa3bde55dde4d77d5e3a
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Fri Feb 17 07:03:52 2012 +0100

    fdo#46198: NULL is a perfectly fine general_value

diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index d77fb14..4b85d65 100755
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -1830,7 +1830,7 @@ unsigned_value_spec:
 general_value_spec:
 		parameter
 	| SQL_TOKEN_USER
-	/*	  | SQL_TOKEN_NULL*/
+	| SQL_TOKEN_NULL
 	| SQL_TOKEN_FALSE
 	| SQL_TOKEN_TRUE
 	| SQL_TOKEN_VALUE
@@ -4046,7 +4046,6 @@ else_clause:
 	;
 result:
 		result_expression
-	|	SQL_TOKEN_NULL
 	;
 result_expression:
 	value_exp