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

[Jean-Pierre Ledure]

 wizards/source/access2base/Field.xba |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

New commits:
commit e030f2a3133777df1cdc589f8533f7a52d63d345
Author: Jean-Pierre Ledure <jp at ledure.be>
Date:   Wed Dec 23 12:28:48 2015 +0100

    Access2Base - Support of Hsqldb 2.3
    
    Addition of CLOB and BLOB datatypes
    
    Change-Id: If42c0dbb1862f525d2a0a1abf98bd053543a3d3c

diff --git a/wizards/source/access2base/Field.xba b/wizards/source/access2base/Field.xba
index 7daa9a9..791e3ca 100644
--- a/wizards/source/access2base/Field.xba
+++ b/wizards/source/access2base/Field.xba
@@ -305,12 +305,14 @@ Const cstMaxTextLength = 65535
 					Case .CHAR				:	_PropertyGet = dbText
 					Case .VARCHAR			:	_PropertyGet = dbChar
 					Case .LONGVARCHAR		:	_PropertyGet = dbMemo
+					Case .CLOB				:	_PropertyGet = dbMemo
 					Case .DATE				:	_PropertyGet = dbDate
 					Case .TIME				:	_PropertyGet = dbTime
 					Case .TIMESTAMP			:	_PropertyGet = dbTimeStamp
 					Case .BINARY			:	_PropertyGet = dbBinary
 					Case .VARBINARY			:	_PropertyGet = dbVarBinary
 					Case .LONGVARBINARY		:	_PropertyGet = dbLongBinary
+					Case .BLOB				:	_PropertyGet = dbLongBinary
 					Case .BOOLEAN			:	_PropertyGet = dbBoolean
 					Case Else				:	_PropertyGet = dbUndefined
 				End Select
@@ -352,9 +354,9 @@ Const cstMaxTextLength = 65535
 		Case UCase("FieldSize")					'	Probably physical size = 2 * unicode string length
 			With com.sun.star.sdbc.DataType
 				Select Case Column.Type
-					Case .LONGVARCHAR
+					Case .VARCHAR, .LONGVARCHAR, .CLOB
 						Set oSize = Column.getCharacterStream
-					Case .LONGVARBINARY, .VARBINARY, .BINARY
+					Case .LONGVARBINARY, .VARBINARY, .BINARY, .BLOB
 						Set oSize = Column.getBinaryStream
 					Case Else
 						Set oSize = Nothing
@@ -660,14 +662,14 @@ Const cstMaxLength = 64000
 
 	With com.sun.star.sdbc.DataType
 		Select Case Column.Type
-			Case .BINARY, .VARBINARY, .LONGVARBINARY
+			Case .BINARY, .VARBINARY, .LONGVARBINARY, .BLOB
 				If psMethod <> "ReadAllBytes" Then Goto Trace_Error
 				Set oStream = oSimpleFileAccess.openFileRead(sFile)
 				lFileLength = oStream.getLength()
 				If lFileLength = 0 Then Goto Trace_File
 				Column.updateBinaryStream(oStream, lFileLength)
 				oStream.closeInput()
-			Case .LONGVARCHAR
+			Case .VARCHAR, .LONGVARCHAR, .CLOB
 				If psMethod <> "ReadAllText" Then Goto Trace_Error
 				sMemo = ""
 				lFileLength = 0
@@ -728,10 +730,10 @@ Dim sFile As String, oSimpleFileAccess As Object, sMethod As String, oStream As
 	oSimpleFileAccess = CreateUnoService("com.sun.star.ucb.SimpleFileAccess")
 	With com.sun.star.sdbc.DataType
 		Select Case Column.Type
-			Case .BINARY, .VARBINARY, .LONGVARBINARY
+			Case .BINARY, .VARBINARY, .LONGVARBINARY, .BLOB
 				If psMethod <> "WriteAllBytes" Then Goto Trace_Error
 				Set oStream = Column.getBinaryStream()
-			Case .LONGVARCHAR
+			Case .VARCHAR, .LONGVARCHAR, .CLOB
 				If psMethod <> "WriteAllText" Then Goto Trace_Error
 				Set oStream = Column.getCharacterStream()
 			Case Else