SENTRY-788: Fix mysql and postgres scripts of generalized model (Sravya Tirukkovalur, Reviewed by: Lenni Kuff)
Project: http://git-wip-us.apache.org/repos/asf/incubator-sentry/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-sentry/commit/ce60020b Tree: http://git-wip-us.apache.org/repos/asf/incubator-sentry/tree/ce60020b Diff: http://git-wip-us.apache.org/repos/asf/incubator-sentry/diff/ce60020b Branch: refs/heads/hive_plugin_v2 Commit: ce60020b9b8ebdc933c6158502e39651703ec888 Parents: 17fcc4d Author: Sravya Tirukkovalur <[email protected]> Authored: Thu Jul 2 15:18:34 2015 -0700 Committer: Sravya Tirukkovalur <[email protected]> Committed: Thu Jul 2 15:18:34 2015 -0700 ---------------------------------------------------------------------- .../src/main/resources/005-SENTRY-398.mysql.sql | 3 ++- .../src/main/resources/005-SENTRY-398.postgres.sql | 2 +- .../sentry-provider-db/src/main/resources/sentry-mysql-1.6.0.sql | 3 ++- .../src/main/resources/sentry-postgres-1.6.0.sql | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/ce60020b/sentry-provider/sentry-provider-db/src/main/resources/005-SENTRY-398.mysql.sql ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/resources/005-SENTRY-398.mysql.sql b/sentry-provider/sentry-provider-db/src/main/resources/005-SENTRY-398.mysql.sql index cf715a0..920737f 100644 --- a/sentry-provider/sentry-provider-db/src/main/resources/005-SENTRY-398.mysql.sql +++ b/sentry-provider/sentry-provider-db/src/main/resources/005-SENTRY-398.mysql.sql @@ -21,7 +21,8 @@ CREATE TABLE `SENTRY_GM_PRIVILEGE` ALTER TABLE `SENTRY_GM_PRIVILEGE` ADD CONSTRAINT `SENTRY_GM_PRIVILEGE_PK` PRIMARY KEY (`GM_PRIVILEGE_ID`); -- Constraints for table SENTRY_GM_PRIVILEGE for class(es) [org.apache.sentry.provider.db.service.model.MSentryGMPrivilege] -CREATE UNIQUE INDEX `GM_PRIVILEGE_INDEX` ON `SENTRY_GM_PRIVILEGE` (`COMPONENT_NAME`,`SERVICE_NAME`,`RESOURCE_NAME_0`,`RESOURCE_TYPE_0`,`RESOURCE_NAME_1`,`RESOURCE_TYPE_1`,`RESOURCE_NAME_2`,`RESOURCE_TYPE_2`,`RESOURCE_NAME_3`,`RESOURCE_TYPE_3`,`ACTION`,`WITH_GRANT_OPTION`); +ALTER TABLE `SENTRY_GM_PRIVILEGE` + ADD UNIQUE `GM_PRIVILEGE_UNIQUE` (`COMPONENT_NAME`,`SERVICE_NAME`,`RESOURCE_NAME_0`,`RESOURCE_TYPE_0`,`RESOURCE_NAME_1`,`RESOURCE_TYPE_1`,`RESOURCE_NAME_2`,`RESOURCE_TYPE_2`,`RESOURCE_NAME_3`,`RESOURCE_TYPE_3`,`ACTION`,`WITH_GRANT_OPTION`); ALTER TABLE `SENTRY_GM_PRIVILEGE` ADD INDEX `SENTRY_GM_PRIV_COMP_IDX` (`COMPONENT_NAME`); http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/ce60020b/sentry-provider/sentry-provider-db/src/main/resources/005-SENTRY-398.postgres.sql ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/resources/005-SENTRY-398.postgres.sql b/sentry-provider/sentry-provider-db/src/main/resources/005-SENTRY-398.postgres.sql index 000f662..e9e1655 100644 --- a/sentry-provider/sentry-provider-db/src/main/resources/005-SENTRY-398.postgres.sql +++ b/sentry-provider/sentry-provider-db/src/main/resources/005-SENTRY-398.postgres.sql @@ -13,7 +13,7 @@ CREATE TABLE "SENTRY_GM_PRIVILEGE" ( "RESOURCE_TYPE_2" character varying(64) DEFAULT '__NULL__', "RESOURCE_TYPE_3" character varying(64) DEFAULT '__NULL__', "ACTION" character varying(32) NOT NULL, - "scope" character varying(128) NOT NULL, + "SCOPE" character varying(128) NOT NULL, "SERVICE_NAME" character varying(64) NOT NULL ); ALTER TABLE ONLY "SENTRY_GM_PRIVILEGE" http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/ce60020b/sentry-provider/sentry-provider-db/src/main/resources/sentry-mysql-1.6.0.sql ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/resources/sentry-mysql-1.6.0.sql b/sentry-provider/sentry-provider-db/src/main/resources/sentry-mysql-1.6.0.sql index 8136b7a..1c1bb94 100644 --- a/sentry-provider/sentry-provider-db/src/main/resources/sentry-mysql-1.6.0.sql +++ b/sentry-provider/sentry-provider-db/src/main/resources/sentry-mysql-1.6.0.sql @@ -152,7 +152,8 @@ CREATE TABLE `SENTRY_GM_PRIVILEGE` ALTER TABLE `SENTRY_GM_PRIVILEGE` ADD CONSTRAINT `SENTRY_GM_PRIVILEGE_PK` PRIMARY KEY (`GM_PRIVILEGE_ID`); -- Constraints for table SENTRY_GM_PRIVILEGE for class(es) [org.apache.sentry.provider.db.service.model.MSentryGMPrivilege] -CREATE UNIQUE INDEX `GM_PRIVILEGE_INDEX` ON `SENTRY_GM_PRIVILEGE` (`COMPONENT_NAME`,`SERVICE_NAME`,`RESOURCE_NAME_0`,`RESOURCE_TYPE_0`,`RESOURCE_NAME_1`,`RESOURCE_TYPE_1`,`RESOURCE_NAME_2`,`RESOURCE_TYPE_2`,`RESOURCE_NAME_3`,`RESOURCE_TYPE_3`,`ACTION`,`WITH_GRANT_OPTION`); +ALTER TABLE `SENTRY_GM_PRIVILEGE` + ADD UNIQUE `GM_PRIVILEGE_UNIQUE` (`COMPONENT_NAME`,`SERVICE_NAME`,`RESOURCE_NAME_0`,`RESOURCE_TYPE_0`,`RESOURCE_NAME_1`,`RESOURCE_TYPE_1`,`RESOURCE_NAME_2`,`RESOURCE_TYPE_2`,`RESOURCE_NAME_3`,`RESOURCE_TYPE_3`,`ACTION`,`WITH_GRANT_OPTION`); ALTER TABLE `SENTRY_GM_PRIVILEGE` ADD INDEX `SENTRY_GM_PRIV_COMP_IDX` (`COMPONENT_NAME`); http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/ce60020b/sentry-provider/sentry-provider-db/src/main/resources/sentry-postgres-1.6.0.sql ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/resources/sentry-postgres-1.6.0.sql b/sentry-provider/sentry-provider-db/src/main/resources/sentry-postgres-1.6.0.sql index 0e33dd2..62edf3e 100644 --- a/sentry-provider/sentry-provider-db/src/main/resources/sentry-postgres-1.6.0.sql +++ b/sentry-provider/sentry-provider-db/src/main/resources/sentry-postgres-1.6.0.sql @@ -138,7 +138,7 @@ CREATE TABLE "SENTRY_GM_PRIVILEGE" ( "RESOURCE_TYPE_2" character varying(64) DEFAULT '__NULL__', "RESOURCE_TYPE_3" character varying(64) DEFAULT '__NULL__', "ACTION" character varying(32) NOT NULL, - "scope" character varying(128) NOT NULL, + "SCOPE" character varying(128) NOT NULL, "CREATE_TIME" BIGINT NOT NULL, "WITH_GRANT_OPTION" CHAR(1) NOT NULL );
