You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2014/10/26 16:36:43 UTC
git commit: AMBARI-7975 Schema upgrade failed after upgrade from
1.6.0 to 1.7.0 (dsen)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 a1a9860db -> f0efa3edf
AMBARI-7975 Schema upgrade failed after upgrade from 1.6.0 to 1.7.0 (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f0efa3ed
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f0efa3ed
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f0efa3ed
Branch: refs/heads/branch-1.7.0
Commit: f0efa3edfd6175a3e0e7753e9588acbc564a2d6b
Parents: a1a9860
Author: Dmytro Sen <ds...@hortonworks.com>
Authored: Sun Oct 26 16:43:24 2014 +0200
Committer: Dmytro Sen <ds...@hortonworks.com>
Committed: Sun Oct 26 16:43:24 2014 +0200
----------------------------------------------------------------------
.../org/apache/ambari/server/upgrade/UpgradeCatalog170.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/f0efa3ed/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
index c756a29..27d317e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
@@ -381,9 +381,11 @@ public class UpgradeCatalog170 extends AbstractUpgradeCatalog {
dbAccessor.executeQuery("ALTER TABLE clusterconfig ADD CONSTRAINT UQ_config_type_tag UNIQUE (cluster_id, type_name, version_tag)", true);
dbAccessor.executeQuery("ALTER TABLE clusterconfig ADD CONSTRAINT UQ_config_type_version UNIQUE (cluster_id, type_name, version)", true);
- dbAccessor.alterColumn("clusterconfig", new DBColumnInfo("config_data", char[].class, null, null, false));
- dbAccessor.alterColumn("blueprint_configuration", new DBColumnInfo("config_data", char[].class, null, null, false));
- dbAccessor.alterColumn("hostgroup_configuration", new DBColumnInfo("config_data", char[].class, null, null, false));
+ if (!Configuration.ORACLE_DB_NAME.equals(dbType)) {
+ dbAccessor.alterColumn("clusterconfig", new DBColumnInfo("config_data", char[].class, null, null, false));
+ dbAccessor.alterColumn("blueprint_configuration", new DBColumnInfo("config_data", char[].class, null, null, false));
+ dbAccessor.alterColumn("hostgroup_configuration", new DBColumnInfo("config_data", char[].class, null, null, false));
+ }
columns.clear();
columns.add(new DBColumnInfo("service_config_id", Long.class, null, null, false));