Repository: incubator-sentry Updated Branches: refs/heads/master 5a352bf72 -> 219f6bc9d
SENTRY-1066: fix Sentry oracle upgrade script failed with ORA-0955 duplicate name issue by drop implicit index explicitly. (Anne Yu, reviewed by Lenni Kuff and Colin Ma) Project: http://git-wip-us.apache.org/repos/asf/incubator-sentry/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-sentry/commit/219f6bc9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-sentry/tree/219f6bc9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-sentry/diff/219f6bc9 Branch: refs/heads/master Commit: 219f6bc9d2c9b240b21c72fef456a2bb357d8229 Parents: 5a352bf Author: Anne Yu <[email protected]> Authored: Wed Feb 17 13:10:51 2016 -0800 Committer: Anne Yu <[email protected]> Committed: Wed Feb 17 13:10:51 2016 -0800 ---------------------------------------------------------------------- .../src/main/resources/002-SENTRY-339.oracle.sql | 2 +- .../sentry-provider-db/src/main/resources/004-SENTRY-74.oracle.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/219f6bc9/sentry-provider/sentry-provider-db/src/main/resources/002-SENTRY-339.oracle.sql ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/resources/002-SENTRY-339.oracle.sql b/sentry-provider/sentry-provider-db/src/main/resources/002-SENTRY-339.oracle.sql index b5c78d6..f5f596d 100644 --- a/sentry-provider/sentry-provider-db/src/main/resources/002-SENTRY-339.oracle.sql +++ b/sentry-provider/sentry-provider-db/src/main/resources/002-SENTRY-339.oracle.sql @@ -1,5 +1,5 @@ -- SENTRY-339 -ALTER TABLE SENTRY_DB_PRIVILEGE DROP CONSTRAINT "SENTRY_DB_PRIV_PRIV_NAME_UNIQ"; +ALTER TABLE SENTRY_DB_PRIVILEGE DROP CONSTRAINT "SENTRY_DB_PRIV_PRIV_NAME_UNIQ" DROP INDEX; ALTER TABLE SENTRY_DB_PRIVILEGE ADD CONSTRAINT "SENTRY_DB_PRIV_PRIV_NAME_UNIQ" UNIQUE ("SERVER_NAME","DB_NAME","TABLE_NAME","URI","ACTION","WITH_GRANT_OPTION"); ALTER TABLE SENTRY_DB_PRIVILEGE DROP COLUMN PRIVILEGE_NAME; http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/219f6bc9/sentry-provider/sentry-provider-db/src/main/resources/004-SENTRY-74.oracle.sql ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/resources/004-SENTRY-74.oracle.sql b/sentry-provider/sentry-provider-db/src/main/resources/004-SENTRY-74.oracle.sql index dafe697..a70ae0a 100644 --- a/sentry-provider/sentry-provider-db/src/main/resources/004-SENTRY-74.oracle.sql +++ b/sentry-provider/sentry-provider-db/src/main/resources/004-SENTRY-74.oracle.sql @@ -1,4 +1,4 @@ -- SENTRY-74 ALTER TABLE SENTRY_DB_PRIVILEGE ADD COLUMN_NAME VARCHAR2(128) DEFAULT '__NULL__'; -ALTER TABLE SENTRY_DB_PRIVILEGE DROP CONSTRAINT "SENTRY_DB_PRIV_PRIV_NAME_UNIQ"; +ALTER TABLE SENTRY_DB_PRIVILEGE DROP CONSTRAINT "SENTRY_DB_PRIV_PRIV_NAME_UNIQ" DROP INDEX; ALTER TABLE SENTRY_DB_PRIVILEGE ADD CONSTRAINT "SENTRY_DB_PRIV_PRIV_NAME_UNIQ" UNIQUE ("SERVER_NAME","DB_NAME","TABLE_NAME","COLUMN_NAME","URI","ACTION","WITH_GRANT_OPTION");
