[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - connectivity/source

[Petr Mladek]

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

New commits:
commit 02dc763291630f7cb4cd9342e8937f3abb92dbc2
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
    
    Signed-off-by: Petr Mladek <pmladek at suse.cz>

diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index 742b9cf..eb6467e 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 3a61c9f1c51893b242ccf5bb20163b72721a2bf0
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
    
    Signed-off-by: Petr Mladek <pmladek at suse.cz>

diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index 19bb494..742b9cf 100755
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -1816,7 +1816,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
@@ -4032,7 +4032,6 @@ else_clause:
 	;
 result:
 		result_expression
-	|	SQL_TOKEN_NULL
 	;
 result_expression:
 	value_exp