Repository: incubator-sentry Updated Branches: refs/heads/master 7fb9ac4fe -> eb772e637
SENTRY-195: Sentry schema tool can't process comments inside statement (Jarek Jarcec Cecho 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/eb772e63 Tree: http://git-wip-us.apache.org/repos/asf/incubator-sentry/tree/eb772e63 Diff: http://git-wip-us.apache.org/repos/asf/incubator-sentry/diff/eb772e63 Branch: refs/heads/master Commit: eb772e637d461ddb498fdf3236b33e0a4efdee2a Parents: 7fb9ac4 Author: Prasad Mujumdar <[email protected]> Authored: Sun May 11 18:36:57 2014 -0700 Committer: Prasad Mujumdar <[email protected]> Committed: Sun May 11 18:36:57 2014 -0700 ---------------------------------------------------------------------- .../src/main/resources/sentry-mysql-1.4.0.sql | 16 ++++++++-------- .../src/main/resources/sentry-oracle-1.4.0.sql | 16 ++++++++-------- .../src/main/resources/sentry-postgres-1.4.0.sql | 16 ++++++++-------- 3 files changed, 24 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/eb772e63/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 2d843bc..cd222c5 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 @@ -27,15 +27,15 @@ CREATE TABLE `SENTRY_DB_PRIVILEGE` ( `DB_PRIVILEGE_ID` BIGINT NOT NULL, - `PRIVILEGE_NAME` VARCHAR(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, -- Name of the privilege - `PRIVILEGE_SCOPE` VARCHAR(32) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, -- Scope. Valid values are Server, Database, Table + `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, `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, -- Allowed action. Valid values are ALL, INSERT, SELECT + `PRIVILEGE` 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 -- principal of the creator + `GRANTOR_PRINCIPAL` VARCHAR(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `SENTRY_ROLE` ( @@ -54,14 +54,14 @@ CREATE TABLE `SENTRY_GROUP` ( CREATE TABLE `SENTRY_ROLE_DB_PRIVILEGE_MAP` ( `ROLE_PRIVILEGE_MAP_ID` BIGINT NOT NULL, - `ROLE_ID` BIGINT NOT NULL, -- FK to SENTRY_ROLE.ROLE_ID - `DB_PRIVILEGE_ID` BIGINT NOT NULL -- FK to SENTRY_DB_PRIVILEGE.DB_PRIVILEGE_ID + `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, -- FK to SENTRY_ROLE.ROLE_ID - `GROUP_ID` BIGINT NOT NULL -- FK to SENTRY_GROUP.GROUP_ID + `ROLE_ID` BIGINT NOT NULL, + `GROUP_ID` BIGINT NOT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `SENTRY_VERSION` ( http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/eb772e63/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 d71fda7..6c8de2e 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 @@ -15,15 +15,15 @@ CREATE TABLE "SENTRY_DB_PRIVILEGE" ( "DB_PRIVILEGE_ID" NUMBER NOT NULL, - "PRIVILEGE_NAME" VARCHAR2(128) NOT NULL, -- Name of the privilege - "PRIVILEGE_SCOPE" VARCHAR2(32) NOT NULL, -- Scope. Valid values are Server, Database, Table + "PRIVILEGE_NAME" VARCHAR2(128) NOT NULL, + "PRIVILEGE_SCOPE" VARCHAR2(32) NOT NULL, "SERVER_NAME" VARCHAR2(128) NOT NULL, "DATABASE_NAME" VARCHAR2(128) NULL, "TABLE_NAME" VARCHAR2(128) NULL, "URI" VARCHAR2(4000) NULL, - "PRIVILEGE" VARCHAR2(128) NOT NULL, -- Allowed action. Valid values are ALL, INSERT, SELECT + "PRIVILEGE" VARCHAR2(128) NOT NULL, "CREATE_TIME" NUMBER NOT NULL, - "GRANTOR_PRINCIPAL" VARCHAR(128) NOT NULL -- principal of the creator + "GRANTOR_PRINCIPAL" VARCHAR(128) NOT NULL ); CREATE TABLE "SENTRY_ROLE" ( @@ -42,14 +42,14 @@ CREATE TABLE "SENTRY_GROUP" ( CREATE TABLE "SENTRY_ROLE_DB_PRIVILEGE_MAP" ( "ROLE_PRIVILEGE_MAP_ID" NUMBER NOT NULL, - "ROLE_ID" NUMBER NOT NULL, -- FK to SENTRY_ROLE.ROLE_ID - "DB_PRIVILEGE_ID" NUMBER NOT NULL -- FK to SENTRY_DB_PRIVILEGE.DB_PRIVILEGE_ID + "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, -- FK to SENTRY_ROLE.ROLE_ID - "GROUP_ID" NUMBER NOT NULL -- FK to SENTRY_GROUP.GROUP_ID + "ROLE_ID" NUMBER NOT NULL, + "GROUP_ID" NUMBER NOT NULL ); CREATE TABLE "SENTRY_VERSION" ( http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/eb772e63/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 5bf0471..d8c5a5d 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 @@ -27,15 +27,15 @@ SET default_with_oids = false; CREATE TABLE "SENTRY_DB_PRIVILEGE" ( "DB_PRIVILEGE_ID" BIGINT NOT NULL, - "PRIVILEGE_NAME" character varying(128) NOT NULL, -- Name of the privilege - "PRIVILEGE_SCOPE" character varying(32) NOT NULL, -- Scope. Valid values are Server, Database, Table + "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, "TABLE_NAME" character varying(128) DEFAULT NULL::character varying, "URI" character varying(4000) DEFAULT NULL::character varying, - "PRIVILEGE" character varying(128) NOT NULL, -- Allowed action. Valid values are ALL, INSERT, SELECT + "PRIVILEGE" character varying(128) NOT NULL, "CREATE_TIME" BIGINT NOT NULL, - "GRANTOR_PRINCIPAL" VARCHAR(128) NOT NULL -- principal of the creator + "GRANTOR_PRINCIPAL" VARCHAR(128) NOT NULL ); CREATE TABLE "SENTRY_ROLE" ( @@ -54,14 +54,14 @@ CREATE TABLE "SENTRY_GROUP" ( CREATE TABLE "SENTRY_ROLE_DB_PRIVILEGE_MAP" ( "ROLE_PRIVILEGE_MAP_ID" BIGINT NOT NULL, - "ROLE_ID" BIGINT NOT NULL, -- FK to SENTRY_ROLE.ROLE_ID - "DB_PRIVILEGE_ID" BIGINT NOT NULL -- FK to SENTRY_DB_PRIVILEGE.DB_PRIVILEGE_ID + "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, -- FK to SENTRY_ROLE.ROLE_ID - "GROUP_ID" BIGINT NOT NULL -- FK to SENTRY_GROUP.GROUP_ID + "ROLE_ID" BIGINT NOT NULL, + "GROUP_ID" BIGINT NOT NULL ); CREATE TABLE "SENTRY_VERSION" (
