Author: tolusha
Date: 2011-01-12 11:06:25 -0500 (Wed, 12 Jan 2011)
New Revision: 3795
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/backup/util/BackupTables.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/backup/util/RestoreTables.java
Log:
EXOJCR-1096: Test on all supported database: db2
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/backup/util/BackupTables.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/backup/util/BackupTables.java 2011-01-12
15:48:51 UTC (rev 3794)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/backup/util/BackupTables.java 2011-01-12
16:06:25 UTC (rev 3795)
@@ -224,9 +224,11 @@
for (int i = 0; i < columnCount; i++)
{
InputStream value;
- if (dialect == DB_DIALECT_HSQLDB || dialect == DB_DIALECT_SYBASE)
+ if (dialect == DB_DIALECT_HSQLDB || dialect == DB_DIALECT_SYBASE ||
dialect == DB_DIALECT_DB2
+ || dialect == DB_DIALECT_DB2V8)
{
- if (columnType[i] == Types.VARBINARY || columnType[i] ==
Types.LONGVARBINARY)
+ if (columnType[i] == Types.VARBINARY || columnType[i] ==
Types.LONGVARBINARY
+ || columnType[i] == Types.BLOB)
{
value = rs.getBinaryStream(i + 1);
}
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/backup/util/RestoreTables.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/backup/util/RestoreTables.java 2011-01-12
15:48:51 UTC (rev 3794)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/backup/util/RestoreTables.java 2011-01-12
16:06:25 UTC (rev 3795)
@@ -248,8 +248,7 @@
/**
* Restore table.
*/
- private void restore(File storageDir, Connection jdbcConn, String tableName,
- RestoreTableRule restoreRule)
+ private void restore(File storageDir, Connection jdbcConn, String tableName,
RestoreTableRule restoreRule)
throws IOException, SQLException
{
// Need privileges
@@ -465,9 +464,11 @@
}
else
{
- if (dialect == BackupTables.DB_DIALECT_HSQLDB || dialect ==
BackupTables.DB_DIALECT_SYBASE)
+ if (dialect == BackupTables.DB_DIALECT_HSQLDB || dialect ==
BackupTables.DB_DIALECT_SYBASE
+ || dialect == BackupTables.DB_DIALECT_DB2 || dialect ==
BackupTables.DB_DIALECT_DB2V8)
{
- if (columnType.get(i) == Types.VARBINARY || columnType.get(i) ==
Types.LONGVARBINARY)
+ if (columnType.get(i) == Types.VARBINARY || columnType.get(i) ==
Types.LONGVARBINARY
+ || columnType.get(i) == Types.BLOB)
{
insertNode.setBinaryStream(targetIndex + 1, stream,
(int)len);
}
Show replies by date