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

[Jean-Pierre Ledure]

 wizards/source/access2base/Database.xba |    7 ++++++-
 wizards/source/access2base/Test.xba     |    3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 6aef291fae27a2ff5617759b731a6a5e0b84c584
Author: Jean-Pierre Ledure <jp at ledure.be>
Date:   Tue Jun 20 14:32:44 2017 +0200

    Access2Base - Introduce support of embedded Firebird
    
    Metadata array set for CopyObject command
    Firebird implementation found very unstable ...
    
    Change-Id: Ia0847e263cbedfba55a2a469b9e044b3134b66b8

diff --git a/wizards/source/access2base/Database.xba b/wizards/source/access2base/Database.xba
index 3b9535df5330..9672bec48221 100644
--- a/wizards/source/access2base/Database.xba
+++ b/wizards/source/access2base/Database.xba
@@ -1122,6 +1122,7 @@ Const cstMaxInfo = 40
 	ReDim _ColumnPrecisions(0 To cstMaxInfo)
 Const cstHSQLDB1 = "HSQL Database Engine 1."
 Const cstHSQLDB2 = "HSQL Database Engine 2."
+Const cstFirebird = "sdbc:embedded:firebird"
 Const cstMSAccess2003 = "MS Jet 0"
 Const cstMSAccess2007 = "MS Jet 04."
 Const cstMYSQL = "MySQL"
@@ -1173,6 +1174,10 @@ Const cstSQLITE = "SQLite"
 				_RDBMS = DBMS_HSQLDB2
 				_ColumnTypesAlias = Array(0, -5, -3, -7, 2004, 16, 1, 2005, 91, 3, 0, 8, 8, 4, -3, 12, 2, 0, 0, 8, 0, 5, 0, 0, 92, 93, -6, -3, 12)
 				_BinaryStream = True
+			Case .URL = cstFirebird
+				_RDBMS = DBMS_FIREBIRD
+				_ColumnTypesAlias = Array(0, -5, 2004, 16, 2004, 16, 1, 12, 91, 8, 0, 8, 6, 4, 2004, 12, 8, 0, 0, 8, 0, 5, 0, 0, 92, 93, 4, 2004, 12)
+				_BinaryStream = True
 			Case Len(sProduct) > Len(cstMSAccess2007) And Left(sProduct, Len(cstMSAccess2007)) = cstMSAccess2007
 				_RDBMS = DBMS_MSACCESS2007
 				_ColumnTypesAlias = Array(0, 4, -2, 16, -2, 16, 12, 12, 93, 8, 0, 8, 6, 4, -3, 12, 2, 0, 0, 8, 0, 5, 0, 0, 93, 93, -6, -2, 12)
@@ -1193,7 +1198,7 @@ Const cstSQLITE = "SQLite"
 				_RDBMS = DBMS_SQLITE
 				_ColumnTypesAlias = Array(0, -5, -4, -7, -4, -7, 1, -1, 91, 8, 0, 8, 6, 4, -4, -1, 8, 0, 0, 8, 0, 5, 0, 0, 92, 93, -6, -4, 12)
 				_BinaryStream = True
-			Case Else		'	Firebird TODO
+			Case Else
 				_RDBMS = DBMS_UNKNOWN
 				_BinaryStream = True
 		End Select
diff --git a/wizards/source/access2base/Test.xba b/wizards/source/access2base/Test.xba
index bada74473061..7ad95904e189 100644
--- a/wizards/source/access2base/Test.xba
+++ b/wizards/source/access2base/Test.xba
@@ -6,7 +6,8 @@
 Sub Main
 Dim a, b()
 	_ErrorHandler(False)
-	TraceConsole()
+'	DebugPrint vbLF
+'	TraceConsole()
 	exit sub
 End Sub