Repository: incubator-sentry Updated Branches: refs/heads/branch-1.5.0 f941f4048 -> 2665ea1c8
SENTRY-500: 1.4 to 1.5 upgrade needs to handle empty strings with __NULL__ Project: http://git-wip-us.apache.org/repos/asf/incubator-sentry/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-sentry/commit/2665ea1c Tree: http://git-wip-us.apache.org/repos/asf/incubator-sentry/tree/2665ea1c Diff: http://git-wip-us.apache.org/repos/asf/incubator-sentry/diff/2665ea1c Branch: refs/heads/branch-1.5.0 Commit: 2665ea1c8224b6aa3426983eb8480069a7c32c3c Parents: f941f40 Author: Prasad Mujumdar <pras...@apache.org> Authored: Thu Apr 2 19:12:56 2015 -0700 Committer: Prasad Mujumdar <pras...@apache.org> Committed: Thu Apr 2 19:14:37 2015 -0700 ---------------------------------------------------------------------- .../main/resources/001-SENTRY-327.postgres.sql | 2 +- .../src/main/resources/002-SENTRY-339.derby.sql | 8 ++++++ .../src/main/resources/002-SENTRY-339.mysql.sql | 9 +++++++ .../main/resources/002-SENTRY-339.oracle.sql | 9 +++++++ .../main/resources/002-SENTRY-339.postgres.sql | 15 ++++++++--- .../main/resources/003-SENTRY-380.postgres.sql | 10 +++---- .../src/main/resources/004-SENTRY-74.derby.sql | 2 +- .../src/main/resources/004-SENTRY-74.mysql.sql | 2 +- .../src/main/resources/004-SENTRY-74.oracle.sql | 2 +- .../main/resources/004-SENTRY-74.postgres.sql | 6 ++--- .../src/main/resources/005-SENTRY-398.derby.sql | 18 ++++++------- .../src/main/resources/005-SENTRY-398.mysql.sql | 20 +++++++------- .../main/resources/005-SENTRY-398.oracle.sql | 24 ++++++++--------- .../main/resources/005-SENTRY-398.postgres.sql | 24 ++++++++--------- .../src/main/resources/sentry-derby-1.5.0.sql | 24 ++++++++--------- .../src/main/resources/sentry-mysql-1.5.0.sql | 24 ++++++++--------- .../src/main/resources/sentry-oracle-1.5.0.sql | 28 ++++++++++---------- .../main/resources/sentry-postgres-1.5.0.sql | 24 ++++++++--------- .../sentry-upgrade-postgres-1.4.0-to-1.5.0.sql | 2 +- 19 files changed, 144 insertions(+), 109 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/2665ea1c/sentry-provider/sentry-provider-db/src/main/resources/001-SENTRY-327.postgres.sql ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/resources/001-SENTRY-327.postgres.sql b/sentry-provider/sentry-provider-db/src/main/resources/001-SENTRY-327.postgres.sql index 04353d1..1b670ec 100644 --- a/sentry-provider/sentry-provider-db/src/main/resources/001-SENTRY-327.postgres.sql +++ b/sentry-provider/sentry-provider-db/src/main/resources/001-SENTRY-327.postgres.sql @@ -1,2 +1,2 @@ -- SENTRY-327 -ALTER TABLE SENTRY_DB_PRIVILEGE ADD COLUMN WITH_GRANT_OPTION CHAR(1) NOT NULL DEFAULT 'N'; +ALTER TABLE "SENTRY_DB_PRIVILEGE" ADD COLUMN "WITH_GRANT_OPTION" CHAR(1) NOT NULL DEFAULT 'N'; http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/2665ea1c/sentry-provider/sentry-provider-db/src/main/resources/002-SENTRY-339.derby.sql ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/resources/002-SENTRY-339.derby.sql b/sentry-provider/sentry-provider-db/src/main/resources/002-SENTRY-339.derby.sql index aceac06..647e9e2 100644 --- a/sentry-provider/sentry-provider-db/src/main/resources/002-SENTRY-339.derby.sql +++ b/sentry-provider/sentry-provider-db/src/main/resources/002-SENTRY-339.derby.sql @@ -3,3 +3,11 @@ DROP INDEX SENTRYPRIVILEGENAME; CREATE UNIQUE INDEX SENTRYPRIVILEGENAME ON SENTRY_DB_PRIVILEGE ("SERVER_NAME",DB_NAME,"TABLE_NAME",URI,"ACTION",WITH_GRANT_OPTION); ALTER TABLE SENTRY_DB_PRIVILEGE DROP COLUMN PRIVILEGE_NAME; + +ALTER TABLE SENTRY_DB_PRIVILEGE ALTER COLUMN DB_NAME SET DEFAULT '__NULL__'; +ALTER TABLE SENTRY_DB_PRIVILEGE ALTER COLUMN TABLE_NAME SET DEFAULT '__NULL__'; +ALTER TABLE SENTRY_DB_PRIVILEGE ALTER COLUMN URI SET DEFAULT '__NULL__'; + +UPDATE SENTRY_DB_PRIVILEGE SET DB_NAME = DEFAULT WHERE DB_NAME is null; +UPDATE SENTRY_DB_PRIVILEGE SET TABLE_NAME = DEFAULT WHERE TABLE_NAME is null; +UPDATE SENTRY_DB_PRIVILEGE SET URI = DEFAULT WHERE URI is null; http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/2665ea1c/sentry-provider/sentry-provider-db/src/main/resources/002-SENTRY-339.mysql.sql ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/resources/002-SENTRY-339.mysql.sql b/sentry-provider/sentry-provider-db/src/main/resources/002-SENTRY-339.mysql.sql index a786ecc..cd4ec7c 100644 --- a/sentry-provider/sentry-provider-db/src/main/resources/002-SENTRY-339.mysql.sql +++ b/sentry-provider/sentry-provider-db/src/main/resources/002-SENTRY-339.mysql.sql @@ -2,3 +2,12 @@ ALTER TABLE `SENTRY_DB_PRIVILEGE` DROP INDEX `SENTRY_DB_PRIV_PRIV_NAME_UNIQ`; ALTER TABLE `SENTRY_DB_PRIVILEGE` ADD UNIQUE `SENTRY_DB_PRIV_PRIV_NAME_UNIQ` (`SERVER_NAME`,`DB_NAME`,`TABLE_NAME`,`URI`(250),`ACTION`,`WITH_GRANT_OPTION`); ALTER TABLE `SENTRY_DB_PRIVILEGE` DROP `PRIVILEGE_NAME`; + +ALTER TABLE SENTRY_DB_PRIVILEGE ALTER COLUMN DB_NAME SET DEFAULT '__NULL__'; +ALTER TABLE SENTRY_DB_PRIVILEGE ALTER COLUMN TABLE_NAME SET DEFAULT '__NULL__'; +ALTER TABLE SENTRY_DB_PRIVILEGE ALTER COLUMN URI SET DEFAULT '__NULL__'; + +UPDATE SENTRY_DB_PRIVILEGE SET DB_NAME = DEFAULT WHERE DB_NAME is null; +UPDATE SENTRY_DB_PRIVILEGE SET TABLE_NAME = DEFAULT WHERE TABLE_NAME is null; +UPDATE SENTRY_DB_PRIVILEGE SET URI = DEFAULT WHERE URI is null; + http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/2665ea1c/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 f64f690..b5c78d6 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 @@ -2,3 +2,12 @@ ALTER TABLE SENTRY_DB_PRIVILEGE DROP CONSTRAINT "SENTRY_DB_PRIV_PRIV_NAME_UNIQ"; 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; + +ALTER TABLE SENTRY_DB_PRIVILEGE MODIFY DB_NAME DEFAULT '__NULL__'; +ALTER TABLE SENTRY_DB_PRIVILEGE MODIFY TABLE_NAME DEFAULT '__NULL__'; +ALTER TABLE SENTRY_DB_PRIVILEGE MODIFY URI DEFAULT '__NULL__'; + +UPDATE SENTRY_DB_PRIVILEGE SET DB_NAME = DEFAULT WHERE DB_NAME is null; +UPDATE SENTRY_DB_PRIVILEGE SET TABLE_NAME = DEFAULT WHERE TABLE_NAME is null; +UPDATE SENTRY_DB_PRIVILEGE SET URI = DEFAULT WHERE URI is null; + http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/2665ea1c/sentry-provider/sentry-provider-db/src/main/resources/002-SENTRY-339.postgres.sql ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/resources/002-SENTRY-339.postgres.sql b/sentry-provider/sentry-provider-db/src/main/resources/002-SENTRY-339.postgres.sql index 2c98672..458e447 100644 --- a/sentry-provider/sentry-provider-db/src/main/resources/002-SENTRY-339.postgres.sql +++ b/sentry-provider/sentry-provider-db/src/main/resources/002-SENTRY-339.postgres.sql @@ -1,4 +1,13 @@ -- SENTRY-339 -ALTER TABLE SENTRY_DB_PRIVILEGE DROP CONSTRAINT "SENTRY_DB_PRIV_PRIV_NAME_UNIQ"; -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; +ALTER TABLE "SENTRY_DB_PRIVILEGE" DROP CONSTRAINT "SENTRY_DB_PRIV_PRIV_NAME_UNIQ"; +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"; + +ALTER TABLE "SENTRY_DB_PRIVILEGE" ALTER COLUMN "DB_NAME" SET DEFAULT '__NULL__'; +AlTER TABLE "SENTRY_DB_PRIVILEGE" ALTER COLUMN "TABLE_NAME" SET DEFAULT '__NULL__'; +ALTER TABLE "SENTRY_DB_PRIVILEGE" ALTER COLUMN "URI" SET DEFAULT '__NULL__'; + +UPDATE "SENTRY_DB_PRIVILEGE" SET "DB_NAME" = DEFAULT where "DB_NAME" is null; +UPDATE "SENTRY_DB_PRIVILEGE" SET "TABLE_NAME" = DEFAULT where "TABLE_NAME" is null; +UPDATE "SENTRY_DB_PRIVILEGE" SET "URI" = DEFAULT where "URI" is null; + http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/2665ea1c/sentry-provider/sentry-provider-db/src/main/resources/003-SENTRY-380.postgres.sql ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/resources/003-SENTRY-380.postgres.sql b/sentry-provider/sentry-provider-db/src/main/resources/003-SENTRY-380.postgres.sql index e6fa26b..95a2ef1 100644 --- a/sentry-provider/sentry-provider-db/src/main/resources/003-SENTRY-380.postgres.sql +++ b/sentry-provider/sentry-provider-db/src/main/resources/003-SENTRY-380.postgres.sql @@ -1,7 +1,7 @@ -- SENTRY-380 -ALTER TABLE `SENTRY_DB_PRIVILEGE` DROP `GRANTOR_PRINCIPAL`; -ALTER TABLE `SENTRY_ROLE` DROP `GRANTOR_PRINCIPAL`; -ALTER TABLE `SENTRY_GROUP` DROP `GRANTOR_PRINCIPAL`; +ALTER TABLE "SENTRY_DB_PRIVILEGE" DROP "GRANTOR_PRINCIPAL"; +ALTER TABLE "SENTRY_ROLE" DROP "GRANTOR_PRINCIPAL"; +ALTER TABLE "SENTRY_GROUP" DROP "GRANTOR_PRINCIPAL"; -ALTER TABLE `SENTRY_ROLE_DB_PRIVILEGE_MAP` ADD `GRANTOR_PRINCIPAL` character varying(128); -ALTER TABLE `SENTRY_ROLE_GROUP_MAP` ADD `character varying(128); \ No newline at end of file +ALTER TABLE "SENTRY_ROLE_DB_PRIVILEGE_MAP" ADD "GRANTOR_PRINCIPAL" character varying(128); +ALTER TABLE "SENTRY_ROLE_GROUP_MAP" ADD "GRANTOR_PRINCIPAL" character varying(128); http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/2665ea1c/sentry-provider/sentry-provider-db/src/main/resources/004-SENTRY-74.derby.sql ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/resources/004-SENTRY-74.derby.sql b/sentry-provider/sentry-provider-db/src/main/resources/004-SENTRY-74.derby.sql index b82e97f..da1f4d6 100644 --- a/sentry-provider/sentry-provider-db/src/main/resources/004-SENTRY-74.derby.sql +++ b/sentry-provider/sentry-provider-db/src/main/resources/004-SENTRY-74.derby.sql @@ -1,4 +1,4 @@ -- SENTRY-74 -ALTER TABLE SENTRY_DB_PRIVILEGE ADD COLUMN COLUMN_NAME VARCHAR(4000); +ALTER TABLE SENTRY_DB_PRIVILEGE ADD COLUMN COLUMN_NAME VARCHAR(4000) DEFAULT '__NULL__'; DROP INDEX SENTRYPRIVILEGENAME; CREATE UNIQUE INDEX SENTRYPRIVILEGENAME ON SENTRY_DB_PRIVILEGE ("SERVER_NAME",DB_NAME,"TABLE_NAME","COLUMN_NAME",URI,"ACTION",WITH_GRANT_OPTION); http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/2665ea1c/sentry-provider/sentry-provider-db/src/main/resources/004-SENTRY-74.mysql.sql ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/resources/004-SENTRY-74.mysql.sql b/sentry-provider/sentry-provider-db/src/main/resources/004-SENTRY-74.mysql.sql index c475a2c..1419ca3 100644 --- a/sentry-provider/sentry-provider-db/src/main/resources/004-SENTRY-74.mysql.sql +++ b/sentry-provider/sentry-provider-db/src/main/resources/004-SENTRY-74.mysql.sql @@ -1,4 +1,4 @@ -- SENTRY-74 -ALTER TABLE `SENTRY_DB_PRIVILEGE` ADD `COLUMN_NAME` VARCHAR(128) DEFAULT NULL; +ALTER TABLE `SENTRY_DB_PRIVILEGE` ADD `COLUMN_NAME` VARCHAR(128) DEFAULT '__NULL__'; ALTER TABLE `SENTRY_DB_PRIVILEGE` DROP INDEX `SENTRY_DB_PRIV_PRIV_NAME_UNIQ`; ALTER TABLE `SENTRY_DB_PRIVILEGE` ADD UNIQUE `SENTRY_DB_PRIV_PRIV_NAME_UNIQ` (`SERVER_NAME`,`DB_NAME`,`TABLE_NAME`,`COLUMN_NAME`,`URI`(250),`ACTION`,`WITH_GRANT_OPTION`); http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/2665ea1c/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 a78b76f..dafe697 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 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 ADD CONSTRAINT "SENTRY_DB_PRIV_PRIV_NAME_UNIQ" UNIQUE ("SERVER_NAME","DB_NAME","TABLE_NAME","COLUMN_NAME","URI","ACTION","WITH_GRANT_OPTION"); http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/2665ea1c/sentry-provider/sentry-provider-db/src/main/resources/004-SENTRY-74.postgres.sql ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/resources/004-SENTRY-74.postgres.sql b/sentry-provider/sentry-provider-db/src/main/resources/004-SENTRY-74.postgres.sql index 74ed9c3..81bdfa3 100644 --- a/sentry-provider/sentry-provider-db/src/main/resources/004-SENTRY-74.postgres.sql +++ b/sentry-provider/sentry-provider-db/src/main/resources/004-SENTRY-74.postgres.sql @@ -1,4 +1,4 @@ -- SENTRY-74 -ALTER TABLE SENTRY_DB_PRIVILEGE ADD COLUMN COLUMN_NAME character varying(128) DEFAULT NULL; -ALTER TABLE SENTRY_DB_PRIVILEGE DROP CONSTRAINT "SENTRY_DB_PRIV_PRIV_NAME_UNIQ"; -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"); +ALTER TABLE "SENTRY_DB_PRIVILEGE" ADD COLUMN "COLUMN_NAME" character varying(128) DEFAULT '__NULL__'; +ALTER TABLE "SENTRY_DB_PRIVILEGE" DROP CONSTRAINT "SENTRY_DB_PRIV_PRIV_NAME_UNIQ"; +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"); http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/2665ea1c/sentry-provider/sentry-provider-db/src/main/resources/005-SENTRY-398.derby.sql ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/resources/005-SENTRY-398.derby.sql b/sentry-provider/sentry-provider-db/src/main/resources/005-SENTRY-398.derby.sql index ce4f418..c038b81 100644 --- a/sentry-provider/sentry-provider-db/src/main/resources/005-SENTRY-398.derby.sql +++ b/sentry-provider/sentry-provider-db/src/main/resources/005-SENTRY-398.derby.sql @@ -5,15 +5,15 @@ CREATE TABLE SENTRY_GM_PRIVILEGE "ACTION" VARCHAR(40), COMPONENT_NAME VARCHAR(400), CREATE_TIME BIGINT NOT NULL, - WITH_GRANT_OPTION CHAR(1), - RESOURCE_NAME_0 VARCHAR(400), - RESOURCE_NAME_1 VARCHAR(400), - RESOURCE_NAME_2 VARCHAR(400), - RESOURCE_NAME_3 VARCHAR(400), - RESOURCE_TYPE_0 VARCHAR(400), - RESOURCE_TYPE_1 VARCHAR(400), - RESOURCE_TYPE_2 VARCHAR(400), - RESOURCE_TYPE_3 VARCHAR(400), + WITH_GRANT_OPTION CHAR(1) NOT NULL DEFAULT 'N', + RESOURCE_NAME_0 VARCHAR(400) DEFAULT '__NULL__', + RESOURCE_NAME_1 VARCHAR(400) DEFAULT '__NULL__', + RESOURCE_NAME_2 VARCHAR(400) DEFAULT '__NULL__', + RESOURCE_NAME_3 VARCHAR(400) DEFAULT '__NULL__', + RESOURCE_TYPE_0 VARCHAR(400) DEFAULT '__NULL__', + RESOURCE_TYPE_1 VARCHAR(400) DEFAULT '__NULL__', + RESOURCE_TYPE_2 VARCHAR(400) DEFAULT '__NULL__', + RESOURCE_TYPE_3 VARCHAR(400) DEFAULT '__NULL__', "SCOPE" VARCHAR(40), SERVICE_NAME VARCHAR(400) ); http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/2665ea1c/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 6d054b8..cf715a0 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 @@ -5,15 +5,15 @@ CREATE TABLE `SENTRY_GM_PRIVILEGE` `ACTION` VARCHAR(32) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, `COMPONENT_NAME` VARCHAR(32) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, `CREATE_TIME` BIGINT NOT NULL, - `WITH_GRANT_OPTION` CHAR(1) NOT NULL, - `RESOURCE_NAME_0` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, - `RESOURCE_NAME_1` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, - `RESOURCE_NAME_2` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, - `RESOURCE_NAME_3` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, - `RESOURCE_TYPE_0` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, - `RESOURCE_TYPE_1` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, - `RESOURCE_TYPE_2` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, - `RESOURCE_TYPE_3` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, + `WITH_GRANT_OPTION` CHAR(1) NOT NULL DEFAULT 'N', + `RESOURCE_NAME_0` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT '__NULL__', + `RESOURCE_NAME_1` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT '__NULL__', + `RESOURCE_NAME_2` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT '__NULL__', + `RESOURCE_NAME_3` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT '__NULL__', + `RESOURCE_TYPE_0` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT '__NULL__', + `RESOURCE_TYPE_1` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT '__NULL__', + `RESOURCE_TYPE_2` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT '__NULL__', + `RESOURCE_TYPE_3` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT '__NULL__', `SCOPE` VARCHAR(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, `SERVICE_NAME` VARCHAR(64) BINARY CHARACTER SET utf8 COLLATE utf8_bin NOT NULL ) ENGINE=INNODB DEFAULT CHARSET=utf8; @@ -58,4 +58,4 @@ ALTER TABLE `SENTRY_ROLE_GM_PRIVILEGE_MAP` ALTER TABLE `SENTRY_ROLE_GM_PRIVILEGE_MAP` ADD CONSTRAINT `SEN_RL_GM_PRV_MAP_SN_DB_PRV_FK` - FOREIGN KEY (`GM_PRIVILEGE_ID`) REFERENCES `SENTRY_GM_PRIVILEGE`(`GM_PRIVILEGE_ID`); \ No newline at end of file + FOREIGN KEY (`GM_PRIVILEGE_ID`) REFERENCES `SENTRY_GM_PRIVILEGE`(`GM_PRIVILEGE_ID`); http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/2665ea1c/sentry-provider/sentry-provider-db/src/main/resources/005-SENTRY-398.oracle.sql ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/resources/005-SENTRY-398.oracle.sql b/sentry-provider/sentry-provider-db/src/main/resources/005-SENTRY-398.oracle.sql index 61c743a..bde30f8 100644 --- a/sentry-provider/sentry-provider-db/src/main/resources/005-SENTRY-398.oracle.sql +++ b/sentry-provider/sentry-provider-db/src/main/resources/005-SENTRY-398.oracle.sql @@ -2,19 +2,19 @@ CREATE TABLE "SENTRY_GM_PRIVILEGE" ( "GM_PRIVILEGE_ID" NUMBER NOT NULL, "COMPONENT_NAME" VARCHAR2(32) NOT NULL, - "SERVICE_NAME" VARCHAR2(64) NOT NULL, - "RESOURCE_NAME_0" VARCHAR2(64) NULL, - "RESOURCE_NAME_1" VARCHAR2(64) NULL, - "RESOURCE_NAME_2" VARCHAR2(64) NULL, - "RESOURCE_NAME_3" VARCHAR2(64) NULL, - "RESOURCE_TYPE_0" VARCHAR2(64) NULL, - "RESOURCE_TYPE_1" VARCHAR2(64) NULL, - "RESOURCE_TYPE_2" VARCHAR2(64) NULL, - "RESOURCE_TYPE_3" VARCHAR2(64) NULL, + "CREATE_TIME" NUMBER NOT NULL, + "WITH_GRANT_OPTION" CHAR(1) DEFAULT 'N' NOT NULL, + "RESOURCE_NAME_0" VARCHAR2(64) DEFAULT '__NULL__', + "RESOURCE_NAME_1" VARCHAR2(64) DEFAULT '__NULL__', + "RESOURCE_NAME_2" VARCHAR2(64) DEFAULT '__NULL__', + "RESOURCE_NAME_3" VARCHAR2(64) DEFAULT '__NULL__', + "RESOURCE_TYPE_0" VARCHAR2(64) DEFAULT '__NULL__', + "RESOURCE_TYPE_1" VARCHAR2(64) DEFAULT '__NULL__', + "RESOURCE_TYPE_2" VARCHAR2(64) DEFAULT '__NULL__', + "RESOURCE_TYPE_3" VARCHAR2(64) DEFAULT '__NULL__', "ACTION" VARCHAR2(32) NOT NULL, "scope" VARCHAR2(128) NOT NULL, - "CREATE_TIME" NUMBER NOT NULL, - "WITH_GRANT_OPTION" CHAR(1) NOT NULL + "SERVICE_NAME" VARCHAR2(64) NOT NULL ); ALTER TABLE "SENTRY_GM_PRIVILEGE" @@ -52,4 +52,4 @@ ALTER TABLE "SENTRY_ROLE_GM_PRIVILEGE_MAP" ALTER TABLE "SENTRY_ROLE_GM_PRIVILEGE_MAP" ADD CONSTRAINT "SEN_RL_GM_PRV_MAP_SN_DB_PRV_FK" - FOREIGN KEY ("GM_PRIVILEGE_ID") REFERENCES "SENTRY_GM_PRIVILEGE"("GM_PRIVILEGE_ID") INITIALLY DEFERRED; \ No newline at end of file + FOREIGN KEY ("GM_PRIVILEGE_ID") REFERENCES "SENTRY_GM_PRIVILEGE"("GM_PRIVILEGE_ID") INITIALLY DEFERRED; http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/2665ea1c/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 54c4c01..000f662 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 @@ -2,19 +2,19 @@ CREATE TABLE "SENTRY_GM_PRIVILEGE" ( "GM_PRIVILEGE_ID" BIGINT NOT NULL, "COMPONENT_NAME" character varying(32) NOT NULL, - "SERVICE_NAME" character varying(64) NOT NULL, - "RESOURCE_NAME_0" character varying(64) DEFAULT NULL::character varying, - "RESOURCE_NAME_1" character varying(64) DEFAULT NULL::character varying, - "RESOURCE_NAME_2" character varying(64) DEFAULT NULL::character varying, - "RESOURCE_NAME_3" character varying(64) DEFAULT NULL::character varying, - "RESOURCE_TYPE_0" character varying(64) DEFAULT NULL::character varying, - "RESOURCE_TYPE_1" character varying(64) DEFAULT NULL::character varying, - "RESOURCE_TYPE_2" character varying(64) DEFAULT NULL::character varying, - "RESOURCE_TYPE_3" character varying(64) DEFAULT NULL::character varying, + "CREATE_TIME" BIGINT NOT NULL, + "WITH_GRANT_OPTION" CHAR(1) NOT NULL DEFAULT 'N', + "RESOURCE_NAME_0" character varying(64) DEFAULT '__NULL__', + "RESOURCE_NAME_1" character varying(64) DEFAULT '__NULL__', + "RESOURCE_NAME_2" character varying(64) DEFAULT '__NULL__', + "RESOURCE_NAME_3" character varying(64) DEFAULT '__NULL__', + "RESOURCE_TYPE_0" character varying(64) DEFAULT '__NULL__', + "RESOURCE_TYPE_1" character varying(64) DEFAULT '__NULL__', + "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, - "CREATE_TIME" BIGINT NOT NULL, - "WITH_GRANT_OPTION" CHAR(1) NOT NULL + "SERVICE_NAME" character varying(64) NOT NULL ); ALTER TABLE ONLY "SENTRY_GM_PRIVILEGE" ADD CONSTRAINT "SENTRY_GM_PRIV_PK" PRIMARY KEY ("GM_PRIVILEGE_ID"); @@ -51,4 +51,4 @@ ALTER TABLE ONLY "SENTRY_ROLE_GM_PRIVILEGE_MAP" ALTER TABLE ONLY "SENTRY_ROLE_GM_PRIVILEGE_MAP" ADD CONSTRAINT "SEN_RL_GM_PRV_MAP_SN_DB_PRV_FK" - FOREIGN KEY ("GM_PRIVILEGE_ID") REFERENCES "SENTRY_GM_PRIVILEGE"("GM_PRIVILEGE_ID") DEFERRABLE; \ No newline at end of file + FOREIGN KEY ("GM_PRIVILEGE_ID") REFERENCES "SENTRY_GM_PRIVILEGE"("GM_PRIVILEGE_ID") DEFERRABLE; http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/2665ea1c/sentry-provider/sentry-provider-db/src/main/resources/sentry-derby-1.5.0.sql ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/resources/sentry-derby-1.5.0.sql b/sentry-provider/sentry-provider-db/src/main/resources/sentry-derby-1.5.0.sql index 483aa7e..89d73bb 100644 --- a/sentry-provider/sentry-provider-db/src/main/resources/sentry-derby-1.5.0.sql +++ b/sentry-provider/sentry-provider-db/src/main/resources/sentry-derby-1.5.0.sql @@ -17,14 +17,14 @@ CREATE TABLE SENTRY_DB_PRIVILEGE ( DB_PRIVILEGE_ID BIGINT NOT NULL generated always as identity (start with 1), - URI VARCHAR(4000), + URI VARCHAR(4000) DEFAULT '__NULL__', "ACTION" VARCHAR(40), CREATE_TIME BIGINT NOT NULL, - DB_NAME VARCHAR(4000), + DB_NAME VARCHAR(4000) DEFAULT '__NULL__', PRIVILEGE_SCOPE VARCHAR(40), "SERVER_NAME" VARCHAR(4000), - "TABLE_NAME" VARCHAR(4000), - "COLUMN_NAME" VARCHAR(4000), + "TABLE_NAME" VARCHAR(4000) DEFAULT '__NULL__', + "COLUMN_NAME" VARCHAR(4000) DEFAULT '__NULL__', WITH_GRANT_OPTION CHAR(1) NOT NULL ); @@ -120,14 +120,14 @@ CREATE TABLE SENTRY_GM_PRIVILEGE COMPONENT_NAME VARCHAR(400), CREATE_TIME BIGINT NOT NULL, WITH_GRANT_OPTION CHAR(1), - RESOURCE_NAME_0 VARCHAR(400), - RESOURCE_NAME_1 VARCHAR(400), - RESOURCE_NAME_2 VARCHAR(400), - RESOURCE_NAME_3 VARCHAR(400), - RESOURCE_TYPE_0 VARCHAR(400), - RESOURCE_TYPE_1 VARCHAR(400), - RESOURCE_TYPE_2 VARCHAR(400), - RESOURCE_TYPE_3 VARCHAR(400), + RESOURCE_NAME_0 VARCHAR(400) DEFAULT '__NULL__', + RESOURCE_NAME_1 VARCHAR(400) DEFAULT '__NULL__', + RESOURCE_NAME_2 VARCHAR(400) DEFAULT '__NULL__', + RESOURCE_NAME_3 VARCHAR(400) DEFAULT '__NULL__', + RESOURCE_TYPE_0 VARCHAR(400) DEFAULT '__NULL__', + RESOURCE_TYPE_1 VARCHAR(400) DEFAULT '__NULL__', + RESOURCE_TYPE_2 VARCHAR(400) DEFAULT '__NULL__', + RESOURCE_TYPE_3 VARCHAR(400) DEFAULT '__NULL__', "SCOPE" VARCHAR(40), SERVICE_NAME VARCHAR(400) ); http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/2665ea1c/sentry-provider/sentry-provider-db/src/main/resources/sentry-mysql-1.5.0.sql ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/resources/sentry-mysql-1.5.0.sql b/sentry-provider/sentry-provider-db/src/main/resources/sentry-mysql-1.5.0.sql index e190c47..d5d2e0a 100644 --- a/sentry-provider/sentry-provider-db/src/main/resources/sentry-mysql-1.5.0.sql +++ b/sentry-provider/sentry-provider-db/src/main/resources/sentry-mysql-1.5.0.sql @@ -29,10 +29,10 @@ CREATE TABLE `SENTRY_DB_PRIVILEGE` ( `DB_PRIVILEGE_ID` BIGINT NOT NULL, `PRIVILEGE_SCOPE` VARCHAR(32) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, `SERVER_NAME` VARCHAR(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, - `DB_NAME` VARCHAR(128) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, - `TABLE_NAME` VARCHAR(128) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, - `COLUMN_NAME` VARCHAR(128) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, - `URI` VARCHAR(4000) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, + `DB_NAME` VARCHAR(128) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT '__NULL__', + `TABLE_NAME` VARCHAR(128) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT '__NULL__', + `COLUMN_NAME` VARCHAR(128) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT '__NULL__', + `URI` VARCHAR(4000) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT '__NULL__', `ACTION` VARCHAR(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, `CREATE_TIME` BIGINT NOT NULL, `WITH_GRANT_OPTION` CHAR(1) NOT NULL @@ -137,14 +137,14 @@ CREATE TABLE `SENTRY_GM_PRIVILEGE` `COMPONENT_NAME` VARCHAR(32) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, `CREATE_TIME` BIGINT NOT NULL, `WITH_GRANT_OPTION` CHAR(1) NOT NULL, - `RESOURCE_NAME_0` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, - `RESOURCE_NAME_1` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, - `RESOURCE_NAME_2` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, - `RESOURCE_NAME_3` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, - `RESOURCE_TYPE_0` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, - `RESOURCE_TYPE_1` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, - `RESOURCE_TYPE_2` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, - `RESOURCE_TYPE_3` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, + `RESOURCE_NAME_0` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT '__NULL__', + `RESOURCE_NAME_1` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT '__NULL__', + `RESOURCE_NAME_2` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT '__NULL__', + `RESOURCE_NAME_3` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT '__NULL__', + `RESOURCE_TYPE_0` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT '__NULL__', + `RESOURCE_TYPE_1` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT '__NULL__', + `RESOURCE_TYPE_2` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT '__NULL__', + `RESOURCE_TYPE_3` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT '__NULL__', `SCOPE` VARCHAR(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, `SERVICE_NAME` VARCHAR(64) BINARY CHARACTER SET utf8 COLLATE utf8_bin NOT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8; http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/2665ea1c/sentry-provider/sentry-provider-db/src/main/resources/sentry-oracle-1.5.0.sql ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/resources/sentry-oracle-1.5.0.sql b/sentry-provider/sentry-provider-db/src/main/resources/sentry-oracle-1.5.0.sql index 7ff9332..f987a0f 100644 --- a/sentry-provider/sentry-provider-db/src/main/resources/sentry-oracle-1.5.0.sql +++ b/sentry-provider/sentry-provider-db/src/main/resources/sentry-oracle-1.5.0.sql @@ -17,13 +17,13 @@ CREATE TABLE "SENTRY_DB_PRIVILEGE" ( "DB_PRIVILEGE_ID" NUMBER NOT NULL, "PRIVILEGE_SCOPE" VARCHAR2(32) NOT NULL, "SERVER_NAME" VARCHAR2(128) NOT NULL, - "DB_NAME" VARCHAR2(128) NULL, - "TABLE_NAME" VARCHAR2(128) NULL, - "COLUMN_NAME" VARCHAR2(128) NULL, - "URI" VARCHAR2(4000) NULL, + "DB_NAME" VARCHAR2(128) DEFAULT '__NULL__', + "TABLE_NAME" VARCHAR2(128) DEFAULT '__NULL__', + "COLUMN_NAME" VARCHAR2(128) DEFAULT '__NULL__', + "URI" VARCHAR2(4000) DEFAULT '__NULL__', "ACTION" VARCHAR2(128) NOT NULL, "CREATE_TIME" NUMBER NOT NULL, - "WITH_GRANT_OPTION" CHAR(1) NOT NULL + "WITH_GRANT_OPTION" CHAR(1) DEFAULT 'N' NOT NULL ); CREATE TABLE "SENTRY_ROLE" ( @@ -116,18 +116,18 @@ CREATE TABLE "SENTRY_GM_PRIVILEGE" ( "GM_PRIVILEGE_ID" NUMBER NOT NULL, "COMPONENT_NAME" VARCHAR2(32) NOT NULL, "SERVICE_NAME" VARCHAR2(64) NOT NULL, - "RESOURCE_NAME_0" VARCHAR2(64) NULL, - "RESOURCE_NAME_1" VARCHAR2(64) NULL, - "RESOURCE_NAME_2" VARCHAR2(64) NULL, - "RESOURCE_NAME_3" VARCHAR2(64) NULL, - "RESOURCE_TYPE_0" VARCHAR2(64) NULL, - "RESOURCE_TYPE_1" VARCHAR2(64) NULL, - "RESOURCE_TYPE_2" VARCHAR2(64) NULL, - "RESOURCE_TYPE_3" VARCHAR2(64) NULL, + "RESOURCE_NAME_0" VARCHAR2(64) DEFAULT '__NULL__', + "RESOURCE_NAME_1" VARCHAR2(64) DEFAULT '__NULL__', + "RESOURCE_NAME_2" VARCHAR2(64) DEFAULT '__NULL__', + "RESOURCE_NAME_3" VARCHAR2(64) DEFAULT '__NULL__', + "RESOURCE_TYPE_0" VARCHAR2(64) DEFAULT '__NULL__', + "RESOURCE_TYPE_1" VARCHAR2(64) DEFAULT '__NULL__', + "RESOURCE_TYPE_2" VARCHAR2(64) DEFAULT '__NULL__', + "RESOURCE_TYPE_3" VARCHAR2(64) DEFAULT '__NULL__', "ACTION" VARCHAR2(32) NOT NULL, "scope" VARCHAR2(128) NOT NULL, "CREATE_TIME" NUMBER NOT NULL, - "WITH_GRANT_OPTION" CHAR(1) NOT NULL + "WITH_GRANT_OPTION" CHAR(1) DEFAULT 'N' NOT NULL ); ALTER TABLE "SENTRY_GM_PRIVILEGE" http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/2665ea1c/sentry-provider/sentry-provider-db/src/main/resources/sentry-postgres-1.5.0.sql ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/resources/sentry-postgres-1.5.0.sql b/sentry-provider/sentry-provider-db/src/main/resources/sentry-postgres-1.5.0.sql index ae387cc..733619b 100644 --- a/sentry-provider/sentry-provider-db/src/main/resources/sentry-postgres-1.5.0.sql +++ b/sentry-provider/sentry-provider-db/src/main/resources/sentry-postgres-1.5.0.sql @@ -29,10 +29,10 @@ CREATE TABLE "SENTRY_DB_PRIVILEGE" ( "DB_PRIVILEGE_ID" BIGINT NOT NULL, "PRIVILEGE_SCOPE" character varying(32) NOT NULL, "SERVER_NAME" character varying(128) NOT NULL, - "DB_NAME" character varying(128) DEFAULT NULL::character varying, - "TABLE_NAME" character varying(128) DEFAULT NULL::character varying, - "COLUMN_NAME" character varying(128) DEFAULT NULL::character varying, - "URI" character varying(4000) DEFAULT NULL::character varying, + "DB_NAME" character varying(128) DEFAULT '__NULL__', + "TABLE_NAME" character varying(128) DEFAULT '__NULL__', + "COLUMN_NAME" character varying(128) DEFAULT '__NULL__', + "URI" character varying(4000) DEFAULT '__NULL__', "ACTION" character varying(128) NOT NULL, "CREATE_TIME" BIGINT NOT NULL, "WITH_GRANT_OPTION" CHAR(1) NOT NULL @@ -129,14 +129,14 @@ CREATE TABLE "SENTRY_GM_PRIVILEGE" ( "GM_PRIVILEGE_ID" BIGINT NOT NULL, "COMPONENT_NAME" character varying(32) NOT NULL, "SERVICE_NAME" character varying(64) NOT NULL, - "RESOURCE_NAME_0" character varying(64) DEFAULT NULL::character varying, - "RESOURCE_NAME_1" character varying(64) DEFAULT NULL::character varying, - "RESOURCE_NAME_2" character varying(64) DEFAULT NULL::character varying, - "RESOURCE_NAME_3" character varying(64) DEFAULT NULL::character varying, - "RESOURCE_TYPE_0" character varying(64) DEFAULT NULL::character varying, - "RESOURCE_TYPE_1" character varying(64) DEFAULT NULL::character varying, - "RESOURCE_TYPE_2" character varying(64) DEFAULT NULL::character varying, - "RESOURCE_TYPE_3" character varying(64) DEFAULT NULL::character varying, + "RESOURCE_NAME_0" character varying(64) DEFAULT '__NULL__', + "RESOURCE_NAME_1" character varying(64) DEFAULT '__NULL__', + "RESOURCE_NAME_2" character varying(64) DEFAULT '__NULL__', + "RESOURCE_NAME_3" character varying(64) DEFAULT '__NULL__', + "RESOURCE_TYPE_0" character varying(64) DEFAULT '__NULL__', + "RESOURCE_TYPE_1" character varying(64) DEFAULT '__NULL__', + "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, "CREATE_TIME" BIGINT NOT NULL, http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/2665ea1c/sentry-provider/sentry-provider-db/src/main/resources/sentry-upgrade-postgres-1.4.0-to-1.5.0.sql ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/resources/sentry-upgrade-postgres-1.4.0-to-1.5.0.sql b/sentry-provider/sentry-provider-db/src/main/resources/sentry-upgrade-postgres-1.4.0-to-1.5.0.sql index ed38774..2f03d5e 100644 --- a/sentry-provider/sentry-provider-db/src/main/resources/sentry-upgrade-postgres-1.4.0-to-1.5.0.sql +++ b/sentry-provider/sentry-provider-db/src/main/resources/sentry-upgrade-postgres-1.4.0-to-1.5.0.sql @@ -5,5 +5,5 @@ SELECT 'Upgrading Sentry store schema from 1.4.0 to 1.5.0'; \i 004-SENTRY-74.postgres.sql; \i 005-SENTRY-398.postgres.sql; -UPDATE SENTRY_VERSION SET SCHEMA_VERSION='1.5.0', VERSION_COMMENT='Sentry release version 1.5.0' WHERE VER_ID=1; +UPDATE "SENTRY_VERSION" SET "SCHEMA_VERSION"='1.5.0', "VERSION_COMMENT"='Sentry release version 1.5.0' WHERE "VER_ID"=1; SELECT 'Finished upgrading Sentry store schema from 1.4.0 to 1.5.0';
