You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2008/03/09 18:08:56 UTC
svn commit: r635290 - in /cayenne/sandbox/DBPatch: doc/README.txt
src/org/apache/cayenne/tools/AntDBPatchRunner.java
src/org/apache/cayenne/tools/DBPatchRunner.java
Author: aadamchik
Date: Sun Mar 9 10:08:54 2008
New Revision: 635290
URL: http://svn.apache.org/viewvc?rev=635290&view=rev
Log:
various minor tweaks
Modified:
cayenne/sandbox/DBPatch/doc/README.txt
cayenne/sandbox/DBPatch/src/org/apache/cayenne/tools/AntDBPatchRunner.java
cayenne/sandbox/DBPatch/src/org/apache/cayenne/tools/DBPatchRunner.java
Modified: cayenne/sandbox/DBPatch/doc/README.txt
URL: http://svn.apache.org/viewvc/cayenne/sandbox/DBPatch/doc/README.txt?rev=635290&r1=635289&r2=635290&view=diff
==============================================================================
--- cayenne/sandbox/DBPatch/doc/README.txt (original)
+++ cayenne/sandbox/DBPatch/doc/README.txt Sun Mar 9 10:08:54 2008
@@ -10,4 +10,15 @@
The following taskdef is needed:
<taskdef name="dbpatch" classname="org.apache.cayenne.tools.DBPatchTask"/>
+
+
+An example of dbpatch task invocation:
+
+ <dbpatch
+ patchIndex="patches/index.txt"
+ patchReleaseId="${version}"
+ driver="com.mysql.jdbc.Driver"
+ url="${db.url}"
+ userid="${db.userid}"
+ password="${db.password}"/>
Modified: cayenne/sandbox/DBPatch/src/org/apache/cayenne/tools/AntDBPatchRunner.java
URL: http://svn.apache.org/viewvc/cayenne/sandbox/DBPatch/src/org/apache/cayenne/tools/AntDBPatchRunner.java?rev=635290&r1=635289&r2=635290&view=diff
==============================================================================
--- cayenne/sandbox/DBPatch/src/org/apache/cayenne/tools/AntDBPatchRunner.java (original)
+++ cayenne/sandbox/DBPatch/src/org/apache/cayenne/tools/AntDBPatchRunner.java Sun Mar 9 10:08:54 2008
@@ -57,6 +57,8 @@
+ patchFile.getAbsolutePath());
}
+ logVerbose("Will run patch: " + patchName);
+
parentTask.setSrc(patchFile);
parentTask.runSQL();
}
Modified: cayenne/sandbox/DBPatch/src/org/apache/cayenne/tools/DBPatchRunner.java
URL: http://svn.apache.org/viewvc/cayenne/sandbox/DBPatch/src/org/apache/cayenne/tools/DBPatchRunner.java?rev=635290&r1=635289&r2=635290&view=diff
==============================================================================
--- cayenne/sandbox/DBPatch/src/org/apache/cayenne/tools/DBPatchRunner.java (original)
+++ cayenne/sandbox/DBPatch/src/org/apache/cayenne/tools/DBPatchRunner.java Sun Mar 9 10:08:54 2008
@@ -77,7 +77,7 @@
private void setupPatchTable() throws SQLException {
String tableName = patchTableName;
- String schema = "%";
+ String schema = null;
int dot = patchTableName.indexOf('.');
if (dot > 0 && dot < patchTableName.length() - 1) {
@@ -86,7 +86,7 @@
}
boolean patchTableExists;
- ResultSet rs = connection.getMetaData().getTables("%", schema,
+ ResultSet rs = connection.getMetaData().getTables(null, schema,
tableName, null);
try {
patchTableExists = rs.next();