You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2017/10/06 14:03:47 UTC
[2/2] ambari git commit: 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)
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/f44c8669
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f44c8669
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f44c8669
Branch: refs/heads/trunk
Commit: f44c86690a64523aed04bfd76e5c38e194e731ba
Parents: b358ee2
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Fri Oct 6 17:02:13 2017 +0300
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Fri Oct 6 17:03:10 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/f44c8669/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 c31469e..866a501 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
@@ -144,11 +144,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);
}
/**