[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - connectivity/source

[Lionel Elie Mamane]

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

New commits:
commit 91ec81fe56ef4bcd93f598c7f36ec81f2c59eb28
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Thu Jul 3 15:42:40 2014 +0200

    JOINs are left-associative
    
    Change-Id: I24fdd2ce9bb87cc52a7c84ec8cd300bc13b11461
    Reviewed-on: https://gerrit.libreoffice.org/10057
    Tested-by: Norbert Thiebaud <nthiebaud at gmail.com>
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index 97e1ae9..dda9dd3 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -121,7 +121,8 @@ using namespace connectivity;
 
 %token <pParseNode> SQL_TOKEN_GRANT SQL_TOKEN_GROUP SQL_TOKEN_HAVING SQL_TOKEN_IN SQL_TOKEN_INDICATOR SQL_TOKEN_INNER SQL_TOKEN_INTEGER SQL_TOKEN_INTO SQL_TOKEN_IS SQL_TOKEN_INTERSECT
 
-%token <pParseNode> SQL_TOKEN_JOIN SQL_TOKEN_KEY SQL_TOKEN_LEADING SQL_TOKEN_LIKE SQL_TOKEN_LOCAL SQL_TOKEN_LOWER
+%left <pParseNode> SQL_TOKEN_JOIN
+%token <pParseNode> SQL_TOKEN_KEY SQL_TOKEN_LEADING SQL_TOKEN_LIKE SQL_TOKEN_LOCAL SQL_TOKEN_LOWER
 %token <pParseNode> SQL_TOKEN_MAX SQL_TOKEN_MIN SQL_TOKEN_NATURAL SQL_TOKEN_NCHAR SQL_TOKEN_NULL SQL_TOKEN_NUMERIC
 
 %token <pParseNode> SQL_TOKEN_OCTET_LENGTH SQL_TOKEN_OF SQL_TOKEN_ON SQL_TOKEN_OPTION SQL_TOKEN_ORDER SQL_TOKEN_OUTER