[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - connectivity/source

[jucasaca (via logerrit)]

 connectivity/source/parse/sqlbison.y |    2 ++
 connectivity/source/parse/sqlflex.l  |    1 +
 2 files changed, 3 insertions(+)

New commits:
commit 60e08a6cfda00a52088500b695b0adc1fe99b768
Author:     jucasaca <jucas...@gmail.com>
AuthorDate: Sun Jul 30 19:20:29 2023 +0200
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Tue Aug 22 11:07:19 2023 +0200

    tdf#156534 Add Firebird's DATEADD function to SQL parser
    
    Add DATEADD function to SQL parser, so the function can be used in
    Query's Design and can produce  editable queries
    
    Change-Id: I14f9d88f6a96021b0f9199fd79df18c8f4bb5ea3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155071
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
    (cherry picked from commit ccf30787a701860d19941a1d36ad3d1db2fb2e06)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155786
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/connectivity/source/parse/sqlbison.y 
b/connectivity/source/parse/sqlbison.y
index c119ee8eaec5..3bd271d852a8 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -156,6 +156,7 @@ using namespace connectivity;
 %token <pParseNode> SQL_TOKEN_DAYNAME  SQL_TOKEN_DAYOFMONTH  
SQL_TOKEN_DAYOFWEEK  SQL_TOKEN_DAYOFYEAR SQL_TOKEN_EXTRACT
 %token <pParseNode> SQL_TOKEN_HOUR SQL_TOKEN_MILLISECOND SQL_TOKEN_MINUTE  
SQL_TOKEN_MONTH  SQL_TOKEN_MONTHNAME SQL_TOKEN_NOW SQL_TOKEN_QUARTER 
SQL_TOKEN_DATEDIFF
 %token <pParseNode> SQL_TOKEN_SECOND SQL_TOKEN_TIMESTAMPADD 
SQL_TOKEN_TIMESTAMPDIFF SQL_TOKEN_TIMEVALUE SQL_TOKEN_WEEK SQL_TOKEN_WEEKDAY 
SQL_TOKEN_YEAR SQL_TOKEN_YEARDAY
+%token <pParseNode> SQL_TOKEN_DATEADD
 
 /* numeric functions */
 %token <pParseNode> SQL_TOKEN_ABS SQL_TOKEN_ACOS SQL_TOKEN_ASIN SQL_TOKEN_ATAN 
SQL_TOKEN_ATAN2 SQL_TOKEN_CEILING
@@ -1978,6 +1979,7 @@ date_function_1Argument:
 date_function:
                SQL_TOKEN_TIMESTAMPADD
        |       SQL_TOKEN_TIMESTAMPDIFF
+       |       SQL_TOKEN_DATEADD
        ;
 numeric_function_0Argument:
                SQL_TOKEN_PI
diff --git a/connectivity/source/parse/sqlflex.l 
b/connectivity/source/parse/sqlflex.l
index 34a4067ea21c..44daeb236bf7 100644
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
@@ -186,6 +186,7 @@ CURSOR              {SQL_NEW_KEYWORD(SQL_TOKEN_CURSOR);  }
 
 D                   {SQL_NEW_KEYWORD(SQL_TOKEN_D);  }
 DATE                {SQL_NEW_KEYWORD(SQL_TOKEN_DATE);  }
+DATEADD             {SQL_NEW_KEYWORD(SQL_TOKEN_DATEADD);  }
 DATEDIFF            {SQL_NEW_KEYWORD(SQL_TOKEN_DATEDIFF);  }
 DATEVALUE           {SQL_NEW_KEYWORD(SQL_TOKEN_DATEVALUE);  }
 DAY                 {SQL_NEW_KEYWORD(SQL_TOKEN_DAY);  }