[Libreoffice-commits] core.git: wizards/source

[Jean-Pierre Ledure (via logerrit)]

 wizards/source/access2base/Database.xba |    9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

New commits:
commit 54f0ae24173a69d145e2ffc3aaa2f6bd29e39611
Author:     Jean-Pierre Ledure <jp at ledure.be>
AuthorDate: Tue Sep 1 12:06:28 2020 +0200
Commit:     Jean-Pierre Ledure <jp at ledure.be>
CommitDate: Tue Sep 1 12:06:28 2020 +0200

    Access2Base - Remove workaround on Firebird product name
    
    Bug 118809 has been fixed. Workaround may be removed
    without regression
    
    Change-Id: I8716fa75a6d98b7e15752692e5275dbcb81e7efb

diff --git a/wizards/source/access2base/Database.xba b/wizards/source/access2base/Database.xba
index 7b35585bfee7..c654d1d0a7e9 100644
--- a/wizards/source/access2base/Database.xba
+++ b/wizards/source/access2base/Database.xba
@@ -992,7 +992,7 @@ Dim i As Integer, bFound As Boolean, oTables As Object
 			Set oObject = RecordsetsColl.Item(pvIndex)
 		Case Else		'	pvIndex is numeric
 			If pvIndex < 0 Or pvIndex >= RecordsetsColl.Count Then Goto Trace_IndexError
-			Set oObject = RecordsetsColl.Item(pvIndex + 1)		'	Collection members are numbered 1 ... Count
+			Set oObject = RecordsetsColl.Item(pvIndex + 1)		'	Collection members are numERRSQLSTATEMENTbered 1 ... Count
 	End Select
 
 Exit_Function:
@@ -1161,12 +1161,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"
@@ -1177,7 +1172,7 @@ Dim sProductName As String
 				sTarget = UCase(psFunction) & "(" & psExpr & ")"
 			End If
 			sSql = "SELECT " & sTarget & " AS " & sTempField & " FROM " & psDomain &  sWhere & sOrderBy & sLimit
-		Case "FIREBIRD"
+		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