Updated Branches: refs/heads/master ab67228ce -> 55c15b2f6
OOZIE-1684 DB upgrade from 3.3.0 to trunk fails on Oracle (rkanter) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/55c15b2f Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/55c15b2f Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/55c15b2f Branch: refs/heads/master Commit: 55c15b2f605ce7d0eb799faa3d5e5240ac581c0f Parents: ab67228 Author: Robert Kanter <[email protected]> Authored: Mon Feb 3 23:17:57 2014 -0800 Committer: Robert Kanter <[email protected]> Committed: Mon Feb 3 23:17:57 2014 -0800 ---------------------------------------------------------------------- release-log.txt | 1 + tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/55c15b2f/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index f424dd3..876a256 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.1.0 release (trunk - unreleased) +OOZIE-1684 DB upgrade from 3.3.0 to trunk fails on Oracle (rkanter) OOZIE-1675 Adding absolute URI of local cluster to dist cache not working with hadoop version 0.20.2 and before (satish via ryota) OOZIE-1683 UserGroupInformationService should close any filesystems opened by it (rkanter) OOZIE-1646 HBase Table Copy between two HBase servers doesn't work with Kerberos (rkanter) http://git-wip-us.apache.org/repos/asf/oozie/blob/55c15b2f/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java ---------------------------------------------------------------------- diff --git a/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java b/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java index 7312faa..a116984 100644 --- a/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java +++ b/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java @@ -1038,11 +1038,7 @@ public class OozieDBCLI { System.out.println((create) ? "Create SQL schema" : "Upgrade SQL schema"); String[] args = createMappingToolArguments(sqlFile); org.apache.openjpa.jdbc.meta.MappingTool.main(args); - // With oracle, mapping tool tries to create a table even if already - // exists and fails - // However the update is reflected in the database even though the below - // block is not executed - if (run && (create || !getDBVendor().equals("oracle"))) { + if (run) { args = createMappingToolArguments(null); org.apache.openjpa.jdbc.meta.MappingTool.main(args); }
