Repository: ambari Updated Branches: refs/heads/trunk c516b3107 -> b1c67d97e
AMBARI-21549. Ambari upgrade should update unique constraints (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b1c67d97 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b1c67d97 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b1c67d97 Branch: refs/heads/trunk Commit: b1c67d97e23ded0de663fec066c1ec4e2fd1fbad Parents: c516b31 Author: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Authored: Thu Jul 27 16:00:07 2017 +0300 Committer: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Committed: Thu Jul 27 16:00:07 2017 +0300 ---------------------------------------------------------------------- .../java/org/apache/ambari/server/orm/DBAccessor.java | 10 ++++++++++ .../java/org/apache/ambari/server/orm/DBAccessorImpl.java | 7 +++++++ 2 files changed, 17 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b1c67d97/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java index 4ddaf26..ef343d5 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java @@ -184,6 +184,16 @@ public interface DBAccessor { throws SQLException; /** + * Add unique table constraint + * @param constraintName name of the constraint + * @param tableName name of the table + * @param columnNames list of columns + * @throws SQLException + */ + void updateUniqueConstraint(String tableName, String constraintName, String... columnNames) + throws SQLException; + + /** * * @param tableName name of the table * @param constraintName name of the constraint http://git-wip-us.apache.org/repos/asf/ambari/blob/b1c67d97/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java index a88430b..04e4c66 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java @@ -571,6 +571,13 @@ public class DBAccessorImpl implements DBAccessor { } @Override + public void updateUniqueConstraint(String tableName, String constraintName, String... columnNames) + throws SQLException { + dropUniqueConstraint(tableName, constraintName); + addUniqueConstraint(tableName, constraintName, columnNames); + } + + @Override public void addPKConstraint(String tableName, String constraintName, boolean ignoreErrors, String... columnName) throws SQLException { if (!tableHasPrimaryKey(tableName, null) && tableHasColumn(tableName, columnName)) { String query = dbmsHelper.getAddPrimaryKeyConstraintStatement(tableName, constraintName, columnName);
