Repository: sentry Updated Branches: refs/heads/master 212eb0ccd -> 097948e32
SENTRY-2259: SQL CONSTRAINT name is too long for Oracle 11.2 (Na Li, reviewed by Sergio Pena) Project: http://git-wip-us.apache.org/repos/asf/sentry/repo Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/097948e3 Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/097948e3 Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/097948e3 Branch: refs/heads/master Commit: 097948e320f71912f195bbbeb834fddb8fc9c85c Parents: 212eb0c Author: lina.li <[email protected]> Authored: Thu Jun 7 16:38:41 2018 -0500 Committer: lina.li <[email protected]> Committed: Thu Jun 7 16:39:19 2018 -0500 ---------------------------------------------------------------------- .../src/main/resources/011-SENTRY-2154.derby.sql | 4 ++-- .../src/main/resources/011-SENTRY-2154.mysql.sql | 4 ++-- .../src/main/resources/011-SENTRY-2154.oracle.sql | 6 +++--- .../src/main/resources/011-SENTRY-2154.postgres.sql | 4 ++-- .../sentry-provider-db/src/main/resources/sentry-db2-2.1.0.sql | 6 +++--- .../src/main/resources/sentry-derby-2.1.0.sql | 4 ++-- .../src/main/resources/sentry-mysql-2.1.0.sql | 4 ++-- .../src/main/resources/sentry-oracle-2.1.0.sql | 6 +++--- .../src/main/resources/sentry-postgres-2.1.0.sql | 2 +- .../src/main/resources/sentry-upgrade-db2-2.0.0-to-2.1.0.sql | 6 +++--- 10 files changed, 23 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sentry/blob/097948e3/sentry-provider/sentry-provider-db/src/main/resources/011-SENTRY-2154.derby.sql ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/resources/011-SENTRY-2154.derby.sql b/sentry-provider/sentry-provider-db/src/main/resources/011-SENTRY-2154.derby.sql index e042ec4..e6b0c0e 100644 --- a/sentry-provider/sentry-provider-db/src/main/resources/011-SENTRY-2154.derby.sql +++ b/sentry-provider/sentry-provider-db/src/main/resources/011-SENTRY-2154.derby.sql @@ -6,14 +6,14 @@ CREATE TABLE SENTRY_USER_DB_PRIVILEGE_MAP ( ); ALTER TABLE SENTRY_USER_DB_PRIVILEGE_MAP - ADD CONSTRAINT SENTRY_USER_DB_PRIVILEGE_MAP_PK PRIMARY KEY (USER_ID,DB_PRIVILEGE_ID); + ADD CONSTRAINT SENTRY_USR_DB_PRV_MAP_PK PRIMARY KEY (USER_ID,DB_PRIVILEGE_ID); ALTER TABLE SENTRY_USER_DB_PRIVILEGE_MAP ADD CONSTRAINT SEN_USR_DB_PRV_MAP_SN_USR_FK FOREIGN KEY (USER_ID) REFERENCES SENTRY_USER(USER_ID); ALTER TABLE SENTRY_USER_DB_PRIVILEGE_MAP - ADD CONSTRAINT SEN_USR_DB_PRV_MAP_SN_DB_PRV_FK + ADD CONSTRAINT SEN_USR_DB_PRV_MAP_DB_PRV_FK FOREIGN KEY (DB_PRIVILEGE_ID) REFERENCES SENTRY_DB_PRIVILEGE(DB_PRIVILEGE_ID); CREATE INDEX SEN_USR_DB_PRV_MAP_USR_FK_IDX ON SENTRY_USER_DB_PRIVILEGE_MAP (USER_ID); http://git-wip-us.apache.org/repos/asf/sentry/blob/097948e3/sentry-provider/sentry-provider-db/src/main/resources/011-SENTRY-2154.mysql.sql ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/resources/011-SENTRY-2154.mysql.sql b/sentry-provider/sentry-provider-db/src/main/resources/011-SENTRY-2154.mysql.sql index db12019..4a56101 100644 --- a/sentry-provider/sentry-provider-db/src/main/resources/011-SENTRY-2154.mysql.sql +++ b/sentry-provider/sentry-provider-db/src/main/resources/011-SENTRY-2154.mysql.sql @@ -6,14 +6,14 @@ CREATE TABLE `SENTRY_USER_DB_PRIVILEGE_MAP` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; ALTER TABLE `SENTRY_USER_DB_PRIVILEGE_MAP` - ADD CONSTRAINT `SENTRY_USER_DB_PRIVILEGE_MAP_PK` PRIMARY KEY (`USER_ID`,`DB_PRIVILEGE_ID`); + ADD CONSTRAINT `SENTRY_USR_DB_PRV_MAP_PK` PRIMARY KEY (`USER_ID`,`DB_PRIVILEGE_ID`); ALTER TABLE `SENTRY_USER_DB_PRIVILEGE_MAP` ADD CONSTRAINT `SEN_USR_DB_PRV_MAP_SN_USR_FK` FOREIGN KEY (`USER_ID`) REFERENCES `SENTRY_USER`(`USER_ID`); ALTER TABLE `SENTRY_USER_DB_PRIVILEGE_MAP` - ADD CONSTRAINT `SEN_USR_DB_PRV_MAP_SN_DB_PRV_FK` + ADD CONSTRAINT `SEN_USR_DB_PRV_MAP_DB_PRV_FK` FOREIGN KEY (`DB_PRIVILEGE_ID`) REFERENCES `SENTRY_DB_PRIVILEGE`(`DB_PRIVILEGE_ID`); CREATE INDEX `SEN_USR_DB_PRV_MAP_USR_FK_IDX` ON `SENTRY_USER_DB_PRIVILEGE_MAP` (`USER_ID`); http://git-wip-us.apache.org/repos/asf/sentry/blob/097948e3/sentry-provider/sentry-provider-db/src/main/resources/011-SENTRY-2154.oracle.sql ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/resources/011-SENTRY-2154.oracle.sql b/sentry-provider/sentry-provider-db/src/main/resources/011-SENTRY-2154.oracle.sql index 9852ac5..0b8f1fb 100644 --- a/sentry-provider/sentry-provider-db/src/main/resources/011-SENTRY-2154.oracle.sql +++ b/sentry-provider/sentry-provider-db/src/main/resources/011-SENTRY-2154.oracle.sql @@ -5,14 +5,14 @@ CREATE TABLE "SENTRY_USER_DB_PRIVILEGE_MAP" ( ); ALTER TABLE "SENTRY_USER_DB_PRIVILEGE_MAP" - ADD CONSTRAINT "SEN_USER_PRIV_MAP_PK" PRIMARY KEY ("USER_ID","DB_PRIVILEGE_ID"); + ADD CONSTRAINT "SENTRY_USR_DB_PRV_MAP_PK" PRIMARY KEY ("USER_ID","DB_PRIVILEGE_ID"); ALTER TABLE "SENTRY_USER_DB_PRIVILEGE_MAP" - ADD CONSTRAINT "SEN_USER_DB_PRV_MAP_SN_USER_FK" + ADD CONSTRAINT "SEN_USR_DB_PRV_MAP_SN_USR_FK" FOREIGN KEY ("USER_ID") REFERENCES "SENTRY_USER"("USER_ID") INITIALLY DEFERRED; ALTER TABLE "SENTRY_USER_DB_PRIVILEGE_MAP" - ADD CONSTRAINT "SEN_USER_DB_PRV_MAP_SN_DB_PRV_FK" + ADD CONSTRAINT "SEN_USR_DB_PRV_MAP_DB_PRV_FK" FOREIGN KEY ("DB_PRIVILEGE_ID") REFERENCES "SENTRY_DB_PRIVILEGE"("DB_PRIVILEGE_ID") INITIALLY DEFERRED; CREATE INDEX "SEN_USR_DB_PRV_MAP_USR_FK_IDX" ON "SENTRY_USER_DB_PRIVILEGE_MAP" ("USER_ID"); http://git-wip-us.apache.org/repos/asf/sentry/blob/097948e3/sentry-provider/sentry-provider-db/src/main/resources/011-SENTRY-2154.postgres.sql ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/resources/011-SENTRY-2154.postgres.sql b/sentry-provider/sentry-provider-db/src/main/resources/011-SENTRY-2154.postgres.sql index a57e4f2..1d9cdcc 100644 --- a/sentry-provider/sentry-provider-db/src/main/resources/011-SENTRY-2154.postgres.sql +++ b/sentry-provider/sentry-provider-db/src/main/resources/011-SENTRY-2154.postgres.sql @@ -6,14 +6,14 @@ CREATE TABLE "SENTRY_USER_DB_PRIVILEGE_MAP" ( ); ALTER TABLE "SENTRY_USER_DB_PRIVILEGE_MAP" - ADD CONSTRAINT "SENTRY_USER_DB_PRIVILEGE_MAP_PK" PRIMARY KEY ("USER_ID","DB_PRIVILEGE_ID"); + ADD CONSTRAINT "SENTRY_USR_DB_PRV_MAP_PK" PRIMARY KEY ("USER_ID","DB_PRIVILEGE_ID"); ALTER TABLE ONLY "SENTRY_USER_DB_PRIVILEGE_MAP" ADD CONSTRAINT "SN_USR_DB_PRV_MAP_SN_USER_FK" FOREIGN KEY ("USER_ID") REFERENCES "SENTRY_USER"("USER_ID") DEFERRABLE; ALTER TABLE ONLY "SENTRY_USER_DB_PRIVILEGE_MAP" - ADD CONSTRAINT "SN_USR_DB_PRV_MAP_SN_DB_PRV_FK" + ADD CONSTRAINT "SEN_USR_DB_PRV_MAP_DB_PRV_FK" FOREIGN KEY ("DB_PRIVILEGE_ID") REFERENCES "SENTRY_DB_PRIVILEGE"("DB_PRIVILEGE_ID") DEFERRABLE; CREATE INDEX "SEN_USR_DB_PRV_MAP_USR_FK_IDX" ON "SENTRY_USER_DB_PRIVILEGE_MAP" ("USER_ID"); http://git-wip-us.apache.org/repos/asf/sentry/blob/097948e3/sentry-provider/sentry-provider-db/src/main/resources/sentry-db2-2.1.0.sql ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/resources/sentry-db2-2.1.0.sql b/sentry-provider/sentry-provider-db/src/main/resources/sentry-db2-2.1.0.sql index f2a109e..9a05575 100644 --- a/sentry-provider/sentry-provider-db/src/main/resources/sentry-db2-2.1.0.sql +++ b/sentry-provider/sentry-provider-db/src/main/resources/sentry-db2-2.1.0.sql @@ -262,12 +262,12 @@ CREATE TABLE SENTRY_USER_DB_PRIVILEGE_MAP ); -- Constraints for table SENTRY_USER_DB_PRIVILEGE_MAP -ALTER TABLE SENTRY_USER_DB_PRIVILEGE_MAP ADD CONSTRAINT SENTRY_USER_DB_PRIVILEGE_MAP_PK PRIMARY KEY (USER_ID,DB_PRIVILEGE_ID); +ALTER TABLE SENTRY_USER_DB_PRIVILEGE_MAP ADD CONSTRAINT SENTRY_USR_DB_PRV_MAP_PK PRIMARY KEY (USER_ID,DB_PRIVILEGE_ID); CREATE INDEX SENTRY_USER_DB_PRIVILEGE_MAP_N50 ON SENTRY_USER_DB_PRIVILEGE_MAP (USER_ID); CREATE INDEX SENTRY_USER_DB_PRIVILEGE_MAP_N49 ON SENTRY_USER_DB_PRIVILEGE_MAP (DB_PRIVILEGE_ID); -ALTER TABLE SENTRY_USER_DB_PRIVILEGE_MAP ADD CONSTRAINT SENTRY_USER_DB_PRIVILEGE_MAP_FK2 FOREIGN KEY (DB_PRIVILEGE_ID) REFERENCES SENTRY_DB_PRIVILEGE (DB_PRIVILEGE_ID) ; +ALTER TABLE SENTRY_USER_DB_PRIVILEGE_MAP ADD CONSTRAINT SEN_USR_DB_PRV_MAP_DB_PRV_FK FOREIGN KEY (DB_PRIVILEGE_ID) REFERENCES SENTRY_DB_PRIVILEGE (DB_PRIVILEGE_ID) ; -ALTER TABLE SENTRY_USER_DB_PRIVILEGE_MAP ADD CONSTRAINT SENTRY_USER_DB_PRIVILEGE_MAP_FK1 FOREIGN KEY (USER_ID) REFERENCES SENTRY_USER (USER_ID) ; \ No newline at end of file +ALTER TABLE SENTRY_USER_DB_PRIVILEGE_MAP ADD CONSTRAINT SEN_USR_DB_PRV_MAP_SN_USR_FK FOREIGN KEY (USER_ID) REFERENCES SENTRY_USER (USER_ID) ; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/sentry/blob/097948e3/sentry-provider/sentry-provider-db/src/main/resources/sentry-derby-2.1.0.sql ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/resources/sentry-derby-2.1.0.sql b/sentry-provider/sentry-provider-db/src/main/resources/sentry-derby-2.1.0.sql index b23e782..3e1944d 100644 --- a/sentry-provider/sentry-provider-db/src/main/resources/sentry-derby-2.1.0.sql +++ b/sentry-provider/sentry-provider-db/src/main/resources/sentry-derby-2.1.0.sql @@ -261,14 +261,14 @@ CREATE TABLE SENTRY_USER_DB_PRIVILEGE_MAP ( ); ALTER TABLE SENTRY_USER_DB_PRIVILEGE_MAP - ADD CONSTRAINT SENTRY_USER_DB_PRIVILEGE_MAP_PK PRIMARY KEY (USER_ID,DB_PRIVILEGE_ID); + ADD CONSTRAINT SENTRY_USR_DB_PRV_MAP_PK PRIMARY KEY (USER_ID,DB_PRIVILEGE_ID); ALTER TABLE SENTRY_USER_DB_PRIVILEGE_MAP ADD CONSTRAINT SEN_USR_DB_PRV_MAP_SN_USR_FK FOREIGN KEY (USER_ID) REFERENCES SENTRY_USER(USER_ID); ALTER TABLE SENTRY_USER_DB_PRIVILEGE_MAP - ADD CONSTRAINT SEN_USR_DB_PRV_MAP_SN_DB_PRV_FK + ADD CONSTRAINT SEN_USR_DB_PRV_MAP_DB_PRV_FK FOREIGN KEY (DB_PRIVILEGE_ID) REFERENCES SENTRY_DB_PRIVILEGE(DB_PRIVILEGE_ID); CREATE INDEX SEN_USR_DB_PRV_MAP_USR_FK_IDX ON SENTRY_USER_DB_PRIVILEGE_MAP (USER_ID); http://git-wip-us.apache.org/repos/asf/sentry/blob/097948e3/sentry-provider/sentry-provider-db/src/main/resources/sentry-mysql-2.1.0.sql ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/resources/sentry-mysql-2.1.0.sql b/sentry-provider/sentry-provider-db/src/main/resources/sentry-mysql-2.1.0.sql index 2630e01..787dcae 100644 --- a/sentry-provider/sentry-provider-db/src/main/resources/sentry-mysql-2.1.0.sql +++ b/sentry-provider/sentry-provider-db/src/main/resources/sentry-mysql-2.1.0.sql @@ -296,14 +296,14 @@ CREATE TABLE `SENTRY_USER_DB_PRIVILEGE_MAP` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; ALTER TABLE `SENTRY_USER_DB_PRIVILEGE_MAP` - ADD CONSTRAINT `SENTRY_USER_DB_PRIVILEGE_MAP_PK` PRIMARY KEY (`USER_ID`,`DB_PRIVILEGE_ID`); + ADD CONSTRAINT `SENTRY_USR_DB_PRV_MAP_PK` PRIMARY KEY (`USER_ID`,`DB_PRIVILEGE_ID`); ALTER TABLE `SENTRY_USER_DB_PRIVILEGE_MAP` ADD CONSTRAINT `SEN_USR_DB_PRV_MAP_SN_USR_FK` FOREIGN KEY (`USER_ID`) REFERENCES `SENTRY_USER`(`USER_ID`); ALTER TABLE `SENTRY_USER_DB_PRIVILEGE_MAP` - ADD CONSTRAINT `SEN_USR_DB_PRV_MAP_SN_DB_PRV_FK` + ADD CONSTRAINT `SEN_USR_DB_PRV_MAP_DB_PRV_FK` FOREIGN KEY (`DB_PRIVILEGE_ID`) REFERENCES `SENTRY_DB_PRIVILEGE`(`DB_PRIVILEGE_ID`); CREATE INDEX `SEN_USR_DB_PRV_MAP_USR_FK_IDX` ON `SENTRY_USER_DB_PRIVILEGE_MAP` (`USER_ID`); http://git-wip-us.apache.org/repos/asf/sentry/blob/097948e3/sentry-provider/sentry-provider-db/src/main/resources/sentry-oracle-2.1.0.sql ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/resources/sentry-oracle-2.1.0.sql b/sentry-provider/sentry-provider-db/src/main/resources/sentry-oracle-2.1.0.sql index 847a359..98756a8 100644 --- a/sentry-provider/sentry-provider-db/src/main/resources/sentry-oracle-2.1.0.sql +++ b/sentry-provider/sentry-provider-db/src/main/resources/sentry-oracle-2.1.0.sql @@ -276,14 +276,14 @@ CREATE TABLE "SENTRY_USER_DB_PRIVILEGE_MAP" ( ); ALTER TABLE "SENTRY_USER_DB_PRIVILEGE_MAP" - ADD CONSTRAINT "SEN_USER_PRIV_MAP_PK" PRIMARY KEY ("USER_ID","DB_PRIVILEGE_ID"); + ADD CONSTRAINT "SENTRY_USR_DB_PRV_MAP_PK" PRIMARY KEY ("USER_ID","DB_PRIVILEGE_ID"); ALTER TABLE "SENTRY_USER_DB_PRIVILEGE_MAP" - ADD CONSTRAINT "SEN_USER_DB_PRV_MAP_SN_USER_FK" + ADD CONSTRAINT "SEN_USR_DB_PRV_MAP_SN_USR_FK" FOREIGN KEY ("USER_ID") REFERENCES "SENTRY_USER"("USER_ID") INITIALLY DEFERRED; ALTER TABLE "SENTRY_USER_DB_PRIVILEGE_MAP" - ADD CONSTRAINT "SEN_USER_DB_PRV_MAP_SN_DB_PRV_FK" + ADD CONSTRAINT "SEN_USR_DB_PRV_MAP_DB_PRV_FK" FOREIGN KEY ("DB_PRIVILEGE_ID") REFERENCES "SENTRY_DB_PRIVILEGE"("DB_PRIVILEGE_ID") INITIALLY DEFERRED; CREATE INDEX "SEN_USR_DB_PRV_MAP_USR_FK_IDX" ON "SENTRY_USER_DB_PRIVILEGE_MAP" ("USER_ID"); http://git-wip-us.apache.org/repos/asf/sentry/blob/097948e3/sentry-provider/sentry-provider-db/src/main/resources/sentry-postgres-2.1.0.sql ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/resources/sentry-postgres-2.1.0.sql b/sentry-provider/sentry-provider-db/src/main/resources/sentry-postgres-2.1.0.sql index 97a666a..82bda06 100644 --- a/sentry-provider/sentry-provider-db/src/main/resources/sentry-postgres-2.1.0.sql +++ b/sentry-provider/sentry-provider-db/src/main/resources/sentry-postgres-2.1.0.sql @@ -284,7 +284,7 @@ CREATE TABLE "SENTRY_USER_DB_PRIVILEGE_MAP" ( ); ALTER TABLE "SENTRY_USER_DB_PRIVILEGE_MAP" - ADD CONSTRAINT "SENTRY_USER_DB_PRIVILEGE_MAP_PK" PRIMARY KEY ("USER_ID","DB_PRIVILEGE_ID"); + ADD CONSTRAINT "SENTRY_USR_DB_PRV_MAP_PK" PRIMARY KEY ("USER_ID","DB_PRIVILEGE_ID"); ALTER TABLE ONLY "SENTRY_USER_DB_PRIVILEGE_MAP" ADD CONSTRAINT "SN_USR_DB_PRV_MAP_SN_USER_FK" http://git-wip-us.apache.org/repos/asf/sentry/blob/097948e3/sentry-provider/sentry-provider-db/src/main/resources/sentry-upgrade-db2-2.0.0-to-2.1.0.sql ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/resources/sentry-upgrade-db2-2.0.0-to-2.1.0.sql b/sentry-provider/sentry-provider-db/src/main/resources/sentry-upgrade-db2-2.0.0-to-2.1.0.sql index d6be0d6..492789e 100644 --- a/sentry-provider/sentry-provider-db/src/main/resources/sentry-upgrade-db2-2.0.0-to-2.1.0.sql +++ b/sentry-provider/sentry-provider-db/src/main/resources/sentry-upgrade-db2-2.0.0-to-2.1.0.sql @@ -10,15 +10,15 @@ CREATE TABLE SENTRY_USER_DB_PRIVILEGE_MAP ); -- Constraints for table SENTRY_USER_DB_PRIVILEGE_MAP -ALTER TABLE SENTRY_USER_DB_PRIVILEGE_MAP ADD CONSTRAINT SENTRY_USER_DB_PRIVILEGE_MAP_PK PRIMARY KEY (USER_ID,DB_PRIVILEGE_ID); +ALTER TABLE SENTRY_USER_DB_PRIVILEGE_MAP ADD CONSTRAINT SENTRY_USR_DB_PRV_MAP_PK PRIMARY KEY (USER_ID,DB_PRIVILEGE_ID); CREATE INDEX SENTRY_USER_DB_PRIVILEGE_MAP_N50 ON SENTRY_USER_DB_PRIVILEGE_MAP (USER_ID); CREATE INDEX SENTRY_USER_DB_PRIVILEGE_MAP_N49 ON SENTRY_USER_DB_PRIVILEGE_MAP (DB_PRIVILEGE_ID); -ALTER TABLE SENTRY_USER_DB_PRIVILEGE_MAP ADD CONSTRAINT SENTRY_USER_DB_PRIVILEGE_MAP_FK2 FOREIGN KEY (DB_PRIVILEGE_ID) REFERENCES SENTRY_DB_PRIVILEGE (DB_PRIVILEGE_ID) ; +ALTER TABLE SENTRY_USER_DB_PRIVILEGE_MAP ADD CONSTRAINT SEN_USR_DB_PRV_MAP_DB_PRV_FK FOREIGN KEY (DB_PRIVILEGE_ID) REFERENCES SENTRY_DB_PRIVILEGE (DB_PRIVILEGE_ID) ; -ALTER TABLE SENTRY_USER_DB_PRIVILEGE_MAP ADD CONSTRAINT SENTRY_USER_DB_PRIVILEGE_MAP_FK1 FOREIGN KEY (USER_ID) REFERENCES SENTRY_USER (USER_ID) ; +ALTER TABLE SENTRY_USER_DB_PRIVILEGE_MAP ADD CONSTRAINT SEN_USR_DB_PRV_MAP_SN_USR_FK FOREIGN KEY (USER_ID) REFERENCES SENTRY_USER (USER_ID) ; -- Version update UPDATE SENTRY_VERSION SET SCHEMA_VERSION='2.1.0', VERSION_COMMENT='Sentry release version 2.1.0' WHERE VER_ID=1;
