Statements should be delimited with a semicolon. If statements are not delimited with - * a semicolon then there should be one statement per line. Statements are allowed to span - * lines only if they are delimited with a semicolon. + * Execute the given SQL script. + *
Use with caution outside of a transaction! + *
The script will normally be loaded by classpath. *
Do not use this method to execute DDL if you expect rollback.
- * @param continueOnError whether or not to continue without throwing
- * an exception in the event of an error
+ * @param sqlResourcePath the Spring resource path for the SQL script
+ * @param continueOnError whether or not to continue without throwing an
+ * exception in the event of an error
* @throws DataAccessException if there is an error executing a statement
- * and continueOnError was false
+ * @see ResourceDatabasePopulator
+ * @see #setSqlScriptEncoding
*/
protected void executeSqlScript(String sqlResourcePath, boolean continueOnError) throws DataAccessException {
- if (logger.isInfoEnabled()) {
- logger.info("Executing SQL script '" + sqlResourcePath + "'");
- }
-
- EncodedResource resource =
- new EncodedResource(getApplicationContext().getResource(sqlResourcePath), this.sqlScriptEncoding);
- long startTime = System.currentTimeMillis();
- List statements = new LinkedList();
- try {
- LineNumberReader lnr = new LineNumberReader(resource.getReader());
- String script = JdbcTestUtils.readScript(lnr);
- char delimiter = ';';
- if (!JdbcTestUtils.containsSqlScriptDelimiters(script, delimiter)) {
- delimiter = '\n';
- }
- JdbcTestUtils.splitSqlScript(script, delimiter, statements);
- for (Iterator itr = statements.iterator(); itr.hasNext(); ) {
- String statement = (String) itr.next();
- try {
- int rowsAffected = this.jdbcTemplate.update(statement);
- if (logger.isDebugEnabled()) {
- logger.debug(rowsAffected + " rows affected by SQL: " + statement);
- }
- }
- catch (DataAccessException ex) {
- if (continueOnError) {
- if (logger.isWarnEnabled()) {
- logger.warn("SQL: " + statement + " failed", ex);
- }
- }
- else {
- throw ex;
- }
- }
- }
- long elapsedTime = System.currentTimeMillis() - startTime;
- logger.info("Done executing SQL scriptBuilder '" + sqlResourcePath + "' in " + elapsedTime + " ms");
- }
- catch (IOException ex) {
- throw new DataAccessResourceFailureException("Failed to open SQL script '" + sqlResourcePath + "'", ex);
- }
+ Resource resource = this.applicationContext.getResource(sqlResourcePath);
+ new ResourceDatabasePopulator(continueOnError, false, this.sqlScriptEncoding, resource).execute(jdbcTemplate.getDataSource());
}
}
diff --git a/spring-orm/src/test/java/org/springframework/test/jdbc/JdbcTestUtils.java b/spring-orm/src/test/java/org/springframework/test/jdbc/JdbcTestUtils.java
deleted file mode 100644
index 47030307ae4..00000000000
--- a/spring-orm/src/test/java/org/springframework/test/jdbc/JdbcTestUtils.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.test.jdbc;
-
-import java.io.IOException;
-import java.io.LineNumberReader;
-import java.util.List;
-
-import org.springframework.util.StringUtils;
-
-/**
- * JdbcTestUtils is a collection of JDBC related utility methods for
- * use in unit and integration testing scenarios.
- *
- * @author Thomas Risberg
- * @since 2.5.4
- */
-public class JdbcTestUtils {
-
- /**
- * Read a script from the LineNumberReaded and build a String containing the lines.
- * @param lineNumberReader the {@code LineNumberReader} containing the script to be processed
- * @return {@code String} containing the script lines
- * @throws IOException
- */
- public static String readScript(LineNumberReader lineNumberReader) throws IOException {
- String currentStatement = lineNumberReader.readLine();
- StringBuilder scriptBuilder = new StringBuilder();
- while (currentStatement != null) {
- if (StringUtils.hasText(currentStatement)) {
- if (scriptBuilder.length() > 0) {
- scriptBuilder.append('\n');
- }
- scriptBuilder.append(currentStatement);
- }
- currentStatement = lineNumberReader.readLine();
- }
- return scriptBuilder.toString();
- }
-
- /**
- * Does the provided SQL script contain the specified delimiter?
- * @param script the SQL script
- * @param delim charecter delimiting each statement - typically a ';' character
- */
- public static boolean containsSqlScriptDelimiters(String script, char delim) {
- boolean inLiteral = false;
- char[] content = script.toCharArray();
- for (int i = 0; i < script.length(); i++) {
- if (content[i] == '\'') {
- inLiteral = !inLiteral;
- }
- if (content[i] == delim && !inLiteral) {
- return true;
- }
- }
- return false;
- }
-
- /**
- * Split an SQL script into separate statements delimited with the provided delimiter character. Each
- * individual statement will be added to the provided {@code List}.
- * @param script the SQL script
- * @param delim charecter delimiting each statement - typically a ';' character
- * @param statements the List that will contain the individual statements
- */
- public static void splitSqlScript(String script, char delim, List