From: Sanjay Dalal <sanjay.dalal@berkeley.edu>
Date: Wed, 2 Jun 2010 20:41:51 +0000 (+0000)
Subject: CSPACE-2006 added tenant id to unique constraint
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=5c53352970bda516fb097b727b61fd0e79bfb111;p=tmp%2Fjakarta-migration.git

CSPACE-2006 added tenant id to unique constraint

M    authorization/jaxb/src/main/resources/roles.xsd
M    authorization/pstore/src/main/resources/db/mysql/authorization.sql
---

diff --git a/services/authorization/jaxb/src/main/resources/roles.xsd b/services/authorization/jaxb/src/main/resources/roles.xsd
index 74eaae89d..cdb71cf7c 100644
--- a/services/authorization/jaxb/src/main/resources/roles.xsd
+++ b/services/authorization/jaxb/src/main/resources/roles.xsd
@@ -53,6 +53,7 @@
                     <orm:table name="roles">
                         <orm:unique-constraint>
                             <orm:column-name>rolename</orm:column-name>
+                            <orm:column-name>tenant_id</orm:column-name>
                         </orm:unique-constraint>
                     </orm:table>
                 </hj:entity>
diff --git a/services/authorization/pstore/src/main/resources/db/mysql/authorization.sql b/services/authorization/pstore/src/main/resources/db/mysql/authorization.sql
index 0db2ab063..24c77efb0 100644
--- a/services/authorization/pstore/src/main/resources/db/mysql/authorization.sql
+++ b/services/authorization/pstore/src/main/resources/db/mysql/authorization.sql
@@ -8,5 +8,5 @@ create table accounts_roles (HJID bigint not null auto_increment, account_id var
 create table permissions (csid varchar(128) not null, attribute_name varchar(128), created_at datetime not null, description varchar(255), effect varchar(32) not null, resource_name varchar(128) not null, tenant_id varchar(128) not null, updated_at datetime, primary key (csid));
 create table permissions_actions (HJID bigint not null auto_increment, name varchar(128) not null, ACTIONS_PERMISSION_CSID varchar(128), primary key (HJID));
 create table permissions_roles (HJID bigint not null auto_increment, created_at datetime not null, permission_id varchar(128) not null, permission_resource varchar(255), role_id varchar(128) not null, role_name varchar(255), primary key (HJID), unique (permission_id, role_id));
-create table roles (csid varchar(128) not null, created_at datetime not null, description varchar(255), rolegroup varchar(255), rolename varchar(200) not null, tenant_id varchar(128) not null, updated_at datetime, primary key (csid), unique (rolename));
+create table roles (csid varchar(128) not null, created_at datetime not null, description varchar(255), rolegroup varchar(255), rolename varchar(200) not null, tenant_id varchar(128) not null, updated_at datetime, primary key (csid), unique (rolename, tenant_id));
 alter table permissions_actions add index FK85F82042E2DC84FD (ACTIONS_PERMISSION_CSID), add constraint FK85F82042E2DC84FD foreign key (ACTIONS_PERMISSION_CSID) references permissions (csid);