Repository: ambari Updated Branches: refs/heads/trunk 211560943 -> 2a4f67ae9
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/2a4f67ae Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2a4f67ae Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2a4f67ae Branch: refs/heads/trunk Commit: 2a4f67ae9cb56e9132956bc0fffecdc6779677ea Parents: 2115609 Author: Dmytro Sen <[email protected]> Authored: Sun Oct 26 17:40:01 2014 +0200 Committer: Dmytro Sen <[email protected]> Committed: Sun Oct 26 17:40:01 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/2a4f67ae/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 89fa9cb..0ea33c0 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 @@ -382,9 +382,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));
