--no commit message

--no commit message

--no commit message
bccf4e46 · Thomas Mueller · 8a3fd959 · bccf4e46 · bccf4e46 · bccf4e46
--- a/h2/ant-build.properties
+++ b/h2/ant-build.properties
-#Mon Jan 15 18:29:59 CET 2007
+#Wed Jan 17 06:42:07 CET 2007
 javac=javac
 benchmark.drivers.dir=D\:/data/java
-version.name.maven=1.0.20070116
+version.name.maven=1.0.20070117
 jdk=1.4
--- a/h2/src/docsrc/html/advanced.html
+++ b/h2/src/docsrc/html/advanced.html
@@ -647,10 +647,10 @@ This database supports UUIDs. Also upported is a function to create new UUIDs us
 a cryptographically strong pseudo random number generator.
 With random UUIDs, the chance of two having the same value can be calculated
 using the probability theory. See also 'Birthday Paradox'.
-Standarized randomly generated UUIDs have 122 random bits.
+Standardized randomly generated UUIDs have 122 random bits.
 4 bits are used for the version (Randomly generated UUID), and 2 bits for the variant (Leach-Salz).
 This database supports generating such UUIDs using the built-in function RANDOM_UUID().
-Here is a small program to estimate the proability of having two identical UUIDs
+Here is a small program to estimate the probability of having two identical UUIDs
 after generating a number of values:
 <pre>
 double x = Math.pow(2, 122);

--- a/h2/src/docsrc/html/download.html
+++ b/h2/src/docsrc/html/download.html
@@ -11,10 +11,10 @@ H2 Database Engine

 <h1>Downloads</h1>

-<h3>Version 1.0 / 2007-01-02 (Current)</h3>
+<h3>Version 1.0 / 2007-01-17 (Current)</h3>
 <p>
-<a href="http://www.h2database.com/h2-setup-2007-01-02.exe">Windows Installer (2.7 MB)</a><br>
-<a href="http://www.h2database.com/h2-2007-01-02.zip">Platform-Independent Zip (3.6 MB)</a><br>
+<a href="http://www.h2database.com/h2-setup-2007-01-17.exe">Windows Installer (2.7 MB)</a><br>
+<a href="http://www.h2database.com/h2-2007-01-17.zip">Platform-Independent Zip (3.6 MB)</a><br>
 </p>

 <h3>Version 1.0 / 2006-08-31 (Last Stable)</h3>

--- a/h2/src/docsrc/html/faq.html
+++ b/h2/src/docsrc/html/faq.html
@@ -15,11 +15,11 @@ Frequently Asked Questions
 <h3>Are there any known bugs? When is the next release?</h3>
 Usually, bugs get fixes as they are found. There is a release every few weeks.
 The next release is planned for
-2007-01-16.
+2007-01-29.
 Here is the list of known and confirmed issues as of
-2007-01-02:
+2007-01-17:
 <ul>
-<li>Can not compile with JDK 1.3 at the moment.
+<li>Can not build using ant with JDK 1.3 at the moment. However most things are fixed.
 <li>Some problems have been found with right outer join. Internally, it is converted to left outer join, which
    does not always produce the correct results when used in combination with other joins.
 </ul>

--- a/h2/src/docsrc/html/features.html
+++ b/h2/src/docsrc/html/features.html
@@ -1230,7 +1230,7 @@ SET CACHE_SIZE size.
 This database supports two cache page replacement algorithms: LRU (the default) and
 2Q. For LRU, the pages that were least frequently used are removed from the
 cache if it becomes full. The 2Q algorithm is a bit more complicated, basically two 
-queues are used. The 2Q algorithm is more resistent to table scans, however the overhead
+queues are used. The 2Q algorithm is more resistant to table scans, however the overhead
 is a bit higher compared to the LRU. To use the cache algorithm 2Q, use a database URL
 of the form jdbc:h2:test;CACHE_TYPE=TQ. The cache algorithm can not be changed
 once the database is open.

--- a/h2/src/docsrc/html/history.html
+++ b/h2/src/docsrc/html/history.html
--- a/h2/src/docsrc/html/mainWeb.html
+++ b/h2/src/docsrc/html/mainWeb.html
@@ -30,17 +30,17 @@ Welcome to H2, the free SQL database. The main feature of H2 are:
        <table style="border: 0px; margin: 5px; background-color: #eee;">
              <tr><td style="border: 0px; background-color: #eee;" colspan="2">
                <h3>Download</h3>
-                Version 1.0 / 2007-01-02:
+                Version 1.0 / 2007-01-17:
            </td></tr>
            <tr><td style="border: 0px; background-color: #eee;">
-                <a href="http://www.h2database.com/h2-setup-2007-01-02.exe"><img border="1" src="images/download.png" alt="download"></a>
+                <a href="http://www.h2database.com/h2-setup-2007-01-17.exe"><img border="1" src="images/download.png" alt="download"></a>
            </td><td style="vertical-align: middle; border: 0px; background-color: #eee;">
-                <a href="http://www.h2database.com/h2-setup-2007-01-02.exe">Windows Installer (2.7 MB)</a>
+                <a href="http://www.h2database.com/h2-setup-2007-01-17.exe">Windows Installer (2.7 MB)</a>
            </td></tr>
            <tr><td style="border: 0px; background-color: #eee;">
-                <a href="http://www.h2database.com/h2-2007-01-02.zip"><img border="1" src="images/download.png" alt="download"></a>
+                <a href="http://www.h2database.com/h2-2007-01-17.zip"><img border="1" src="images/download.png" alt="download"></a>
            </td><td style="vertical-align: middle; border: 0px; background-color: #eee;">
-                <a href="http://www.h2database.com/h2-2007-01-02.zip">Platform-Independent Zip (3.6 MB)</a>
+                <a href="http://www.h2database.com/h2-2007-01-17.zip">Platform-Independent Zip (3.6 MB)</a>
            </td></tr>
            <tr><td style="border: 0px; background-color: #eee;" colspan="2">
                <a href="download.html">All Downloads</a>

--- a/h2/src/docsrc/html/performance.html
+++ b/h2/src/docsrc/html/performance.html
@@ -183,7 +183,7 @@ This benchmark runs three times, the last run counts.
 <h4>Memory Usage</h4>
 It is not enough to measure the time taken, the memory usage is important as well.
 Performance can be improved in databases by using a bigger in-memory cache,
-but there is only a limited amout of memory available on the system.
+but there is only a limited amount of memory available on the system.
 HSQLDB tables are kept fully in memory by default, this benchmark
 uses 'disk based' tables for all databases.
 Unfortunately, it is not so easy to calculate the memory usage of PostgreSQL

--- a/h2/src/installer/h2.nsi
+++ b/h2/src/installer/h2.nsi
@@ -122,7 +122,7 @@ Section "All"
  SetOutPath "$INSTDIR\odbc"
  File /r /x CVS /x .cvsignore ..\..\odbc\*.*
  SetOutPath "$INSTDIR\service"
-  File /r /x CVS /x .cvsignore ..\..\service\*.*
+  File /r /x CVS /x .cvsignore /x .svn ..\..\service\*.*
  SetOutPath "$INSTDIR"
  File /r /x CVS /x .cvsignore ..\..\build.xml  
  File /r /x CVS /x .cvsignore ..\..\ant-build.properties

--- a/h2/src/main/org/h2/engine/Constants.java
+++ b/h2/src/main/org/h2/engine/Constants.java
@@ -15,9 +15,19 @@ package org.h2.engine;
 * - Update latest version in build.html: http://mirrors.ibiblio.org/pub/mirrors/maven2/com/h2database/h2/
 * - ant jarClient, check jar file size
 * - Compiling with JDK 1.3, 1.4, 1.5 and 1.6
+ * 
 *   set path=C:\jdk1.3.1_19\bin;%PATH%
 *   set JAVA_HOME=C:\jdk1.3.1_19\bin
+ *   ant codeswitch_jdk16
+ *   ant compile
+ *
 *   set path=C:\Programme\Java\jdk1.6.0\bin;%PATH%
+ *   set JAVA_HOME=C:\Programme\Java\jdk1.6.0\bin
+ *   ant codeswitch_jdk16
+ *   ant compile
+ *   
+ *   ant codeswitch_jdk14
+ *   
 * - Change FAQ (next release planned, known bugs)
 * - Check version, change build number in Constants.java and build.xml
 * - Check code coverage
@@ -59,8 +69,8 @@ package org.h2.engine;
 */
 public class Constants {

-    public static final int BUILD_ID = 39;
-    private static final String BUILD = "2007-01-16";
+    public static final int BUILD_ID = 40;
+    private static final String BUILD = "2007-01-17";
    public static final int VERSION_MAJOR = 1;
    public static final int VERSION_MINOR = 0;


--- a/h2/src/main/org/h2/jdbc/JdbcClob.java
+++ b/h2/src/main/org/h2/jdbc/JdbcClob.java
@@ -18,6 +18,12 @@ import org.h2.message.TraceObject;
 import org.h2.util.IOUtils;
 import org.h2.value.Value;

+//#ifdef JDK16
+/*
+import java.sql.NClob;
+*/
+//#endif
+
 /**
 * Represents a CLOB value.
 */

--- a/h2/src/main/org/h2/res/help.csv
+++ b/h2/src/main/org/h2/res/help.csv
@@ -332,7 +332,7 @@ CREATE DOMAIN [IF NOT EXISTS] newDomainName AS dataType
 ","
 Creates a new data type (domain).
 The check condition must evaluate to true or to NULL (to prevent NULL values, use NOT NULL).
- In the condition, the term VALUE refers to the value beeing tested.
+ In the condition, the term VALUE refers to the value being tested.
 ","
 CREATE DOMAIN EMAIL AS VARCHAR(255) CHECK (POSITION('@', VALUE) > 1)
 "
@@ -2508,7 +2508,7 @@ CALL SCHEMA()
 "Functions (System)","SESSION_ID","
 SESSION_ID(): int
 ","
-Returns the unique session id numberfor the current database connection.
+Returns the unique session id number for the current database connection.
 This id stays the same while the connection is open.
 The database engine may re-use a session id after the connection is closed.
 ","

--- a/h2/src/test/org/h2/samples/newsfeed.sql
+++ b/h2/src/test/org/h2/samples/newsfeed.sql
@@ -10,10 +10,44 @@ INSERT INTO CHANNEL VALUES('H2 Database Engine' ,

 CREATE TABLE ITEM(ID INT PRIMARY KEY, TITLE VARCHAR, ISSUED TIMESTAMP, DESC VARCHAR);

+INSERT INTO ITEM VALUES(20,
+'New version available: 1.0 / 2007-01-17', '2007-01-17 12:00:00',
+'A new version of H2 is available for <a href="http://www.h2database.com">download</a>.
+<br>
+<b>Changes and new functionality:</b>
+<ul>
+<li>The Console is now translated to Japanese thanks to 
+	IKEMOTO, Masahiro (ikeyan (at) arizona (dot) ne (dot) jp).
+<li>The database engine can now be compiled with JDK 1.3 using ant codeswitch_jdk13. 
+	There are still some limitations, and the ant script to build the jar does not work yet.
+<li>SCRIPT NODATA now writes the row count for each table.
+<li>Timestamps with timezone information (Z or +/-hh:mm) and dates before year 1 
+	can now be parsed. However dates before year 1 are not formatted correctly.
+</ul>
+<b>Bugfixes:</b>
+<ul>
+<li>Fixed a problem where data in the log file was not written to the data file 
+	(recovery failure) after a crash, if an index was deleted previously.
+<li>Setting the collation (SET COLLATOR) was very slow on some systems (up to 24 seconds).
+<li>Selecting a column using the syntax schemaName.tableName.columName did not work in all cases.
+<li>When stopping the TCP server from an application and immediately afterwards starting 
+	it again using a different TCP password, an exception was thrown sometimes.
+<li>Now PreparedStatement.setBigDecimal(..) can only be called with an object of 
+	type java.math.BigDecimal. Derived classes are not allowed any more. Many thanks to 
+	Maciej Wegorkiewicz for finding this problem.
+<li>It was possible to manipulate values in the byte array after calling PreparedStatement.setBytes, 
+	and this could lead to problems if the same byte array was used again. Now the byte array 
+	is copied if required.
+<li>Date, time and timestamp objects were cloned in cases where it was not required. Fixed. 
+</ul>
+For future plans, see the new ''Roadmap'' page on the web site.
+</ul>
+');
+
 INSERT INTO ITEM VALUES(19,
 'New version available: 1.0 / 2007-01-02', '2007-01-02 12:00:00',
 'A new version of H2 is available for <a href="http://www.h2database.com">download</a>.
-<br/>
+<br>
 <b>Changes and new functionality:</b>
 <ul>
 <li>H2 is now available in Maven. The groupId is com.h2database,     the 
@@ -56,7 +90,7 @@ For future plans, see the new ''Roadmap'' page on the web site.
 INSERT INTO ITEM VALUES(18,
 'New version available: 1.0 / 2006-12-17', '2006-12-17 12:00:00',
 'A new version of H2 is available for <a href="http://www.h2database.com">download</a>.
-<br/>
+<br>
 <b>Changes and new functionality:</b>
 <ul>
 <li>Large BLOB and CLOB support for the server and the cluster mode. 
@@ -98,7 +132,7 @@ For future plans, see the new ''Roadmap'' page on the web site.
 INSERT INTO ITEM VALUES(17,
 'New version available: 1.0 / 2006-12-03', '2006-12-03 12:00:00',
 'A new version of H2 is available for <a href="http://www.h2database.com">download</a>.
-<br/>
+<br>
 <b>Changes and new functionality:</b>
 <ul>
 <li>New connection time setting CACHE_TYPE=TQ to use the 2Q page replacement 
@@ -142,7 +176,7 @@ For future plans, see the new ''Roadmap'' page on the web site.
 INSERT INTO ITEM VALUES(16,
 'New version available: 1.0 / 2006-11-20', '2006-11-20 12:00:00',
 'A new version of H2 is available for <a href="http://www.h2database.com">download</a>.
-<br/>
+<br>
 <b>Changes and new functionality:</b>
 <ul>
 <li>New SQL statement SET SCHEMA to change the current schema of this session.
@@ -178,7 +212,7 @@ For future plans, see the new ''Roadmap'' page on the web site.
 INSERT INTO ITEM VALUES(15,
 'New version available: 1.0 / 2006-11-03', '2006-11-03 12:00:00',
 'A new version of H2 is available for <a href="http://www.h2database.com">download</a>.
-<br/>
+<br>
 <b>Changes and new functionality:</b>
 <ul>
 <li>New SQL statement COMMENT ON ... IS ...
@@ -223,7 +257,7 @@ For future plans, see the new ''Roadmap'' page on the web site.
 INSERT INTO ITEM VALUES(14,
 'New version available: 1.0 / 2006-10-10', '2006-10-10 12:00:00',
 'A new version of H2 is available for <a href="http://www.h2database.com">download</a>.
-<br/>
+<br>
 <b>Changes and new functionality:</b>
 <ul>
 <li>Support for DOMAIN (user defined data types).
@@ -249,7 +283,7 @@ For future plans, see the new ''Roadmap'' page on the web site.
 INSERT INTO ITEM VALUES(13,
 'New version available: 1.0 / 2006-09-24', '2006-09-24 12:00:00',
 'A new version of H2 is available for <a href="http://www.h2database.com">download</a>.
-<br/>
+<br>
 <b>Changes and new functionality:</b>
 <ul>
 <li>Protection against SQL injection: New command SET ALLOW_LITERALS {NONE|ALL|NUMBERS}.
@@ -291,7 +325,7 @@ For future plans, see the new ''Roadmap'' page on the web site.
 INSERT INTO ITEM VALUES(12,
 'New version available: 1.0 / 2006-09-10', '2006-09-10 12:00:00',
 'A new version of H2 is available for <a href="http://www.h2database.com">download</a>.
-<br/>
+<br>
 <b>Changes and new functionality:</b>
 <ul>
 <li>SET IGNORECASE is now supported for compatibility with HSQLDB.
@@ -327,7 +361,7 @@ See <a href="http://www.infoq.com/news/h2-released">http://www.infoq.com/news/h2
 INSERT INTO ITEM VALUES(10,
 'New version available: 1.0 / 2006-08-31', '2006-08-31 12:00:00',
 'H2 version 1.0 is available for <a href="http://www.h2database.com">download</a>.
-<br/>
+<br>
 <b>Bugfixes:</b>
 <ul>
 <li>In some situations, wide b-tree indexes (with large VARCHAR columns for example) could get corrupted. Fixed.
@@ -340,7 +374,7 @@ For future plans, see the new ''Roadmap'' page on the web site.
 INSERT INTO ITEM VALUES(9,
 'New version available: 1.0 RC 2 / 2006-08-28', '2006-08-28 12:00:00',
 'A new version of H2 is available for <a href="http://www.h2database.com">download</a>.
-<br/>
+<br>
 <b>Changes and new functionality:</b>
 <ul>
 <li>Linked tables: The table name is no longer quoted when accessing the foreign database.
@@ -381,7 +415,7 @@ This is still open for discussion at the <a href="http://www.h2database.com/ipow
 INSERT INTO ITEM VALUES(7,
 'New version available: 0.9 RC 1 / 2006-08-23', '2006-08-23 12:00:00',
 'A new version of H2 is available for <a href="http://www.h2database.com">download</a>.
-<br/>
+<br>
 <b>Changes and new functionality:</b>
 <ul>
 <li>Date and time constants outside the valid range (February 31 and so on) are no longer accepted.
@@ -415,7 +449,7 @@ The plans for the next release (RC 2) are:
 INSERT INTO ITEM VALUES(6,
 'New version available: 0.9 Beta / 2006-08-14', '2006-08-14 12:00:00',
 'A new version of H2 is available for <a href="http://www.h2database.com">download</a>.
-<br/>
+<br>
 <b>Changes and new functionality:</b>
 <ul>
 <li>Autocomplete support in the H2 Console.
@@ -449,7 +483,7 @@ The plans for the next release are:
 INSERT INTO ITEM VALUES(5,
 'New version available: 0.9 Beta / 2006-07-29', '2006-07-30 12:00:00',
 'A new version of H2 is available for <a href="http://www.h2database.com">download</a>.
-<br/>
+<br>
 <b>Changes and new functionality:</b>
 <ul>
 <li>ParameterMetaData is now implemented
@@ -488,7 +522,7 @@ For details see also the history. The plans for the next release are:
 INSERT INTO ITEM VALUES(4,
 'New version available: 0.9 Beta / 2006-07-14', '2006-07-14 12:00:00',
 'A new version of H2 is available for <a href="http://www.h2database.com">download</a>.
-<br/>
+<br>
 <b>Changes and new functionality:</b>
 <ul>
 <li>The cache size is now measured in blocks and no longer in rows.
@@ -526,7 +560,7 @@ For details see also the history. The plans for the next release are:
 INSERT INTO ITEM VALUES(3,
 'New version available: 0.9 Beta / 2006-07-01', '2006-07-01 12:00:00',
 'A new version of H2 is available for <a href="http://www.h2database.com">download</a>.
-<br/>
+<br>
 <b>Changes and new functionality:</b>
 <ul>
 <li>Reduced memory usage: implemented a String cache and improved the Value cache.
@@ -558,44 +592,6 @@ For details see also the history. The plans for the next release are:
 </ul>
 ');

-INSERT INTO ITEM VALUES(2,
-'New version available: 0.9 Beta / 2006-06-16', '2006-06-16 12:00:00',
-'A new version of H2 is available for <a href="http://www.h2database.com">download</a>.
-<br/>
-<b>Changes and new functionality:</b>
-<ul>
-<li>It''s now Beta version; don''t expect much added functionality until 1.0
-<li>New XML encoding functions (XMLTEXT, XMLATTR, XMLNODE,...).
-<li>New functions FORMATDATETIME and PARSEDATETIME
-<li>Performance: improved opening of a large databases
-<li>Performance: improved creating and opening encrypted databases
-<li>Blob.getLength() and Clob.getLength() are now fast operations
-<li>Documented ALTER TABLE DROP COLUMN
-<li>Implemented DROP TRIGGER
-<li>Calling Server.start...Server now waits until the server is ready
-<li>If a connection is closed while there is still an operation running, this operation is stopped
-    Implemented distributing lob files into directories, and only keep up to 255 files in one directory.
-    However this is disabled by default; it will be enabled the next time the file format changes
-    (maybe not before 1.1). It can be enabled by the application by setting
-    Constants.LOB_FILES_IN_DIRECTORIES = true
-</ul>
-<b>Bugfixes:</b>
-<ul>
-<li>Issue #110: PreparedStatement.setCharacterStream
-<li>Issue #111: The catalog name was not uppercase
-<li>Issue #112: Two threads could not open the same database at the same time
-<li>Issue #113: Drop is now restricted
-<li>Issue #114: Support large index data size
-<li>Issue #115: Lock timeout for three or more threads
-</ul>
-For details see also the history. The plans for the next release are:
-<ul>
-<li>Bugfixes, write more tests, more bugfixes, more tests
-<li>Proposal for changed license (still pending...)
-<li>For other plans, see the new ''Roadmap'' part on the web site
-</ul>
-');
-
 SELECT 'newsfeed-rss.xml' FILE,
    XMLSTARTDOC() ||
    XMLNODE('rss', XMLATTR('version', '2.0'),

--- a/h2/src/test/org/h2/test/TestAll.java
+++ b/h2/src/test/org/h2/test/TestAll.java
@@ -86,6 +86,9 @@ java -Xmx512m -Xrunhprof:cpu=samples,depth=8 org.h2.tools.RunScript -url jdbc:h2
        TestAll test = new TestAll();
        test.printSystem();
        
+//        Hi i found one small nasty bug with h2 database. When i use prepared statement on tables that have primary key UUID DEFAULT random_UUID(), and when i call getGeneratedKeys() method I only get (long) 0 as result, instead of random_uuid.
+//        And if I use IDENTITY type for primary ket i get corect value from methord PreparedStatement.getGeneratedKeys(). Problem is with UUID and random_uuid() combination.
+        
        // NULL || 'X' should probably return null by default
        // change default to read committed transaction isolation
        // Hot backup (incremental backup, online backup): backup data, log, index? files

--- a/h2/src/test/org/h2/test/synth/TestHalt.java
+++ b/h2/src/test/org/h2/test/synth/TestHalt.java
+/*
+ * Copyright 2004-2006 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html).
+ * Initial Developer: H2 Group
+ */
 package org.h2.test.synth;

 import java.io.File;

--- a/h2/src/test/org/h2/test/synth/TestHaltApp.java
+++ b/h2/src/test/org/h2/test/synth/TestHaltApp.java
+/*
+ * Copyright 2004-2006 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html).
+ * Initial Developer: H2 Group
+ */
 package org.h2.test.synth;

 import java.sql.PreparedStatement;

--- a/h2/src/tools/org/h2/tools/doc/GenerateDoc.java
+++ b/h2/src/tools/org/h2/tools/doc/GenerateDoc.java
@@ -95,8 +95,10 @@ public class GenerateDoc {
                }
                String topic = rs.getString("TOPIC");
                String syntax =  rs.getString("SYNTAX");
+                syntax = PageParser.escapeHtml(syntax);
+                syntax = StringUtils.replaceAll(syntax, "<br>", "");
                syntax = bnf.getSyntax(topic, syntax);
-                map.put("syntax", PageParser.escapeHtml(syntax));
+                map.put("syntax", syntax);
                list.add(map);
            }
            session.put(key, list);