You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by cb...@apache.org on 2008/08/31 05:36:28 UTC
svn commit: r690631 - in /ibatis/trunk/java/ibatis-3:
ibatis-3-compat/src/main/java/com/ibatis/common/jdbc/
ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/
ibatis-3-core/src/main/java/org/apache/ibatis/migration/
ibatis-3-core/src/main/java/org/apa...
Author: cbegin
Date: Sat Aug 30 20:36:27 2008
New Revision: 690631
URL: http://svn.apache.org/viewvc?rev=690631&view=rev
Log:
Moved script and sql runner to jdbc package, moved tests around to match.
Added:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/Null.java
- copied, changed from r690629, ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/Null.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java
- copied, changed from r690629, ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/ScriptRunner.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/SqlRunner.java
- copied, changed from r690629, ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/SqlRunner.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/NullTest.java
- copied, changed from r690629, ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/adhoc/NullTest.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/ScriptRunnerTest.java
- copied, changed from r690629, ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/migration/ScriptRunnerTest.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/SqlRunnerTest.java
- copied, changed from r690629, ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/adhoc/AdHocExecutorTest.java
Removed:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/Null.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/ScriptRunner.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/SqlRunner.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/adhoc/
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/migration/ScriptRunnerTest.java
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/common/jdbc/ScriptRunner.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BaseCommand.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BootstrapCommand.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/DownCommand.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/UpCommand.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/BaseDataTest.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/migration/MigratorTest.java
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/common/jdbc/ScriptRunner.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/common/jdbc/ScriptRunner.java?rev=690631&r1=690630&r2=690631&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/common/jdbc/ScriptRunner.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/common/jdbc/ScriptRunner.java Sat Aug 30 20:36:27 2008
@@ -2,10 +2,9 @@
import org.apache.ibatis.jdbc.UnpooledDataSource;
-import javax.sql.DataSource;
import java.sql.*;
-public class ScriptRunner extends org.apache.ibatis.migration.ScriptRunner {
+public class ScriptRunner extends org.apache.ibatis.jdbc.ScriptRunner {
public ScriptRunner(Connection connection, boolean autoCommit, boolean stopOnError) {
super(connection);
Copied: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/Null.java (from r690629, ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/Null.java)
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/Null.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/Null.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/Null.java&r1=690629&r2=690631&rev=690631&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/Null.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/Null.java Sat Aug 30 20:36:27 2008
@@ -1,4 +1,4 @@
-package org.apache.ibatis.migration;
+package org.apache.ibatis.jdbc;
import org.apache.ibatis.type.*;
Copied: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java (from r690629, ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/ScriptRunner.java)
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/ScriptRunner.java&r1=690629&r2=690631&rev=690631&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/ScriptRunner.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java Sat Aug 30 20:36:27 2008
@@ -1,4 +1,4 @@
-package org.apache.ibatis.migration;
+package org.apache.ibatis.jdbc;
import java.io.*;
import java.sql.*;
Copied: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/SqlRunner.java (from r690629, ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/SqlRunner.java)
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/SqlRunner.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/SqlRunner.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/SqlRunner.java&r1=690629&r2=690631&rev=690631&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/SqlRunner.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/SqlRunner.java Sat Aug 30 20:36:27 2008
@@ -1,8 +1,7 @@
-package org.apache.ibatis.migration;
+package org.apache.ibatis.jdbc;
import org.apache.ibatis.type.*;
-import org.apache.ibatis.migration.Null;
-import org.apache.ibatis.jdbc.UnpooledDataSource;
+import org.apache.ibatis.jdbc.Null;
import java.sql.*;
import java.util.*;
@@ -13,15 +12,14 @@
private Connection connection;
private TypeHandlerRegistry typeHandlerRegistry;
- private boolean forceGeneratedKeySupport = false;
+ private boolean forceGeneratedKeySupport;
public SqlRunner(Connection connection) {
- this(connection, false);
- }
-
- public SqlRunner(Connection connection, boolean forceGeneratedKeySupport) {
this.connection = connection;
this.typeHandlerRegistry = new TypeHandlerRegistry();
+ }
+
+ public void setForceGeneratedKeySupport(boolean forceGeneratedKeySupport) {
this.forceGeneratedKeySupport = forceGeneratedKeySupport;
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BaseCommand.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BaseCommand.java?rev=690631&r1=690630&r2=690631&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BaseCommand.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BaseCommand.java Sat Aug 30 20:36:27 2008
@@ -1,9 +1,10 @@
package org.apache.ibatis.migration.commands;
-import org.apache.ibatis.migration.SqlRunner;
+import org.apache.ibatis.jdbc.SqlRunner;
import org.apache.ibatis.io.Resources;
import org.apache.ibatis.migration.*;
import org.apache.ibatis.jdbc.UnpooledDataSource;
+import org.apache.ibatis.jdbc.ScriptRunner;
import java.io.*;
import java.math.BigDecimal;
@@ -157,7 +158,7 @@
UnpooledDataSource dataSource = new UnpooledDataSource(driverClassLoader, driver, url, username, password);
dataSource.setAutoCommit(true);
- return new SqlRunner(dataSource.getConnection(), false);
+ return new SqlRunner(dataSource.getConnection());
} catch (SQLException e) {
throw new RuntimeException("Could not create SqlRunner. Cause: " + e, e);
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BootstrapCommand.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BootstrapCommand.java?rev=690631&r1=690630&r2=690631&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BootstrapCommand.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BootstrapCommand.java Sat Aug 30 20:36:27 2008
@@ -1,6 +1,7 @@
package org.apache.ibatis.migration.commands;
import org.apache.ibatis.migration.*;
+import org.apache.ibatis.jdbc.ScriptRunner;
import java.io.*;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/DownCommand.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/DownCommand.java?rev=690631&r1=690630&r2=690631&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/DownCommand.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/DownCommand.java Sat Aug 30 20:36:27 2008
@@ -1,7 +1,8 @@
package org.apache.ibatis.migration.commands;
-import org.apache.ibatis.migration.SqlRunner;
+import org.apache.ibatis.jdbc.SqlRunner;
import org.apache.ibatis.migration.*;
+import org.apache.ibatis.jdbc.ScriptRunner;
import java.io.*;
import java.sql.SQLException;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/UpCommand.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/UpCommand.java?rev=690631&r1=690630&r2=690631&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/UpCommand.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/UpCommand.java Sat Aug 30 20:36:27 2008
@@ -1,7 +1,8 @@
package org.apache.ibatis.migration.commands;
-import org.apache.ibatis.migration.SqlRunner;
+import org.apache.ibatis.jdbc.SqlRunner;
import org.apache.ibatis.migration.*;
+import org.apache.ibatis.jdbc.ScriptRunner;
import java.io.*;
import java.sql.SQLException;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/BaseDataTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/BaseDataTest.java?rev=690631&r1=690630&r2=690631&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/BaseDataTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/BaseDataTest.java Sat Aug 30 20:36:27 2008
@@ -2,7 +2,7 @@
import org.apache.ibatis.io.Resources;
import org.apache.ibatis.jdbc.PooledDataSource;
-import org.apache.ibatis.migration.ScriptRunner;
+import org.apache.ibatis.jdbc.ScriptRunner;
import org.junit.Test;
import javax.sql.DataSource;
Copied: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/NullTest.java (from r690629, ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/adhoc/NullTest.java)
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/NullTest.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/NullTest.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/adhoc/NullTest.java&r1=690629&r2=690631&rev=690631&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/adhoc/NullTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/NullTest.java Sat Aug 30 20:36:27 2008
@@ -1,7 +1,7 @@
-package org.apache.ibatis.adhoc;
+package org.apache.ibatis.jdbc;
import org.apache.ibatis.type.*;
-import org.apache.ibatis.migration.Null;
+import org.apache.ibatis.jdbc.Null;
import org.junit.*;
public class NullTest {
Copied: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/ScriptRunnerTest.java (from r690629, ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/migration/ScriptRunnerTest.java)
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/ScriptRunnerTest.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/ScriptRunnerTest.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/migration/ScriptRunnerTest.java&r1=690629&r2=690631&rev=690631&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/migration/ScriptRunnerTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/ScriptRunnerTest.java Sat Aug 30 20:36:27 2008
@@ -1,7 +1,7 @@
-package org.apache.ibatis.migration;
+package org.apache.ibatis.jdbc;
import org.apache.ibatis.BaseDataTest;
-import org.apache.ibatis.migration.SqlRunner;
+import org.apache.ibatis.jdbc.SqlRunner;
import org.apache.ibatis.io.Resources;
import org.apache.ibatis.jdbc.*;
import org.junit.*;
Copied: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/SqlRunnerTest.java (from r690629, ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/adhoc/AdHocExecutorTest.java)
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/SqlRunnerTest.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/SqlRunnerTest.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/adhoc/AdHocExecutorTest.java&r1=690629&r2=690631&rev=690631&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/adhoc/AdHocExecutorTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/SqlRunnerTest.java Sat Aug 30 20:36:27 2008
@@ -1,14 +1,15 @@
-package org.apache.ibatis.adhoc;
+package org.apache.ibatis.jdbc;
import org.apache.ibatis.BaseDataTest;
-import org.apache.ibatis.migration.*;
import org.apache.ibatis.jdbc.PooledDataSource;
+import org.apache.ibatis.jdbc.Null;
+import org.apache.ibatis.jdbc.SqlRunner;
import org.junit.*;
import java.sql.Connection;
import java.util.*;
-public class AdHocExecutorTest extends BaseDataTest {
+public class SqlRunnerTest extends BaseDataTest {
@Test
public void shouldSelectOne() throws Exception {
@@ -46,7 +47,8 @@
runScript(ds, BLOG_DDL);
Connection connection = ds.getConnection();
try {
- SqlRunner exec = new SqlRunner(connection, true);
+ SqlRunner exec = new SqlRunner(connection);
+ exec.setForceGeneratedKeySupport(true);
int id = exec.insert("INSERT INTO author (username, password, email, bio) VALUES (?,?,?,?)", "someone", "******", "someone@apache.org", Null.LONGVARCHAR);
Map row = exec.selectOne("SELECT * FROM author WHERE username = ?", "someone");
connection.rollback();
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/migration/MigratorTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/migration/MigratorTest.java?rev=690631&r1=690630&r2=690631&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/migration/MigratorTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/migration/MigratorTest.java Sat Aug 30 20:36:27 2008
@@ -1,7 +1,7 @@
package org.apache.ibatis.migration;
import org.apache.ibatis.BaseDataTest;
-import org.apache.ibatis.migration.SqlRunner;
+import org.apache.ibatis.jdbc.SqlRunner;
import org.apache.ibatis.jdbc.PooledDataSource;
import org.apache.ibatis.io.Resources;
import org.junit.*;