[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - wizards/source

[Jean-Pierre Ledure (via logerrit)]

 wizards/source/access2base/Database.xba |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit c7eef3cbceacca944785daf6ca5e8d8301df1644
Author:     Jean-Pierre Ledure <j...@ledure.be>
AuthorDate: Tue Sep 1 12:06:28 2020 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Jan 5 09:33:23 2021 +0100

    tdf#118767: Access2Base - Remove workaround on Firebird product name
    
    Bug 118809 has been fixed. Workaround may be removed
    without regression
    
    This patch also reverts 2a65be46f191f53177188a1f1827e71381a5983a.
    It was pushed to libreoffice-7-0 branch only. It's always desible
    to cherry-pick the changes instead, so the code is consistent
    across the branches.
    
    Change-Id: I8716fa75a6d98b7e15752692e5275dbcb81e7efb
    Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108671
    Tested-by: Jean-Pierre Ledure <j...@ledure.be>
    Tested-by: Jenkins
    Reviewed-by: Jean-Pierre Ledure <j...@ledure.be>

diff --git a/wizards/source/access2base/Database.xba 
b/wizards/source/access2base/Database.xba
index 07b19ca0a2bd..3d2c22bae30c 100644
--- a/wizards/source/access2base/Database.xba
+++ b/wizards/source/access2base/Database.xba
@@ -1151,12 +1151,7 @@ Dim sProductName As String
        If pvOrderClause &lt;&gt; &quot;&quot; Then sOrderBy = &quot; ORDER BY 
&quot; &amp; pvOrderClause Else sOrderBy = &quot;&quot;
        sLimit = &quot;&quot;
 
-&apos; Workaround for 
https://bugs.documentfoundation.org/show_bug.cgi?id=118767
-&apos; awaiting solution for 
https://bugs.documentfoundation.org/show_bug.cgi?id=118809
        sProductName = UCase(MetaData.getDatabaseProductName())
-       If sProductName = &quot;&quot; Then
-               If MetaData.URL = &quot;sdbc:embedded:firebird&quot; Or 
Left(MetaData.URL, 13) = &quot;sdbc:firebird&quot; Then sProductName = 
&quot;FIREBIRD&quot;
-       End If
 
        Select Case sProductName
                Case &quot;MYSQL&quot;, &quot;SQLITE&quot;
@@ -1167,7 +1162,7 @@ Dim sProductName As String
                                sTarget = UCase(psFunction) &amp; &quot;(&quot; 
&amp; psExpr &amp; &quot;)&quot;
                        End If
                        sSql = &quot;SELECT &quot; &amp; sTarget &amp; &quot; 
AS &quot; &amp; sTempField &amp; &quot; FROM &quot; &amp; psDomain &amp;  
sWhere &amp; sOrderBy &amp; sLimit
-               Case &quot;FIREBIRD&quot;, &quot;FIREBIRD (ENGINE12)&quot;
+               Case &quot;FIREBIRD (ENGINE12)&quot;
                        If psFunction = &quot;&quot; Then sTarget = &quot;FIRST 
1 &quot; &amp; psExpr Else sTarget = UCase(psFunction) &amp; &quot;(&quot; 
&amp; psExpr &amp; &quot;)&quot;
                        sSql = &quot;SELECT &quot; &amp; sTarget &amp; &quot; 
AS &quot; &amp; sTempField &amp; &quot; FROM &quot; &amp; psDomain &amp; sWhere 
&amp; sOrderBy
                Case Else               &apos;  Standard syntax - Includes 
HSQLDB
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits