Index: metastore/scripts/upgrade/derby/hive-schema-0.13.0.derby.sql =================================================================== --- metastore/scripts/upgrade/derby/hive-schema-0.13.0.derby.sql (revision 71184) +++ metastore/scripts/upgrade/derby/hive-schema-0.13.0.derby.sql (working copy) @@ -124,7 +124,7 @@ CREATE UNIQUE INDEX "APP"."UNIQUE_DATABASE" ON "APP"."DBS" ("NAME"); -CREATE UNIQUE INDEX "APP"."USERROLEMAPINDEX" ON "APP"."ROLE_MAP" ("PRINCIPAL_NAME", "ROLE_ID", "GRANTOR", "GRANTOR_TYPE"); +CREATE UNIQUE INDEX "APP"."USERROLEMAPINDEX" ON "APP"."ROLE_MAP" ("PRINCIPAL_NAME", "PRINCIPAL_TYPE", "ROLE_ID", "GRANTOR", "GRANTOR_TYPE"); CREATE UNIQUE INDEX "APP"."GLOBALPRIVILEGEINDEX" ON "APP"."GLOBAL_PRIVS" ("PRINCIPAL_NAME", "PRINCIPAL_TYPE", "USER_PRIV", "GRANTOR", "GRANTOR_TYPE"); Index: metastore/scripts/upgrade/mssql/hive-schema-0.13.0.mssql.sql =================================================================== --- metastore/scripts/upgrade/mssql/hive-schema-0.13.0.mssql.sql (revision 71184) +++ metastore/scripts/upgrade/mssql/hive-schema-0.13.0.mssql.sql (working copy) @@ -689,7 +689,7 @@ CREATE INDEX ROLE_MAP_N49 ON ROLE_MAP (ROLE_ID); -CREATE UNIQUE INDEX USERROLEMAPINDEX ON ROLE_MAP (PRINCIPAL_NAME,ROLE_ID,GRANTOR,GRANTOR_TYPE); +CREATE UNIQUE INDEX USERROLEMAPINDEX ON ROLE_MAP (PRINCIPAL_NAME,PRINCIPAL_TYPE,ROLE_ID,GRANTOR,GRANTOR_TYPE); -- Constraints for table TBLS for class(es) [org.apache.hadoop.hive.metastore.model.MTable] Index: metastore/scripts/upgrade/mysql/hive-schema-0.13.0.mysql.sql =================================================================== --- metastore/scripts/upgrade/mysql/hive-schema-0.13.0.mysql.sql (revision 71184) +++ metastore/scripts/upgrade/mysql/hive-schema-0.13.0.mysql.sql (working copy) @@ -370,7 +370,7 @@ `PRINCIPAL_TYPE` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL, `ROLE_ID` bigint(20) DEFAULT NULL, PRIMARY KEY (`ROLE_GRANT_ID`), - UNIQUE KEY `USERROLEMAPINDEX` (`PRINCIPAL_NAME`,`ROLE_ID`,`GRANTOR`,`GRANTOR_TYPE`), + UNIQUE KEY `USERROLEMAPINDEX` (`PRINCIPAL_NAME`, `PRINCIPAL_TYPE`, `ROLE_ID`,`GRANTOR`,`GRANTOR_TYPE`), KEY `ROLE_MAP_N49` (`ROLE_ID`), CONSTRAINT `ROLE_MAP_FK1` FOREIGN KEY (`ROLE_ID`) REFERENCES `ROLES` (`ROLE_ID`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; Index: metastore/scripts/upgrade/oracle/hive-schema-0.13.0.oracle.sql =================================================================== --- metastore/scripts/upgrade/oracle/hive-schema-0.13.0.oracle.sql (revision 71184) +++ metastore/scripts/upgrade/oracle/hive-schema-0.13.0.oracle.sql (working copy) @@ -699,7 +699,7 @@ CREATE INDEX ROLE_MAP_N49 ON ROLE_MAP (ROLE_ID); -CREATE UNIQUE INDEX USERROLEMAPINDEX ON ROLE_MAP (PRINCIPAL_NAME,ROLE_ID,GRANTOR,GRANTOR_TYPE); +CREATE UNIQUE INDEX USERROLEMAPINDEX ON ROLE_MAP (PRINCIPAL_NAME,PRINCIPAL_TYPE,ROLE_ID,GRANTOR,GRANTOR_TYPE); -- Constraints for table SERDE_PARAMS Index: metastore/scripts/upgrade/postgres/hive-schema-0.13.0.postgres.sql =================================================================== --- metastore/scripts/upgrade/postgres/hive-schema-0.13.0.postgres.sql (revision 71184) +++ metastore/scripts/upgrade/postgres/hive-schema-0.13.0.postgres.sql (working copy) @@ -929,7 +929,7 @@ -- ALTER TABLE ONLY "ROLE_MAP" - ADD CONSTRAINT "USERROLEMAPINDEX" UNIQUE ("PRINCIPAL_NAME", "ROLE_ID", "GRANTOR", "GRANTOR_TYPE"); + ADD CONSTRAINT "USERROLEMAPINDEX" UNIQUE ("PRINCIPAL_NAME", "PRINCIPAL_TYPE", "ROLE_ID", "GRANTOR", "GRANTOR_TYPE"); --