Repository: incubator-sentry Updated Branches: refs/heads/master 0d5e43581 -> b1d4dde5e
SENTRY-203: Column name mismatch causes DataNucleus to throw exceptions ( 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/b1d4dde5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-sentry/tree/b1d4dde5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-sentry/diff/b1d4dde5 Branch: refs/heads/master Commit: b1d4dde5e6eb352e5b7b2386a1e03551978945a4 Parents: 0d5e435 Author: Prasad Mujumdar <[email protected]> Authored: Fri May 16 13:27:49 2014 -0700 Committer: Prasad Mujumdar <[email protected]> Committed: Fri May 16 13:27:49 2014 -0700 ---------------------------------------------------------------------- .../src/main/resources/sentry-mysql-1.4.0.sql | 6 +++--- .../src/main/resources/sentry-oracle-1.4.0.sql | 6 +++--- .../src/main/resources/sentry-postgres-1.4.0.sql | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/b1d4dde5/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 cd222c5..68354da 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 @@ -30,10 +30,10 @@ CREATE TABLE `SENTRY_DB_PRIVILEGE` ( `PRIVILEGE_NAME` VARCHAR(128) CHARACTER SET utf8 COLLATE utf8_bin 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, - `DATABASE_NAME` VARCHAR(128) 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, `URI` VARCHAR(4000) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, - `PRIVILEGE` VARCHAR(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, + `ACTION` VARCHAR(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, `CREATE_TIME` BIGINT NOT NULL, `GRANTOR_PRINCIPAL` VARCHAR(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -42,7 +42,7 @@ CREATE TABLE `SENTRY_ROLE` ( `ROLE_ID` BIGINT NOT NULL, `ROLE_NAME` VARCHAR(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, `CREATE_TIME` BIGINT NOT NULL, - `ROLE_OWNER` VARCHAR(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL + `GRANTOR_PRINCIPAL` VARCHAR(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `SENTRY_GROUP` ( http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/b1d4dde5/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 6c8de2e..688b66d 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 @@ -18,10 +18,10 @@ CREATE TABLE "SENTRY_DB_PRIVILEGE" ( "PRIVILEGE_NAME" VARCHAR2(128) NOT NULL, "PRIVILEGE_SCOPE" VARCHAR2(32) NOT NULL, "SERVER_NAME" VARCHAR2(128) NOT NULL, - "DATABASE_NAME" VARCHAR2(128) NULL, + "DB_NAME" VARCHAR2(128) NULL, "TABLE_NAME" VARCHAR2(128) NULL, "URI" VARCHAR2(4000) NULL, - "PRIVILEGE" VARCHAR2(128) NOT NULL, + "ACTION" VARCHAR2(128) NOT NULL, "CREATE_TIME" NUMBER NOT NULL, "GRANTOR_PRINCIPAL" VARCHAR(128) NOT NULL ); @@ -30,7 +30,7 @@ CREATE TABLE "SENTRY_ROLE" ( "ROLE_ID" NUMBER NOT NULL, "ROLE_NAME" VARCHAR2(128) NOT NULL, "CREATE_TIME" NUMBER NOT NULL, - "ROLE_OWNER" VARCHAR2(128) NOT NULL + "GRANTOR_PRINCIPAL" VARCHAR2(128) NOT NULL ); CREATE TABLE "SENTRY_GROUP" ( http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/b1d4dde5/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 d8c5a5d..14b9bb6 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 @@ -30,10 +30,10 @@ CREATE TABLE "SENTRY_DB_PRIVILEGE" ( "PRIVILEGE_NAME" character varying(128) NOT NULL, "PRIVILEGE_SCOPE" character varying(32) NOT NULL, "SERVER_NAME" character varying(128) NOT NULL, - "DATABASE_NAME" character varying(128) DEFAULT NULL::character varying, + "DB_NAME" character varying(128) DEFAULT NULL::character varying, "TABLE_NAME" character varying(128) DEFAULT NULL::character varying, "URI" character varying(4000) DEFAULT NULL::character varying, - "PRIVILEGE" character varying(128) NOT NULL, + "ACTION" character varying(128) NOT NULL, "CREATE_TIME" BIGINT NOT NULL, "GRANTOR_PRINCIPAL" VARCHAR(128) NOT NULL ); @@ -42,7 +42,7 @@ CREATE TABLE "SENTRY_ROLE" ( "ROLE_ID" BIGINT NOT NULL, "ROLE_NAME" character varying(128) NOT NULL, "CREATE_TIME" BIGINT NOT NULL, - "ROLE_OWNER" character varying(128) NOT NULL + "GRANTOR_PRINCIPAL" character varying(128) NOT NULL ); CREATE TABLE "SENTRY_GROUP" (
