提交 d3f18cfa authored 作者: Thomas Mueller's avatar Thomas Mueller

--no commit message

--no commit message
上级 0451349f
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
</java> </java>
</target> </target>
<target name="compileResources" depends="clean"> <target name="compileResources" depends="clean, compileTest">
<javac target="${jdk}" source="${jdk}" executable="${javac}" srcdir="src/main" destdir="bin" debug="true" includes="org/h2/util/Resources.java"/> <javac target="${jdk}" source="${jdk}" executable="${javac}" srcdir="src/main" destdir="bin" debug="true" includes="org/h2/util/Resources.java"/>
<java fork="true" classname="org.h2.util.Resources" classpath="bin" dir="."/> <java fork="true" classname="org.h2.util.Resources" classpath="bin" dir="."/>
<delete> <delete>
...@@ -89,19 +89,19 @@ ...@@ -89,19 +89,19 @@
</delete> </delete>
</target> </target>
<target name="compileServlet" depends="compileServletTest, compile" if="servlet.jar.present"> <target name="compileServlet" depends="compile" if="servlet.jar.present">
<javac target="${jdk}" source="${jdk}" executable="${javac}" srcdir="src/tools" destdir="bin" debug="true"> <javac target="${jdk}" source="${jdk}" executable="${javac}" srcdir="src/tools" destdir="bin" debug="true">
<classpath location="${path.servlet.jar}" /> <classpath location="${path.servlet.jar}" />
<include name="org/h2/server/web/*.*"/> <include name="org/h2/server/web/*.*"/>
</javac> </javac>
</target> </target>
<target name="compileServletTest" depends="init" unless="servlet.jar.present"> <target name="compileServletTest" depends="init" unless="java.version.ok">
<echo message="Servlet API jar not found, console servlet not compiled."/> <echo message="Servlet API jar not found, console servlet not compiled."/>
<echo message="Please set ant-build.properties / path.servlet.jar"/> <echo message="Please set ant-build.properties / path.servlet.jar"/>
</target> </target>
<target name="compile" depends="compileResources"> <target name="compile" depends="compileResources, compileTest">
<javac target="${jdk}" source="${jdk}" executable="${javac}" srcdir="src/main" destdir="bin" debug="true"/> <javac target="${jdk}" source="${jdk}" executable="${javac}" srcdir="src/main" destdir="bin" debug="true"/>
<javac target="${jdk}" source="${jdk}" executable="${javac}" srcdir="src/test" destdir="bin" debug="true"/> <javac target="${jdk}" source="${jdk}" executable="${javac}" srcdir="src/test" destdir="bin" debug="true"/>
<javac target="${jdk}" source="${jdk}" executable="${javac}" srcdir="src/tools" destdir="bin" debug="true"> <javac target="${jdk}" source="${jdk}" executable="${javac}" srcdir="src/tools" destdir="bin" debug="true">
...@@ -116,6 +116,11 @@ ...@@ -116,6 +116,11 @@
<fileset dir="src/test" includes="**/*.properties"/> <fileset dir="src/test" includes="**/*.properties"/>
</copy> </copy>
</target> </target>
<target name="compileTest" unless="java.version.ok">
<echo message="Java version is ${java.specification.version} but source code is switched to ${jdk}."/>
<echo message="Run ant codeswitchJdk.. first."/>
</target>
<target name="createPatch" depends="clean"> <target name="createPatch" depends="clean">
<delete file="../h2-patch.*"/> <delete file="../h2-patch.*"/>
...@@ -146,8 +151,25 @@ ...@@ -146,8 +151,25 @@
<target name="init"> <target name="init">
<available file="${path.servlet.jar}" property="servlet.jar.present"/> <available file="${path.servlet.jar}" property="servlet.jar.present"/>
<condition property="java.version.ok">
<or>
<and>
<equals arg1="${java.specification.version}" arg2="1.6"/>
<equals arg1="${jdk}" arg2="1.6"/>
</and>
<and>
<equals arg1="${java.specification.version}" arg2="1.5"/>
<equals arg1="${jdk}" arg2="1.4"/>
</and>
<and>
<equals arg1="${java.specification.version}" arg2="1.4"/>
<equals arg1="${jdk}" arg2="1.4"/>
</and>
</or>
</condition>
<echo message="${java.version.ok} spec:${java.specification.version} jdk:${jdk}"></echo>
</target> </target>
<target name="jar" depends="compile, compileServlet"> <target name="jar" depends="compile, compileServlet">
<mkdir dir="bin/META-INF"/> <mkdir dir="bin/META-INF"/>
<manifest file="bin/META-INF/MANIFEST.MF"> <manifest file="bin/META-INF/MANIFEST.MF">
......
<?xml version="1.0"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<!-- <!--
Copyright 2004-2007 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html). Copyright 2004-2007 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html).
...@@ -107,16 +106,16 @@ This may not have the desired effect if a default value in the target table is o ...@@ -107,16 +106,16 @@ This may not have the desired effect if a default value in the target table is o
This database supports the following transaction isolation levels: This database supports the following transaction isolation levels:
</p> </p>
<ul> <ul>
<li><b>Serializable</b><br /> <li><b>Read Committed</b><br />
This is the default level.<br /> This is the default level.
To enable, execute the SQL statement 'SET LOCK_MODE 0'<br />
or append ;LOCK_MODE=1 to the database URL: jdbc:h2:~/test;LOCK_MODE=1
</li><li><b>Read Committed</b><br />
Read locks are released immediately. Read locks are released immediately.
Higher concurrency is possible when using this level.<br /> Higher concurrency is possible when using this level.<br />
This is the isolation level used for many database systems.<br /> To enable, execute the SQL statement 'SET LOCK_MODE 3'<br />
To enable, execute the SQL statement 'SET LOCK_MODE 0'<br />
or append ;LOCK_MODE=3 to the database URL: jdbc:h2:~/test;LOCK_MODE=3 or append ;LOCK_MODE=3 to the database URL: jdbc:h2:~/test;LOCK_MODE=3
</li><li>
<b>Serializable</b><br />
To enable, execute the SQL statement 'SET LOCK_MODE 1'<br />
or append ;LOCK_MODE=1 to the database URL: jdbc:h2:~/test;LOCK_MODE=1
</li><li><b>Read Uncommitted</b><br /> </li><li><b>Read Uncommitted</b><br />
This level means that transaction isolation is disabled.<br /> This level means that transaction isolation is disabled.<br />
To enable, execute the SQL statement 'SET LOCK_MODE 0'<br /> To enable, execute the SQL statement 'SET LOCK_MODE 0'<br />
...@@ -452,8 +451,7 @@ Referential integrity rules are always enforced. ...@@ -452,8 +451,7 @@ Referential integrity rules are always enforced.
<h3>Isolation</h3> <h3>Isolation</h3>
<p> <p>
For H2, the default isolation level is 'serializable', which means complete isolation. For H2, as with most other database systems, the default isolation level is 'read committed'.
The default transaction isolation level for many other databases is 'read committed'.
This provides better performance, but also means that transactions are not completely isolated. This provides better performance, but also means that transactions are not completely isolated.
H2 supports the transaction isolation levels 'serializable', 'read committed', and 'read uncommitted'. H2 supports the transaction isolation levels 'serializable', 'read committed', and 'read uncommitted'.
</p> </p>
......
<?xml version="1.0"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<!-- <!--
Copyright 2004-2007 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html). Copyright 2004-2007 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html).
...@@ -13,7 +12,6 @@ Build ...@@ -13,7 +12,6 @@ Build
<table class="content"><tr class="content"><td class="content"><div class="contentDiv"> <table class="content"><tr class="content"><td class="content"><div class="contentDiv">
<h1>Build</h1> <h1>Build</h1>
<a href="#portability"> <a href="#portability">
Portability</a><br /> Portability</a><br />
<a href="#environment"> <a href="#environment">
...@@ -25,13 +23,17 @@ Build ...@@ -25,13 +23,17 @@ Build
<br /><a name="portability"></a> <br /><a name="portability"></a>
<h2>Portability</h2> <h2>Portability</h2>
<p>
This database is written in Java and therefore works on many platforms. This database is written in Java and therefore works on many platforms.
It can also be compiled to a native executable using GCJ. It can also be compiled to a native executable using GCJ.
</p>
<br /><a name="environment"></a> <br /><a name="environment"></a>
<h2>Environment</h2> <h2>Environment</h2>
<p>
To build the database executables, the following software stack was used. To build the database executables, the following software stack was used.
In most cases, newer version or compatible software works too. In most cases, newer version or compatible software works too.
</p>
<ul> <ul>
<li>Windows XP <li>Windows XP
</li><li>Sun JDK Version 1.4 or 1.5 </li><li>Sun JDK Version 1.4 or 1.5
...@@ -43,6 +45,7 @@ In most cases, newer version or compatible software works too. ...@@ -43,6 +45,7 @@ In most cases, newer version or compatible software works too.
<br /><a name="building"></a> <br /><a name="building"></a>
<h2>Building the Software</h2> <h2>Building the Software</h2>
<p>
On the command line, go to the directory src and execute the following command: On the command line, go to the directory src and execute the following command:
<pre> <pre>
ant -projecthelp ant -projecthelp
...@@ -57,10 +60,12 @@ use the target jarClient: ...@@ -57,10 +60,12 @@ use the target jarClient:
ant jarClient ant jarClient
</pre> </pre>
The other targets may be used as well. The other targets may be used as well.
</p>
<br /><a name="maven2"></a> <br /><a name="maven2"></a>
<h2>Using Maven 2</h2> <h2>Using Maven 2</h2>
<h3>Using a Central Repository</h3> <h3>Using a Central Repository</h3>
<p>
You can include the database in your Maven 2 project as a dependency. You can include the database in your Maven 2 project as a dependency.
The version is currently 1.0.&lt;year&gt;&lt;month&gt;&lt;day&gt;. Example: The version is currently 1.0.&lt;year&gt;&lt;month&gt;&lt;day&gt;. Example:
<pre> <pre>
...@@ -70,8 +75,10 @@ The version is currently 1.0.&lt;year&gt;&lt;month&gt;&lt;day&gt;. Example: ...@@ -70,8 +75,10 @@ The version is currently 1.0.&lt;year&gt;&lt;month&gt;&lt;day&gt;. Example:
&lt;version&gt;1.0.20070617&lt;/version&gt; &lt;version&gt;1.0.20070617&lt;/version&gt;
&lt;/dependency&gt; &lt;/dependency&gt;
</pre> </pre>
</p>
<h3>Using Snapshot Version</h3> <h3>Using Snapshot Version</h3>
<p>
To build a 'snapshot' H2 .jar file and upload it the to the local Maven 2 repository, execute the following command: To build a 'snapshot' H2 .jar file and upload it the to the local Maven 2 repository, execute the following command:
<pre> <pre>
ant mavenUploadLocal ant mavenUploadLocal
...@@ -84,5 +91,6 @@ Afterwards, you can include the database in your Maven 2 project as a dependency ...@@ -84,5 +91,6 @@ Afterwards, you can include the database in your Maven 2 project as a dependency
&lt;version&gt;1.0-SNAPSHOT&lt;/version&gt; &lt;version&gt;1.0-SNAPSHOT&lt;/version&gt;
&lt;/dependency&gt; &lt;/dependency&gt;
</pre> </pre>
</p>
</div></td></tr></table></body></html> </div></td></tr></table></body></html>
<?xml version="1.0"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<!-- <!--
Copyright 2004-2007 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html). Copyright 2004-2007 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html).
......
<?xml version="1.0"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<!-- <!--
Copyright 2004-2007 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html). Copyright 2004-2007 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html).
......
<?xml version="1.0"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<!-- <!--
Copyright 2004-2007 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html). Copyright 2004-2007 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html).
...@@ -85,7 +84,7 @@ Features ...@@ -85,7 +84,7 @@ Features
<h3>Additional Features</h3> <h3>Additional Features</h3>
<ul> <ul>
<li>Disk based or in-memory databases and tables, read-only database support, temporary tables <li>Disk based or in-memory databases and tables, read-only database support, temporary tables
</li><li>Transaction support (serializable transaction isolation), 2-phase-commit </li><li>Transaction support (read committed and serializable transaction isolation), 2-phase-commit
</li><li>Multiple connections, table level locking </li><li>Multiple connections, table level locking
</li><li>Cost based optimizer, using a genetic algorithm for complex queries, zero-administration </li><li>Cost based optimizer, using a genetic algorithm for complex queries, zero-administration
</li><li>Scrollable and updatable result set support, large result set, external result sorting, functions can return a result set </li><li>Scrollable and updatable result set support, large result set, external result sorting, functions can return a result set
......
<?xml version="1.0"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<!-- <!--
Copyright 2004-2007 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html). Copyright 2004-2007 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html).
...@@ -24,6 +23,7 @@ History ...@@ -24,6 +23,7 @@ History
<br /><a name="history"></a> <br /><a name="history"></a>
<h2>History of this Database Engine</h2> <h2>History of this Database Engine</h2>
<p>
The development of H2 was started in May 2004, The development of H2 was started in May 2004,
but it was first published on December 14th 2005. but it was first published on December 14th 2005.
The author of H2, Thomas Mueller, is also the original developer of Hypersonic SQL. The author of H2, Thomas Mueller, is also the original developer of Hypersonic SQL.
...@@ -32,6 +32,7 @@ At that point, he had to discontinue Hypersonic SQL, but then the HSQLDB Group w ...@@ -32,6 +32,7 @@ At that point, he had to discontinue Hypersonic SQL, but then the HSQLDB Group w
to continued to work on the Hypersonic SQL codebase. to continued to work on the Hypersonic SQL codebase.
The name H2 stands for Hypersonic 2; however H2 does not share any code with The name H2 stands for Hypersonic 2; however H2 does not share any code with
Hypersonic SQL or HSQLDB. H2 is built from scratch. Hypersonic SQL or HSQLDB. H2 is built from scratch.
</p>
<br /><a name="changelog"></a> <br /><a name="changelog"></a>
<h2>Change Log</h2> <h2>Change Log</h2>
...@@ -39,7 +40,11 @@ Hypersonic SQL or HSQLDB. H2 is built from scratch. ...@@ -39,7 +40,11 @@ Hypersonic SQL or HSQLDB. H2 is built from scratch.
<h3>Version 1.0 (Current)</h3> <h3>Version 1.0 (Current)</h3>
<h3>Version 1.0 / TODO (Build xx)</h3><ul> <h3>Version 1.0 / TODO (Build xx)</h3><ul>
<li>PG server: data was truncated when reading large VARCHAR columns and decimal columns. <li>Google translate did not work for the H2 homepage. It should be fixed now.
</li><li>The CONVERT function did not work with views when using UNION.
</li><li>The build now issues a warning if the source code is switched to the wrong version.
</li><li>The default lock mode is now read committed instead of serialized.
</li><li>PG server: data was truncated when reading large VARCHAR columns and decimal columns.
</li><li>PG server: when the same database was accessed multiple times using the PostgreSQL ODBC driver, </li><li>PG server: when the same database was accessed multiple times using the PostgreSQL ODBC driver,
the pg_catalog schema update failed, and connecting to the database was not possible. Fixed. the pg_catalog schema update failed, and connecting to the database was not possible. Fixed.
</li><li>Some file operations didn't work for files in the root directory. Fixed. </li><li>Some file operations didn't work for files in the root directory. Fixed.
...@@ -810,7 +815,6 @@ Hypersonic SQL or HSQLDB. H2 is built from scratch. ...@@ -810,7 +815,6 @@ Hypersonic SQL or HSQLDB. H2 is built from scratch.
</li><li>Special methods for DataPage.writeByte / writeShort and so on </li><li>Special methods for DataPage.writeByte / writeShort and so on
</li><li>Index organized tables CREATE TABLE...(...) ORGANIZATION INDEX (store in data file) (probably file format changes are required for rowId) </li><li>Index organized tables CREATE TABLE...(...) ORGANIZATION INDEX (store in data file) (probably file format changes are required for rowId)
</li><li>Change the default for NULL || 'x' to NULL </li><li>Change the default for NULL || 'x' to NULL
</li><li>Change the default isolation level to read committed
</li><li>Automatic upgrade if there is a file format change </li><li>Automatic upgrade if there is a file format change
</li></ul> </li></ul>
...@@ -1108,6 +1112,8 @@ Hypersonic SQL or HSQLDB. H2 is built from scratch. ...@@ -1108,6 +1112,8 @@ Hypersonic SQL or HSQLDB. H2 is built from scratch.
</li><li>Access rights: remember the owner of an object. COMMENT: allow owner of object to change it. </li><li>Access rights: remember the owner of an object. COMMENT: allow owner of object to change it.
</li><li>Implement INSTEAD OF trigger. </li><li>Implement INSTEAD OF trigger.
</li><li>Access rights: Finer grained access control (grant access for specific functions) </li><li>Access rights: Finer grained access control (grant access for specific functions)
</li><li>Support N'text'
</li><li>Support SCOPE_IDENTITY() to avoid problems when inserting rows in a trigger
</li></ul> </li></ul>
<h3>Not Planned</h3> <h3>Not Planned</h3>
...@@ -1118,9 +1124,11 @@ Hypersonic SQL or HSQLDB. H2 is built from scratch. ...@@ -1118,9 +1124,11 @@ Hypersonic SQL or HSQLDB. H2 is built from scratch.
<br /><a name="supporters"></a> <br /><a name="supporters"></a>
<h2>Supporters</h2> <h2>Supporters</h2>
<p>
Many thanks for those who helped by finding and reporting bugs, gave valuable feedback, Many thanks for those who helped by finding and reporting bugs, gave valuable feedback,
spread the word and have translated this project. Also many thanks to the donors who contributed spread the word and have translated this project. Also many thanks to the donors who contributed
via PayPal: via PayPal:
</p>
<ul> <ul>
<li>Florent Ramiere, France <li>Florent Ramiere, France
</li><li>Pete Haidinyak, USA </li><li>Pete Haidinyak, USA
......
<?xml version="1.0"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<!-- <!--
Copyright 2004-2007 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html). Copyright 2004-2007 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html).
...@@ -25,7 +24,9 @@ Installation ...@@ -25,7 +24,9 @@ Installation
<br /><a name="requirements"></a> <br /><a name="requirements"></a>
<h2>Requirements</h2> <h2>Requirements</h2>
<p>
To run the database, the following minimum software stack is known to work: To run the database, the following minimum software stack is known to work:
</p>
<ul> <ul>
<li>Windows XP, MacOS, or Linux <li>Windows XP, MacOS, or Linux
</li><li>Recommended Windows file system: NTFS (FAT32 supports files up to 4 GB) </li><li>Recommended Windows file system: NTFS (FAT32 supports files up to 4 GB)
...@@ -35,15 +36,19 @@ To run the database, the following minimum software stack is known to work: ...@@ -35,15 +36,19 @@ To run the database, the following minimum software stack is known to work:
<br /><a name="supported_platforms"></a> <br /><a name="supported_platforms"></a>
<h2>Supported Platforms</h2> <h2>Supported Platforms</h2>
<p>
As this database is written in Java, it can be run on many different platforms. As this database is written in Java, it can be run on many different platforms.
It is tested with Java 1.4, 1.5, and 1.6 but can also be compiled to native code using GCJ. It is tested with Java 1.4, 1.5, and 1.6 but can also be compiled to native code using GCJ.
The source code does not use features of Java 1.5. Currently, the database is The source code does not use features of Java 1.5. Currently, the database is
developed and tested on Windows XP using the Sun JDK 1.4, but it also developed and tested on Windows XP using the Sun JDK 1.4, but it also
works in many other operating systems and using other Java runtime environments. works in many other operating systems and using other Java runtime environments.
</p>
<br /><a name="installing"></a> <br /><a name="installing"></a>
<h2>Installing the Software</h2> <h2>Installing the Software</h2>
<p>
To install the software, run the installer or unzip it to a directory of your choice. To install the software, run the installer or unzip it to a directory of your choice.
</p>
<br /><a name="directory_structure"></a> <br /><a name="directory_structure"></a>
<h2>Directory Structure</h2> <h2>Directory Structure</h2>
......
...@@ -24,7 +24,9 @@ Installation ...@@ -24,7 +24,9 @@ Installation
<br /><a name="requirements"></a> <br /><a name="requirements"></a>
<h2>必要条件</h2> <h2>必要条件</h2>
<p>
データベースを実行するために、以下のソフトウェアが動作することを確認します。 互換性のあるソフトウェアでも動作しますが、テストはされていません。 データベースを実行するために、以下のソフトウェアが動作することを確認します。 互換性のあるソフトウェアでも動作しますが、テストはされていません。
</p>
<ul> <ul>
<li>Windows XP, MacOS, or Linux <li>Windows XP, MacOS, or Linux
</li><li>Recommended Windows file system: NTFS (FAT32 supports files up to 4 GB) </li><li>Recommended Windows file system: NTFS (FAT32 supports files up to 4 GB)
...@@ -34,11 +36,15 @@ Installation ...@@ -34,11 +36,15 @@ Installation
<br /><a name="supported_platforms"></a> <br /><a name="supported_platforms"></a>
<h2>サポートされているプラットフォーム</h2> <h2>サポートされているプラットフォーム</h2>
<p>
このデータベースはJavaで書かれているため、多くの異なったプラットフォームで実行することができます。 Java 1.4 と 1.5でテストされましたが、GCJを使用することでネイティブコードにコンパイルすることもできます。 ソースコードはJava 1.5の特徴は使われていません。現在、データベースはWindows XPでSun JDKを使用して開発、テストされていますが、 おそらく、他の多くのOSと他のJava Runtime Environmentを使用しても動作するでしょう。 このデータベースはJavaで書かれているため、多くの異なったプラットフォームで実行することができます。 Java 1.4 と 1.5でテストされましたが、GCJを使用することでネイティブコードにコンパイルすることもできます。 ソースコードはJava 1.5の特徴は使われていません。現在、データベースはWindows XPでSun JDKを使用して開発、テストされていますが、 おそらく、他の多くのOSと他のJava Runtime Environmentを使用しても動作するでしょう。
</p>
<br /><a name="installing"></a> <br /><a name="installing"></a>
<h2>ソフトウェアのインストール</h2> <h2>ソフトウェアのインストール</h2>
<p>
ソフトウェアをインストールするために、インストーラーを実行するか 選択したディレクトリにソフトウェアを解凍します。 ソフトウェアをインストールするために、インストーラーを実行するか 選択したディレクトリにソフトウェアを解凍します。
</p>
<br /><a name="directory_structure"></a> <br /><a name="directory_structure"></a>
<h2>ディレクトリ構成</h2> <h2>ディレクトリ構成</h2>
......
<?xml version="1.0"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<!-- <!--
Copyright 2004-2007 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html). Copyright 2004-2007 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html).
...@@ -17,17 +16,23 @@ H2 Database Engine ...@@ -17,17 +16,23 @@ H2 Database Engine
Welcome to H2, the free SQL database engine. Welcome to H2, the free SQL database engine.
</p> </p>
<br />
<p>
<a href="quickstartText.html" style="font-size: 16px; font-weight: bold">Quickstart</a> <a href="quickstartText.html" style="font-size: 16px; font-weight: bold">Quickstart</a>
<br /> <br />
Click here to get a fast overview. Click here to get a fast overview.
<br /><br /> </p>
<p>
<a href="tutorial.html" style="font-size: 16px; font-weight: bold">Tutorial</a> <a href="tutorial.html" style="font-size: 16px; font-weight: bold">Tutorial</a>
<br /> <br />
Go through the samples. Go through the samples.
<br /><br /> </p>
<p>
<a href="features.html" style="font-size: 16px; font-weight: bold">Features</a> <a href="features.html" style="font-size: 16px; font-weight: bold">Features</a>
<br /> <br />
See what this database can do and how to use these features. See what this database can do and how to use these features.
<br /><br /> </p>
</div></td></tr></table></body></html> </div></td></tr></table></body></html>
<?xml version="1.0"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<!-- <!--
Copyright 2004-2007 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html). Copyright 2004-2007 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html).
...@@ -17,17 +16,23 @@ H2 Database Engine ...@@ -17,17 +16,23 @@ H2 Database Engine
ようこそ、無料のSQLデータベース、H2へ ようこそ、無料のSQLデータベース、H2へ
</p> </p>
<br />
<p>
<a href="quickstartText_ja.html" style="font-size: 16px; font-weight: bold">クイックスタート</a> <a href="quickstartText_ja.html" style="font-size: 16px; font-weight: bold">クイックスタート</a>
<br /> <br />
Click here to get a fast overview. Click here to get a fast overview.
<br /><br /> </p>
<p>
<a href="tutorial_ja.html" style="font-size: 16px; font-weight: bold">チュートリアル</a> <a href="tutorial_ja.html" style="font-size: 16px; font-weight: bold">チュートリアル</a>
<br /> <br />
Go through the samples. Go through the samples.
<br /><br /> </p>
<p>
<a href="features.html" style="font-size: 16px; font-weight: bold">特徴</a> <a href="features.html" style="font-size: 16px; font-weight: bold">特徴</a>
<br /> <br />
See what this database can do and how to use these features. See what this database can do and how to use these features.
<br /><br /> </p>
</div></td></tr></table></body></html> </div></td></tr></table></body></html>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<!--
-->
<!-- Copyright 2004-2007 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html). --> <!-- Copyright 2004-2007 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html). -->
<html><head><meta http-equiv="Content-Type" content="text/html;charset=utf-8" /><title> <html>
<head><meta http-equiv="Content-Type" content="text/html;charset=utf-8" /><title>
H2 Database Engine H2 Database Engine
</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /> </title><link rel="stylesheet" type="text/css" href="stylesheet.css" />
<link rel="alternate" type="application/atom+xml" title="H2 Newsfeed" href="http://www.h2database.com/html/newsfeed-atom.xml" /> <link rel="alternate" type="application/atom+xml" title="H2 Newsfeed" href="http://www.h2database.com/html/newsfeed-atom.xml" />
......
<?xml version="1.0"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<!-- <!--
Copyright 2004-2007 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html). Copyright 2004-2007 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html).
......
<?xml version="1.0"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<!-- <!--
Copyright 2004-2007 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html). Copyright 2004-2007 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html).
...@@ -20,9 +19,9 @@ Quickstart ...@@ -20,9 +19,9 @@ Quickstart
<br /><a name="embedding"></a> <br /><a name="embedding"></a>
<h2>Embedding H2 in an Application</h2> <h2>Embedding H2 in an Application</h2>
<p>
This database can be used in embedded mode, or in server mode. To use it in embedded mode, you need to: This database can be used in embedded mode, or in server mode. To use it in embedded mode, you need to:
</p>
<ul> <ul>
<li>Add <code>h2.jar</code> to the classpath <li>Add <code>h2.jar</code> to the classpath
</li><li>Use the JDBC driver class: <code>org.h2.Driver</code> </li><li>Use the JDBC driver class: <code>org.h2.Driver</code>
...@@ -31,19 +30,24 @@ This database can be used in embedded mode, or in server mode. To use it in embe ...@@ -31,19 +30,24 @@ This database can be used in embedded mode, or in server mode. To use it in embe
<br /><a name="h2_console"></a> <br /><a name="h2_console"></a>
<h2>The H2 Console Application</h2> <h2>The H2 Console Application</h2>
<p>
The Console lets you access a SQL database using a browser interface. The Console lets you access a SQL database using a browser interface.
<br /> <br />
<img src="images/console.png" alt="Web Browser - H2 Console Server - H2 Database" /> <img src="images/console.png" alt="Web Browser - H2 Console Server - H2 Database" />
<br /> <br />
If you don't have Windows XP, or if something does not work as expected, If you don't have Windows XP, or if something does not work as expected,
please see the detailed description in the <a href="tutorial.html">Tutorial</a>. please see the detailed description in the <a href="tutorial.html">Tutorial</a>.
</p>
<h3>Step-by-Step</h3> <h3>Step-by-Step</h3>
<h4>Installation</h4> <h4>Installation</h4>
<p>
Install the software using the Windows Installer (if you did not yet do that). Install the software using the Windows Installer (if you did not yet do that).
</p>
<h4>Start the Console</h4> <h4>Start the Console</h4>
<p>
Click <span class="button">Start</span>, Click <span class="button">Start</span>,
<span class="button">All Programs</span>, <span class="button">All Programs</span>,
<span class="button">H2</span>, and <span class="button">H2</span>, and
...@@ -54,31 +58,42 @@ A new console window appears:<br /> ...@@ -54,31 +58,42 @@ A new console window appears:<br />
Also, a new browser page should open with the URL http://localhost:8082. Also, a new browser page should open with the URL http://localhost:8082.
You may get a security warning from the firewall. If you don't want other computers in the network to access the database You may get a security warning from the firewall. If you don't want other computers in the network to access the database
on your machine, you can let the firewall block these connections. Only local connections are required at this time. on your machine, you can let the firewall block these connections. Only local connections are required at this time.
</p>
<h4>Login</h4> <h4>Login</h4>
<p>
Select <span class="button">Generic H2</span> and click <span class="button">Connect</span>:<br /> Select <span class="button">Generic H2</span> and click <span class="button">Connect</span>:<br />
<img class="screenshot" src="images/quickstart-3.png" alt="screenshot: Login screen" /><br /> <img class="screenshot" src="images/quickstart-3.png" alt="screenshot: Login screen" /><br />
You are now logged in. You are now logged in.
</p>
<h4>Sample</h4> <h4>Sample</h4>
<p>
Click on the <span class="button">Sample SQL Script</span>:<br /> Click on the <span class="button">Sample SQL Script</span>:<br />
<img class="screenshot" src="images/quickstart-4.png" alt="screenshot: click on the sample SQL script" /><br /> <img class="screenshot" src="images/quickstart-4.png" alt="screenshot: click on the sample SQL script" /><br />
The SQL commands appear in the command area.<br /> The SQL commands appear in the command area.<br />
</p>
<h4>Execute</h4> <h4>Execute</h4>
<p>
Click <span class="button">Run</span>:<br /> Click <span class="button">Run</span>:<br />
<img class="screenshot" src="images/quickstart-5.png" alt="screenshot: click Run" /><br /> <img class="screenshot" src="images/quickstart-5.png" alt="screenshot: click Run" /><br />
On the left side, a new entry TEST is added below the database icon. On the left side, a new entry TEST is added below the database icon.
The operations and results of the statements are shown below the script.<br /> The operations and results of the statements are shown below the script.<br />
<img class="screenshot" src="images/quickstart-6.png" alt="screenshot: see the result" /><br /> <img class="screenshot" src="images/quickstart-6.png" alt="screenshot: see the result" /><br />
</p>
<h4>Disconnect</h4> <h4>Disconnect</h4>
<p>
Click on <span class="button">Disconnect</span>:<br /> Click on <span class="button">Disconnect</span>:<br />
<img src="images/icon_disconnect.gif" alt="Disconnect icon" /><br /> <img src="images/icon_disconnect.gif" alt="Disconnect icon" /><br />
to close the database. to close the database.
</p>
<h4>End</h4> <h4>End</h4>
<p>
Close the console window. Close the console window.
For more information, see the <a href="tutorial.html">Tutorial</a>. For more information, see the <a href="tutorial.html">Tutorial</a>.
</p>
</div></td></tr></table></body></html> </div></td></tr></table></body></html>
...@@ -19,8 +19,9 @@ Quickstart ...@@ -19,8 +19,9 @@ Quickstart
<br /><a name="embedding"></a> <br /><a name="embedding"></a>
<h2>Embedding H2 in an Application</h2> <h2>Embedding H2 in an Application</h2>
<p>
This database can be used in embedded mode, or in server mode. To use it in embedded mode, you need to: This database can be used in embedded mode, or in server mode. To use it in embedded mode, you need to:
</p>
<ul> <ul>
<li>Add <code>h2.jar</code> to the classpath <li>Add <code>h2.jar</code> to the classpath
...@@ -30,18 +31,23 @@ This database can be used in embedded mode, or in server mode. To use it in embe ...@@ -30,18 +31,23 @@ This database can be used in embedded mode, or in server mode. To use it in embe
<br /><a name="h2_console"></a> <br /><a name="h2_console"></a>
<h2>H2 コンソール アプリケーション</h2> <h2>H2 コンソール アプリケーション</h2>
<p>
このコンソールはブラウザインターフェースを使ってSQL データベースにアクセスします。 このコンソールはブラウザインターフェースを使ってSQL データベースにアクセスします。
<br /> <br />
<img src="images/console.png" alt="Web Browser - H2 Console Server - H2 Database" /> <img src="images/console.png" alt="Web Browser - H2 Console Server - H2 Database" />
<br /> <br />
Windows XPをご使用でなかったり、 期待通りに機能しない場合は、 <a href="tutorial.html">チュートリアル</a> 内の 詳細説明をご覧下さい。 Windows XPをご使用でなかったり、 期待通りに機能しない場合は、 <a href="tutorial.html">チュートリアル</a> 内の 詳細説明をご覧下さい。
</p>
<h3>手順</h3> <h3>手順</h3>
<h4>インストール</h4> <h4>インストール</h4>
<p>
Windows インストーラーを使用してソフトウェアをインストールしましょう (まだインストールされていない場合)。 Windows インストーラーを使用してソフトウェアをインストールしましょう (まだインストールされていない場合)。
</p>
<h4>コンソールを起動する</h4> <h4>コンソールを起動する</h4>
<p>
<span class="button">スタート</span> <span class="button">スタート</span>
<span class="button">すべてのプログラム</span> <span class="button">すべてのプログラム</span>
<span class="button">H2</span> <span class="button">H2</span>
...@@ -51,29 +57,40 @@ Windows インストーラーを使用してソフトウェアをインストー ...@@ -51,29 +57,40 @@ Windows インストーラーを使用してソフトウェアをインストー
<img class="screenshot" src="images/quickstart-2.png" alt="screenshot: H2 Running" /><br /> <img class="screenshot" src="images/quickstart-2.png" alt="screenshot: H2 Running" /><br />
新しいブラウザで URL http://localhost:8082/ にアクセスして下さい。 ファイアーウォールによるセキュリティ警告を設定することができます。 新しいブラウザで URL http://localhost:8082/ にアクセスして下さい。 ファイアーウォールによるセキュリティ警告を設定することができます。
外部ネットワークから あなたのマシンのデータベースにアクセスされたくないのであれば、ファイアーウォールが他の接続を遮断します。 ローカル接続のみ必要です。 外部ネットワークから あなたのマシンのデータベースにアクセスされたくないのであれば、ファイアーウォールが他の接続を遮断します。 ローカル接続のみ必要です。
</p>
<h4>ログイン</h4> <h4>ログイン</h4>
<p>
<span class="button">Generic H2</span>を選び、<span class="button">Connect</span>をクリックします:<br /> <span class="button">Generic H2</span>を選び、<span class="button">Connect</span>をクリックします:<br />
<img class="screenshot" src="images/quickstart-3.png" alt="screenshot: Login screen" /><br /> <img class="screenshot" src="images/quickstart-3.png" alt="screenshot: Login screen" /><br />
ログインされました。 ログインされました。
</p>
<h4>サンプル</h4> <h4>サンプル</h4>
<p>
<span class="button">Sample SQL Script</span>をクリックします。: <br /> <span class="button">Sample SQL Script</span>をクリックします。: <br />
<img class="screenshot" src="images/quickstart-4.png" alt="screenshot: click on the sample SQL script" /><br /> <img class="screenshot" src="images/quickstart-4.png" alt="screenshot: click on the sample SQL script" /><br />
SQLコマンドがコマンドエリアに表示されます。<br /> SQLコマンドがコマンドエリアに表示されます。<br />
</p>
<h4>実行する</h4> <h4>実行する</h4>
<p>
<span class="button">Run</span>をクリックします:<br /> <span class="button">Run</span>をクリックします:<br />
<img class="screenshot" src="images/quickstart-5.png" alt="screenshot: click Run" /><br /> <img class="screenshot" src="images/quickstart-5.png" alt="screenshot: click Run" /><br />
左側のデータベースアイコンの下に、 新しいテーブル TEST が追加されます。動作とステートメントの結果は、スクリプトの下に表示されます。<br /> 左側のデータベースアイコンの下に、 新しいテーブル TEST が追加されます。動作とステートメントの結果は、スクリプトの下に表示されます。<br />
<img class="screenshot" src="images/quickstart-6.png" alt="screenshot: see the result" /><br /> <img class="screenshot" src="images/quickstart-6.png" alt="screenshot: see the result" /><br />
</p>
<h4>切断</h4> <h4>切断</h4>
<p>
<span class="button">Disconnect</span>をクリックします:<br /> <span class="button">Disconnect</span>をクリックします:<br />
<img src="images/icon_disconnect.gif" alt="Disconnect icon" /><br /> <img src="images/icon_disconnect.gif" alt="Disconnect icon" /><br />
データベースを閉じます。 データベースを閉じます。
</p>
<h4>終了</h4> <h4>終了</h4>
<p>
コンソールウィンドウを閉じます。詳細は<a href="tutorial.html">チュートリアル</a>をご覧下さい。 コンソールウィンドウを閉じます。詳細は<a href="tutorial.html">チュートリアル</a>をご覧下さい。
</p>
</div></td></tr></table></body></html> </div></td></tr></table></body></html>
...@@ -101,6 +101,11 @@ a:hover { ...@@ -101,6 +101,11 @@ a:hover {
text-decoration: underline; text-decoration: underline;
} }
em.u {
text-decoration: underline;
font-style: normal;
}
.button { .button {
border: 1px outset #800; border: 1px outset #800;
margin: 0px 2px 0px 2px; margin: 0px 2px 0px 2px;
......
...@@ -100,6 +100,11 @@ a:hover { ...@@ -100,6 +100,11 @@ a:hover {
text-decoration: underline; text-decoration: underline;
} }
em.u {
text-decoration: underline;
font-style: normal;
}
.screenshot { .screenshot {
border: 1px outset #888; border: 1px outset #888;
padding: 10px; padding: 10px;
......
...@@ -211,6 +211,7 @@ public class Constants { ...@@ -211,6 +211,7 @@ public class Constants {
public static final int DEFAULT_MAX_MEMORY_UNDO = getIntSetting("h2.defaultMaxMemoryUndo", 50000); public static final int DEFAULT_MAX_MEMORY_UNDO = getIntSetting("h2.defaultMaxMemoryUndo", 50000);
public static final boolean OPTIMIZE_NOT = getBooleanSetting("h2.optimizeNot", true); public static final boolean OPTIMIZE_NOT = getBooleanSetting("h2.optimizeNot", true);
public static final boolean OPTIMIZE_2_EQUALS = getBooleanSetting("h2.optimizeTwoEquals", true); public static final boolean OPTIMIZE_2_EQUALS = getBooleanSetting("h2.optimizeTwoEquals", true);
public static final int DEFAULT_LOCK_MODE = getIntSetting("h2.defaultLockMode", LOCK_MODE_READ_COMMITTED);
public static void setBaseDir(String dir) { public static void setBaseDir(String dir) {
if(!dir.endsWith("/")) { if(!dir.endsWith("/")) {
......
...@@ -116,7 +116,7 @@ public class Database implements DataHandler { ...@@ -116,7 +116,7 @@ public class Database implements DataHandler {
private FileStore emergencyReserve; private FileStore emergencyReserve;
private int maxMemoryRows = Constants.DEFAULT_MAX_MEMORY_ROWS; private int maxMemoryRows = Constants.DEFAULT_MAX_MEMORY_ROWS;
private int maxMemoryUndo = Constants.DEFAULT_MAX_MEMORY_UNDO; private int maxMemoryUndo = Constants.DEFAULT_MAX_MEMORY_UNDO;
private int lockMode = Constants.LOCK_MODE_TABLE; private int lockMode = Constants.DEFAULT_LOCK_MODE;
private boolean logIndexChanges; private boolean logIndexChanges;
private int logLevel = 1; private int logLevel = 1;
private int cacheSize; private int cacheSize;
......
...@@ -1412,13 +1412,18 @@ public class Function extends Expression implements FunctionCall { ...@@ -1412,13 +1412,18 @@ public class Function extends Expression implements FunctionCall {
buff.append(info.name); buff.append(info.name);
buff.append('('); buff.append('(');
switch(info.type) { switch(info.type) {
case CAST: case CAST: {
case CONVERT: {
buff.append(args[0].getSQL()); buff.append(args[0].getSQL());
buff.append(" AS "); buff.append(" AS ");
buff.append(new Column(null, dataType, precision, scale).getCreateSQL()); buff.append(new Column(null, dataType, precision, scale).getCreateSQL());
break; break;
} }
case CONVERT: {
buff.append(args[0].getSQL());
buff.append(",");
buff.append(new Column(null, dataType, precision, scale).getCreateSQL());
break;
}
case EXTRACT: { case EXTRACT: {
ValueString v = (ValueString)((ValueExpression)args[0]).getValue(null); ValueString v = (ValueString)((ValueExpression)args[0]).getValue(null);
buff.append(v.getString()); buff.append(v.getString());
......
...@@ -63,8 +63,8 @@ ...@@ -63,8 +63,8 @@
90040=F\u00FCr diese Operation werden Administrator-Rechte ben\u00F6tigt 90040=F\u00FCr diese Operation werden Administrator-Rechte ben\u00F6tigt
90041=Trigger {0} besteht bereits 90041=Trigger {0} besteht bereits
90042=Trigger {0} nicht gefunden 90042=Trigger {0} nicht gefunden
90043=Fehler beim Erzeugen des Triggers {0}, Klasse {1} 90043=Fehler beim Erzeugen des Triggers {0}, Klasse {1}; siehe Ursache f\u00FCr Details
90044=Fehler beim Ausf\u00FChren des Triggers {0}, Klasse {1} 90044=Fehler beim Ausf\u00FChren des Triggers {0}, Klasse {1}; siehe Ursache f\u00FCr Details
90045=Bedingung {0} besteht bereits 90045=Bedingung {0} besteht bereits
90046=URL Format Fehler; erwartet {0}, erhalten {1} 90046=URL Format Fehler; erwartet {0}, erhalten {1}
90047=Falsche Version, Treiber Version ist {0}, Server Version ist {1} 90047=Falsche Version, Treiber Version ist {0}, Server Version ist {1}
......
...@@ -63,8 +63,8 @@ ...@@ -63,8 +63,8 @@
90040=Admin rights are required for this operation 90040=Admin rights are required for this operation
90041=Trigger {0} already exists 90041=Trigger {0} already exists
90042=Trigger {0} not found 90042=Trigger {0} not found
90043=Error creating trigger {0} object, class {1} 90043=Error creating or initializing trigger {0} object, class {1}; see root cause for details
90044=Error executing trigger {0}, class {1} 90044=Error executing trigger {0}, class {1}; see root cause for details
90045=Constraint {0} already exists 90045=Constraint {0} already exists
90046=URL format error; must be {0} but is {1} 90046=URL format error; must be {0} but is {1}
90047=Version mismatch, driver version is {0} but server version is {1} 90047=Version mismatch, driver version is {0} but server version is {1}
......
...@@ -63,8 +63,8 @@ ...@@ -63,8 +63,8 @@
90040=Uprawnienia administratora sa wymagane do wykonania tej operacji 90040=Uprawnienia administratora sa wymagane do wykonania tej operacji
90041=Wyzwalacz {0} juz istnieje 90041=Wyzwalacz {0} juz istnieje
90042=Wyzwalacz {0} nie istnieje 90042=Wyzwalacz {0} nie istnieje
90043=Blad tworzenia wyzwalacza, obiekt {0}, klasa {1} 90043=\#Blad tworzenia wyzwalacza, obiekt {0}, klasa {1}
90044=Blad wykonania wyzwalacza, obiekt {0}, klasa {1} 90044=\#Blad wykonania wyzwalacza, obiekt {0}, klasa {1}
90045=Ograniczenie {0} juz istnieje 90045=Ograniczenie {0} juz istnieje
90046=Bledny format URL; powinno byc {0} a jest {1} 90046=Bledny format URL; powinno byc {0} a jest {1}
90047=Niezgodna wersja sterownika, aktualna werjsa to {0} a wersja serwera to {1} 90047=Niezgodna wersja sterownika, aktualna werjsa to {0} a wersja serwera to {1}
...@@ -149,6 +149,7 @@ ...@@ -149,6 +149,7 @@
90126=Baza danych nie jest trwala 90126=Baza danych nie jest trwala
90127=\#The result set is not updatable. The query must select all columns from a unique key. Only one table may be selected. 90127=\#The result set is not updatable. The query must select all columns from a unique key. Only one table may be selected.
90128=\#The result set is not scrollable and can not be reset. You may need to use conn.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY). 90128=\#The result set is not scrollable and can not be reset. You may need to use conn.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY).
90129=\#Transaction {0} not found
HY000=Blad ogolny\: {0} HY000=Blad ogolny\: {0}
HY004=Nieznany typ danyche\: {0} HY004=Nieznany typ danyche\: {0}
HYC00=Cecha nie jest wspierana HYC00=Cecha nie jest wspierana
......
...@@ -94,53 +94,16 @@ java -Xmx512m -Xrunhprof:cpu=samples,depth=8 org.h2.tools.RunScript -url jdbc:h2 ...@@ -94,53 +94,16 @@ java -Xmx512m -Xrunhprof:cpu=samples,depth=8 org.h2.tools.RunScript -url jdbc:h2
/* /*
Add version number. Install directory: h2-1.0, jar file: h2-1.0.jar strict xhtml (license,...)
make docs translatable
Class.forName("org.h2.Driver");
DeleteDbFiles.execute("~", null, true);
Connection conn1 = DriverManager.getConnection("jdbc:h2:~/test");
Statement s1 = conn1.createStatement();
s1.execute("create table test(id int)");
conn1.setAutoCommit(false);
s1.execute("delete from test");
s1.execute("PREPARE COMMIT TX_8");
s1.execute("COMMIT TRANSACTION TX_8");
Connection conn2 = DriverManager.getConnection("jdbc:h2:~/test");
conn2.createStatement().execute("select * from test");
create table test(id int);
set autocommit off;
insert into test values(1);
prepare commit tx1;
commit transaction tx1;
rollback;
select * from test;
drop table test;
call N'@name';
pg_version is in public instead of pg_catalog
copyright to include 2007
search for japanese: works, but is it ok? search for japanese: works, but is it ok?
can not use google to translate h2 homepage?
pdf: first page looks empty (because the top part is empty) - title on the top? pdf: first page looks empty (because the top part is empty) - title on the top?
pdf / openoffice: pictures don't work? pdf / openoffice: pictures don't work?
test odbc again a few times (debug catalog creation)
extend tests that simulate power off extend tests that simulate power off
CREATE TABLE first (id IDENTITY, value INT); Openfire server uses this script to setup a user permissions
CREATE TABLE second (id IDENTITY, value INT);
CREATE TRIGGER T BEFORE INSERT ON first CALL X;
INSERT INTO first VALUES(1,2);
...trigger calls INSERT INTO second VALUES(3, 4); before the first INSERT
CALL IDENTITY();
Openfire server uses this script to setup a user permissions
on the fresh-installed server. The database is [current] HSQLDB : on the fresh-installed server. The database is [current] HSQLDB :
CREATE SCHEMA PUBLIC AUTHORIZATION DBA CREATE SCHEMA PUBLIC AUTHORIZATION DBA
CREATE USER SA PASSWORD "" CREATE USER SA PASSWORD ""
...@@ -154,8 +117,6 @@ move Comparison to Other Database Engines > Comparison ...@@ -154,8 +117,6 @@ move Comparison to Other Database Engines > Comparison
move Products that Work with H2 > Comparison move Products that Work with H2 > Comparison
move Performance Tuning > Advanced Topics move Performance Tuning > Advanced Topics
set read-committed as the default
storages should be an int hash map storages should be an int hash map
testHalt testHalt
...@@ -197,10 +158,6 @@ Automate real power off tests ...@@ -197,10 +158,6 @@ Automate real power off tests
Negative dictionary: Negative dictionary:
Please note that Please note that
support translated exceptions (translated, then english at the end, for Hibernate compatibility)
make static member variables final (this helps find forgotten initializers)
Merge more from diff.zip (Pavel Ganelin) Merge more from diff.zip (Pavel Ganelin)
Integrate patches from Pavel Ganelin: www.dullesopen.com/software/h2-database-03-04-07-mod.src.zip Integrate patches from Pavel Ganelin: www.dullesopen.com/software/h2-database-03-04-07-mod.src.zip
...@@ -217,8 +174,6 @@ http://javolution.org/ ...@@ -217,8 +174,6 @@ http://javolution.org/
http://joda-time.sourceforge.net/ http://joda-time.sourceforge.net/
http://ibatis.apache.org/ http://ibatis.apache.org/
strict xhtml (license,...)
Document org.h2.samples.MixedMode Document org.h2.samples.MixedMode
http://www.igniterealtime.org/projects/openfire/index.jsp http://www.igniterealtime.org/projects/openfire/index.jsp
...@@ -242,8 +197,12 @@ document SET SEARCH_PATH, BEGIN, EXECUTE, $ parameters ...@@ -242,8 +197,12 @@ document SET SEARCH_PATH, BEGIN, EXECUTE, $ parameters
Complete Javadocs for Messages and add to docs Complete Javadocs for Messages and add to docs
Add version number. Install directory: h2-1.0, jar file: h2-1.0.jar
write tests using the PostgreSQL JDBC driver write tests using the PostgreSQL JDBC driver
JDK 1.6: Deskop.isDesktopSupported, browse(URI uri)
*/ */
/* /*
......
select * from (select x from dual union select convert(x, int) from dual) where x=0;
create table test(id int); create table test(id int);
insert into scriptSimple.public.test(id) values(1), (2); insert into scriptSimple.public.test(id) values(1), (2);
update test t set t.id=t.id+1; update test t set t.id=t.id+1;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论