Author: dimuthul
Date: Fri Jan 4 00:10:05 2008
New Revision: 11833
Log:
Adding the uniqueness constraint to um_user_permission and um_role_permission.
Modified:
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultDatabaseUtil.java
trunk/commons/usermanager/modules/core/src/main/resources/database-scripts/create_db.sql
Modified:
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultDatabaseUtil.java
==============================================================================
---
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultDatabaseUtil.java
(original)
+++
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultDatabaseUtil.java
Fri Jan 4 00:10:05 2008
@@ -10,51 +10,53 @@
public class DefaultDatabaseUtil {
public static String userTable = "CREATE TABLE UM_USERS (ID VARCHAR(255),"
- + "USER_NAME VARCHAR(255) NOT NULL,"
- + "PASSWORD VARCHAR(255) NOT NULL,"
- + "UNIQUE (USER_NAME),"
- + "PRIMARY KEY (ID))";
+ + " USER_NAME VARCHAR(255) NOT NULL,"
+ + " PASSWORD VARCHAR(255) NOT NULL,"
+ + " UNIQUE (USER_NAME),"
+ + " PRIMARY KEY (ID))";
public static String userAttributeTable = "CREATE TABLE
UM_USER_ATTRIBUTES (ID VARCHAR(255),"
- + "ATTR_NAME VARCHAR(255) NOT NULL,"
- + "ATTR_VALUE VARCHAR(255),"
- + "USER_ID VARCHAR(255),"
- + "FOREIGN KEY (USER_ID) REFERENCES UM_USERS(ID) ON DELETE
CASCADE,"
- + "PRIMARY KEY (ID))";
+ + " ATTR_NAME VARCHAR(255) NOT NULL,"
+ + " ATTR_VALUE VARCHAR(255),"
+ + " USER_ID VARCHAR(255),"
+ + " FOREIGN KEY (USER_ID) REFERENCES UM_USERS(ID) ON DELETE
CASCADE,"
+ + " PRIMARY KEY (ID))";
public static String roleTable = "CREATE TABLE UM_ROLES (ID VARCHAR(255),"
- + "ROLE_NAME VARCHAR(255) NOT NULL,"
- + "UNIQUE (ROLE_NAME),"
- + "PRIMARY KEY (ID))";
+ + " ROLE_NAME VARCHAR(255) NOT NULL,"
+ + " UNIQUE (ROLE_NAME),"
+ + " PRIMARY KEY (ID))";
public static String roleAttributeTable = "CREATE TABLE
UM_ROLE_ATTRIBUTES (ID VARCHAR(255),"
- + "ATTR_NAME VARCHAR(255) NOT NULL,"
- + "ATTR_VALUE VARCHAR(255),"
- + "ROLE_ID VARCHAR(255),"
- + "FOREIGN KEY (ROLE_ID) REFERENCES UM_ROLES(ID) ON DELETE
CASCADE,"
- + "PRIMARY KEY (ID))";
+ + " ATTR_NAME VARCHAR(255) NOT NULL,"
+ + " ATTR_VALUE VARCHAR(255),"
+ + " ROLE_ID VARCHAR(255),"
+ + " FOREIGN KEY (ROLE_ID) REFERENCES UM_ROLES(ID) ON DELETE
CASCADE,"
+ + " PRIMARY KEY (ID))";
public static String permissionTable = "CREATE TABLE UM_PERMISSIONS (ID
VARCHAR(255),"
- + "RESOURCE_ID VARCHAR(255) NOT NULL,"
- + "ACTION VARCHAR(255) NOT NULL,"
- + "PRIMARY KEY (ID))";
+ + " RESOURCE_ID VARCHAR(255) NOT NULL,"
+ + " ACTION VARCHAR(255) NOT NULL,"
+ + " PRIMARY KEY (ID))";
public static String rolePermissionTable = "CREATE TABLE
UM_ROLE_PERMISSIONS (ID VARCHAR(255),"
- + "PERMISSION_ID VARCHAR(255),"
- + "ROLE_ID VARCHAR(255),"
- + "IS_ALLOWED SMALLINT NOT NULL,"
- + "FOREIGN KEY (PERMISSION_ID) REFERENCES UM_PERMISSIONS(ID) ON
DELETE CASCADE,"
- + "FOREIGN KEY (ROLE_ID) REFERENCES UM_ROLES(ID) ON DELETE
CASCADE,"
- + "PRIMARY KEY (ID))";
+ + " PERMISSION_ID VARCHAR(255) NOT NULL,"
+ + " ROLE_ID VARCHAR(255) NOT NULL,"
+ + " IS_ALLOWED SMALLINT NOT NULL,"
+ + " FOREIGN KEY (PERMISSION_ID) REFERENCES UM_PERMISSIONS(ID) ON
DELETE CASCADE,"
+ + " FOREIGN KEY (ROLE_ID) REFERENCES UM_ROLES(ID) ON DELETE
CASCADE,"
+ + " UNIQUE (PERMISSION_ID, ROLE_ID),"
+ + " PRIMARY KEY (ID))";
public static String userPermissionTable = "CREATE TABLE
UM_USER_PERMISSIONS (ID VARCHAR(255),"
- + "IS_ALLOWED SMALLINT NOT NULL,"
- + "PERMISSION_ID VARCHAR(255),"
- + "USER_ID VARCHAR(255),"
- + "FOREIGN KEY (PERMISSION_ID) REFERENCES UM_PERMISSIONS(ID) ON
DELETE CASCADE,"
- + "FOREIGN KEY (USER_ID) REFERENCES UM_USERS(ID) ON DELETE
CASCADE,"
- + "PRIMARY KEY (ID))";
+ + " IS_ALLOWED SMALLINT NOT NULL,"
+ + " PERMISSION_ID VARCHAR(255) NOT NULL,"
+ + " USER_ID VARCHAR(255) NOT NULL,"
+ + " FOREIGN KEY (PERMISSION_ID) REFERENCES UM_PERMISSIONS(ID) ON
DELETE CASCADE,"
+ + " FOREIGN KEY (USER_ID) REFERENCES UM_USERS(ID) ON DELETE
CASCADE,"
+ + " UNIQUE (PERMISSION_ID, USER_ID),"
+ + " PRIMARY KEY (ID))";
public static String userRolesTable = "CREATE TABLE UM_USER_ROLES (ID
VARCHAR(255),"
+ "ROLE_ID VARCHAR(255),"
Modified:
trunk/commons/usermanager/modules/core/src/main/resources/database-scripts/create_db.sql
==============================================================================
---
trunk/commons/usermanager/modules/core/src/main/resources/database-scripts/create_db.sql
(original)
+++
trunk/commons/usermanager/modules/core/src/main/resources/database-scripts/create_db.sql
Fri Jan 4 00:10:05 2008
@@ -3,6 +3,6 @@
CREATE TABLE UM_ROLES (ID VARCHAR(255), ROLE_NAME VARCHAR(255) NOT NULL,
PRIMARY KEY (ID), UNIQUE(ROLE_NAME));
CREATE TABLE UM_ROLE_ATTRIBUTES (ID VARCHAR(255), ATTR_NAME VARCHAR(255) NOT
NULL, ATTR_VALUE VARCHAR(255), ROLE_ID VARCHAR(255), FOREIGN KEY (ROLE_ID)
REFERENCES UM_ROLES(ID) ON DELETE CASCADE, PRIMARY KEY (ID));
CREATE TABLE UM_PERMISSIONS (ID VARCHAR(255), RESOURCE_ID VARCHAR(255) NOT
NULL, ACTION VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
-CREATE TABLE UM_ROLE_PERMISSIONS (ID VARCHAR(255), PERMISSION_ID VARCHAR(255),
ROLE_ID VARCHAR(255), IS_ALLOWED SMALLINT NOT NULL, FOREIGN KEY (PERMISSION_ID)
REFERENCES UM_PERMISSIONS(ID) ON DELETE CASCADE, FOREIGN KEY (ROLE_ID)
REFERENCES UM_ROLES(ID) ON DELETE CASCADE, PRIMARY KEY (ID));
-CREATE TABLE UM_USER_PERMISSIONS (ID VARCHAR(255), IS_ALLOWED SMALLINT NOT
NULL, PERMISSION_ID VARCHAR(255), USER_ID VARCHAR(255), FOREIGN KEY
(PERMISSION_ID) REFERENCES UM_PERMISSIONS(ID) ON DELETE CASCADE, FOREIGN KEY
(USER_ID) REFERENCES UM_USERS(ID) ON DELETE CASCADE, PRIMARY KEY (ID));
-CREATE TABLE UM_USER_ROLES (ID VARCHAR(255), ROLE_ID VARCHAR(255), USER_ID
VARCHAR(255), FOREIGN KEY (ROLE_ID) REFERENCES UM_ROLES(ID) ON DELETE CASCADE,
FOREIGN KEY (USER_ID) REFERENCES UM_USERS(ID) ON DELETE CASCADE, PRIMARY KEY
(ID));
+CREATE TABLE UM_ROLE_PERMISSIONS (ID VARCHAR(255), PERMISSION_ID VARCHAR(255),
ROLE_ID VARCHAR(255), IS_ALLOWED SMALLINT NOT NULL, UNIQUE (PERMISSION_ID,
ROLE_ID), FOREIGN KEY (PERMISSION_ID) REFERENCES UM_PERMISSIONS(ID) ON DELETE
CASCADE, FOREIGN KEY (ROLE_ID) REFERENCES UM_ROLES(ID) ON DELETE CASCADE,
PRIMARY KEY (ID));
+CREATE TABLE UM_USER_PERMISSIONS (ID VARCHAR(255), PERMISSION_ID VARCHAR(255),
USER_ID VARCHAR(255), IS_ALLOWED SMALLINT NOT NULL, UNIQUE (PERMISSION_ID,
USER_ID), FOREIGN KEY (PERMISSION_ID) REFERENCES UM_PERMISSIONS(ID) ON DELETE
CASCADE, FOREIGN KEY (USER_ID) REFERENCES UM_USERS(ID) ON DELETE CASCADE,
PRIMARY KEY (ID));
+CREATE TABLE UM_USER_ROLES (ID VARCHAR(255), ROLE_ID VARCHAR(255), USER_ID
VARCHAR(255), FOREIGN KEY (ROLE_ID) REFERENCES UM_ROLES(ID) ON DELETE CASCADE,
FOREIGN KEY (USER_ID) REFERENCES UM_USERS(ID) ON DELETE CASCADE, PRIMARY KEY
(ID));
\ No newline at end of file
_______________________________________________
Commons-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/commons-dev
