I would like to go ahead and replace all instances of the OID column in
turbine with JOB_ID so that it will not conflict with postgres. I think
that this is pretty basic.
Comments anyone?
The following patches are for TurbineMapBuilder.java, JobEntryPeer.java,
and all the .sql build scripts.
*************************** Begin Patches
**********************************
Index:
turbine/src/java/org/apache/turbine/services/schedule/JobEntryPeer.java
===================================================================
RCS file:
/products/cvs/turbine/turbine/src/java/org/apache/turbine/services/schedule/JobEntryPeer.java,v
retrieving revision 1.6
diff -u -r1.6 JobEntryPeer.java
---
turbine/src/java/org/apache/turbine/services/schedule/JobEntryPeer.java
2000/05/18 20:40:02 1.6
+++
turbine/src/java/org/apache/turbine/services/schedule/JobEntryPeer.java
2000/07/06 13:00:20
@@ -82,7 +82,7 @@
private static final String TABLE_NAME = "Jobentry";
// Table colums
- public static final String OID_COLUMN = "OID";
+ public static final String OID_COLUMN = "JOB_ID";
public static final String MIN_COLUMN = "MINUTE";
public static final String HOUR_COLUMN = "HOUR";
public static final String WEEKDAY_COLUMN = "WEEKDAY";
Index:
turbine/src/java/org/apache/turbine/util/db/map/TurbineMapBuilder.java
===================================================================
RCS file:
/products/cvs/turbine/turbine/src/java/org/apache/turbine/util/db/map/TurbineMapBuilder.java,v
retrieving revision 1.4
diff -u -r1.4 TurbineMapBuilder.java
---
turbine/src/java/org/apache/turbine/util/db/map/TurbineMapBuilder.java
2000/05/15 23:26:02 1.4
+++
turbine/src/java/org/apache/turbine/util/db/map/TurbineMapBuilder.java
2000/07/06 12:58:53
@@ -408,7 +408,7 @@
// add Jobentry columns
tMap = dbMap.getTable("Jobentry");
- tMap.addPrimaryKey("OID", integer);
+ tMap.addPrimaryKey("JOB_ID", integer);
tMap.addColumn("MINUTE", integer);
tMap.addColumn("HOUR", integer);
tMap.addColumn("WEEKDAY", integer);
Index: turbine/docs/schemas/Db2_users_roles_permissions.sql
===================================================================
RCS file:
/products/cvs/turbine/turbine/docs/schemas/Db2_users_roles_permissions.sql,v
retrieving revision 1.1
diff -u -r1.1 Db2_users_roles_permissions.sql
--- turbine/docs/schemas/Db2_users_roles_permissions.sql 2000/05/24
17:55:40 1.1
+++ turbine/docs/schemas/Db2_users_roles_permissions.sql 2000/07/06
13:21:09
@@ -106,7 +106,7 @@
DROP TABLE JOBENTRY
;
CREATE TABLE JOBENTRY (
- OID INT NOT NULL,
+ JOB_ID INT NOT NULL,
MINUTE INT default -1 NOT NULL,
HOUR INT default -1 NOT NULL,
WEEKDAY INT default -1 NOT NULL,
@@ -116,7 +116,7 @@
)
;
ALTER TABLE JOBENTRY
- ADD CONSTRAINT OID_PK PRIMARY KEY (OID)
+ ADD CONSTRAINT JOB_ID_PK PRIMARY KEY (JOB_ID)
;
CREATE UNIQUE INDEX JOBENTRY_NAME ON JOBENTRY(TASK)
;
Index: turbine/docs/schemas/HypersonicSQL_users_roles_permissions.sql
===================================================================
RCS file:
/products/cvs/turbine/turbine/docs/schemas/HypersonicSQL_users_roles_permissions.sql,v
retrieving revision 1.1
diff -u -r1.1 HypersonicSQL_users_roles_permissions.sql
--- turbine/docs/schemas/HypersonicSQL_users_roles_permissions.sql
2000/06/05 15:44:40 1.1
+++ turbine/docs/schemas/HypersonicSQL_users_roles_permissions.sql
2000/07/06 13:21:33
@@ -83,7 +83,7 @@
-- FIXME: IDB doesn't like -1 as a default value
-- CREATE TABLE Jobentry (
--- OID BIGINT NOT NULL PRIMARY KEY,
+-- JOB_ID BIGINT NOT NULL PRIMARY KEY,
-- MINUTE INTEGER default -1 NOT NULL,
-- HOUR INTEGER default -1 NOT NULL,
-- WEEKDAY INTEGER default -1 NOT NULL,
Index: turbine/docs/schemas/InstantDB_users_roles_permissions.sql
===================================================================
RCS file:
/products/cvs/turbine/turbine/docs/schemas/InstantDB_users_roles_permissions.sql,v
retrieving revision 1.2
diff -u -r1.2 InstantDB_users_roles_permissions.sql
--- turbine/docs/schemas/InstantDB_users_roles_permissions.sql
2000/06/01 06:35:14 1.2
+++ turbine/docs/schemas/InstantDB_users_roles_permissions.sql
2000/07/06 13:21:52
@@ -108,7 +108,7 @@
; FIXME: IDB doesn't like -1 as a default value
;e create table Jobentry (
-; OID long NOT NULL PRIMARY KEY,
+; JOB_ID long NOT NULL PRIMARY KEY,
; MINUTE integer default -1 NOT NULL,
; HOUR integer default -1 NOT NULL,
; WEEKDAY integer default -1 NOT NULL,
Index: turbine/docs/schemas/MySQL_users_roles_permissions.sql
===================================================================
RCS file:
/products/cvs/turbine/turbine/docs/schemas/MySQL_users_roles_permissions.sql,v
retrieving revision 1.1
diff -u -r1.1 MySQL_users_roles_permissions.sql
--- turbine/docs/schemas/MySQL_users_roles_permissions.sql 2000/05/24
17:55:41 1.1
+++ turbine/docs/schemas/MySQL_users_roles_permissions.sql 2000/07/06
13:22:11
@@ -93,7 +93,7 @@
drop table if exists Jobentry;
create table Jobentry (
- OID int(11) NOT NULL PRIMARY KEY,
+ JOB_ID int(11) NOT NULL PRIMARY KEY,
MINUTE integer default -1 NOT NULL,
HOUR integer default -1 NOT NULL,
WEEKDAY integer default -1 NOT NULL,
Index: turbine/docs/schemas/Odbc_users_roles_permissions.sql
===================================================================
RCS file:
/products/cvs/turbine/turbine/docs/schemas/Odbc_users_roles_permissions.sql,v
retrieving revision 1.1
diff -u -r1.1 Odbc_users_roles_permissions.sql
--- turbine/docs/schemas/Odbc_users_roles_permissions.sql 2000/06/30
20:15:40 1.1
+++ turbine/docs/schemas/Odbc_users_roles_permissions.sql 2000/07/06
13:22:50
@@ -48,7 +48,7 @@
DROP TABLE JOBENTRY;
-CREATE TABLE JOBENTRY ( OID COUNTER(1,1), MINUTE INTEGER NOT NULL, HOUR
INTEGER NOT NULL, WEEKDAY INTEGER NOT NULL, DAY_OF_MONTH INTEGER NOT
NULL, TASK TEXT(99) NOT NULL, EMAIL TEXT(99) NULL, PRIMARY KEY(OID));
+CREATE TABLE JOBENTRY ( JOB_ID COUNTER(1,1), MINUTE INTEGER NOT NULL,
HOUR INTEGER NOT NULL, WEEKDAY INTEGER NOT NULL, DAY_OF_MONTH INTEGER
NOT NULL, TASK TEXT(99) NOT NULL, EMAIL TEXT(99) NULL, PRIMARY
KEY(JOB_ID));
CREATE UNIQUE INDEX JOBENTRY_NAME ON JOBENTRY(TASK);
Index: turbine/docs/schemas/Oracle_users_roles_permissions.sql
===================================================================
RCS file:
/products/cvs/turbine/turbine/docs/schemas/Oracle_users_roles_permissions.sql,v
retrieving revision 1.1
diff -u -r1.1 Oracle_users_roles_permissions.sql
--- turbine/docs/schemas/Oracle_users_roles_permissions.sql 2000/05/24
17:55:41 1.1
+++ turbine/docs/schemas/Oracle_users_roles_permissions.sql 2000/07/06
13:23:14
@@ -113,7 +113,7 @@
DROP TABLE JOBENTRY
/
CREATE TABLE JOBENTRY (
- OID INT NOT NULL,
+ JOB_ID INT NOT NULL,
MINUTE INT default -1 NOT NULL,
HOUR INT default -1 NOT NULL,
WEEKDAY INT default -1 NOT NULL,
@@ -123,7 +123,7 @@
)
/
ALTER TABLE JOBENTRY
- ADD CONSTRAINT OID_PK PRIMARY KEY (OID)
+ ADD CONSTRAINT JOB_ID_PK PRIMARY KEY (JOB_ID)
USING INDEX
/
CREATE UNIQUE INDEX JOBENTRY_NAME ON JOBENTRY(TASK)
Index: turbine/docs/schemas/Sybase_users_roles_permissions.sql
===================================================================
RCS file:
/products/cvs/turbine/turbine/docs/schemas/Sybase_users_roles_permissions.sql,v
retrieving revision 1.2
diff -u -r1.2 Sybase_users_roles_permissions.sql
--- turbine/docs/schemas/Sybase_users_roles_permissions.sql 2000/06/01
22:42:40 1.2
+++ turbine/docs/schemas/Sybase_users_roles_permissions.sql 2000/07/06
13:23:33
@@ -36,14 +36,14 @@
create table Jobentry
(
- OID int not null,
+ JOB_ID int not null,
MINUTE int not null,
HOUR int not null,
WEEKDAY int not null,
DAY_OF_MONTH int not null,
TASK varchar(99) not null,
EMAIL varchar(99) null ,
- constraint Jobentry_PK primary key (OID)
+ constraint Jobentry_PK primary key (JOB_ID)
)
go
Index: turbine/docs/schemas/Postgres_users_roles_permissions.sql
===================================================================
RCS file:
/products/cvs/turbine/turbine/docs/schemas/Postgres_users_roles_permissions.sql,v
retrieving revision 1.1
diff -u -r1.1 Postgres_users_roles_permissions.sql
--- turbine/docs/schemas/Postgres_users_roles_permissions.sql 2000/05/24
17:55:41 1.1
+++ turbine/docs/schemas/Postgres_users_roles_permissions.sql 2000/07/06
13:23:48
@@ -106,3 +106,17 @@
);
create unique index VisitorRole_visitorid_roleid_index on VisitorRole (
VISITORID, ROLEID );
+
+-- -------------------------------------------------------------------
+drop table Jobentry;
+
+create table Jobentry (
+ JOB_ID integer NOT NULL,
+ MINUTE integer default -1 NOT NULL,
+ HOUR integer default -1 NOT NULL,
+ WEEKDAY 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)
+);
*************************** End Patches
************************************
I also want to add a Postgres_id_table.sql like the following:
******************** Begin .sql Script
************************************
-- ------------------------------------
-- This table provides the primary keys for all
-- other tables in the system. Should be used
-- with util.db.IDBroker.
-- -----------------------------------
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)
);
create unique index id_table_id_table_id on id_table(id_table_id);
insert into ID_TABLE (id_table_id, table_name, next_id, quantity)
values (1, 'Permission', 20, 10);
insert into ID_TABLE (id_table_id, table_name, next_id, quantity)
values (2, 'UserRole', 20, 10);
insert into ID_TABLE (id_table_id, table_name, next_id, quantity)
values (3, 'Visitor', 20, 10);
insert into ID_TABLE (id_table_id, table_name, next_id, quantity)
values (4, 'Jobentry', 20, 10);
*********************** End .sql Scirpt
***********************************
John
--
********************************
** John Thorhauer
** [EMAIL PROTECTED]
********************************
------------------------------------------------------------
To subscribe: [EMAIL PROTECTED]
To unsubscribe: [EMAIL PROTECTED]
Search: <http://www.mail-archive.com/turbine%40list.working-dogs.com/>
Problems?: [EMAIL PROTECTED]
