Author: antonio Date: Tue Dec 28 01:39:49 2004 New Revision: 123486 URL: http://svn.apache.org/viewcvs?view=rev&rev=123486 Log: Update sample database to version 1.7.3 Removed: cocoon/trunk/src/blocks/hsqldb/samples/WEB-INF/db/cocoondb.backup cocoon/trunk/src/blocks/hsqldb/samples/WEB-INF/db/cocoondb.data Modified: cocoon/trunk/src/blocks/hsqldb/samples/WEB-INF/db/cocoondb.properties cocoon/trunk/src/blocks/hsqldb/samples/WEB-INF/db/cocoondb.script
Deleted: /cocoon/trunk/src/blocks/hsqldb/samples/WEB-INF/db/cocoondb.backup Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/hsqldb/samples/WEB-INF/db/cocoondb.backup?view=auto&rev=123485 ============================================================================== Deleted: /cocoon/trunk/src/blocks/hsqldb/samples/WEB-INF/db/cocoondb.data Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/hsqldb/samples/WEB-INF/db/cocoondb.data?view=auto&rev=123485 ============================================================================== Modified: cocoon/trunk/src/blocks/hsqldb/samples/WEB-INF/db/cocoondb.properties Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/hsqldb/samples/WEB-INF/db/cocoondb.properties?view=diff&rev=123486&p1=cocoon/trunk/src/blocks/hsqldb/samples/WEB-INF/db/cocoondb.properties&r1=123485&p2=cocoon/trunk/src/blocks/hsqldb/samples/WEB-INF/db/cocoondb.properties&r2=123486 ============================================================================== --- cocoon/trunk/src/blocks/hsqldb/samples/WEB-INF/db/cocoondb.properties (original) +++ cocoon/trunk/src/blocks/hsqldb/samples/WEB-INF/db/cocoondb.properties Tue Dec 28 01:39:49 2004 @@ -1,19 +1,20 @@ #HSQL database - -# Copyright 1999-2004 The Apache Software Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -#Mon Sep 16 23:16:08 CDT 2002 -version=1.6 -modified=yes +#Tue Dec 28 03:28:01 CST 2004 +hsqldb.cache_file_scale=1 +runtime.gc_interval=0 +hsqldb.first_identity=0 +version=1.7.3 +modified=no +hsqldb.script_format=0 +sql.enforce_size=false +hsqldb.cache_size_scale=10 +hsqldb.cache_scale=14 +hsqldb.version=1.7.3 +hsqldb.log_size=200 +sql.enforce_strict_size=false +readonly=false +hsqldb.compatible_version=1.7.2 +hsqldb.original_version=1.7.1 +sql.compare_in_locale=false +hsqldb.nio_data_file=true +hsqldb.cache_version=1.7.0 Modified: cocoon/trunk/src/blocks/hsqldb/samples/WEB-INF/db/cocoondb.script Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/hsqldb/samples/WEB-INF/db/cocoondb.script?view=diff&rev=123486&p1=cocoon/trunk/src/blocks/hsqldb/samples/WEB-INF/db/cocoondb.script&r1=123485&p2=cocoon/trunk/src/blocks/hsqldb/samples/WEB-INF/db/cocoondb.script&r2=123486 ============================================================================== --- cocoon/trunk/src/blocks/hsqldb/samples/WEB-INF/db/cocoondb.script (original) +++ cocoon/trunk/src/blocks/hsqldb/samples/WEB-INF/db/cocoondb.script Tue Dec 28 01:39:49 2004 @@ -1,100 +1,19 @@ -CREATE TABLE DEPARTMENT(ID INTEGER NOT NULL,NAME VARCHAR NOT NULL,UNIQUE(ID)) - -# Copyright 1999-2004 The Apache Software Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -CREATE TABLE EMPLOYEE(ID INTEGER NOT NULL,DEPARTMENT_ID INTEGER NOT NULL,NAME VARCHAR NOT NULL,UNIQUE(ID)) -CREATE TABLE USER(UID INTEGER IDENTITY PRIMARY KEY,NAME VARCHAR,FIRSTNAME VARCHAR,UNAME VARCHAR,UNIQUE(UNAME)) -CREATE TABLE GROUPS(GID INTEGER IDENTITY PRIMARY KEY,GNAME VARCHAR,UNIQUE(GNAME)) -CREATE TABLE USER_GROUPS(UID INTEGER,GID INTEGER,UNIQUE(UID,GID),FOREIGN KEY(UID)REFERENCES USER(UID),FOREIGN KEY(GID)REFERENCES GROUPS(GID)) +CREATE TABLE DEPARTMENT(ID INTEGER NOT NULL,NAME VARCHAR NOT NULL,CONSTRAINT SYS_CT_1 UNIQUE(ID)) +CREATE TABLE EMPLOYEE(ID INTEGER NOT NULL,DEPARTMENT_ID INTEGER NOT NULL,NAME VARCHAR NOT NULL,CONSTRAINT SYS_CT_3 UNIQUE(ID)) +CREATE TABLE USER(UID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 0) NOT NULL PRIMARY KEY,NAME VARCHAR,FIRSTNAME VARCHAR,UNAME VARCHAR,CONSTRAINT SYS_CT_5 UNIQUE(UNAME)) +CREATE TABLE GROUPS(GID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 0) NOT NULL PRIMARY KEY,GNAME VARCHAR,CONSTRAINT SYS_CT_7 UNIQUE(GNAME)) +CREATE TABLE USER_GROUPS(UID INTEGER,GID INTEGER,CONSTRAINT SYS_CT_9 UNIQUE(UID,GID),CONSTRAINT SYS_FK_10 FOREIGN KEY(UID) REFERENCES USER(UID),CONSTRAINT SYS_FK_11 FOREIGN KEY(GID) REFERENCES GROUPS(GID)) CREATE TABLE STATE_TAX(CATEGORY VARCHAR NOT NULL,GROSSTAX_COLLECTED DOUBLE NOT NULL,NETTAX_COLLECTED DOUBLE NOT NULL,YEAR INTEGER NOT NULL) -CREATE TABLE MEDIA(ID INTEGER IDENTITY PRIMARY KEY,IMAGE BINARY,MIMETYPE VARCHAR) -GRANT ALL ON CLASS "org.hsqldb.Library" TO PUBLIC -GRANT ALL ON CLASS "java.lang.Math" TO PUBLIC +CREATE TABLE MEDIA(ID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 0) NOT NULL PRIMARY KEY,IMAGE BINARY,MIMETYPE VARCHAR) +CREATE TABLE SOURCEPROPS(SOURCE VARCHAR NOT NULL,NAMESPACE VARCHAR NOT NULL,NAME VARCHAR NOT NULL,VALUE VARCHAR NOT NULL,CONSTRAINT SYS_CT_11 UNIQUE(SOURCE,NAMESPACE,NAME)) CREATE USER SA PASSWORD "" ADMIN -CREATE ALIAS DAYNAME FOR "org.hsqldb.Library.dayname" -CREATE ALIAS SPACE FOR "org.hsqldb.Library.space" -CREATE ALIAS SUBSTRING FOR "org.hsqldb.Library.substring" -CREATE ALIAS SQRT FOR "java.lang.Math.sqrt" -CREATE ALIAS ABS FOR "java.lang.Math.abs" -CREATE ALIAS POWER FOR "java.lang.Math.pow" -CREATE ALIAS CHAR FOR "org.hsqldb.Library.character" -CREATE ALIAS CONCAT FOR "org.hsqldb.Library.concat" -CREATE ALIAS PI FOR "org.hsqldb.Library.pi" -CREATE ALIAS SECOND FOR "org.hsqldb.Library.second" -CREATE ALIAS TRUNCATE FOR "org.hsqldb.Library.truncate" -CREATE ALIAS MONTH FOR "org.hsqldb.Library.month" -CREATE ALIAS LOWER FOR "org.hsqldb.Library.lcase" -CREATE ALIAS ATAN2 FOR "java.lang.Math.atan2" -CREATE ALIAS REPEAT FOR "org.hsqldb.Library.repeat" -CREATE ALIAS DAYOFMONTH FOR "org.hsqldb.Library.dayofmonth" -CREATE ALIAS TAN FOR "java.lang.Math.tan" -CREATE ALIAS RADIANS FOR "java.lang.Math.toRadians" -CREATE ALIAS FLOOR FOR "java.lang.Math.floor" -CREATE ALIAS NOW FOR "org.hsqldb.Library.now" -CREATE ALIAS ACOS FOR "java.lang.Math.acos" -CREATE ALIAS DAYOFWEEK FOR "org.hsqldb.Library.dayofweek" -CREATE ALIAS CEILING FOR "java.lang.Math.ceil" -CREATE ALIAS DAYOFYEAR FOR "org.hsqldb.Library.dayofyear" -CREATE ALIAS LCASE FOR "org.hsqldb.Library.lcase" -CREATE ALIAS WEEK FOR "org.hsqldb.Library.week" -CREATE ALIAS SOUNDEX FOR "org.hsqldb.Library.soundex" -CREATE ALIAS ASIN FOR "java.lang.Math.asin" -CREATE ALIAS LOCATE FOR "org.hsqldb.Library.locate" -CREATE ALIAS EXP FOR "java.lang.Math.exp" -CREATE ALIAS MONTHNAME FOR "org.hsqldb.Library.monthname" -CREATE ALIAS YEAR FOR "org.hsqldb.Library.year" -CREATE ALIAS LEFT FOR "org.hsqldb.Library.left" -CREATE ALIAS ROUNDMAGIC FOR "org.hsqldb.Library.roundMagic" -CREATE ALIAS BITOR FOR "org.hsqldb.Library.bitor" -CREATE ALIAS LTRIM FOR "org.hsqldb.Library.ltrim" -CREATE ALIAS COT FOR "org.hsqldb.Library.cot" -CREATE ALIAS COS FOR "java.lang.Math.cos" -CREATE ALIAS MOD FOR "org.hsqldb.Library.mod" -CREATE ALIAS SIGN FOR "org.hsqldb.Library.sign" -CREATE ALIAS DEGREES FOR "java.lang.Math.toDegrees" -CREATE ALIAS LOG FOR "java.lang.Math.log" -CREATE ALIAS SIN FOR "java.lang.Math.sin" -CREATE ALIAS CURTIME FOR "org.hsqldb.Library.curtime" -CREATE ALIAS DIFFERENCE FOR "org.hsqldb.Library.difference" -CREATE ALIAS INSERT FOR "org.hsqldb.Library.insert" -CREATE ALIAS SUBSTR FOR "org.hsqldb.Library.substring" -CREATE ALIAS DATABASE FOR "org.hsqldb.Library.database" -CREATE ALIAS MINUTE FOR "org.hsqldb.Library.minute" -CREATE ALIAS HOUR FOR "org.hsqldb.Library.hour" -CREATE ALIAS IDENTITY FOR "org.hsqldb.Library.identity" -CREATE ALIAS QUARTER FOR "org.hsqldb.Library.quarter" -CREATE ALIAS CURDATE FOR "org.hsqldb.Library.curdate" -CREATE ALIAS BITAND FOR "org.hsqldb.Library.bitand" -CREATE ALIAS USER FOR "org.hsqldb.Library.user" -CREATE ALIAS UCASE FOR "org.hsqldb.Library.ucase" -CREATE ALIAS RTRIM FOR "org.hsqldb.Library.rtrim" -CREATE ALIAS LOG10 FOR "org.hsqldb.Library.log10" -CREATE ALIAS RIGHT FOR "org.hsqldb.Library.right" -CREATE ALIAS ATAN FOR "java.lang.Math.atan" -CREATE ALIAS UPPER FOR "org.hsqldb.Library.ucase" -CREATE ALIAS ASCII FOR "org.hsqldb.Library.ascii" -CREATE ALIAS RAND FOR "java.lang.Math.random" -CREATE ALIAS LENGTH FOR "org.hsqldb.Library.length" -CREATE ALIAS ROUND FOR "org.hsqldb.Library.round" -CREATE ALIAS REPLACE FOR "org.hsqldb.Library.replace" +SET WRITE_DELAY 60 INSERT INTO DEPARTMENT VALUES(1,'Development') INSERT INTO DEPARTMENT VALUES(2,'Management') INSERT INTO DEPARTMENT VALUES(3,'Testers') INSERT INTO EMPLOYEE VALUES(1,1,'Donald Ball') -INSERT INTO EMPLOYEE VALUES(2,1,'Sylvain Wallez ') -INSERT INTO EMPLOYEE VALUES(3,1,'Carsten Ziegeler ') +INSERT INTO EMPLOYEE VALUES(2,1,'Sylvain Wallez') +INSERT INTO EMPLOYEE VALUES(3,1,'Carsten Ziegeler') INSERT INTO EMPLOYEE VALUES(4,1,'Torsten Curdt') INSERT INTO EMPLOYEE VALUES(5,1,'Marcus Crafter') INSERT INTO EMPLOYEE VALUES(6,1,'Ovidiu Predescu') @@ -102,29 +21,29 @@ INSERT INTO EMPLOYEE VALUES(8,2,'Stefano Mazzocchi') INSERT INTO EMPLOYEE VALUES(9,3,'Pierpaolo Fumagalli') INSERT INTO EMPLOYEE VALUES(10,3,'Davanum Srinivas') -INSERT INTO EMPLOYEE VALUES(11,3, 'Carlos ChÃvez') -INSERT INTO EMPLOYEE VALUES(12,3, 'Antonio Gallardo') - +INSERT INTO EMPLOYEE VALUES(11,3,'Carlos ChÃvez') +INSERT INTO EMPLOYEE VALUES(12,3,'Antonio Gallardo') +INSERT INTO EMPLOYEE VALUES(13,1,'Jeremy Quinn') INSERT INTO STATE_TAX VALUES('State Sales And Use',6.263250997E9,6.213961851E9,2000) INSERT INTO STATE_TAX VALUES('Local Sales And Use',1.321129345E9,1.321129345E9,2000) -INSERT INTO STATE_TAX VALUES('Resort Area Excise',718624.0,718624.0,2000) +INSERT INTO STATE_TAX VALUES('Resort Area Excise',718624.0E0,718624.0E0,2000) INSERT INTO STATE_TAX VALUES('State Personal Income',8.983891961E9,8.084576329E9,2000) INSERT INTO STATE_TAX VALUES('Corporation Franchise',1.219484766E9,1.029883951E9,2000) INSERT INTO STATE_TAX VALUES('Motor Vehicle Fuel',1.418996649E9,1.404945725E9,2000) INSERT INTO STATE_TAX VALUES('Public Utility Excise',7.04245493E8,6.75339746E8,2000) -INSERT INTO STATE_TAX VALUES('Kilowatt-Hour Excise',0.0,0.0,2000) +INSERT INTO STATE_TAX VALUES('Kilowatt-Hour Excise',0.0E0,0.0E0,2000) INSERT INTO STATE_TAX VALUES('Cigarette Excise',2.89795508E8,2.87710095E8,2000) -INSERT INTO STATE_TAX VALUES('Dealers in Intangibles',5055311.0,2.2333722E7,2000) +INSERT INTO STATE_TAX VALUES('Dealers in Intangibles',5055311.0E0,2.2333722E7,2000) INSERT INTO STATE_TAX VALUES('Motor Fuel Use',2.2615436E7,6.6889345E7,2000) INSERT INTO STATE_TAX VALUES('Alchoholic Beverage Excise',5.6125329E7,5.5993783E7,2000) -INSERT INTO STATE_TAX VALUES('Replacement Tire Fee',3339367.0,3339367.0,2000) -INSERT INTO STATE_TAX VALUES('Local Alchoholic Beverage',6284465.0,5851787.0,2000) +INSERT INTO STATE_TAX VALUES('Replacement Tire Fee',3339367.0E0,3339367.0E0,2000) +INSERT INTO STATE_TAX VALUES('Local Alchoholic Beverage',6284465.0E0,5851787.0E0,2000) INSERT INTO STATE_TAX VALUES('Horse Racing',1.6582056E7,1.7321198E7,2000) -INSERT INTO STATE_TAX VALUES('Severance',8295336.0,7981539.0,2000) +INSERT INTO STATE_TAX VALUES('Severance',8295336.0E0,7981539.0E0,2000) INSERT INTO STATE_TAX VALUES('School District Income',1.50083042E8,1.61257059E8,2000) INSERT INTO STATE_TAX VALUES('State Sales And Use',6.287758244E9,6.23711041E9,2001) INSERT INTO STATE_TAX VALUES('Local Sales And Use',1.352436625E9,1.352436625E9,2001) -INSERT INTO STATE_TAX VALUES('Resort Area Excise',719420.0,719420.0,2001) +INSERT INTO STATE_TAX VALUES('Resort Area Excise',719420.0E0,719420.0E0,2001) INSERT INTO STATE_TAX VALUES('State Personal Income',9.221429278E9,8.119314587E9,2001) INSERT INTO STATE_TAX VALUES('Corporation Franchise',1.158910767E9,9.72967198E8,2001) INSERT INTO STATE_TAX VALUES('Motor Vehicle Fuel',1.325132798E9,1.307275001E9,2001) @@ -134,8 +53,8 @@ INSERT INTO STATE_TAX VALUES('Dealers in Intangibles',2.4913075E7,2.4881108E7,2001) INSERT INTO STATE_TAX VALUES('Motor Fuel Use',7.5662992E7,7.5311561E7,2001) INSERT INTO STATE_TAX VALUES('Alchoholic Beverage Excise',5.5862063E7,5.5740722E7,2001) -INSERT INTO STATE_TAX VALUES('Replacement Tire Fee',3470795.0,3470795.0,2001) -INSERT INTO STATE_TAX VALUES('Local Alchoholic Beverage',5851787.0,5851787.0,2001) +INSERT INTO STATE_TAX VALUES('Replacement Tire Fee',3470795.0E0,3470795.0E0,2001) +INSERT INTO STATE_TAX VALUES('Local Alchoholic Beverage',5851787.0E0,5851787.0E0,2001) INSERT INTO STATE_TAX VALUES('Horse Racing',1.7921198E7,1.7321198E7,2001) -INSERT INTO STATE_TAX VALUES('Severance',7981539.0,7967438.0,2001) +INSERT INTO STATE_TAX VALUES('Severance',7981539.0E0,7967438.0E0,2001) INSERT INTO STATE_TAX VALUES('School District Income',1.61257059E8,1.53238001E8,2001)
