Repository: ambari Updated Branches: refs/heads/branch-2.6 6cf8be32e -> 5c09b19ae refs/heads/trunk b358ee20e -> f44c86690
AMBARI-22158. Ambari schema upgrade fails when upgrading ambari from 2.5.1.0 to 2.6.0.0 and using oracle as database (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5c09b19a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5c09b19a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5c09b19a Branch: refs/heads/branch-2.6 Commit: 5c09b19ae0e902826cec9f999da9ef1ad3ec5d66 Parents: 6cf8be3 Author: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Authored: Fri Oct 6 17:02:13 2017 +0300 Committer: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Committed: Fri Oct 6 17:02:13 2017 +0300 ---------------------------------------------------------------------- .../org/apache/ambari/server/upgrade/UpgradeCatalog260.java | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/5c09b19a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java index 30bf50a..5a24bbb 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java @@ -143,11 +143,14 @@ public class UpgradeCatalog260 extends AbstractUpgradeCatalog { public static final String CURRENT = "CURRENT"; public static final String SELECTED = "1"; public static final String VIEWURL_TABLE = "viewurl"; + public static final String VIEWINSTANCE_TABLE = "viewinstance"; public static final String PK_VIEWURL = "PK_viewurl"; public static final String URL_ID_COLUMN = "url_id"; public static final String STALE_POSTGRESS_VIEWURL_PKEY = "viewurl_pkey"; public static final String USERS_TABLE = "users"; public static final String STALE_POSTGRESS_USERS_LDAP_USER_KEY = "users_ldap_user_key"; + public static final String SHORT_URL_COLUMN = "short_url"; + public static final String FK_INSTANCE_URL_ID = "FK_instance_url_id"; /** @@ -205,8 +208,11 @@ public class UpgradeCatalog260 extends AbstractUpgradeCatalog { * Adds the {@value #PK_VIEWURL} constraint. */ private void addViewUrlPKConstraint() throws SQLException { + dbAccessor.dropFKConstraint(VIEWINSTANCE_TABLE, FK_INSTANCE_URL_ID); dbAccessor.dropPKConstraint(VIEWURL_TABLE, STALE_POSTGRESS_VIEWURL_PKEY); dbAccessor.addPKConstraint(VIEWURL_TABLE, PK_VIEWURL, URL_ID_COLUMN); + dbAccessor.addFKConstraint(VIEWINSTANCE_TABLE, FK_INSTANCE_URL_ID, + SHORT_URL_COLUMN, VIEWURL_TABLE, URL_ID_COLUMN, false); } /**