Repository: incubator-sentry Updated Branches: refs/heads/master 953185014 -> 7c71b0c88
SENTRY-209: Empty list returned when calling listPrivilegesByRoleName (Arun Suresh via Prasad Mujumdar) Project: http://git-wip-us.apache.org/repos/asf/incubator-sentry/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-sentry/commit/7c71b0c8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-sentry/tree/7c71b0c8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-sentry/diff/7c71b0c8 Branch: refs/heads/master Commit: 7c71b0c88cb5ed9d4f6acf7337104245a51a58c2 Parents: 9531850 Author: Prasad Mujumdar <[email protected]> Authored: Mon May 19 05:46:50 2014 -0700 Committer: Prasad Mujumdar <[email protected]> Committed: Mon May 19 05:46:50 2014 -0700 ---------------------------------------------------------------------- .../src/main/resources/sentry-mysql-1.4.0.sql | 14 ++++++-------- .../src/main/resources/sentry-oracle-1.4.0.sql | 14 ++++++-------- .../src/main/resources/sentry-postgres-1.4.0.sql | 14 ++++++-------- 3 files changed, 18 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/7c71b0c8/sentry-provider/sentry-provider-db/src/main/resources/sentry-mysql-1.4.0.sql ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/resources/sentry-mysql-1.4.0.sql b/sentry-provider/sentry-provider-db/src/main/resources/sentry-mysql-1.4.0.sql index 68354da..3765520 100644 --- a/sentry-provider/sentry-provider-db/src/main/resources/sentry-mysql-1.4.0.sql +++ b/sentry-provider/sentry-provider-db/src/main/resources/sentry-mysql-1.4.0.sql @@ -53,13 +53,11 @@ CREATE TABLE `SENTRY_GROUP` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `SENTRY_ROLE_DB_PRIVILEGE_MAP` ( - `ROLE_PRIVILEGE_MAP_ID` BIGINT NOT NULL, `ROLE_ID` BIGINT NOT NULL, `DB_PRIVILEGE_ID` BIGINT NOT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `SENTRY_ROLE_GROUP_MAP` ( - `ROLE_GROUP_MAP_ID` BIGINT NOT NULL, `ROLE_ID` BIGINT NOT NULL, `GROUP_ID` BIGINT NOT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -79,12 +77,6 @@ ALTER TABLE `SENTRY_ROLE` ALTER TABLE `SENTRY_GROUP` ADD CONSTRAINT `SENTRY_GROUP_PK` PRIMARY KEY (`GROUP_ID`); -ALTER TABLE `SENTRY_ROLE_DB_PRIVILEGE_MAP` - ADD CONSTRAINT `SENTRY_ROLE_DB_PRIV_MAP_PK` PRIMARY KEY (`ROLE_PRIVILEGE_MAP_ID`); - -ALTER TABLE `SENTRY_ROLE_GROUP_MAP` - ADD CONSTRAINT `SENTRY_ROLE_GROUP_MAP_PK` PRIMARY KEY (`ROLE_GROUP_MAP_ID`); - ALTER TABLE `SENTRY_VERSION` ADD CONSTRAINT `SENTRY_VERSION` PRIMARY KEY (`VER_ID`); @@ -98,6 +90,12 @@ ALTER TABLE `SENTRY_GROUP` ADD CONSTRAINT `SENTRY_GRP_GRP_NAME_UNIQUE` UNIQUE (`GROUP_NAME`); ALTER TABLE `SENTRY_ROLE_DB_PRIVILEGE_MAP` + ADD CONSTRAINT `SENTRY_ROLE_DB_PRIVILEGE_MAP_PK` PRIMARY KEY (`ROLE_ID`,`DB_PRIVILEGE_ID`); + +ALTER TABLE `SENTRY_ROLE_GROUP_MAP` + ADD CONSTRAINT `SENTRY_ROLE_GROUP_MAP_PK` PRIMARY KEY (`ROLE_ID`,`GROUP_ID`); + +ALTER TABLE `SENTRY_ROLE_DB_PRIVILEGE_MAP` ADD CONSTRAINT `SEN_RLE_DB_PRV_MAP_SN_RLE_FK` FOREIGN KEY (`ROLE_ID`) REFERENCES `SENTRY_ROLE`(`ROLE_ID`); http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/7c71b0c8/sentry-provider/sentry-provider-db/src/main/resources/sentry-oracle-1.4.0.sql ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/resources/sentry-oracle-1.4.0.sql b/sentry-provider/sentry-provider-db/src/main/resources/sentry-oracle-1.4.0.sql index 688b66d..2f7a63e 100644 --- a/sentry-provider/sentry-provider-db/src/main/resources/sentry-oracle-1.4.0.sql +++ b/sentry-provider/sentry-provider-db/src/main/resources/sentry-oracle-1.4.0.sql @@ -41,13 +41,11 @@ CREATE TABLE "SENTRY_GROUP" ( ); CREATE TABLE "SENTRY_ROLE_DB_PRIVILEGE_MAP" ( - "ROLE_PRIVILEGE_MAP_ID" NUMBER NOT NULL, "ROLE_ID" NUMBER NOT NULL, "DB_PRIVILEGE_ID" NUMBER NOT NULL ); CREATE TABLE "SENTRY_ROLE_GROUP_MAP" ( - "ROLE_GROUP_MAP_ID" NUMBER NOT NULL, "ROLE_ID" NUMBER NOT NULL, "GROUP_ID" NUMBER NOT NULL ); @@ -67,12 +65,6 @@ ALTER TABLE "SENTRY_ROLE" ALTER TABLE "SENTRY_GROUP" ADD CONSTRAINT "SENTRY_GROUP_PK" PRIMARY KEY ("GROUP_ID"); -ALTER TABLE "SENTRY_ROLE_DB_PRIVILEGE_MAP" - ADD CONSTRAINT "SENTRY_ROLE_DB_PRIV_MAP_PK" PRIMARY KEY ("ROLE_PRIVILEGE_MAP_ID"); - -ALTER TABLE "SENTRY_ROLE_GROUP_MAP" - ADD CONSTRAINT "SENTRY_ROLE_GROUP_MAP_PK" PRIMARY KEY ("ROLE_GROUP_MAP_ID"); - ALTER TABLE "SENTRY_VERSION" ADD CONSTRAINT "SENTRY_VERSION_PK" PRIMARY KEY ("VER_ID"); ALTER TABLE "SENTRY_DB_PRIVILEGE" @@ -83,6 +75,12 @@ ALTER TABLE "SENTRY_ROLE" ALTER TABLE "SENTRY_GROUP" ADD CONSTRAINT "SENTRY_GRP_GRP_NAME_UNIQUE" UNIQUE ("GROUP_NAME"); + +ALTER TABLE "SENTRY_ROLE_DB_PRIVILEGE_MAP" + ADD CONSTRAINT "SENTRY_ROLE_DB_PRIVILEGE_MAP_PK" PRIMARY KEY ("ROLE_ID","DB_PRIVILEGE_ID"); + +ALTER TABLE "SENTRY_ROLE_GROUP_MAP" + ADD CONSTRAINT "SENTRY_ROLE_GROUP_MAP_PK" PRIMARY KEY ("ROLE_ID","GROUP_ID"); ALTER TABLE "SENTRY_ROLE_DB_PRIVILEGE_MAP" ADD CONSTRAINT "SEN_RLE_DB_PRV_MAP_SN_RLE_FK" http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/7c71b0c8/sentry-provider/sentry-provider-db/src/main/resources/sentry-postgres-1.4.0.sql ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/resources/sentry-postgres-1.4.0.sql b/sentry-provider/sentry-provider-db/src/main/resources/sentry-postgres-1.4.0.sql index 14b9bb6..1b3175d 100644 --- a/sentry-provider/sentry-provider-db/src/main/resources/sentry-postgres-1.4.0.sql +++ b/sentry-provider/sentry-provider-db/src/main/resources/sentry-postgres-1.4.0.sql @@ -53,13 +53,11 @@ CREATE TABLE "SENTRY_GROUP" ( ); CREATE TABLE "SENTRY_ROLE_DB_PRIVILEGE_MAP" ( - "ROLE_PRIVILEGE_MAP_ID" BIGINT NOT NULL, "ROLE_ID" BIGINT NOT NULL, "DB_PRIVILEGE_ID" BIGINT NOT NULL ); CREATE TABLE "SENTRY_ROLE_GROUP_MAP" ( - "ROLE_GROUP_MAP_ID" BIGINT NOT NULL, "ROLE_ID" BIGINT NOT NULL, "GROUP_ID" BIGINT NOT NULL ); @@ -80,12 +78,6 @@ ALTER TABLE ONLY "SENTRY_ROLE" ALTER TABLE ONLY "SENTRY_GROUP" ADD CONSTRAINT "SENTRY_GROUP_PK" PRIMARY KEY ("GROUP_ID"); -ALTER TABLE ONLY "SENTRY_ROLE_DB_PRIVILEGE_MAP" - ADD CONSTRAINT "SENTRY_ROLE_DB_PRIV_MAP_PK" PRIMARY KEY ("ROLE_PRIVILEGE_MAP_ID"); - -ALTER TABLE ONLY "SENTRY_ROLE_GROUP_MAP" - ADD CONSTRAINT "SENTRY_ROLE_GROUP_MAP_PK" PRIMARY KEY ("ROLE_GROUP_MAP_ID"); - ALTER TABLE ONLY "SENTRY_VERSION" ADD CONSTRAINT "SENTRY_VERSION_PK" PRIMARY KEY ("VER_ID"); ALTER TABLE ONLY "SENTRY_DB_PRIVILEGE" @@ -97,6 +89,12 @@ ALTER TABLE ONLY "SENTRY_ROLE" ALTER TABLE ONLY "SENTRY_GROUP" ADD CONSTRAINT "SENTRY_GRP_GRP_NAME_UNIQUE" UNIQUE ("GROUP_NAME"); +ALTER TABLE "SENTRY_ROLE_DB_PRIVILEGE_MAP" + ADD CONSTRAINT "SENTRY_ROLE_DB_PRIVILEGE_MAP_PK" PRIMARY KEY ("ROLE_ID","DB_PRIVILEGE_ID"); + +ALTER TABLE "SENTRY_ROLE_GROUP_MAP" + ADD CONSTRAINT "SENTRY_ROLE_GROUP_MAP_PK" PRIMARY KEY ("ROLE_ID","GROUP_ID"); + ALTER TABLE ONLY "SENTRY_ROLE_DB_PRIVILEGE_MAP" ADD CONSTRAINT "SEN_RLE_DB_PRV_MAP_SN_RLE_FK" FOREIGN KEY ("ROLE_ID") REFERENCES "SENTRY_ROLE"("ROLE_ID") DEFERRABLE;
