You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ojb-dev@db.apache.org by th...@apache.org on 2002/12/12 21:12:46 UTC

cvs commit: jakarta-ojb/src/test/org/apache/ojb/quick-db OJB.properties OJB.script

thma        2002/12/12 12:12:46

  Modified:    src/test/org/apache/ojb/quick-db OJB.properties OJB.script
  Log:
  adopt latest changes of testdata
  
  Revision  Changes    Path
  1.8       +1 -1      jakarta-ojb/src/test/org/apache/ojb/quick-db/OJB.properties
  
  Index: OJB.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/test/org/apache/ojb/quick-db/OJB.properties,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- OJB.properties	22 Nov 2002 19:53:59 -0000	1.7
  +++ OJB.properties	12 Dec 2002 20:12:46 -0000	1.8
  @@ -1,5 +1,5 @@
   #HSQL database
  -#Fri Nov 22 19:29:17 CET 2002
  +#Tue Dec 10 21:42:51 CET 2002
   sql.strict_fk=true
   readonly=false
   sql.strong_fk=true
  
  
  
  1.9       +25 -19    jakarta-ojb/src/test/org/apache/ojb/quick-db/OJB.script
  
  Index: OJB.script
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/test/org/apache/ojb/quick-db/OJB.script,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- OJB.script	22 Nov 2002 19:53:59 -0000	1.8
  +++ OJB.script	12 Dec 2002 20:12:46 -0000	1.9
  @@ -1,7 +1,7 @@
  -CREATE TABLE ARTIKEL(ARTIKEL_NR INTEGER NOT NULL PRIMARY KEY,ARTIKELNAME VARCHAR(60),LIEFERANTEN_NR INTEGER,KATEGORIE_NR INTEGER,LIEFEREINHEIT VARCHAR(30),EINZELPREIS FLOAT,LAGERBESTAND INTEGER,BESTELLTEEINHEITEN INTEGER,MINDESTBESTAND INTEGER,AUSLAUFARTIKEL INTEGER)
  -CREATE TABLE BOOKS(ARTIKEL_NR INTEGER NOT NULL PRIMARY KEY,ARTIKELNAME VARCHAR(60),LIEFERANTEN_NR INTEGER,KATEGORIE_NR INTEGER,LIEFEREINHEIT VARCHAR(30),EINZELPREIS FLOAT,LAGERBESTAND INTEGER,BESTELLTEEINHEITEN INTEGER,MINDESTBESTAND INTEGER,AUSLAUFARTIKEL INTEGER,ISBN VARCHAR(10),AUTHOR VARCHAR(50))
  -CREATE TABLE CDS(ARTIKEL_NR INTEGER NOT NULL PRIMARY KEY,ARTIKELNAME VARCHAR(60),LIEFERANTEN_NR INTEGER,KATEGORIE_NR INTEGER,LIEFEREINHEIT VARCHAR(30),EINZELPREIS FLOAT,LAGERBESTAND INTEGER,BESTELLTEEINHEITEN INTEGER,MINDESTBESTAND INTEGER,AUSLAUFARTIKEL INTEGER,LABEL VARCHAR(50),MUSICIANS VARCHAR(250))
   CREATE TABLE KATEGORIEN(KATEGORIE_NR INTEGER NOT NULL PRIMARY KEY,KATEGORIENAME VARCHAR(20),BESCHREIBUNG VARCHAR(60))
  +CREATE TABLE ARTIKEL(ARTIKEL_NR INTEGER NOT NULL PRIMARY KEY,ARTIKELNAME VARCHAR(60),LIEFERANTEN_NR INTEGER,KATEGORIE_NR INTEGER,LIEFEREINHEIT VARCHAR(30),EINZELPREIS FLOAT,LAGERBESTAND INTEGER,BESTELLTEEINHEITEN INTEGER,MINDESTBESTAND INTEGER,AUSLAUFARTIKEL INTEGER,CONSTRAINT ARTIKEL_FK_1 FOREIGN KEY(KATEGORIE_NR) REFERENCES KATEGORIEN(KATEGORIE_NR))
  +CREATE TABLE BOOKS(ARTIKEL_NR INTEGER NOT NULL PRIMARY KEY,ARTIKELNAME VARCHAR(60),LIEFERANTEN_NR INTEGER,KATEGORIE_NR INTEGER,LIEFEREINHEIT VARCHAR(30),EINZELPREIS FLOAT,LAGERBESTAND INTEGER,BESTELLTEEINHEITEN INTEGER,MINDESTBESTAND INTEGER,AUSLAUFARTIKEL INTEGER,ISBN VARCHAR(10),AUTHOR VARCHAR(50),CONSTRAINT BOOKS_FK_1 FOREIGN KEY(KATEGORIE_NR) REFERENCES KATEGORIEN(KATEGORIE_NR))
  +CREATE TABLE CDS(ARTIKEL_NR INTEGER NOT NULL PRIMARY KEY,ARTIKELNAME VARCHAR(60),LIEFERANTEN_NR INTEGER,KATEGORIE_NR INTEGER,LIEFEREINHEIT VARCHAR(30),EINZELPREIS FLOAT,LAGERBESTAND INTEGER,BESTELLTEEINHEITEN INTEGER,MINDESTBESTAND INTEGER,AUSLAUFARTIKEL INTEGER,LABEL VARCHAR(50),MUSICIANS VARCHAR(250),CONSTRAINT CDS_FK_1 FOREIGN KEY(KATEGORIE_NR) REFERENCES KATEGORIEN(KATEGORIE_NR))
   CREATE TABLE ORDER_POSITION(ID INTEGER NOT NULL PRIMARY KEY,ORDER_ID INTEGER,ARTICLE_ID INTEGER)
   CREATE TABLE TREE(ID INTEGER NOT NULL PRIMARY KEY,DATA VARCHAR(50),PARENT_ID INTEGER)
   CREATE TABLE TREEGROUP(ID INTEGER NOT NULL PRIMARY KEY,DATA VARCHAR(50),PARENT_ID INTEGER,GROUP_ID INTEGER)
  @@ -9,29 +9,29 @@
   CREATE TABLE PRODUCT(ID INTEGER NOT NULL PRIMARY KEY,NAME VARCHAR(100),PRICE FLOAT,STOCK INTEGER)
   CREATE TABLE PERSON(ID INTEGER NOT NULL PRIMARY KEY,FIRSTNAME VARCHAR(50),LASTNAME VARCHAR(50))
   CREATE TABLE PROJECT(ID INTEGER NOT NULL PRIMARY KEY,TITLE VARCHAR(50),DESCRIPTION VARCHAR(250))
  -CREATE TABLE PERSON_PROJECT(PERSON_ID INTEGER NOT NULL,PROJECT_ID INTEGER NOT NULL,ROLENAME VARCHAR(20),CONSTRAINT SYS_PK_PERSON_PROJECT PRIMARY KEY(PERSON_ID,PROJECT_ID))
  -CREATE TABLE TASK(TASK_ID INTEGER NOT NULL PRIMARY KEY,PERSON_ID INTEGER,PROJECT_ID INTEGER,TASKNAME VARCHAR(20))
  +CREATE TABLE PERSON_PROJECT(PERSON_ID INTEGER NOT NULL,PROJECT_ID INTEGER NOT NULL,ROLENAME VARCHAR(20),CONSTRAINT SYS_PK_PERSON_PROJECT PRIMARY KEY(PERSON_ID,PROJECT_ID),CONSTRAINT PERSON_PROJECT_FK_1 FOREIGN KEY(PERSON_ID) REFERENCES PERSON(ID),CONSTRAINT PERSON_PROJECT_FK_2 FOREIGN KEY(PROJECT_ID) REFERENCES PROJECT(ID))
  +CREATE TABLE TASK(TASK_ID INTEGER NOT NULL PRIMARY KEY,PERSON_ID INTEGER,PROJECT_ID INTEGER,TASKNAME VARCHAR(20),CONSTRAINT TASK_FK_1 FOREIGN KEY(PERSON_ID,PROJECT_ID) REFERENCES PERSON_PROJECT(PERSON_ID,PROJECT_ID))
   CREATE TABLE FAMILY_MEMBER(ID INTEGER NOT NULL PRIMARY KEY,FIRSTNAME VARCHAR(50),LASTNAME VARCHAR(50),MOTHER_ID INTEGER,FATHER_ID INTEGER)
   CREATE TABLE LOCKED_BY_VERSION(ID INTEGER NOT NULL PRIMARY KEY,VALUE_ VARCHAR(60),VERSION_ INTEGER)
   CREATE TABLE LOCKED_BY_TIMESTAMP(ID INTEGER NOT NULL PRIMARY KEY,VALUE_ VARCHAR(60),TIMESTAMP_ TIMESTAMP)
   CREATE TABLE BLOB_TEST(ID INTEGER NOT NULL PRIMARY KEY,BLOB_VALUE_ LONGVARBINARY,CLOB_VALUE_ VARCHAR)
   CREATE TABLE MDTEST_MASTER(MASTERID INTEGER NOT NULL PRIMARY KEY,MASTER_TEXT VARCHAR(255))
  -CREATE TABLE MDTEST_DETAIL_FKINPK(MASTERID INTEGER NOT NULL,DETAILID INTEGER NOT NULL,DETAIL_TEXT VARCHAR(255),CONSTRAINT SYS_PK_MDTEST_DETAIL_FKINPK PRIMARY KEY(MASTERID,DETAILID))
  -CREATE TABLE MDTEST_DETAIL_FKNOPK(DETAILID INTEGER NOT NULL PRIMARY KEY,MASTERID INTEGER,DETAIL_TEXT VARCHAR(255))
  +CREATE TABLE MDTEST_DETAIL_FKINPK(MASTERID INTEGER NOT NULL,DETAILID INTEGER NOT NULL,DETAIL_TEXT VARCHAR(255),CONSTRAINT SYS_PK_MDTEST_DETAIL_FKINPK PRIMARY KEY(MASTERID,DETAILID),CONSTRAINT MDTEST_DETAIL_FKINPK_FK_1 FOREIGN KEY(MASTERID) REFERENCES MDTEST_MASTER(MASTERID))
  +CREATE TABLE MDTEST_DETAIL_FKNOPK(DETAILID INTEGER NOT NULL PRIMARY KEY,MASTERID INTEGER,DETAIL_TEXT VARCHAR(255),CONSTRAINT MDTEST_DETAIL_FKNOPK_FK_1 FOREIGN KEY(MASTERID) REFERENCES MDTEST_MASTER(MASTERID))
   CREATE TABLE POINT_TABLE(ID INTEGER NOT NULL PRIMARY KEY,X INTEGER,Y INTEGER)
   CREATE TABLE GRAPH_NODE(ID INTEGER NOT NULL PRIMARY KEY,NAME VARCHAR(50),LOCATION INTEGER)
   CREATE TABLE GRAPH_EDGE(ID INTEGER NOT NULL PRIMARY KEY,SOURCE INTEGER,SINK INTEGER)
   CREATE TABLE TESTCLASSA(ID VARCHAR(48) NOT NULL PRIMARY KEY,VALUE1 VARCHAR(64),VALUE2 VARCHAR(64),VALUE3 INTEGER,BOID VARCHAR(48))
   CREATE TABLE TESTCLASSB(ID VARCHAR(48) NOT NULL PRIMARY KEY,VALUE1 VARCHAR(64),AOID VARCHAR(48))
   CREATE TABLE RELATEDTOCONTRACT(PK VARCHAR(48) NOT NULL PRIMARY KEY,RELATEDVALUE1 VARCHAR(64),RELATEDVALUE2 INTEGER,RELATEDVALUE3 TIMESTAMP)
  -CREATE TABLE CONTRACT(PK VARCHAR(48) NOT NULL PRIMARY KEY,FK_TO_RELATED VARCHAR(48),CONTRACT_VALUE1 VARCHAR(64),CONTRACT_VALUE2 INTEGER,CONTRACT_VALUE3 VARCHAR(64),CONTRACT_VALUE4 TIMESTAMP)
  -CREATE TABLE VERSION(PK VARCHAR(48) NOT NULL PRIMARY KEY,FK_TO_CONTRACT VARCHAR(48),VERSION_VALUE1 VARCHAR(64),VERSION_VALUE2 INTEGER,VERSION_VALUE3 TIMESTAMP)
  -CREATE TABLE EFFECTIVENESS(PK VARCHAR(48) NOT NULL PRIMARY KEY,FK_TO_VERSION VARCHAR(48),EFF_VALUE1 VARCHAR(64),EFF_VALUE2 INTEGER,EFF_VALUE3 TIMESTAMP)
  +CREATE TABLE CONTRACT(PK VARCHAR(48) NOT NULL PRIMARY KEY,FK_TO_RELATED VARCHAR(48),CONTRACT_VALUE1 VARCHAR(64),CONTRACT_VALUE2 INTEGER,CONTRACT_VALUE3 VARCHAR(64),CONTRACT_VALUE4 TIMESTAMP,CONSTRAINT CONTRACT_FK_1 FOREIGN KEY(FK_TO_RELATED) REFERENCES RELATEDTOCONTRACT(PK))
  +CREATE TABLE VERSION(PK VARCHAR(48) NOT NULL PRIMARY KEY,FK_TO_CONTRACT VARCHAR(48),VERSION_VALUE1 VARCHAR(64),VERSION_VALUE2 INTEGER,VERSION_VALUE3 TIMESTAMP,CONSTRAINT VERSION_FK_1 FOREIGN KEY(FK_TO_CONTRACT) REFERENCES CONTRACT(PK))
  +CREATE TABLE EFFECTIVENESS(PK VARCHAR(48) NOT NULL PRIMARY KEY,FK_TO_VERSION VARCHAR(48),EFF_VALUE1 VARCHAR(64),EFF_VALUE2 INTEGER,EFF_VALUE3 TIMESTAMP,CONSTRAINT EFFECTIVENESS_FK_1 FOREIGN KEY(FK_TO_VERSION) REFERENCES VERSION(PK))
   CREATE TABLE MULTIMAPPEDTABLE(ID INTEGER NOT NULL PRIMARY KEY,VALUE1 VARCHAR(64),VALUE2 INTEGER,VALUE3 TIMESTAMP,VALUE4 VARCHAR(64),VALUE5 INTEGER,VALUE6 TIMESTAMP,VALUE7 VARCHAR(64),OJBCONCRETECLASS VARCHAR(64))
   CREATE TABLE TABLE_1(PK INTEGER NOT NULL PRIMARY KEY,FK_TO_RELATED INTEGER)
   CREATE TABLE TABLE_2(PK INTEGER NOT NULL PRIMARY KEY)
   CREATE TABLE BIDIR_A(PK VARCHAR(48) NOT NULL PRIMARY KEY,FK_TO_B VARCHAR(48))
  -CREATE TABLE BIDIR_B(PK VARCHAR(48) NOT NULL PRIMARY KEY,FK_TO_A VARCHAR(48))
  +CREATE TABLE BIDIR_B(PK VARCHAR(48) NOT NULL PRIMARY KEY,FK_TO_A VARCHAR(48),CONSTRAINT BIDIR_B_FK_1 FOREIGN KEY(FK_TO_A) REFERENCES BIDIR_A(PK))
   CREATE TABLE MAMMAL(ANIMALID INTEGER NOT NULL PRIMARY KEY,NAME VARCHAR(60),AGE INTEGER,NUMLEGS INTEGER,ZOOID INTEGER)
   CREATE TABLE REPTILE(ANIMALID INTEGER NOT NULL PRIMARY KEY,NAME VARCHAR(60),AGE INTEGER,COLOR VARCHAR(60),ZOOID INTEGER)
   CREATE TABLE ZOO(ZOOID INTEGER NOT NULL PRIMARY KEY,NAME VARCHAR(60))
  @@ -66,6 +66,8 @@
   CREATE TABLE OJB_DSET_ENTRIES(ID INTEGER NOT NULL PRIMARY KEY,DLIST_ID INTEGER,POSITION_ INTEGER,OID_ LONGVARBINARY)
   CREATE TABLE OJB_DMAP(ID INTEGER NOT NULL PRIMARY KEY,SIZE_ INTEGER)
   CREATE TABLE OJB_DMAP_ENTRIES(ID INTEGER NOT NULL PRIMARY KEY,DMAP_ID INTEGER,KEY_OID LONGVARBINARY,VALUE_OID LONGVARBINARY)
  +ALTER TABLE TABLE_1 ADD CONSTRAINT TABLE_1_FK_1 FOREIGN KEY(FK_TO_RELATED) REFERENCES TABLE_2(PK)
  +ALTER TABLE BIDIR_A ADD CONSTRAINT BIDIR_A_FK_1 FOREIGN KEY(FK_TO_B) REFERENCES BIDIR_B(PK)
   GRANT ALL ON CLASS "java.lang.Math" TO PUBLIC
   GRANT ALL ON CLASS "org.hsqldb.Library" TO PUBLIC
   CREATE USER SA PASSWORD "" ADMIN
  @@ -137,6 +139,14 @@
   CREATE ALIAS LENGTH FOR "org.hsqldb.Library.length"
   CREATE ALIAS ROUND FOR "org.hsqldb.Library.round"
   CREATE ALIAS REPLACE FOR "org.hsqldb.Library.replace"
  +INSERT INTO KATEGORIEN VALUES(1,'Beverages','Alles leckere zum S\u00fcffeln')
  +INSERT INTO KATEGORIEN VALUES(2,'Spices','Gew\u00fcrze, Dressings etc.')
  +INSERT INTO KATEGORIEN VALUES(3,'Meat','')
  +INSERT INTO KATEGORIEN VALUES(4,'Liquors','')
  +INSERT INTO KATEGORIEN VALUES(5,'Books','Strange Books...')
  +INSERT INTO KATEGORIEN VALUES(6,'bread','')
  +INSERT INTO KATEGORIEN VALUES(7,'Fruits','Fr\u00fcchte etc.')
  +INSERT INTO KATEGORIEN VALUES(8,'Dairy Products','Kat 8')
   INSERT INTO ARTIKEL VALUES(1,'Chai',1,1,'10 boxes x 20 bags',18.53E0,39,0,10,0)
   INSERT INTO ARTIKEL VALUES(2,'Chang',1,1,'24 - 12 oz bottles',19.89E0,17,40,25,0)
   INSERT INTO ARTIKEL VALUES(3,'Aniseed Syrup',1,2,'12 - 550 ml bottles',10.2E0,13,70,25,0)
  @@ -219,14 +229,6 @@
   INSERT INTO CDS VALUES(200,'Mama\u00b4s Gun',12,5,'12 boxes',23.0E0,32,0,15,0,'Motown Records','Erykah Badu')
   INSERT INTO CDS VALUES(201,'STREETSOUL',12,5,'12 boxes',25.0E0,32,0,15,0,'Virgin Records','Guru\u00b4s Jazzmatazz')
   INSERT INTO CDS VALUES(202,'Beyond Skin',12,5,'12 boxes',25.0E0,32,0,15,0,'Outcaste Records','Nitin Sawhney')
  -INSERT INTO KATEGORIEN VALUES(1,'Beverages','Alles leckere zum S\u00fcffeln')
  -INSERT INTO KATEGORIEN VALUES(2,'Spices','Gew\u00fcrze, Dressings etc.')
  -INSERT INTO KATEGORIEN VALUES(3,'Meat','')
  -INSERT INTO KATEGORIEN VALUES(4,'Liquors','')
  -INSERT INTO KATEGORIEN VALUES(5,'Books','Strange Books...')
  -INSERT INTO KATEGORIEN VALUES(6,'bread','')
  -INSERT INTO KATEGORIEN VALUES(7,'Fruits','Fr\u00fcchte etc.')
  -INSERT INTO KATEGORIEN VALUES(8,'Dairy Products','Kat 8')
   INSERT INTO ORDER_POSITION VALUES(1,1,5)
   INSERT INTO ORDER_POSITION VALUES(2,1,100)
   INSERT INTO ORDER_POSITION VALUES(3,1,200)
  @@ -245,6 +247,7 @@
   INSERT INTO PROJECT VALUES(3,'HSQLDB','HSQLDB')
   INSERT INTO PROJECT VALUES(4,'XERCES','XERCES')
   INSERT INTO PROJECT VALUES(5,'Linux','Linux')
  +INSERT INTO PROJECT VALUES(6,'mySQL','mySQL')
   INSERT INTO PERSON_PROJECT VALUES(1,1,'founder')
   INSERT INTO PERSON_PROJECT VALUES(1,2,'friend')
   INSERT INTO PERSON_PROJECT VALUES(2,1,'developer')
  @@ -256,6 +259,9 @@
   INSERT INTO PERSON_PROJECT VALUES(4,1,'developer')
   INSERT INTO PERSON_PROJECT VALUES(5,2,'tester')
   INSERT INTO PERSON_PROJECT VALUES(5,4,'lead')
  +INSERT INTO PERSON_PROJECT VALUES(7,4,'lead')
  +INSERT INTO PERSON_PROJECT VALUES(7,5,'founder')
  +INSERT INTO PERSON_PROJECT VALUES(7,6,'tester')
   INSERT INTO TASK VALUES(1,2,1,'Initial Layout')
   INSERT INTO TASK VALUES(2,2,1,'Initial Spec')
   INSERT INTO TASK VALUES(3,2,2,'Project Cleanup')