When the system property h2.lobInDatabase is set, the lob tables were always…

When the system property h2.lobInDatabase is set, the lob tables were always created when closing the database, even if the tables were not needed.

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,9 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>In the MySQL mode, SHOW TABLES didn't work, and meta data tables were not
+<ul><li>When the system property h2.lobInDatabase is set, the lob tables were always
+    created when closing the database, even if the tables were not needed.
+</li><li>In the MySQL mode, SHOW TABLES didn't work, and meta data tables were not
     case insensitive. Updatable result sets didn't work as expected. Issue 249.
 </li><li>Connection-created Clob and Blob objects can now be filled using
     Clob.setCharacterStream(1), Clob.setString(1, s), Blob.setBytes(1, x), Blob.setBinaryStream(1).

h2/src/docsrc/html/roadmap.html

@@ -443,7 +443,7 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Scripting language support (Javascript).
 </li><li>The network client should better detect if the server is not an H2 server and fail early.
 </li><li>H2 Console: support CLOB/BLOB upload.
-</li><li>Move away from system properties where possible.
+</li><li>Database file name suffix: a way to use no or a different suffix (for example using a slash).
 </li><li>Database file lock: detect hibernate / standby / very slow threads (compare system time).
 </li><li>Automatic detection of redundant indexes.
 </li><li>Maybe reject join without "on" (except natural join).
@@ -477,7 +477,6 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Indexes of temporary tables are currently kept in-memory. Is this how it should be?
 </li><li>The Shell tool should support the same built-in commands as the H2 Console.
 </li><li>Maybe use PhantomReference instead of finalize.
-</li><li>Database file name suffix: a way to use no or a different suffix (for example using a slash).
 </li><li>Database file name suffix: should only have one dot by default. Example: .h2db
 </li><li>Issue 196: Function based indexes
 </li><li>Fix the disk space leak (killing the process at the exact right moment will increase

h2/src/main/org/h2/engine/Database.java

@@ -199,6 +199,10 @@ public class Database implements DataHandler {
             listener = StringUtils.trim(listener, true, true, "'");
             setEventListenerClass(listener);
         }
+        String modeName = ci.removeProperty("MODE", null);
+        if (modeName != null) {
+            this.mode = Mode.getInstance(modeName);
+        }
         this.multiVersion = ci.getProperty("MVCC", false);
         boolean closeAtVmShutdown = dbSettings.dbCloseOnExit;
         int traceLevelFile = ci.getIntProperty(SetTypes.TRACE_LEVEL_FILE, TraceSystem.DEFAULT_TRACE_LEVEL_FILE);
@@ -1053,11 +1057,14 @@ public class Database implements DataHandler {
         }
         // remove all session variables
         if (persistent) {
-            try {
-                getLobStorage();
-                lobStorage.removeAllForTable(LobStorage.TABLE_ID_SESSION_VARIABLE);
-            } catch (DbException e) {
-                traceSystem.getTrace(Trace.DATABASE).error("close", e);
+            boolean lobStorageIsUsed = infoSchema.findTableOrView(systemSession, LobStorage.LOB_DATA_TABLE) != null;
+            if (lobStorageIsUsed) {
+                try {
+                    getLobStorage();
+                    lobStorage.removeAllForTable(LobStorage.TABLE_ID_SESSION_VARIABLE);
+                } catch (DbException e) {
+                    traceSystem.getTrace(Trace.DATABASE).error("close", e);
+                }
             }
         }
         tempFileDeleter.deleteAll();

h2/src/main/org/h2/store/LobStorage.java

@@ -44,10 +44,16 @@ public class LobStorage {
      */
     public static final int TABLE_TEMP = -2;
 
+    /**
+     * The name of the lob data table. If this table exists, then lob storage is used.
+     */
+    public static final String LOB_DATA_TABLE = "LOB_DATA";
+
+    private static final String LOB_SCHEMA = "INFORMATION_SCHEMA";
 
-    private static final String LOBS = "INFORMATION_SCHEMA.LOBS";
-    private static final String LOB_MAP = "INFORMATION_SCHEMA.LOB_MAP";
-    private static final String LOB_DATA = "INFORMATION_SCHEMA.LOB_DATA";
+    private static final String LOBS = LOB_SCHEMA + ".LOBS";
+    private static final String LOB_MAP = LOB_SCHEMA + ".LOB_MAP";
+    private static final String LOB_DATA = LOB_SCHEMA + "." + LOB_DATA_TABLE;
 
     private static final int BLOCK_LENGTH = 20000;
 

h2/src/test/org/h2/test/TestBase.java

@@ -881,7 +881,7 @@ public abstract class TestBase {
             String actual = rs.getString(1);
             assertEquals(expected, actual);
         } else {
-            assertEquals(null, expected);
+            assertEquals(expected, null);
         }
     }
 

h2/src/test/org/h2/test/test-1.3.txt

@@ -2483,10 +2483,10 @@ create table address(id identity, name varchar check instr(value, '@') > 1);
 create table address(id identity, name varchar check instr(name, '@') > 1);
 > ok
 
-drop table address;
+drop view if exists address_view;
 > ok
 
-drop view if exists address_view;
+drop table address;
 > ok
 
 create memory table a(k10 blob(10k), m20 blob(20m), g30 clob(30g));