Author: tolusha
Date: 2011-01-13 05:24:25 -0500 (Thu, 13 Jan 2011)
New Revision: 3800
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: oracle
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-13
09:10:00 UTC (rev 3799)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/backup/util/BackupTables.java 2011-01-13
10:24:25 UTC (rev 3800)
@@ -64,16 +64,6 @@
public static final String CONTENT_LEN_FILE_SUFFIX = ".len";
/**
- * Generic dialect.
- */
- public static final int DB_DIALECT_GENERIC =
DBConstants.DB_DIALECT_GENERIC.hashCode();
-
- /**
- * HSQLDB dialect.
- */
- public static final int DB_DIALECT_HSQLDB = DBConstants.DB_DIALECT_HSQLDB.hashCode();
-
- /**
* MySQL dialect.
*/
public static final int DB_DIALECT_MYSQL = DBConstants.DB_DIALECT_MYSQL.hashCode();
@@ -224,23 +214,15 @@
for (int i = 0; i < columnCount; i++)
{
InputStream value;
- if (dialect == DB_DIALECT_HSQLDB || dialect == DB_DIALECT_SYBASE ||
dialect == DB_DIALECT_DB2
- || dialect == DB_DIALECT_DB2V8 || dialect == DB_DIALECT_PGSQL)
+ if (columnType[i] == Types.VARBINARY || columnType[i] ==
Types.LONGVARBINARY
+ || columnType[i] == Types.BLOB || columnType[i] == Types.BINARY)
{
- if (columnType[i] == Types.VARBINARY || columnType[i] ==
Types.LONGVARBINARY
- || columnType[i] == Types.BLOB || columnType[i] == Types.BINARY)
- {
- value = rs.getBinaryStream(i + 1);
- }
- else
- {
- String str = rs.getString(i + 1);
- value = str == null ? null : new
ByteArrayInputStream(str.getBytes(Constants.DEFAULT_ENCODING));
- }
+ value = rs.getBinaryStream(i + 1);
}
else
{
- value = rs.getBinaryStream(i + 1);
+ String str = rs.getString(i + 1);
+ value = str == null ? null : new
ByteArrayInputStream(str.getBytes(Constants.DEFAULT_ENCODING));
}
if (value == null)
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-13
09:10:00 UTC (rev 3799)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/backup/util/RestoreTables.java 2011-01-13
10:24:25 UTC (rev 3800)
@@ -462,29 +462,17 @@
String value = new String(readBuffer);
insertNode.setBoolean(targetIndex + 1,
value.equals("true"));
}
+ else if (columnType.get(i) == Types.VARBINARY || columnType.get(i) ==
Types.LONGVARBINARY
+ || columnType.get(i) == Types.BLOB || columnType.get(i) ==
Types.BINARY)
+ {
+ insertNode.setBinaryStream(targetIndex + 1, stream, (int)len);
+ }
else
{
- if (dialect == BackupTables.DB_DIALECT_HSQLDB || dialect ==
BackupTables.DB_DIALECT_SYBASE
- || dialect == BackupTables.DB_DIALECT_DB2 || dialect ==
BackupTables.DB_DIALECT_DB2V8
- || dialect == BackupTables.DB_DIALECT_PGSQL)
- {
- if (columnType.get(i) == Types.VARBINARY || columnType.get(i) ==
Types.LONGVARBINARY
- || columnType.get(i) == Types.BLOB || columnType.get(i) ==
Types.BINARY)
- {
- insertNode.setBinaryStream(targetIndex + 1, stream,
(int)len);
- }
- else
- {
- byte[] readBuffer = new byte[(int)len];
- stream.read(readBuffer);
+ byte[] readBuffer = new byte[(int)len];
+ stream.read(readBuffer);
- insertNode.setString(targetIndex + 1, new String(readBuffer,
Constants.DEFAULT_ENCODING));
- }
- }
- else
- {
- insertNode.setBinaryStream(targetIndex + 1, stream, (int)len);
- }
+ insertNode.setString(targetIndex + 1, new String(readBuffer,
Constants.DEFAULT_ENCODING));
}
}
else