--no commit message

--no commit message

h2/src/docsrc/html/roadmap.html

@@ -400,6 +400,7 @@ Roadmap
 </li><li>Use a default delay of 1 second before closing a database.
 </li><li>Maven: upload source code and javadocs as well
 </li><li>Write (log) to system table before adding to internal data structures
+</li><li>Support very large deletes and updates
 </li></ul>
 
 <h2>Not Planned</h2>

h2/src/docsrc/text/_docs_en.utf8.txt

@@ -4256,10 +4256,10 @@ Download
 Version 1.0.69 (2008-03-29):
 
 @mainWeb_1009_a
-Windows Installer (2.9 MB)
+Windows Installer (3.0 MB)
 
 @mainWeb_1010_a
-All platforms (zip, 4.1 MB)
+All platforms (zip, 4.2 MB)
 
 @mainWeb_1011_a
 All Downloads
@@ -6763,13 +6763,16 @@ Maven: upload source code and javadocs as well
 @roadmap_1373_li
 Write (log) to system table before adding to internal data structures
 
-@roadmap_1374_h2
+@roadmap_1374_li
+Support very large deletes and updates
+
+@roadmap_1375_h2
 Not Planned
 
-@roadmap_1375_li
+@roadmap_1376_li
 HSQLDB (did) support this: select id i from test where i>0 (other databases don't). Supporting it may break compatibility.
 
-@roadmap_1376_li
+@roadmap_1377_li
 String.intern (so that Strings can be compared with ==) will not be used because some VMs have problems when used extensively.
 
 @search_1000_b

h2/src/docsrc/text/_docs_ja.utf8.txt

@@ -4258,10 +4258,10 @@ H2 データベース エンジン
 #Version 1.0.69 (2008-03-29):
 
 @mainWeb_1009_a
-#Windows Installer (2.9 MB)
+#Windows Installer (3.0 MB)
 
 @mainWeb_1010_a
-#All platforms (zip, 4.1 MB)
+#All platforms (zip, 4.2 MB)
 
 @mainWeb_1011_a
 全てダウンロード
@@ -6771,13 +6771,16 @@ SQLコマンドがコマンドエリアに表示されます。
 @roadmap_1373_li
 #Write (log) to system table before adding to internal data structures
 
-@roadmap_1374_h2
+@roadmap_1374_li
+#Support very large deletes and updates
+
+@roadmap_1375_h2
 #Not Planned
 
-@roadmap_1375_li
+@roadmap_1376_li
 #HSQLDB (did) support this: select id i from test where i>0 (other databases don't). Supporting it may break compatibility.
 
-@roadmap_1376_li
+@roadmap_1377_li
 #String.intern (so that Strings can be compared with ==) will not be used because some VMs have problems when used extensively.
 
 @search_1000_b
@@ -7481,3 +7484,9 @@ Javaアプリケーション内からインデックスを呼び出すことも
 @tutorial_1198_p
 #If the time zone is not set, the value is parsed using the current time zone setting of the system. Date and time information is stored in H2 database files in GMT (Greenwich Mean Time). If the database is opened using another system time zone, the date and time will change accordingly. If you want to move a database from one time zone to the other and don't want this to happen, you need to create a SQL script file using the SCRIPT command or Script tool, and then load the database using the RUNSCRIPT command or the RunScript tool in the new time zone.
 
+@~roadmap_1374_h2
+#Not Planned
+
+@~roadmap_1375_li
+#HSQLDB (did) support this: select id i from test where i>0 (other databases don't). Supporting it may break compatibility.
+

h2/src/docsrc/textbase/_docs_en.properties

@@ -1417,8 +1417,8 @@ mainWeb_1005_li=Written in Java; can be compiled with GCJ and IKVM.NET
 mainWeb_1006_li=Small footprint\: around 1 MB
 mainWeb_1007_h3=Download
 mainWeb_1008_td=Version 1.0.69 (2008-03-29)\:
-mainWeb_1009_a=Windows Installer (2.9 MB)
-mainWeb_1010_a=All platforms (zip, 4.1 MB)
+mainWeb_1009_a=Windows Installer (3.0 MB)
+mainWeb_1010_a=All platforms (zip, 4.2 MB)
 mainWeb_1011_a=All Downloads
 mainWeb_1012_td=   
 mainWeb_1013_h3=Support
@@ -2253,9 +2253,10 @@ roadmap_1370_li=MySQL compatibility\: SHOW TABLES, DESCRIBE TEST (then remove fr
 roadmap_1371_li=Use a default delay of 1 second before closing a database.
 roadmap_1372_li=Maven\: upload source code and javadocs as well
 roadmap_1373_li=Write (log) to system table before adding to internal data structures
-roadmap_1374_h2=Not Planned
-roadmap_1375_li=HSQLDB (did) support this\: select id i from test where i>0 (other databases don't). Supporting it may break compatibility.
-roadmap_1376_li=String.intern (so that Strings can be compared with \=\=) will not be used because some VMs have problems when used extensively.
+roadmap_1374_li=Support very large deletes and updates
+roadmap_1375_h2=Not Planned
+roadmap_1376_li=HSQLDB (did) support this\: select id i from test where i>0 (other databases don't). Supporting it may break compatibility.
+roadmap_1377_li=String.intern (so that Strings can be compared with \=\=) will not be used because some VMs have problems when used extensively.
 search_1000_b=Search\:
 search_1001_td=Highlight keyword(s)
 search_1002_a=Home

h2/src/docsrc/textbase/_text_en.properties

@@ -5,6 +5,7 @@ a.lynxNotSupported=Sorry, Lynx not supported yet
 a.password=Password
 a.remoteConnectionsDisabled=Sorry, remote connections ('webAllowOthers') are disabled on this server.
 a.title=H2 Console
+a.tools=Tools
 a.user=User Name
 admin.executing=Executing
 admin.ip=IP
@@ -52,7 +53,6 @@ login.connect=Connect
 login.driverClass=Driver Class
 login.driverNotFound=Database driver not found<br />See in the Help for how to add drivers
 login.goAdmin=Preferences
-login.goTools=Tools
 login.jdbcUrl=JDBC URL
 login.language=Language
 login.login=Login
@@ -94,6 +94,45 @@ toolbar.refresh=Refresh
 toolbar.rollback=Rollback
 toolbar.run=Run (Ctrl+Enter)
 toolbar.sqlStatement=SQL statement
+tools.backup=Backup
+tools.backup.help=Creates a backup of a database.
+tools.changePassword=ChangePassword
+tools.changePassword.help=Allows changing the database file password.
+tools.cipher=Cipher (AES or XTEA)
+tools.commandLine=Command line
+tools.convertTraceFile=ConvertTraceFile
+tools.convertTraceFile.help=Converts a .trace.db file to a Java application and SQL script.
+tools.createCluster=CreateCluster
+tools.createCluster.help=Creates a cluster from a standalone database.
+tools.databaseName=Database name
+tools.decryptionPassword=Decryption password
+tools.deleteDbFiles=DeleteDbFiles
+tools.deleteDbFiles.help=Deletes all files belonging to a database.
+tools.directory=Directory
+tools.encryptionPassword=Encryption password
+tools.javaDirectoryClassName=Java directory and class name
+tools.recover=Recover
+tools.recover.help=Helps recovering a corrupted database.
+tools.restore=Restore
+tools.restore.help=Restores a database backup.
+tools.result=Result
+tools.run=Run
+tools.runScript=RunScript
+tools.runScript.help=Runs a SQL script.
+tools.script=Script
+tools.script.help=Allows to convert a database to a SQL script for backup or migration.
+tools.scriptFileName=Script file name
+tools.serverList=Server list
+tools.sourceDatabaseName=Source database name
+tools.sourceDatabaseURL=Source database URL
+tools.sourceDirectory=Target directory
+tools.sourceFileName=Source file name
+tools.sourceScriptFileName=Source script file name
+tools.targetDatabaseName=Target database name
+tools.targetDatabaseURL=Target database URL
+tools.targetFileName=Target file name
+tools.targetScriptFileName=Target script file name
+tools.traceFileName=Trace file name
 tree.admin=Admin
 tree.current=Current value
 tree.hashed=Hashed

h2/src/main/org/h2/constant/ErrorCode.java

@@ -1532,14 +1532,14 @@ public class ErrorCode {
      * The error with code <code>90117</code> is thrown when
      * trying to connect to a TCP server from another machine, if remote
      * connections are not allowed. To allow remote connections,
-     * start the TCP server using the option -tcpAllowOthers true as in:
+     * start the TCP server using the option -tcpAllowOthers as in:
      * <pre>
-     * java org.h2.tools.Server -tcp -tcpAllowOthers true
+     * java org.h2.tools.Server -tcp -tcpAllowOthers
      * </pre>
      * Or, when starting the server from an application, use:
      * <pre>
      * Server server = Server.createTcpServer(new String[] { 
-     *          "-tcpAllowOthers", "true" });
+     *          "-tcpAllowOthers" });
      * server.start();
      * </pre>
      */

h2/src/main/org/h2/index/MultiVersionCursor.java

@@ -54,6 +54,24 @@ public class MultiVersionCursor implements Cursor {
         }
     }
 
+    private void loadPrevious(boolean base) throws SQLException {
+        synchronized (sync) {
+            if (base) {
+                if (baseCursor.previous()) {
+                    baseRow = baseCursor.getSearchRow();
+                } else {
+                    baseRow = null;
+                }
+            } else {
+                if (deltaCursor.previous()) {
+                    deltaRow = deltaCursor.get();
+                } else {
+                    deltaRow = null;
+                }
+            }
+        }
+    }
+
     public Row get() throws SQLException {
         synchronized (sync) {
             if (SysProperties.CHECK && end) {

h2/src/main/org/h2/index/MultiVersionIndex.java

@@ -17,6 +17,8 @@ import org.h2.table.IndexColumn;
 import org.h2.table.Table;
 import org.h2.table.TableData;
 import org.h2.util.ObjectArray;
+import org.h2.value.Value;
+import org.h2.value.ValueNull;
 
 /**
  * A multi-version index is a combination of a regular index,
@@ -79,7 +81,37 @@ public class MultiVersionIndex implements Index {
     }
 
     public Cursor findFirstOrLast(Session session, boolean first) throws SQLException {
+        int test;
         throw Message.getUnsupportedException();
+   
+//        if (first) {
+//            // TODO optimization: this loops through NULL elements
+//            Cursor cursor = find(session, null, false, null);
+//            while (cursor.next()) {
+//                SearchRow row = cursor.getSearchRow();
+//                Value v = row.getValue(columnIds[0]);
+//                if (v != ValueNull.INSTANCE) {
+//                    return cursor;
+//                }
+//            }
+//            return null;
+//        } else {
+//            BtreePage root = getRoot(session);
+//            BtreeCursor cursor = new BtreeCursor(session, this, null);
+//            root.last(cursor);
+//            // TODO optimization: this loops through NULL elements
+//            do {
+//                SearchRow row = cursor.getSearchRow();
+//                if (row == null) {
+//                    break;
+//                }
+//                Value v = row.getValue(columnIds[0]);
+//                if (v != ValueNull.INSTANCE) {
+//                    return cursor;
+//                }
+//            } while (cursor.previous());
+//            return null;
+//        }        
     }
 
     public double getCost(Session session, int[] masks) throws SQLException {

h2/src/main/org/h2/res/_messages_ja.properties

@@ -74,7 +74,7 @@
 90051=\#Statement was cancelled or the session timed out
 90052=\u30B5\u30D6\u30AF\u30A8\u30EA\u304C\u5358\u4E00\u5217\u306E\u30AF\u30A8\u30EA\u3067\u306F\u3042\u308A\u307E\u305B\u3093
 90053=\u6570\u5024\u30B5\u30D6\u30AF\u30A8\u30EA\u304C\u8907\u6570\u306E\u884C\u3092\u542B\u3093\u3067\u3044\u307E\u3059
-90054=\u96C6\u5408\u95A2\u6570 {0} \u306E\u4E0D\u6B63\u306A\u4F7F\u7528
+90054=\u96C6\u7D04\u95A2\u6570 {0} \u306E\u4E0D\u6B63\u306A\u4F7F\u7528
 90055={0} \u306F\u672A\u30B5\u30DD\u30FC\u30C8\u306E\u6697\u53F7\u3067\u3059
 90056=\u5217 {0} \u306B\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u304C\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
 90057=\u5236\u7D04 {0} \u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
@@ -147,17 +147,17 @@
 90124=\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\: {0}
 90125=\u7121\u52B9\u306A\u30AF\u30E9\u30B9, {0} \u304C\u671F\u5F85\u3055\u308C\u3066\u3044\u308B\u306B\u3082\u304B\u304B\u308F\u3089\u305A {1} \u3092\u53D6\u5F97\u3057\u307E\u3057\u305F
 90126=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306F\u6C38\u7D9A\u7684\u3067\u306F\u3042\u308A\u307E\u305B\u3093
-90127=\u30EA\u30B6\u30EB\u30C8\u30BB\u30C3\u30C8\u304C\u66F4\u65B0\u53EF\u80FD\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\u30AF\u30A8\u30EA\u306F\u5358\u4E00\u306E\u30C6\u30FC\u30D6\u30EB\u304B\u3089\u3001\u30E6\u30CB\u30FC\u30AF\u30AD\u30FC\u3092\u5168\u3066select\u3057\u306A\u3051\u308C\u3070\u306A\u308A\u307E\u305B\u3093\u3002
-90128=\u30EA\u30B6\u30EB\u30C8\u30BB\u30C3\u30C8\u304C\u30B9\u30AF\u30ED\u30FC\u30EB\u3001\u30EA\u30BB\u30C3\u30C8\u53EF\u80FD\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002conn.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY) \u3092\u4F7F\u3046\u5FC5\u8981\u304C\u3042\u308B\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002
+90127=\u30EA\u30B6\u30EB\u30C8\u30BB\u30C3\u30C8\u304C\u66F4\u65B0\u53EF\u80FD\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\u30AF\u30A8\u30EA\u306F\u5358\u4E00\u306E\u30C6\u30FC\u30D6\u30EB\u304B\u3089\u3001\u30E6\u30CB\u30FC\u30AF\u30AD\u30FC\u3092\u5168\u3066select\u3057\u306A\u3051\u308C\u3070\u306A\u308A\u307E\u305B\u3093
+90128=\u30EA\u30B6\u30EB\u30C8\u30BB\u30C3\u30C8\u304C\u30B9\u30AF\u30ED\u30FC\u30EB\u3001\u30EA\u30BB\u30C3\u30C8\u53EF\u80FD\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002conn.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY) \u3092\u4F7F\u3046\u5FC5\u8981\u304C\u3042\u308B\u304B\u3082\u3057\u308C\u307E\u305B\u3093
 90129=\u30C8\u30E9\u30F3\u30B6\u30AF\u30B7\u30E7\u30F3 {0} \u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-90130=\u30D7\u30EA\u30DA\u30A2\u30C9\u30B9\u30C6\u30FC\u30C8\u30E1\u30F3\u30C8\u306B\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u306F\u8A31\u3055\u308C\u3066\u3044\u307E\u305B\u3093; \u304B\u308F\u308A\u306B\u901A\u5E38\u306E\u30B9\u30C6\u30FC\u30C8\u30E1\u30F3\u30C8\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+90130=\u30D7\u30EA\u30DA\u30A2\u30C9\u30B9\u30C6\u30FC\u30C8\u30E1\u30F3\u30C8\u306B\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u306F\u8A31\u3055\u308C\u3066\u3044\u307E\u305B\u3093; \u304B\u308F\u308A\u306B\u901A\u5E38\u306E\u30B9\u30C6\u30FC\u30C8\u30E1\u30F3\u30C8\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044
 90131=\u30C6\u30FC\u30D6\u30EB {0} \u306B\u4E26\u884C\u3057\u3066\u66F4\u65B0\u304C\u884C\u308F\u308C\u307E\u3057\u305F\: \u5225\u306E\u30C8\u30E9\u30F3\u30B6\u30AF\u30B7\u30E7\u30F3\u304C\u3001\u540C\u3058\u884C\u306B\u66F4\u65B0\u304B\u524A\u9664\u3092\u884C\u3044\u307E\u3057\u305F
-90132=\#Aggregate {0} not found
-90133=\#Cannot change the setting {0} when the database is already open
-90134=\#Access to the class {0} is denied
-90135=\#The database is open in exclusive mode; can not open additional connections
-90136=\#Unsupported outer join condition\: {0}
-90137=\#Can only assign to a variable, not to\: {0}
+90132=\u96C6\u7D04 {0} \u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
+90133=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30AA\u30FC\u30D7\u30F3\u4E2D\u306B\u306F\u3001\u8A2D\u5B9A {0} \u3092\u5909\u66F4\u3067\u304D\u307E\u305B\u3093
+90134=\u30AF\u30E9\u30B9 {0} \u3078\u306E\u30A2\u30AF\u30BB\u30B9\u304C\u62D2\u5426\u3055\u308C\u307E\u3057\u305F
+90135=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306F\u6392\u4ED6\u30E2\u30FC\u30C9\u3067\u30AA\u30FC\u30D7\u30F3\u3055\u308C\u3066\u3044\u307E\u3059; \u63A5\u7D9A\u3092\u8FFD\u52A0\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+90136=\u672A\u30B5\u30DD\u30FC\u30C8\u306E\u5916\u90E8\u7D50\u5408\u6761\u4EF6\: {0}
+90137=\u5272\u308A\u5F53\u3066\u306F\u5909\u6570\u306B\u306E\u307F\u53EF\u80FD\u3067\u3059\u3002{0} \u306B\u306F\u3067\u304D\u307E\u305B\u3093
 HY000=\u4E00\u822C\u30A8\u30E9\u30FC\: {0}
 HY004=\u4E0D\u660E\u306A\u30C7\u30FC\u30BF\u578B\: {0}
 HYC00=\u6A5F\u80FD\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093

h2/src/main/org/h2/res/help.csv

@@ -1632,6 +1632,7 @@ TIMESTAMP
 ","
 Represents a byte array. For very long arrays, use BLOB.
 There is no maximum precision. The maximum size is the memory available.
+The precision is a size constraint; only the actual data is persisted.
 The whole object is kept in memory when using this data type.
 For large text data BLOB should be used.
 ","
@@ -1657,6 +1658,7 @@ VARCHAR2 | NVARCHAR | NVARCHAR2 | VARCHAR_CASESENSITIVE}
 ","
 Unicode String. Use two single quotes ('') to create a quote.
 There is no maximum precision. The maximum size is the memory available.
+The precision is a size constraint; only the actual data is persisted.
 For large text data CLOB should be used.
 See also java.lang.String.
 ","
@@ -1678,7 +1680,7 @@ VARCHAR_IGNORECASE
 [( precisionInt )]
 ","
 This type is supported for compatibility with other databases and older applications.
-The difference to VARCHAR is that trailing spaces are ignored.
+The difference to VARCHAR is that trailing spaces are ignored and not persisted.
 Unicode String. Use two single quotes ('') to create a quote.
 There is no maximum precision. The maximum size is the memory available.
 For large text data CLOB should be used.
@@ -2581,6 +2583,7 @@ SECOND(CREATED)
 WEEK(timestamp): int
 ","
 Returns the week (1-53) from a timestamp.
+This method uses the current system locale.
 ","
 WEEK(CREATED)
 "

h2/src/main/org/h2/table/TableView.java

@@ -318,6 +318,9 @@ public class TableView extends Table {
         String querySQL = query.getPlanSQL();
         TableView v = new TableView(mainSchema, 0, tempViewName, querySQL, query.getParameters(), null, s,
                 false);
+        if (v.createException != null) {
+            throw v.createException;
+        }
         v.setOwner(owner);
         v.setTemporary(true);
         return v;

h2/src/test/org/h2/test/TestAll.java

@@ -174,7 +174,7 @@ create table test(id int, version int, idx int);
 @LOOP 1000 insert into test values(1, 1, ?);
 @LOOP 1000 insert into test values(1, 2, ?);
 @LOOP 1000 insert into test values(2, 1, ?);
-create index idxtest on test(id, version, idx);
+create index idx_test on test(id, version, idx);
 @LOOP 1000 select max(id)+1 from test;
 @LOOP 1000 select max(idx)+1 from test where id=1 and version=2;
 @LOOP 1000 select max(id)+1 from test;
@@ -184,7 +184,6 @@ create index idxtest on test(id, version, idx);
 -- should be direct query
 
 
-
 Fix ScriptBase.getFileName()
 Fix Shell.java 159 (close PreparedStatement)
 

h2/src/tools/org/h2/build/code/CheckTextFiles.java

@@ -23,7 +23,7 @@ public class CheckTextFiles {
 
     String[] suffixCheck = new String[] { "html", "jsp", "js", "css", "bat", "nsi", "java", "txt", "properties", "sql",
             "xml", "csv", "Driver" };
-    String[] suffixIgnore = new String[] { "gif", "png", "odg", "ico", "sxd", "layout", "res", "win", "jar", "task" };
+    String[] suffixIgnore = new String[] { "gif", "png", "odg", "ico", "sxd", "layout", "res", "win", "jar", "task", "svg" };
     boolean failOnError;
     boolean allowTab, allowCR = true, allowTrailingSpaces = true;
     int spacesPerTab = 4;

h2/src/tools/org/h2/build/doc/SpellChecker.java

@@ -35,7 +35,7 @@ public class SpellChecker {
     private static final String[] SUFFIX = new String[] { "html", "java", "sql", "txt", "xml", "jsp", "css", "bat",
             "csv", "xml", "js", "Driver", "properties", "task", "" };
     private static final String[] IGNORE = new String[] { "dev", "nsi", "gif", "png", "odg", "ico", "sxd", "zip",
-            "bz2", "rc", "layout", "res", "dll", "jar" };
+            "bz2", "rc", "layout", "res", "dll", "jar", "svg" };
     private static final String PREFIX_IGNORE = "abc";
     private static final String IGNORE_FILE = "mainWeb.html";
     private int errorCount;

h2/src/tools/org/h2/build/doc/dictionary.txt

@@ -488,4 +488,4 @@ greenwich sqli informix pointbase fbj pervasive jtds ifx syb mimer sybase
 frontbase intersys maxwidth belonging learning mono typical toggle winexe 
 hider ikvmc invert recycle filtering lesser recycled assertion runner teradata
 christian lgpl elapsed ncr disposed heureuse tera years retrieves unlocked 
-selecting vista everywhere locations zones fragment
\ No newline at end of file
+selecting vista everywhere locations zones fragment svg thought
\ No newline at end of file