taylor      2004/06/05 11:57:16

  Modified:    src/sql/external turbine-mysql.sql
  Log:
  fixed bad patch 1.8, revert back to correct script from 1.7 merged with 1.8 email 
table
  
  Revision  Changes    Path
  1.10      +137 -88   jakarta-jetspeed/src/sql/external/turbine-mysql.sql
  
  Index: turbine-mysql.sql
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/sql/external/turbine-mysql.sql,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- turbine-mysql.sql 22 Mar 2004 22:26:58 -0000      1.9
  +++ turbine-mysql.sql 5 Jun 2004 18:57:16 -0000       1.10
  @@ -14,125 +14,174 @@
   -- limitations under the License.
   -----------------------------------------------------------------------------
       
  ------------------------------------------------------------------------------
  --- TURBINE_PERMISSION
  ------------------------------------------------------------------------------
  -CREATE TABLE TURBINE_PERMISSION
  +# -----------------------------------------------------------------------
  +# TURBINE_USER
  +# -----------------------------------------------------------------------
  +drop table if exists TURBINE_USER;
  +
  +CREATE TABLE TURBINE_USER
   (
  -    PERMISSION_ID integer NOT NULL IDENTITY,
  -    PERMISSION_NAME VARCHAR (99) NOT NULL,
  -    OBJECTDATA BINARY,
  -    PRIMARY KEY(PERMISSION_ID),
  -    UNIQUE (PERMISSION_NAME)
  +                            USER_ID INTEGER NOT NULL AUTO_INCREMENT,
  +                    LOGIN_NAME VARCHAR (32) NOT NULL,
  +                    PASSWORD_VALUE VARCHAR (32) NOT NULL,
  +                    FIRST_NAME VARCHAR (99) NOT NULL,
  +                    LAST_NAME VARCHAR (99) NOT NULL,
  +                    EMAIL VARCHAR (99),
  +                    CONFIRM_VALUE VARCHAR (99),
  +                    MODIFIED TIMESTAMP,
  +                    CREATED TIMESTAMP,
  +                    LAST_LOGIN TIMESTAMP,
  +                    DISABLED CHAR (1),
  +                    OBJECTDATA BLOB,
  +                    PASSWORD_CHANGED TIMESTAMP,
  +    PRIMARY KEY(USER_ID),
  +    UNIQUE (LOGIN_NAME)
   );
   
  +# -----------------------------------------------------------------------
  +# TURBINE_ROLE
  +# -----------------------------------------------------------------------
  +drop table if exists TURBINE_ROLE;
   
  -    
  ------------------------------------------------------------------------------
  --- TURBINE_ROLE
  ------------------------------------------------------------------------------
   CREATE TABLE TURBINE_ROLE
   (
  -    ROLE_ID integer NOT NULL IDENTITY,
  -    ROLE_NAME VARCHAR (99) NOT NULL,
  -    OBJECTDATA BINARY,
  +                            ROLE_ID INTEGER NOT NULL AUTO_INCREMENT,
  +                    ROLE_NAME VARCHAR (99) NOT NULL,
  +                    OBJECTDATA BLOB,
       PRIMARY KEY(ROLE_ID),
       UNIQUE (ROLE_NAME)
   );
   
  +# -----------------------------------------------------------------------
  +# TURBINE_GROUP
  +# -----------------------------------------------------------------------
  +drop table if exists TURBINE_GROUP;
   
  -    
  ------------------------------------------------------------------------------
  --- TURBINE_GROUP
  ------------------------------------------------------------------------------
   CREATE TABLE TURBINE_GROUP
   (
  -    GROUP_ID integer NOT NULL IDENTITY,
  -    GROUP_NAME VARCHAR (99) NOT NULL,
  -    OBJECTDATA BINARY,
  +                            GROUP_ID INTEGER NOT NULL AUTO_INCREMENT,
  +                    GROUP_NAME VARCHAR (99) NOT NULL,
  +                    OBJECTDATA BLOB,
       PRIMARY KEY(GROUP_ID),
       UNIQUE (GROUP_NAME)
   );
   
  +# -----------------------------------------------------------------------
  +# TURBINE_PERMISSION
  +# -----------------------------------------------------------------------
  +drop table if exists TURBINE_PERMISSION;
   
  -    
  ------------------------------------------------------------------------------
  --- TURBINE_ROLE_PERMISSION
  ------------------------------------------------------------------------------
  -CREATE TABLE TURBINE_ROLE_PERMISSION
  +CREATE TABLE TURBINE_PERMISSION
   (
  -    ROLE_ID integer NOT NULL,
  -    PERMISSION_ID integer NOT NULL,
  -    PRIMARY KEY(ROLE_ID,PERMISSION_ID)
  +                            PERMISSION_ID INTEGER NOT NULL AUTO_INCREMENT,
  +                    PERMISSION_NAME VARCHAR (99) NOT NULL,
  +                    OBJECTDATA BLOB,
  +    PRIMARY KEY(PERMISSION_ID),
  +    UNIQUE (PERMISSION_NAME)
   );
   
  -CREATE  INDEX ROLE_PERMISSION_INDEX ON TURBINE_ROLE_PERMISSION (ROLE_ID, 
PERMISSION_ID);
  -    
  ------------------------------------------------------------------------------
  --- TURBINE_USER
  ------------------------------------------------------------------------------
  -CREATE TABLE TURBINE_USER
  +# -----------------------------------------------------------------------
  +# TURBINE_ROLE_PERMISSION
  +# -----------------------------------------------------------------------
  +drop table if exists TURBINE_ROLE_PERMISSION;
  +
  +CREATE TABLE TURBINE_ROLE_PERMISSION
   (
  -    USER_ID integer NOT NULL IDENTITY,
  -    LOGIN_NAME VARCHAR (32) NOT NULL,
  -    PASSWORD_VALUE VARCHAR (32) NOT NULL,
  -    FIRST_NAME VARCHAR (99) NOT NULL,
  -    LAST_NAME VARCHAR (99) NOT NULL,
  -    EMAIL VARCHAR (99),
  -    CONFIRM_VALUE VARCHAR (99),
  -    MODIFIED timestamp,
  -    CREATED timestamp,
  -    LAST_LOGIN timestamp,
  -    DISABLED CHAR,
  -    OBJECTDATA BINARY,
  -    PRIMARY KEY(USER_ID),
  -    UNIQUE (LOGIN_NAME)
  +        ROLE_ID INTEGER NOT NULL,
  +        PERMISSION_ID INTEGER NOT NULL,
  +    PRIMARY KEY(ROLE_ID,PERMISSION_ID),
  +    FOREIGN KEY (ROLE_ID) REFERENCES TURBINE_ROLE (ROLE_ID),
  +    FOREIGN KEY (PERMISSION_ID) REFERENCES TURBINE_PERMISSION (PERMISSION_ID)
   );
   
  +# -----------------------------------------------------------------------
  +# TURBINE_USER_GROUP_ROLE
  +# -----------------------------------------------------------------------
  +drop table if exists TURBINE_USER_GROUP_ROLE;
   
  -    
  ------------------------------------------------------------------------------
  --- TURBINE_USER_GROUP_ROLE
  ------------------------------------------------------------------------------
   CREATE TABLE TURBINE_USER_GROUP_ROLE
   (
  -    USER_ID integer NOT NULL,
  -    GROUP_ID integer NOT NULL,
  -    ROLE_ID integer NOT NULL,
  -    PRIMARY KEY(USER_ID,GROUP_ID,ROLE_ID)
  -);
  -
  -CREATE  INDEX USER_GROUP_ROLE_INDEX ON TURBINE_USER_GROUP_ROLE (USER_ID, GROUP_ID, 
ROLE_ID);
  -    
  ------------------------------------------------------------------------------
  --- TURBINE_SCHEDULED_JOB
  ------------------------------------------------------------------------------
  -CREATE TABLE TURBINE_SCHEDULED_JOB
  -(
  -    JOB_ID integer NOT NULL,
  -    SECOND integer default -1 NOT NULL,
  -    MINUTE integer default -1 NOT NULL,
  -    HOUR integer default -1 NOT NULL,
  -    WEEK_DAY integer default -1 NOT NULL,
  -    DAY_OF_MONTH integer default -1 NOT NULL,
  -    TASK VARCHAR (99) NOT NULL,
  -    EMAIL VARCHAR (99),
  -    PRIMARY KEY(JOB_ID)
  -);
  -
  +        USER_ID INTEGER NOT NULL,
  +        GROUP_ID INTEGER NOT NULL,
  +        ROLE_ID INTEGER NOT NULL,
  +    PRIMARY KEY(USER_ID,GROUP_ID,ROLE_ID),
  +    FOREIGN KEY (USER_ID) REFERENCES TURBINE_USER (USER_ID),
  +    FOREIGN KEY (GROUP_ID) REFERENCES TURBINE_GROUP (GROUP_ID),
  +    FOREIGN KEY (ROLE_ID) REFERENCES TURBINE_ROLE (ROLE_ID)
  +);
  +  
  +
  +# -----------------------------------------------------------------------
  +# JETSPEED_USER_PROFILE
  +# -----------------------------------------------------------------------
  +drop table if exists JETSPEED_USER_PROFILE;
  +
  +CREATE TABLE JETSPEED_USER_PROFILE
  +(
  +                            PSML_ID INTEGER NOT NULL AUTO_INCREMENT,
  +                    USER_NAME VARCHAR (32) NOT NULL,
  +                    MEDIA_TYPE VARCHAR (99),
  +                    LANGUAGE VARCHAR (2),
  +                    COUNTRY VARCHAR (2),
  +                    PAGE VARCHAR (99),
  +                    PROFILE BLOB,
  +    PRIMARY KEY(PSML_ID),
  +    UNIQUE (USER_NAME, MEDIA_TYPE, LANGUAGE, COUNTRY, PAGE)
  +);
  +
  +# -----------------------------------------------------------------------
  +# JETSPEED_GROUP_PROFILE
  +# -----------------------------------------------------------------------
  +drop table if exists JETSPEED_GROUP_PROFILE;
  +
  +CREATE TABLE JETSPEED_GROUP_PROFILE
  +(
  +                            PSML_ID INTEGER NOT NULL AUTO_INCREMENT,
  +                    GROUP_NAME VARCHAR (99) NOT NULL,
  +                    MEDIA_TYPE VARCHAR (99),
  +                    LANGUAGE VARCHAR (2),
  +                    COUNTRY VARCHAR (2),
  +                    PAGE VARCHAR (99),
  +                    PROFILE BLOB,
  +    PRIMARY KEY(PSML_ID),
  +    UNIQUE (GROUP_NAME, MEDIA_TYPE, LANGUAGE, COUNTRY, PAGE)
  +);
  +
  +# -----------------------------------------------------------------------
  +# JETSPEED_ROLE_PROFILE
  +# -----------------------------------------------------------------------
  +drop table if exists JETSPEED_ROLE_PROFILE;
  +
  +CREATE TABLE JETSPEED_ROLE_PROFILE
  +(
  +                            PSML_ID INTEGER NOT NULL AUTO_INCREMENT,
  +                    ROLE_NAME VARCHAR (99) NOT NULL,
  +                    MEDIA_TYPE VARCHAR (99),
  +                    LANGUAGE VARCHAR (2),
  +                    COUNTRY VARCHAR (2),
  +                    PAGE VARCHAR (99),
  +                    PROFILE BLOB,
  +    PRIMARY KEY(PSML_ID),
  +    UNIQUE (ROLE_NAME, MEDIA_TYPE, LANGUAGE, COUNTRY, PAGE)
  +);
  + 
  +
  +# -----------------------------------------------------------------------
  +# COFFEES
  +# -----------------------------------------------------------------------
  +drop table if exists COFFEES;
   
  ------------------------------------------------------------------------------
  --- COFFEES
  ------------------------------------------------------------------------------
   CREATE TABLE COFFEES
   (
  -    COFFEE_ID integer IDENTITY,
  -    COFFEE_NAME VARCHAR (50),
  -    SUPPLIER_ID integer,
  -    PRICE FLOAT,
  -    SALES integer,
  -    TOTAL integer
  +   COFFEE_ID INTEGER NOT NULL AUTO_INCREMENT,
  +   COFFEE_NAME VARCHAR (50),
  +   SUPPLIER_ID INTEGER,
  +   PRICE FLOAT,
  +   SALES INTEGER,
  +   TOTAL INTEGER,
  +   PRIMARY KEY(COFFEE_ID)
   );
  +    
   
   
   -----------------------------------------------------------------------------
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to