Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[4636] trunk/openutils-dbmigration
|
From: <fg...@us...> - 2016-04-03 20:06:43
|
Revision: 4636
http://openutils.svn.sourceforge.net/openutils/?rev=4636&view=rev
Author: fgiust
Date: 2016-04-03 20:06:40 +0000 (Sun, 03 Apr 2016)
Log Message:
-----------
upgrade spring version
Modified Paths:
--------------
trunk/openutils-dbmigration/pom.xml
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbSetupManagerImpl.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DefaultDbVersionManagerImpl.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcColumnBasedConditionalTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnExistsConditionalTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnIndexExistsConditionalTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnIsNotNullableConditionalTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfForeignKeyExistsConditionalTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfPrimaryKeyExistsConditionalTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfTableExistsConditionalTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcObjectCreationTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OraclePackageCreationTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleSequenceCreationTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleStoredProcedureCallTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleTriggerTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleViewCreateOrUpdateTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/postgres/PostGreSQLSequenceChecker.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerFunctionCreateOrUpdateTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerObjCreationTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerProcedureCreateOrUpdateTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerScriptBasedUnconditionalTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerSynonymCreationTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerViewCreateOrUpdateTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/BaseConditionalTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericConditionalTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ScriptBasedUnconditionalTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/update/ScriptBasedDbUpdate.java
Modified: trunk/openutils-dbmigration/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/pom.xml 2016-04-03 20:06:40 UTC (rev 4636)
@@ -148,6 +148,6 @@
</plugins>
</build>
<properties>
- <spring.version>3.0.0.RELEASE</spring.version>
+ <spring.version>4.2.5.RELEASE</spring.version>
</properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbSetupManagerImpl.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbSetupManagerImpl.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbSetupManagerImpl.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,9 +18,6 @@
package it.openutils.migration;
-import it.openutils.migration.task.setup.DbTask;
-import it.openutils.migration.task.update.DbUpdate;
-
import java.util.Comparator;
import java.util.List;
import java.util.Set;
@@ -36,7 +33,10 @@
import org.springframework.transaction.support.TransactionCallbackWithoutResult;
import org.springframework.transaction.support.TransactionTemplate;
+import it.openutils.migration.task.setup.DbTask;
+import it.openutils.migration.task.update.DbUpdate;
+
/**
* DB setup manager: handles db setup and upgrade.
* @author fgiust
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DefaultDbVersionManagerImpl.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DefaultDbVersionManagerImpl.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DefaultDbVersionManagerImpl.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -21,7 +21,7 @@
import javax.sql.DataSource;
import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
/**
@@ -95,11 +95,11 @@
*/
public int getCurrentVersion()
{
- SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
+ JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
int initialVersion = 0;
try
{
- initialVersion = jdbcTemplate.queryForInt(versionQuery);
+ initialVersion = jdbcTemplate.queryForObject(versionCreate, Integer.class);
}
catch (EmptyResultDataAccessException e)
{
@@ -113,7 +113,7 @@
*/
public void setNewVersion(int version)
{
- new SimpleJdbcTemplate(dataSource).update(versionUpdate, version);
+ new JdbcTemplate(dataSource).update(versionUpdate, version);
}
}
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcColumnBasedConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcColumnBasedConditionalTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcColumnBasedConditionalTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,8 +18,6 @@
package it.openutils.migration.generic;
-import it.openutils.migration.task.setup.BaseConditionalTask;
-
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
@@ -31,9 +29,11 @@
import org.apache.commons.lang.StringUtils;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.ConnectionCallback;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
+import it.openutils.migration.task.setup.BaseConditionalTask;
+
/**
* Base conditional task that operates on conditions related to a specific column. This base task takes care of
* retrieving the column metadata, so that subclasses only need to override <code>checkColumnMetadata()</code>.
@@ -89,14 +89,14 @@
* {@inheritDoc}
*/
@Override
- public boolean check(SimpleJdbcTemplate jdbcTemplate)
+ public boolean check(JdbcTemplate jdbcTemplate)
{
String columnTrim = StringUtils.trim(column);
final String tableName = StringUtils.substringBefore(columnTrim, ".");
final String columnName = StringUtils.substringAfter(columnTrim, ".");
- return (Boolean) jdbcTemplate.getJdbcOperations().execute(new ConnectionCallback()
+ return (Boolean) jdbcTemplate.execute(new ConnectionCallback()
{
public Object doInConnection(Connection con) throws SQLException, DataAccessException
@@ -136,14 +136,14 @@
* qualified</li>
* <li><strong>COLUMN_SIZE</strong> int => column size.</li>
* <li><strong>BUFFER_LENGTH</strong> is not used.</li>
- * <li><strong>DECIMAL_DIGITS</strong> int => the number of fractional digits. Null is returned for data types
- * where DECIMAL_DIGITS is not applicable.</li>
+ * <li><strong>DECIMAL_DIGITS</strong> int => the number of fractional digits. Null is returned for data types where
+ * DECIMAL_DIGITS is not applicable.</li>
* <li><strong>NUM_PREC_RADIX</strong> int => Radix (typically either 10 or 2)</li>
* <li><strong>NULLABLE</strong> int => is NULL allowed.</li>
* <ul>
- * <li> columnNoNulls - might not allow <code>NULL</code> values</li>
- * <li> columnNullable - definitely allows <code>NULL</code> values</li>
- * <li> columnNullableUnknown - nullability unknown</li>
+ * <li>columnNoNulls - might not allow <code>NULL</code> values</li>
+ * <li>columnNullable - definitely allows <code>NULL</code> values</li>
+ * <li>columnNullableUnknown - nullability unknown</li>
* </ul>
* <li><strong>REMARKS</strong> String => comment describing column (may be <code>null</code>)</li>
* <li><strong>COLUMN_DEF</strong> String => default value for the column, which should be interpreted as a string
@@ -154,23 +154,23 @@
* <li><strong>ORDINAL_POSITION</strong> int => index of column in table (starting at 1)</li>
* <li><strong>IS_NULLABLE</strong> String => ISO rules are used to determine the nullability for a column.</li>
* <ul>
- * <li> YES --- if the parameter can include NULLs</li>
- * <li> NO --- if the parameter cannot include NULLs</li>
- * <li> empty string --- if the nullability for the parameter is unknown</li>
+ * <li>YES --- if the parameter can include NULLs</li>
+ * <li>NO --- if the parameter cannot include NULLs</li>
+ * <li>empty string --- if the nullability for the parameter is unknown</li>
* </ul>
- * <li><strong>SCOPE_CATLOG</strong> String => catalog of table that is the scope of a reference attribute (<code>null</code>
- * if DATA_TYPE isn't REF)</li>
- * <li><strong>SCOPE_SCHEMA</strong> String => schema of table that is the scope of a reference attribute (<code>null</code>
- * if the DATA_TYPE isn't REF)</li>
- * <li><strong>SCOPE_TABLE</strong> String => table name that this the scope of a reference attribure (<code>null</code>
- * if the DATA_TYPE isn't REF)</li>
+ * <li><strong>SCOPE_CATLOG</strong> String => catalog of table that is the scope of a reference attribute (
+ * <code>null</code> if DATA_TYPE isn't REF)</li>
+ * <li><strong>SCOPE_SCHEMA</strong> String => schema of table that is the scope of a reference attribute (
+ * <code>null</code> if the DATA_TYPE isn't REF)</li>
+ * <li><strong>SCOPE_TABLE</strong> String => table name that this the scope of a reference attribure (
+ * <code>null</code> if the DATA_TYPE isn't REF)</li>
* <li><strong>SOURCE_DATA_TYPE</strong> short => source type of a distinct type or user-generated Ref type, SQL
* type from java.sql.Types (<code>null</code> if DATA_TYPE isn't DISTINCT or user-generated REF)</li>
* <li><strong>IS_AUTOINCREMENT</strong> String => Indicates whether this column is auto incremented</li>
* <ul>
- * <li> YES --- if the column is auto incremented</li>
- * <li> NO --- if the column is not auto incremented</li>
- * <li> empty string --- if it cannot be determined whether the column is auto incremented parameter is unknown</li>
+ * <li>YES --- if the column is auto incremented</li>
+ * <li>NO --- if the column is not auto incremented</li>
+ * <li>empty string --- if it cannot be determined whether the column is auto incremented parameter is unknown</li>
* </ul>
* </ol>
* @param metadata column metadata
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnExistsConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnExistsConditionalTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnExistsConditionalTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,8 +18,6 @@
package it.openutils.migration.generic;
-import it.openutils.migration.task.setup.BaseConditionalTask;
-
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
@@ -28,9 +26,11 @@
import org.apache.commons.lang.StringUtils;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.ConnectionCallback;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
+import it.openutils.migration.task.setup.BaseConditionalTask;
+
/**
* Task that executes if a given column exists.
* @author fgiust
@@ -85,14 +85,14 @@
* {@inheritDoc}
*/
@Override
- public boolean check(SimpleJdbcTemplate jdbcTemplate)
+ public boolean check(JdbcTemplate jdbcTemplate)
{
String columnTrim = StringUtils.trim(column);
final String tableName = StringUtils.substringBefore(columnTrim, ".");
final String columnName = StringUtils.substringAfter(columnTrim, ".");
- return (Boolean) jdbcTemplate.getJdbcOperations().execute(new ConnectionCallback()
+ return (Boolean) jdbcTemplate.execute(new ConnectionCallback()
{
public Object doInConnection(Connection con) throws SQLException, DataAccessException
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnIndexExistsConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnIndexExistsConditionalTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnIndexExistsConditionalTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,8 +18,6 @@
package it.openutils.migration.generic;
-import it.openutils.migration.task.setup.BaseConditionalTask;
-
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
@@ -38,9 +36,11 @@
import org.slf4j.LoggerFactory;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.ConnectionCallback;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
+import it.openutils.migration.task.setup.BaseConditionalTask;
+
/**
* Task that executes if a given column have at least one index.
* @author Antonio Gagliardi
@@ -111,7 +111,7 @@
*/
@SuppressWarnings("unchecked")
@Override
- public boolean check(SimpleJdbcTemplate jdbcTemplate)
+ public boolean check(JdbcTemplate jdbcTemplate)
{
Set<IndexItem> indexExpected = new TreeSet<IndexItem>();
@@ -143,8 +143,7 @@
return indexs.values();
}
};
- Collection<Set<IndexItem>> indexs = (Collection<Set<IndexItem>>) jdbcTemplate.getJdbcOperations().execute(
- action);
+ Collection<Set<IndexItem>> indexs = (Collection<Set<IndexItem>>) jdbcTemplate.execute(action);
log.debug("Expected:{}", asString(indexExpected));
for (Set<IndexItem> index : indexs)
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnIsNotNullableConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnIsNotNullableConditionalTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnIsNotNullableConditionalTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -20,7 +20,9 @@
import java.util.Map;
+import org.apache.commons.lang.StringUtils;
+
/**
* Task that executes if a given column is not nullable (IS_NULLABLE = NO).
* @author fgiust
@@ -36,7 +38,7 @@
protected boolean checkColumnMetadata(Map<String, Object> metadata)
{
- String isNullable = (String) metadata.get("IS_NULLABLE");
- return "NO".equals(isNullable);
+ String isNullable = StringUtils.trim((String) metadata.get("IS_NULLABLE"));
+ return "NO".equalsIgnoreCase(isNullable);
}
}
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfForeignKeyExistsConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfForeignKeyExistsConditionalTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfForeignKeyExistsConditionalTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,8 +18,6 @@
package it.openutils.migration.generic;
-import it.openutils.migration.task.setup.BaseConditionalTask;
-
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
@@ -28,9 +26,11 @@
import org.apache.commons.lang.StringUtils;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.ConnectionCallback;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
+import it.openutils.migration.task.setup.BaseConditionalTask;
+
/**
* Task that executes if a named foreign key eists.
* @author fgiust
@@ -76,14 +76,14 @@
* {@inheritDoc}
*/
@Override
- public boolean check(SimpleJdbcTemplate jdbcTemplate)
+ public boolean check(JdbcTemplate jdbcTemplate)
{
String fkNameTrim = StringUtils.trim(fkName);
final String tableName = StringUtils.substringBefore(fkNameTrim, ".");
final String fkName = StringUtils.substringAfter(fkNameTrim, ".");
- return (Boolean) jdbcTemplate.getJdbcOperations().execute(new ConnectionCallback()
+ return (Boolean) jdbcTemplate.execute(new ConnectionCallback()
{
public Object doInConnection(Connection con) throws SQLException, DataAccessException
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfPrimaryKeyExistsConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfPrimaryKeyExistsConditionalTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfPrimaryKeyExistsConditionalTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,8 +18,6 @@
package it.openutils.migration.generic;
-import it.openutils.migration.task.setup.BaseConditionalTask;
-
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
@@ -33,9 +31,11 @@
import org.slf4j.LoggerFactory;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.ConnectionCallback;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
+import it.openutils.migration.task.setup.BaseConditionalTask;
+
/**
* Task that executes if a given column have at least one index.
* @author Antonio Gagliardi
@@ -60,7 +60,7 @@
*/
@SuppressWarnings("unchecked")
@Override
- public boolean check(SimpleJdbcTemplate jdbcTemplate)
+ public boolean check(JdbcTemplate jdbcTemplate)
{
checkInputs();
@@ -83,7 +83,7 @@
return primaryKey.values();
}
};
- Collection<String> primaryKeyActual = (Collection<String>) jdbcTemplate.getJdbcOperations().execute(action);
+ Collection<String> primaryKeyActual = (Collection<String>) jdbcTemplate.execute(action);
log.debug("Actual:{}", asString(primaryKeyActual));
if (primaryKeyActual.isEmpty())
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfTableExistsConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfTableExistsConditionalTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfTableExistsConditionalTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,8 +18,6 @@
package it.openutils.migration.generic;
-import it.openutils.migration.task.setup.BaseConditionalTask;
-
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
@@ -28,9 +26,11 @@
import org.apache.commons.lang.StringUtils;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.ConnectionCallback;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
+import it.openutils.migration.task.setup.BaseConditionalTask;
+
/**
* Task that executes if a given table exists.
* @author fgiust
@@ -72,7 +72,6 @@
this.schema = schema;
}
-
/**
* Sets the table.
* @param table the table to set
@@ -86,12 +85,12 @@
* {@inheritDoc}
*/
@Override
- public boolean check(SimpleJdbcTemplate jdbcTemplate)
+ public boolean check(JdbcTemplate jdbcTemplate)
{
final String tableName = StringUtils.trim(table);
- return (Boolean) jdbcTemplate.getJdbcOperations().execute(new ConnectionCallback()
+ return (Boolean) jdbcTemplate.execute(new ConnectionCallback()
{
public Object doInConnection(Connection con) throws SQLException, DataAccessException
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcObjectCreationTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcObjectCreationTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcObjectCreationTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,8 +18,6 @@
package it.openutils.migration.generic;
-import it.openutils.migration.task.setup.GenericConditionalTask;
-
import java.io.IOException;
import java.io.InputStream;
import java.sql.Connection;
@@ -35,9 +33,10 @@
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.ConnectionCallback;
import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import it.openutils.migration.task.setup.GenericConditionalTask;
+
/**
* @author fgiust
* @version $Id:SqlServerObjCreationTask.java 3143 2007-09-24 19:50:49Z fgiust $
@@ -81,7 +80,7 @@
@Override
public void execute(DataSource dataSource)
{
- SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
+ JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
for (Resource script : scripts)
{
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OraclePackageCreationTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OraclePackageCreationTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OraclePackageCreationTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,8 +18,6 @@
package it.openutils.migration.oracle;
-import it.openutils.migration.task.setup.DbTask;
-
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
@@ -32,9 +30,11 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.io.Resource;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
+import it.openutils.migration.task.setup.DbTask;
+
/**
* Db tasks that handles the initial setup of packages.
* @author quario
@@ -110,7 +110,7 @@
*/
public void execute(DataSource dataSource)
{
- SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
+ JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
for (Resource script : scripts)
{
@@ -143,11 +143,12 @@
if (StringUtils.isNotBlank(owner))
{
- result = jdbcTemplate.queryForInt(selectAllPackages, new Object[]{packageName, owner });
+ result = jdbcTemplate
+ .queryForObject(selectAllPackages, Integer.class, new Object[]{packageName, owner });
}
else
{
- result = jdbcTemplate.queryForInt(selectUserPackages, packageName);
+ result = jdbcTemplate.queryForObject(selectUserPackages, Integer.class, packageName);
}
if (result <= 0)
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleSequenceCreationTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleSequenceCreationTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleSequenceCreationTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,8 +18,6 @@
package it.openutils.migration.oracle;
-import it.openutils.migration.task.setup.DbTask;
-
import java.text.MessageFormat;
import java.util.List;
@@ -28,9 +26,11 @@
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
+import it.openutils.migration.task.setup.DbTask;
+
/**
* Db tasks that handles the initial setup of sequences.
* @author fgiust
@@ -112,7 +112,7 @@
*/
public void execute(DataSource dataSource)
{
- SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
+ JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
for (String sequenceName : sequences)
{
int result = 0;
@@ -120,19 +120,19 @@
if (StringUtils.contains(sequenceName, "."))
{
String[] tokens = StringUtils.split(sequenceName, ".");
- result = jdbcTemplate.queryForInt(selectAllSequences, new Object[]{tokens[1], tokens[0] });
+ result = jdbcTemplate
+ .queryForObject(selectAllSequences, Integer.class, new Object[]{tokens[1], tokens[0] });
}
else
{
- result = jdbcTemplate.queryForInt(selectUserSequences, sequenceName);
+ result = jdbcTemplate.queryForObject(selectUserSequences, Integer.class, sequenceName);
}
if (result <= 0)
{
log.info("Creating new {}", sequenceName);
- jdbcTemplate.update(MessageFormat.format(creationQuery, new Object[]{
- sequenceName,
- String.valueOf(startsWith) }));
+ jdbcTemplate.update(
+ MessageFormat.format(creationQuery, new Object[]{sequenceName, String.valueOf(startsWith) }));
}
}
}
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleStoredProcedureCallTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleStoredProcedureCallTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleStoredProcedureCallTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,24 +18,24 @@
package it.openutils.migration.oracle;
-import it.openutils.migration.task.setup.GenericConditionalTask;
-
import java.sql.CallableStatement;
import java.sql.Connection;
import java.sql.SQLException;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.ConnectionCallback;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.support.JdbcUtils;
+import it.openutils.migration.task.setup.GenericConditionalTask;
+
public class OracleStoredProcedureCallTask extends GenericConditionalTask
{
@Override
- protected void executeSingle(SimpleJdbcTemplate jdbcTemplate, final String scriptContent)
+ protected void executeSingle(JdbcTemplate jdbcTemplate, final String scriptContent)
{
- jdbcTemplate.getJdbcOperations().execute(new ConnectionCallback()
+ jdbcTemplate.execute(new ConnectionCallback()
{
public Object doInConnection(Connection con) throws SQLException, DataAccessException
{
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleTriggerTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleTriggerTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleTriggerTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,16 +18,16 @@
package it.openutils.migration.oracle;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.jdbc.core.JdbcTemplate;
+
import it.openutils.migration.task.setup.GenericConditionalTask;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
-
public class OracleTriggerTask extends GenericConditionalTask
{
@Override
- protected void executeSingle(SimpleJdbcTemplate jdbcTemplate, final String scriptContent)
+ protected void executeSingle(JdbcTemplate jdbcTemplate, final String scriptContent)
{
if (StringUtils.isNotBlank(scriptContent))
{
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleViewCreateOrUpdateTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleViewCreateOrUpdateTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleViewCreateOrUpdateTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,8 +18,6 @@
package it.openutils.migration.oracle;
-import it.openutils.migration.task.setup.DbTask;
-
import java.io.IOException;
import java.io.InputStream;
import java.text.MessageFormat;
@@ -34,9 +32,11 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.io.Resource;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
+import it.openutils.migration.task.setup.DbTask;
+
/**
* <p>
* Db tasks that handles the initial setup of views.
@@ -45,8 +45,8 @@
* Limitations:
* </p>
* <ol>
- * <li> * not supported in field list</li>
- * <li> fields must be enclosed in quotes</li>
+ * <li>* not supported in field list</li>
+ * <li>fields must be enclosed in quotes</li>
* </ol>
* @author albertoq
* @version $Id$
@@ -110,12 +110,12 @@
public void execute(DataSource dataSource)
{
- SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
+ JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
for (Resource script : scripts)
{
String viewName = this.objectNameFromFileName(script);
- int result = jdbcTemplate.queryForInt(this.selectUserViewExistence, viewName);
+ int result = jdbcTemplate.queryForObject(this.selectUserViewExistence, Integer.class, viewName);
String scriptContent = readFully(script);
@@ -138,10 +138,8 @@
continue;
}
- String previousDDl = (String) jdbcTemplate.getJdbcOperations().queryForObject(
- this.selectUserViewDDL,
- new Object[]{viewName },
- String.class);
+ String previousDDl = jdbcTemplate
+ .queryForObject(this.selectUserViewDDL, new Object[]{viewName }, String.class);
if (!StringUtils.equals(previousDDl.trim(), scriptBody.trim()))
{
@@ -182,7 +180,7 @@
* @param script
* @return
*/
- private void createView(SimpleJdbcTemplate jdbcTemplate, String script)
+ private void createView(JdbcTemplate jdbcTemplate, String script)
{
String[] ddls = StringUtils.split(script, ";");
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/postgres/PostGreSQLSequenceChecker.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/postgres/PostGreSQLSequenceChecker.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/postgres/PostGreSQLSequenceChecker.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -17,8 +17,6 @@
*/
package it.openutils.migration.postgres;
-import it.openutils.migration.task.setup.GenericConditionalTask;
-
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -32,7 +30,9 @@
import org.springframework.jdbc.core.ConnectionCallback;
import org.springframework.jdbc.core.JdbcTemplate;
+import it.openutils.migration.task.setup.GenericConditionalTask;
+
/**
* This is just a patch to move sequences after inserting values from dbMigration. The real solution should be to have
* all the database objects generated by dbMigration and not by hibernate. THIS TASK IS NOT CLUSTER SAFE NOR THREAD
@@ -107,31 +107,31 @@
});
for (String tableName : tables)
{
- if (jdbcTemplate
- .queryForLong("SELECT COUNT(*) FROM information_schema.sequences WHERE SEQUENCE_NAME ILIKE '"
+ if (jdbcTemplate.queryForObject(
+ "SELECT COUNT(*) FROM information_schema.sequences WHERE SEQUENCE_NAME ILIKE '"
+ tableName
- + "_id_seq'") > 0)
+ + "_id_seq'",
+ Long.class) > 0)
{
- String idColumnName = (String) jdbcTemplate.queryForObject(
- "SELECT COLUMN_NAME FROM information_schema.columns WHERE TABLE_NAME ILIKE '"
- + tableName
- + "' AND COLUMN_DEFAULT ILIKE 'nextval(%"
- + tableName
- + "_id_seq%'",
- String.class);
- long tableRows = jdbcTemplate.queryForLong("SELECT MAX(" + idColumnName + ") FROM " + tableName);
- long sequenceVal = jdbcTemplate.queryForLong("SELECT last_value FROM " + tableName + "_id_seq");
+ String idColumnName = jdbcTemplate
+ .queryForObject(
+ "SELECT COLUMN_NAME FROM information_schema.columns WHERE TABLE_NAME ILIKE '"
+ + tableName
+ + "' AND COLUMN_DEFAULT ILIKE 'nextval(%"
+ + tableName
+ + "_id_seq%'",
+ String.class);
+ long tableRows = jdbcTemplate
+ .queryForObject("SELECT MAX(" + idColumnName + ") FROM " + tableName, Long.class);
+ long sequenceVal = jdbcTemplate
+ .queryForObject("SELECT last_value FROM " + tableName + "_id_seq", Long.class);
if ((sequenceVal >= 0) && (tableRows > sequenceVal))
{
- jdbcTemplate.execute("SELECT setval('"
- + tableName
- + "_id_seq', "
- + Long.toString(tableRows + offset)
- + ")");
- log.info("Moved sequence \"{}_id_seq\" value from {} to {}.", new Object[]{
- tableName,
- sequenceVal,
- (tableRows + offset) });
+ jdbcTemplate.execute(
+ "SELECT setval('" + tableName + "_id_seq', " + Long.toString(tableRows + offset) + ")");
+ log.info(
+ "Moved sequence \"{}_id_seq\" value from {} to {}.",
+ new Object[]{tableName, sequenceVal, (tableRows + offset) });
jdbcTemplate.execute("REINDEX TABLE " + tableName);
log.info("Reindexed table: " + tableName);
}
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerFunctionCreateOrUpdateTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerFunctionCreateOrUpdateTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerFunctionCreateOrUpdateTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,8 +18,6 @@
package it.openutils.migration.sqlserver;
-import it.openutils.migration.task.setup.GenericConditionalTask;
-
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
@@ -29,9 +27,11 @@
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.core.io.Resource;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
+import it.openutils.migration.task.setup.GenericConditionalTask;
+
/**
* Compares the function script with the one stored in the db and drops and recreates it if the scripts differs. Be
* aware that tabs chars are ALWAYS considered different, so remove them from your scripts! This works ONLY for SQL
@@ -51,11 +51,11 @@
{
String checkQuery = "select count(*) from dbo.sysobjects where id = object_id(?) and xtype in (N'FN', N'IF', N'TF')";
- SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
+ JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
for (Resource script : scripts)
{
String functionName = this.objectNameFromFileName(script);
- int result = jdbcTemplate.queryForInt(checkQuery, functionName);
+ int result = jdbcTemplate.queryForObject(checkQuery, Integer.class, functionName);
String scriptContent = readFully(script);
scriptContent = StringUtils.replace(scriptContent, "\t", " ");
if (StringUtils.isBlank(scriptContent))
@@ -69,10 +69,8 @@
}
else
{ // If the script is too long a list will be returned, and it must be joined to get the original script.
- List<String> previousDDlList = jdbcTemplate.getJdbcOperations().queryForList(
- "exec sp_helptext ?",
- new Object[]{functionName },
- String.class);
+ List<String> previousDDlList = jdbcTemplate
+ .queryForList("exec sp_helptext ?", new Object[]{functionName }, String.class);
String previousDDl = StringUtils.join(previousDDlList.toArray(new String[previousDDlList.size()]));
if (!StringUtils.equals(previousDDl, scriptContent))
{
@@ -93,7 +91,7 @@
* @param script Function script.
* @return
*/
- private void createFunction(SimpleJdbcTemplate jdbcTemplate, String script)
+ private void createFunction(JdbcTemplate jdbcTemplate, String script)
{
String[] ddls = StringUtils.split(script, ";");
for (String ddl : ddls)
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerObjCreationTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerObjCreationTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerObjCreationTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,8 +18,6 @@
package it.openutils.migration.sqlserver;
-import it.openutils.migration.task.setup.GenericConditionalTask;
-
import java.io.IOException;
import java.io.InputStream;
@@ -28,9 +26,11 @@
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.core.io.Resource;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
+import it.openutils.migration.task.setup.GenericConditionalTask;
+
/**
* @author fgiust
* @version $Id:SqlServerObjCreationTask.java 3143 2007-09-24 19:50:49Z fgiust $
@@ -90,7 +90,7 @@
@Override
public void execute(DataSource dataSource)
{
- SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
+ JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
for (Resource script : scripts)
{
String fqTableName = this.objectNameFromFileName(script);
@@ -99,11 +99,12 @@
if (StringUtils.contains(fqTableName, "."))
{
String[] tokens = StringUtils.split(fqTableName, ".");
- result = jdbcTemplate.queryForInt(qualifiedObjQuery, new Object[]{tokens[1], tokens[0] });
+ result = jdbcTemplate
+ .queryForObject(qualifiedObjQuery, Integer.class, new Object[]{tokens[1], tokens[0] });
}
else
{
- result = jdbcTemplate.queryForInt(unqualifiedObjQuery, fqTableName);
+ result = jdbcTemplate.queryForObject(unqualifiedObjQuery, Integer.class, fqTableName);
}
if (result == 0)
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerProcedureCreateOrUpdateTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerProcedureCreateOrUpdateTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerProcedureCreateOrUpdateTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,8 +18,6 @@
package it.openutils.migration.sqlserver;
-import it.openutils.migration.task.setup.GenericConditionalTask;
-
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
@@ -29,9 +27,11 @@
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.core.io.Resource;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
+import it.openutils.migration.task.setup.GenericConditionalTask;
+
/**
* Compares the procedure script with the one stored in the db and drops and recreates it if the scripts differs. Be
* aware that tabs chars are ALWAYS considered different, so remove them from your scripts! This works ONLY for SQL
@@ -50,11 +50,11 @@
public void execute(DataSource dataSource)
{
String checkQuery = "select count(*) from dbo.sysobjects where id = object_id(?) and (OBJECTPROPERTY(id, N'IsProcedure') = 1)";
- SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
+ JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
for (Resource script : scripts)
{
String procedureName = this.objectNameFromFileName(script);
- int result = jdbcTemplate.queryForInt(checkQuery, procedureName);
+ int result = jdbcTemplate.queryForObject(checkQuery, Integer.class, procedureName);
String scriptContent = readFully(script);
scriptContent = StringUtils.replace(scriptContent, "\t", " ");
if (StringUtils.isBlank(scriptContent))
@@ -68,10 +68,8 @@
}
else
{ // If the script is too long a list will be returned, and it must be joined to get the original script.
- List<String> previousDDlList = jdbcTemplate.getJdbcOperations().queryForList(
- "exec sp_helptext ?",
- new Object[]{procedureName },
- String.class);
+ List<String> previousDDlList = jdbcTemplate
+ .queryForList("exec sp_helptext ?", new Object[]{procedureName }, String.class);
String previousDDl = StringUtils.join(previousDDlList.toArray(new String[previousDDlList.size()]));
if (!StringUtils.equals(previousDDl, scriptContent))
{
@@ -92,7 +90,7 @@
* @param script Stored procedure script.
* @return
*/
- private void createProcedure(SimpleJdbcTemplate jdbcTemplate, String script)
+ private void createProcedure(JdbcTemplate jdbcTemplate, String script)
{
String[] ddls = StringUtils.split(script, ";");
for (String ddl : ddls)
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerScriptBasedUnconditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerScriptBasedUnconditionalTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerScriptBasedUnconditionalTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,10 +18,6 @@
package it.openutils.migration.sqlserver;
-import it.openutils.migration.task.setup.BaseDbTask;
-import it.openutils.migration.task.setup.DbTask;
-import it.openutils.migration.task.setup.ScriptBasedUnconditionalTask;
-
import java.io.IOException;
import java.util.List;
@@ -32,9 +28,13 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.io.Resource;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
+import it.openutils.migration.task.setup.BaseDbTask;
+import it.openutils.migration.task.setup.DbTask;
+import it.openutils.migration.task.setup.ScriptBasedUnconditionalTask;
+
/**
* @author fgiust
* @version $Id:SqlServerScriptBasedUnconditionalTask.java 3143 2007-09-24 19:50:49Z fgiust $
@@ -86,7 +86,7 @@
}
String[] ddls = splitStatements(scriptContent);
- SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
+ JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
for (final String ddl : ddls)
{
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerSynonymCreationTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerSynonymCreationTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerSynonymCreationTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,15 +18,15 @@
package it.openutils.migration.sqlserver;
-import it.openutils.migration.task.setup.DbTask;
-
import java.util.List;
import javax.sql.DataSource;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
+import it.openutils.migration.task.setup.DbTask;
+
/**
* @author Danilo Ghirardelli
* @version $Id:SqlServerSynonymCreationTask.java 3143 2007-09-24 19:50:49Z fgiust $
@@ -62,22 +62,18 @@
public void execute(DataSource dataSource)
{
- SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
+ JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
for (String objectName : objects)
{
- int result = jdbcTemplate.queryForInt(
+ int result = jdbcTemplate.queryForObject(
"select count(*) from dbo.sysobjects where id = object_id(?) and xtype = N'SN'",
+ Integer.class,
objectName);
if (result == 0)
{
- jdbcTemplate.update("CREATE SYNONYM [dbo].["
- + objectName
- + "] FOR ["
- + source
- + "].[dbo].["
- + objectName
- + "]");
+ jdbcTemplate.update(
+ "CREATE SYNONYM [dbo].[" + objectName + "] FOR [" + source + "].[dbo].[" + objectName + "]");
}
}
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerViewCreateOrUpdateTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerViewCreateOrUpdateTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerViewCreateOrUpdateTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,8 +18,6 @@
package it.openutils.migration.sqlserver;
-import it.openutils.migration.task.setup.GenericConditionalTask;
-
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
@@ -29,9 +27,11 @@
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.core.io.Resource;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
+import it.openutils.migration.task.setup.GenericConditionalTask;
+
/**
* @author Danilo Ghirardelli
* @version $Id: SqlServerViewCreateOrUpdateTask.java 391 2007-07-10 17:25:42Z fgiust $
@@ -49,12 +49,12 @@
String checkQuery = "select count(*) from dbo.sysobjects where id = object_id(?) and OBJECTPROPERTY(id, N'IsView') = 1";
- SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
+ JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
for (Resource script : scripts)
{
String viewName = this.objectNameFromFileName(script);
- int result = jdbcTemplate.queryForInt(checkQuery, viewName);
+ int result = jdbcTemplate.queryForObject(checkQuery, Integer.class, viewName);
String scriptContent = readFully(script);
scriptContent = StringUtils.replace(scriptContent, "\t", " ");
@@ -73,10 +73,8 @@
else
{
- List<String> previousDDlList = jdbcTemplate.getJdbcOperations().queryForList(
- "exec sp_helptext ?",
- new Object[]{viewName },
- String.class);
+ List<String> previousDDlList = jdbcTemplate
+ .queryForList("exec sp_helptext ?", new Object[]{viewName }, String.class);
String previousDDl = StringUtils.join(previousDDlList.toArray(new String[previousDDlList.size()]));
@@ -100,7 +98,7 @@
* @param script
* @return
*/
- private void createView(SimpleJdbcTemplate jdbcTemplate, String script)
+ private void createView(JdbcTemplate jdbcTemplate, String script)
{
String[] ddls = StringUtils.split(script, ";");
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/BaseConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/BaseConditionalTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/BaseConditionalTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -31,7 +31,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.io.Resource;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
/**
@@ -125,10 +125,10 @@
/**
* Subclasses need to override this method and provide specific checks.
- * @param jdbcTemplate SimpleJdbcTemplate
+ * @param jdbcTemplate JdbcTemplate
* @return true if the condition is met
*/
- public abstract boolean check(SimpleJdbcTemplate jdbcTemplate);
+ public abstract boolean check(JdbcTemplate jdbcTemplate);
/**
* {@inheritDoc}
@@ -192,7 +192,7 @@
*/
public void execute(DataSource dataSource)
{
- SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
+ JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
if (check(jdbcTemplate) ^ not)
{
@@ -241,7 +241,7 @@
* @param jdbcTemplate
* @param scriptContent
*/
- protected void executeSingle(SimpleJdbcTemplate jdbcTemplate, String scriptContent)
+ protected void executeSingle(JdbcTemplate jdbcTemplate, String scriptContent)
{
String[] ddls;
if (StringUtils.isNotEmpty(splitChar))
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -141,25 +141,25 @@
InputStream is = null;
try
{
- is = script.getInputStream();
- POIFSFileSystem fs = new POIFSFileSystem(is);
- HSSFWorkbook hssfworkbook = new HSSFWorkbook(fs);
- int sheetNums = hssfworkbook.getNumberOfSheets();
- for (int j = 0; j < sheetNums; j++)
- {
- HSSFSheet sheet = hssfworkbook.getSheetAt(j);
- String sheetName = StringUtils.trim(hssfworkbook.getSheetName(j));
- QueryConfig conf = config.get(sheetName);
- if (conf == null)
- {
- suggestSheetConfig(sheet, sheetName, conf, dataSource);
- continue;
- }
-
- String tableName = (StringUtils.isBlank(conf.getTableName())) ? sheetName : conf.getTableName();
- processSheet(sheet, tableName, conf, dataSource);
- }
+ is = script.getInputStream();
+ POIFSFileSystem fs = new POIFSFileSystem(is);
+ HSSFWorkbook hssfworkbook = new HSSFWorkbook(fs);
+ int sheetNums = hssfworkbook.getNumberOfSheets();
+ for (int j = 0; j < sheetNums; j++)
+ {
+ HSSFSheet sheet = hssfworkbook.getSheetAt(j);
+ String sheetName = StringUtils.trim(hssfworkbook.getSheetName(j));
+ QueryConfig conf = config.get(sheetName);
+ if (conf == null)
+ {
+ suggestSheetConfig(sheet, sheetName, conf, dataSource);
+ continue;
+ }
+ String tableName = (StringUtils.isBlank(conf.getTableName())) ? sheetName : conf.getTableName();
+ processSheet(sheet, tableName, conf, dataSource);
+ }
+
}
catch (IOException e)
{
@@ -210,17 +210,19 @@
buffer.append(" <entry key=\"");
buffer.append(tableName);
- buffer.append("\">\n"
- + " <bean class=\"it.openutils.migration.task.setup.ExcelConfigurationTask$QueryConfig\">\n"
- + " <property name=\"checkQuery\">\n"
- + " <value>");
+ buffer.append(
+ "\">\n"
+ + " <bean class=\"it.openutils.migration.task.setup.ExcelConfigurationTask$QueryConfig\">\n"
+ + " <property name=\"checkQuery\">\n"
+ + " <value>");
String initialCol = columns.get(0);
buffer.append("select count(" + initialCol + ") from " + tableName + " where " + initialCol + " = ?");
- buffer.append("</value>\n"
- + " </property>\n"
- + " <property name=\"insertQuery\">\n"
- + " <value>");
+ buffer.append(
+ "</value>\n"
+ + " </property>\n"
+ + " <property name=\"insertQuery\">\n"
+ + " <value>");
buffer.append("INSERT INTO ");
buffer.append(tableName);
@@ -429,12 +431,14 @@
int existing;
try
{
- existing = jdbcTemplate.queryForInt(checkStatement, checkParams, checkParamTypes);
+ existing = jdbcTemplate.queryForObject(checkStatement, Integer.class, checkParams, checkParamTypes);
}
catch (BadSqlGrammarException bsge)
{
- log.error("Error executing check query, current sheet will be skipped. {} Query in error: {}", bsge
- .getMessage(), checkStatement);
+ log.error(
+ "Error executing check query, current sheet will be skipped. {} Query in error: {}",
+ bsge.getMessage(),
+ checkStatement);
return;
}
@@ -478,16 +482,17 @@
if (log.isDebugEnabled())
{
- log.debug("Missing record with key {}; inserting {}", ArrayUtils.toString(checkParams), ArrayUtils
- .toString(insertParams));
+ log.debug(
+ "Missing record with key {}; inserting {}",
+ ArrayUtils.toString(checkParams),
+ ArrayUtils.toString(insertParams));
}
if (insertParams.length != insertTypes.length)
{
- log.warn("Invalid number of param/type for table {}. Params: {}, types: {}", new Object[]{
- tableName,
- insertParams.length,
- insertTypes.length});
+ log.warn(
+ "Invalid number of param/type for table {}. Params: {}, types: {}",
+ new Object[]{tableName, insertParams.length, insertTypes.length });
}
try
@@ -496,15 +501,14 @@
}
catch (DataIntegrityViolationException bsge)
{
- log
- .error(
- "Error executing update, record at {}:{} will be skipped. Query in error: '{}', values: {}. Error message: {}",
- new Object[]{
- tableName,
- rowNum + 1,
- insertStatement,
- ArrayUtils.toString(insertParams),
- bsge.getMessage()});
+ log.error(
+ "Error executing update, record at {}:{} will be skipped. Query in error: '{}', values:...
[truncated message content] |
