portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject cvs commit: jakarta-jetspeed/src/sql/external populate-postgres.sql turbine-postgres.sql
Date Thu, 02 Aug 2001 01:09:23 GMT
taylor      01/08/01 18:09:23

  Modified:    src/sql/external populate-postgres.sql turbine-postgres.sql
  Log:
  - updated postgres database scripts. contributed by Dave Carlson
  
  Revision  Changes    Path
  1.2       +2 -2      jakarta-jetspeed/src/sql/external/populate-postgres.sql
  
  Index: populate-postgres.sql
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/sql/external/populate-postgres.sql,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- populate-postgres.sql	2001/07/30 04:30:11	1.1
  +++ populate-postgres.sql	2001/08/02 01:09:23	1.2
  @@ -10,8 +10,8 @@
   INSERT INTO TURBINE_ROLE VALUES(2,'admin',NULL);
   INSERT INTO TURBINE_GROUP VALUES(1,'Jetspeed',NULL);
   INSERT INTO TURBINE_GROUP VALUES(2,'apache',NULL);
  -INSERT INTO TURBINE_USER VALUES(1,'admin','jetspeed','Raphael','Admin','raphael@apache.org','CONFIRMED',NULL,NULL,NULL,'aced0005737200136a6176612e7574696c2e486173687461626c6513bb0f25214ae4b803000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000037708000000050000000274000a4c4153545f4c4f47494e7372000e6a6176612e7574696c2e44617465686a81014b5974190300007870770800000000000000007874000f5f6163636573735f636f756e746572737200116a6176612e6c616e672e496e746567657212e2a0a4f781873802000149000576616c7565787200106a6176612e6c616e672e4e756d62657286ac951d0b94e08b0200007870000000a778');
  -INSERT INTO TURBINE_USER VALUES(2,'turbine','turbine','David','Turbine','taylor@apache.org','CONFIRMED',NULL,NULL,NULL,'aced0005737200136a6176612e7574696c2e486173687461626c6513bb0f25214ae4b803000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000037708000000050000000274000a4c4153545f4c4f47494e7372000e6a6176612e7574696c2e44617465686a81014b5974190300007870770800000000000000007874000f5f6163636573735f636f756e746572737200116a6176612e6c616e672e496e746567657212e2a0a4f781873802000149000576616c7565787200106a6176612e6c616e672e4e756d62657286ac951d0b94e08b02000078700000007478');
  +INSERT INTO TURBINE_USER VALUES(1,'admin','jetspeed','Raphael','Admin','raphael@apache.org','CONFIRMED',NULL,NULL,NULL,NULL);
  +INSERT INTO TURBINE_USER VALUES(2,'turbine','turbine','David','Turbine','taylor@apache.org','CONFIRMED',NULL,NULL,NULL,NULL);
   INSERT INTO TURBINE_ROLE_PERMISSION VALUES(1,1);
   INSERT INTO TURBINE_ROLE_PERMISSION VALUES(1,2);
   INSERT INTO TURBINE_ROLE_PERMISSION VALUES(1,3);
  
  
  
  1.2       +60 -60    jakarta-jetspeed/src/sql/external/turbine-postgres.sql
  
  Index: turbine-postgres.sql
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/sql/external/turbine-postgres.sql,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- turbine-postgres.sql	2000/12/05 13:26:15	1.1
  +++ turbine-postgres.sql	2001/08/02 01:09:23	1.2
  @@ -2,48 +2,48 @@
   -----------------------------------------------------------------------------
   -- TURBINE_PERMISSION
   -----------------------------------------------------------------------------
  -drop sequence TURBINE_PERMISSION_SEQ;
   drop table TURBINE_PERMISSION;
  +drop sequence TURBINE_PERMI_PERMISSION_ID_SEQ;
   
   CREATE TABLE TURBINE_PERMISSION
   (
  -    PERMISSIONID serial,
  -    PERMISSION varchar (99) NOT NULL,
  +    PERMISSION_ID serial,
  +    PERMISSION_NAME varchar (99) NOT NULL,
       OBJECTDATA oid,
  -    PRIMARY KEY(PERMISSIONID),
  -    UNIQUE (PERMISSION)
  +    PRIMARY KEY(PERMISSION_ID),
  +    UNIQUE (PERMISSION_NAME)
   );
   
       
   -----------------------------------------------------------------------------
   -- TURBINE_ROLE
   -----------------------------------------------------------------------------
  -drop sequence TURBINE_ROLE_SEQ;
   drop table TURBINE_ROLE;
  +drop sequence TURBINE_ROLE_ROLE_ID_SEQ;
   
   CREATE TABLE TURBINE_ROLE
   (
  -    ROLEID serial,
  -    ROLENAME varchar (99) NOT NULL,
  +    ROLE_ID serial,
  +    ROLE_NAME varchar (99) NOT NULL,
       OBJECTDATA oid,
  -    PRIMARY KEY(ROLEID),
  -    UNIQUE (ROLENAME)
  +    PRIMARY KEY(ROLE_ID),
  +    UNIQUE (ROLE_NAME)
   );
   
       
   -----------------------------------------------------------------------------
   -- TURBINE_GROUP
   -----------------------------------------------------------------------------
  -drop sequence TURBINE_GROUP_SEQ;
   drop table TURBINE_GROUP;
  +drop sequence TURBINE_GROUP_GROUP_ID_SEQ;
   
   CREATE TABLE TURBINE_GROUP
   (
  -    GROUPID serial,
  -    GROUPNAME varchar (99) NOT NULL,
  +    GROUP_ID serial,
  +    GROUP_NAME varchar (99) NOT NULL,
       OBJECTDATA oid,
  -    PRIMARY KEY(GROUPID),
  -    UNIQUE (GROUPNAME)
  +    PRIMARY KEY(GROUP_ID),
  +    UNIQUE (GROUP_NAME)
   );
   
       
  @@ -54,56 +54,38 @@
   
   CREATE TABLE TURBINE_ROLE_PERMISSION
   (
  -    ROLEID integer NOT NULL,
  -    PERMISSIONID integer NOT NULL,
  -    PRIMARY KEY(ROLEID,PERMISSIONID),
  -    FOREIGN KEY (ROLEID) REFERENCES TURBINE_ROLE (ROLEID),
  -    FOREIGN KEY (PERMISSIONID) REFERENCES TURBINE_PERMISSION (PERMISSIONID)
  +    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)
   );
  -create  INDEX ROLE_PERMISSION_INDEX (ROLEID, PERMISSIONID);
  +create  INDEX ROLE_PERMISSION_INDEX ON TURBINE_ROLE_PERMISSION (ROLE_ID, PERMISSION_ID);
   
       
   -----------------------------------------------------------------------------
   -- TURBINE_USER
   -----------------------------------------------------------------------------
  -drop sequence TURBINE_USER_SEQ;
   drop table TURBINE_USER;
   
   CREATE TABLE TURBINE_USER
   (
  -    USERID serial,
  -    LOGINID varchar (32) NOT NULL,
  +    USER_ID integer NOT NULL,
  +    LOGIN_NAME varchar (32) NOT NULL,
       PASSWORD_VALUE varchar (32) NOT NULL,
       FIRST_NAME varchar (99) NOT NULL,
       LAST_NAME varchar (99) NOT NULL,
  -    ADDRESS1 varchar (255),
  -    ADDRESS2 varchar (255),
  -    CITY varchar (255),
  -    STATE varchar (32),
  -    POSTALCODE varchar (32),
  -    COUNTRY varchar (99),
  -    CITIZENSHIP varchar (32),
  -    PHONE varchar (32),
  -    ALTPHONE varchar (32),
  -    FAX varchar (32),
  -    CELL varchar (32),
  -    PAGER varchar (32),
       EMAIL varchar (99),
  +    CONFIRM_VALUE varchar (99),
       MODIFIED timestamp,
       CREATED timestamp,
       LASTLOGIN timestamp,
  -    PREFIX_NAME varchar (16),
  -    MIDDLE_NAME varchar (99),
  -    SUFFIX_NAME varchar (16),
  -    COMPANY varchar (255),
  -    CONFIRM_VALUE varchar (99),
       OBJECTDATA oid,
  -    PRIMARY KEY(USERID),
  -    FOREIGN KEY (USERID) REFERENCES TURBINE_USER (USERID),
  -    UNIQUE (LOGINID)
  +    PRIMARY KEY(USER_ID),
  +    UNIQUE (LOGIN_NAME)
   );
   
  -    
  +   
   -----------------------------------------------------------------------------
   -- TURBINE_USER_GROUP_ROLE
   -----------------------------------------------------------------------------
  @@ -111,32 +93,50 @@
   
   CREATE TABLE TURBINE_USER_GROUP_ROLE
   (
  -    USERID integer NOT NULL,
  -    GROUPID integer NOT NULL,
  -    ROLEID integer NOT NULL,
  -    PRIMARY KEY(USERID,GROUPID,ROLEID),
  -    FOREIGN KEY (USERID) REFERENCES TURBINE_USER (USERID),
  -    FOREIGN KEY (GROUPID) REFERENCES TURBINE_GROUP (GROUPID),
  -    FOREIGN KEY (ROLEID) REFERENCES TURBINE_USER_ROLE (ROLEID)
  +    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)
   );
  -create  INDEX USER_GROUP_ROLE_INDEX (USERID, GROUPID, ROLEID);
  +create  INDEX USER_GROUP_ROLE_INDEX ON TURBINE_USER_GROUP_ROLE (USER_ID, GROUP_ID, ROLE_ID);
   
       
   -----------------------------------------------------------------------------
  --- TURBINE_JOBENTRY
  +-- TURBINE_SCHEDULED_JOB
   -----------------------------------------------------------------------------
  -drop table TURBINE_JOBENTRY;
  +drop table TURBINE_SCHEDULED_JOB;
   
  -CREATE TABLE TURBINE_JOBENTRY
  +CREATE TABLE TURBINE_SCHEDULED_JOB
   (
  -    JOBID integer NOT NULL,
  -    SECOND integer default -1 NOT NULL,
  +    JOB_ID integer NOT NULL,
  +    SECOND integer default -1 NOT NULL, 
       MINUTE integer default -1 NOT NULL,
       HOUR integer default -1 NOT NULL,
  -    WEEKDAY 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(JOBID)
  +    PROPERTY oid,
  +    PRIMARY KEY(JOB_ID)
   );
  +
  +-----------------------------------------------------------------------------
  +-- ID_TABLE
  +-----------------------------------------------------------------------------
  +
  +drop table ID_TABLE;
  +
  +CREATE TABLE ID_TABLE
  +(
  +    ID_TABLE_ID integer NOT NULL,
  +    TABLE_NAME varchar (255) NOT NULL,
  +    NEXT_ID integer,
  +    QUANTITY integer,
  +    PRIMARY KEY (ID_TABLE_ID),
  +    UNIQUE (TABLE_NAME)
  +);
  +
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message