diff options
| author | Jean-Pierre Ledure <jp@ledure.be> | 2020-09-01 12:06:28 +0200 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-01-05 09:33:23 +0100 |
| commit | c7eef3cbceacca944785daf6ca5e8d8301df1644 (patch) | |
| tree | 5258cc93a24f9b50f6dbaae475a21b7d9b81a8b1 /wizards | |
| parent | aa87d3f825fcbe1641d9dbeac8293bf55d2f4273 (diff) | |
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 <xiscofauli@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108671
Tested-by: Jean-Pierre Ledure <jp@ledure.be>
Tested-by: Jenkins
Reviewed-by: Jean-Pierre Ledure <jp@ledure.be>
Diffstat (limited to 'wizards')
| -rw-r--r-- | wizards/source/access2base/Database.xba | 7 |
1 files changed, 1 insertions, 6 deletions
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 <> "" Then sOrderBy = " ORDER BY " & pvOrderClause Else sOrderBy = "" sLimit = "" -' Workaround for https://bugs.documentfoundation.org/show_bug.cgi?id=118767 -' awaiting solution for https://bugs.documentfoundation.org/show_bug.cgi?id=118809 sProductName = UCase(MetaData.getDatabaseProductName()) - If sProductName = "" Then - If MetaData.URL = "sdbc:embedded:firebird" Or Left(MetaData.URL, 13) = "sdbc:firebird" Then sProductName = "FIREBIRD" - End If Select Case sProductName Case "MYSQL", "SQLITE" @@ -1167,7 +1162,7 @@ Dim sProductName As String sTarget = UCase(psFunction) & "(" & psExpr & ")" End If sSql = "SELECT " & sTarget & " AS " & sTempField & " FROM " & psDomain & sWhere & sOrderBy & sLimit - Case "FIREBIRD", "FIREBIRD (ENGINE12)" + Case "FIREBIRD (ENGINE12)" If psFunction = "" Then sTarget = "FIRST 1 " & psExpr Else sTarget = UCase(psFunction) & "(" & psExpr & ")" sSql = "SELECT " & sTarget & " AS " & sTempField & " FROM " & psDomain & sWhere & sOrderBy Case Else ' Standard syntax - Includes HSQLDB |