The database URL property DATABASE_EVENT_LISTENER_OBJECT is no longer supported.

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,11 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>H2 Console: asynchronous login (using a DatabaseEventListener) is no longer supported.
+<ul><li>Converting a UUID to bytes was incorrect. Because of that, updatable result sets on
+    tables with UUID primary key did not work. 
+</li><li>The database URL property DATABASE_EVENT_LISTENER_OBJECT is no longer supported
+    (there are problems passing objects when the PostgreSQL driver is installed as well).
+</li><li>H2 Console: asynchronous login (using a DatabaseEventListener) is no longer supported.
 </li><li>A workaround for a Windows socket problem has been implemented. Thanks a lot to Sergi Vladykin.
 </li><li>The Recover tool did not convert correctly convert CLOB data with non-ASCII characters.
 </li><li>Tools: the method run(String... args) has been renamed to runTool(String... args)

h2/src/docsrc/html/roadmap.html

@@ -479,6 +479,7 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Simplify running scripts and recovery: CREATE FORCE USER (overwrites an existing user).
 </li><li>Support CREATE DATABASE LINK (a custom JDBC driver is already supported).
 </li><li>Isse 163: Allow to create foreign keys on metadata types.
+</li><li>Logback: write a native DBAppender.
 </li></ul>
 
 <h2>Not Planned</h2>

h2/src/main/org/h2/command/Parser.java

@@ -4181,10 +4181,6 @@ public class Parser {
             readIfEqualOrTo();
             read();
             return new NoOperation(session);
-        } else if (readIf("DATABASE_EVENT_LISTENER_OBJECT")) {
-            readIfEqualOrTo();
-            read();
-            return new NoOperation(session);
         } else if (readIf("OPEN_NEW")) {
             readIfEqualOrTo();
             read();

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

@@ -11,7 +11,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Properties;
-import org.h2.api.DatabaseEventListener;
 import org.h2.command.dml.SetTypes;
 import org.h2.constant.ErrorCode;
 import org.h2.constant.SysProperties;
@@ -79,7 +78,7 @@ public class ConnectionInfo implements Cloneable {
         set.addAll(list);
         String[] connectionTime = new String[] { "ACCESS_MODE_DATA", "AUTOCOMMIT", "CIPHER",
                 "CREATE", "CACHE_TYPE", "DB_CLOSE_ON_EXIT", "FILE_LOCK", "IGNORE_UNKNOWN_SETTINGS", "IFEXISTS",
-                "PASSWORD", "RECOVER", "USER", "DATABASE_EVENT_LISTENER_OBJECT", "AUTO_SERVER",
+                "PASSWORD", "RECOVER", "USER", "AUTO_SERVER",
                 "AUTO_RECONNECT", "OPEN_NEW" };
         for (String key : connectionTime) {
             if (SysProperties.CHECK && set.contains(key)) {
@@ -206,31 +205,6 @@ public class ConnectionInfo implements Cloneable {
         }
     }
 
-    /**
-     * Removes the database event listener object.
-     */
-    void removeDatabaseEventListenerObject() {
-        prop.remove("DATABASE_EVENT_LISTENER_OBJECT");
-    }
-
-    /**
-     * Return the database event listener object set as a Java object. If the
-     * event listener is not set or set as a string (the class name), then this
-     * method returns null.
-     *
-     * @return the database event listener object or null
-     */
-    DatabaseEventListener getDatabaseEventListenerObject() throws SQLException {
-        Object p = prop.get("DATABASE_EVENT_LISTENER_OBJECT");
-        if (p == null) {
-            return null;
-        }
-        if (p instanceof DatabaseEventListener) {
-            return (DatabaseEventListener) p;
-        }
-        throw Message.getSQLException(ErrorCode.DATA_CONVERSION_ERROR_1, p.getClass().getName());
-    }
-
     private char[] removePassword() {
         Object p = prop.remove("PASSWORD");
         if (p == null) {

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

@@ -182,14 +182,10 @@ public class Database implements DataHandler {
         }
         this.fileLockMethod = FileLock.getFileLockMethod(lockMethodName);
         this.databaseURL = ci.getURL();
-        this.eventListener = ci.getDatabaseEventListenerObject();
-        ci.removeDatabaseEventListenerObject();
-        if (eventListener == null) {
-            String listener = ci.removeProperty("DATABASE_EVENT_LISTENER", null);
-            if (listener != null) {
-                listener = StringUtils.trim(listener, true, true, "'");
-                setEventListenerClass(listener);
-            }
+        String listener = ci.removeProperty("DATABASE_EVENT_LISTENER", null);
+        if (listener != null) {
+            listener = StringUtils.trim(listener, true, true, "'");
+            setEventListenerClass(listener);
         }
         this.multiVersion = ci.getProperty("MVCC", false);
         boolean closeAtVmShutdown = ci.getProperty("DB_CLOSE_ON_EXIT", true);

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

@@ -300,18 +300,15 @@ public class SessionRemote extends SessionWithState implements SessionFactory, D
             throw Message.getUnsupportedException("autoReconnect && serverList != null");
         }
         if (autoReconnect) {
-            eventListener = ci.getDatabaseEventListenerObject();
-            if (eventListener == null) {
-                String className = ci.getProperty("DATABASE_EVENT_LISTENER");
-                if (className != null) {
-                    className = StringUtils.trim(className, true, true, "'");
-                    try {
-                        eventListener = (DatabaseEventListener) ClassUtils.loadUserClass(className).newInstance();
-                    } catch (Exception e) {
-                        throw Message.convert(e);
-                    } catch (Throwable e) {
-                        throw Message.convertThrowable(e);
-                    }
+            String className = ci.getProperty("DATABASE_EVENT_LISTENER");
+            if (className != null) {
+                className = StringUtils.trim(className, true, true, "'");
+                try {
+                    eventListener = (DatabaseEventListener) ClassUtils.loadUserClass(className).newInstance();
+                } catch (Exception e) {
+                    throw Message.convert(e);
+                } catch (Throwable e) {
+                    throw Message.convertThrowable(e);
                 }
             }
         }

h2/src/test/org/h2/test/jdbc/TestDatabaseEventListener.java

@@ -20,7 +20,7 @@ import org.h2.test.TestBase;
  */
 public class TestDatabaseEventListener extends TestBase implements DatabaseEventListener {
 
-    private boolean calledOpened, calledClosingDatabase, calledScan, calledCreateIndex;
+    private static boolean calledOpened, calledClosingDatabase, calledScan, calledCreateIndex;
 
     /**
      * Run just this test.
@@ -32,6 +32,7 @@ public class TestDatabaseEventListener extends TestBase implements DatabaseEvent
     }
 
     public void test() throws SQLException {
+        testInit();
         testIndexRebuiltOnce();
         testIndexNotRebuilt();
         testCalled();
@@ -40,6 +41,59 @@ public class TestDatabaseEventListener extends TestBase implements DatabaseEvent
         deleteDb("databaseEventListener");
     }
 
+    /**
+     * Initialize the database after opening.
+     */
+    public static class Init implements DatabaseEventListener {
+
+        private String databaseUrl;
+
+        public void init(String url) {
+            databaseUrl = url;
+        }
+
+        public void opened() {
+            try {
+                Connection conn = DriverManager.getConnection(databaseUrl, "sa", "sa");
+                Statement stat = conn.createStatement();
+                stat.execute("create table if not exists test(id int)");
+                conn.close();
+            } catch (SQLException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        public void closingDatabase() {
+            // nothing to do
+        }
+
+        public void diskSpaceIsLow(long stillAvailable) {
+            // nothing to do
+        }
+
+        public void exceptionThrown(SQLException e, String sql) {
+            // nothing to do
+        }
+
+        public void setProgress(int state, String name, int x, int max) {
+            // nothing to do
+        }
+
+    }
+
+    private void testInit() throws SQLException {
+        if (config.networked || config.cipher != null || config.memory) {
+            return;
+        }
+        deleteDb("databaseEventListener");
+        String url = getURL("databaseEventListener", true);
+        url += ";DATABASE_EVENT_LISTENER='"+ Init.class.getName() + "'";
+        Connection conn = DriverManager.getConnection(url, "sa", "sa");
+        Statement stat = conn.createStatement();
+        stat.execute("select * from test");
+        conn.close();
+    }
+
     private void testIndexRebuiltOnce() throws SQLException {
         if (config.memory) {
             return;
@@ -74,11 +128,11 @@ public class TestDatabaseEventListener extends TestBase implements DatabaseEvent
         // now the index should be re-built
         conn = DriverManager.getConnection(url, p);
         conn.close();
-        TestDatabaseEventListener l = new TestDatabaseEventListener();
-        p.put("DATABASE_EVENT_LISTENER_OBJECT", l);
+        calledCreateIndex = false;
+        p.put("DATABASE_EVENT_LISTENER", getClass().getName());
         conn = org.h2.Driver.load().connect(url, p);
         conn.close();
-        assertTrue(!l.calledCreateIndex);
+        assertTrue(!calledCreateIndex);
     }
 
     private void testIndexNotRebuilt() throws SQLException {
@@ -106,11 +160,11 @@ public class TestDatabaseEventListener extends TestBase implements DatabaseEvent
         stat.execute("truncate table test");
         stat.execute("insert into test select 1");
         conn.close();
-        TestDatabaseEventListener l = new TestDatabaseEventListener();
-        p.put("DATABASE_EVENT_LISTENER_OBJECT", l);
+        calledCreateIndex = false;
+        p.put("DATABASE_EVENT_LISTENER", getClass().getName());
         conn = org.h2.Driver.load().connect(url, p);
         conn.close();
-        assertTrue(!l.calledCreateIndex);
+        assertTrue(!calledCreateIndex);
     }
 
     private void testCloseLog0(boolean shutdown) throws SQLException {
@@ -132,12 +186,13 @@ public class TestDatabaseEventListener extends TestBase implements DatabaseEvent
         }
         conn.close();
 
-        TestDatabaseEventListener l = new TestDatabaseEventListener();
-        p.put("DATABASE_EVENT_LISTENER_OBJECT", l);
+        calledOpened = false;
+        calledScan = false;
+        p.put("DATABASE_EVENT_LISTENER", getClass().getName());
         conn = org.h2.Driver.load().connect(url, p);
         conn.close();
-        if (l.calledOpened) {
-            assertTrue(!l.calledScan);
+        if (calledOpened) {
+            assertTrue(!calledScan);
         }
     }
 
@@ -145,14 +200,15 @@ public class TestDatabaseEventListener extends TestBase implements DatabaseEvent
         Properties p = new Properties();
         p.setProperty("user", "sa");
         p.setProperty("password", "sa");
-        TestDatabaseEventListener l = new TestDatabaseEventListener();
-        p.put("DATABASE_EVENT_LISTENER_OBJECT", l);
+        calledOpened = false;
+        calledClosingDatabase = false;
+        p.put("DATABASE_EVENT_LISTENER", getClass().getName());
         org.h2.Driver.load();
         String url = "jdbc:h2:mem:databaseEventListener";
         Connection conn = org.h2.Driver.load().connect(url, p);
         conn.close();
-        assertTrue(l.calledOpened);
-        assertTrue(l.calledClosingDatabase);
+        assertTrue(calledOpened);
+        assertTrue(calledClosingDatabase);
     }
 
     public void closingDatabase() {

h2/src/test/org/h2/test/unit/TestAutoReconnect.java

@@ -7,14 +7,11 @@
 package org.h2.test.unit;
 
 import java.sql.Connection;
-import java.sql.Driver;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.util.Properties;
-
 import org.h2.api.DatabaseEventListener;
 import org.h2.test.TestBase;
 import org.h2.tools.Server;
@@ -29,7 +26,6 @@ public class TestAutoReconnect extends TestBase implements DatabaseEventListener
     private Server server;
     private Connection connServer;
     private Connection conn;
-    private String state;
 
     /**
      * Run just this test.
@@ -79,32 +75,7 @@ public class TestAutoReconnect extends TestBase implements DatabaseEventListener
         conn = DriverManager.getConnection(url + ";DATABASE_EVENT_LISTENER='" + getClass().getName() + "'");
         conn.close();
 
-        // test the database event listener object
-        Properties prop = new Properties();
-        state = null;
-        Driver postgreDriver = null;
-        try {
-            postgreDriver = DriverManager.getDriver("jdbc:postgresql:test");
-            if (postgreDriver != null) {
-                DriverManager.deregisterDriver(postgreDriver);
-            }
-        } catch (Exception e) {
-            // ignore
-        }
-        prop.put("DATABASE_EVENT_LISTENER_OBJECT", this);
-        conn = DriverManager.getConnection(url, prop);
-        assertEquals(null, state);
-        Statement stat = conn.createStatement();
-        stat.execute("DROP TABLE IF EXISTS TEST");
-        restart();
-        // the table is created in the database event listener
-        stat.execute("SELECT * FROM TEST");
-        assertEquals("state " + DatabaseEventListener.STATE_RECONNECTED, state);
-        conn.close();
-
-        if (postgreDriver != null) {
-            DriverManager.registerDriver(postgreDriver);
-        }
+        Statement stat;
 
         conn = DriverManager.getConnection(url);
         restart();
@@ -199,22 +170,15 @@ public class TestAutoReconnect extends TestBase implements DatabaseEventListener
     }
 
     public void init(String u) {
-        state = "init";
+        // ignore
     }
 
     public void opened() {
-        state = "opened";
+        // ignore
     }
 
     public void setProgress(int state, String name, int x, int max) {
-        this.state = "state " + state;
-        if (state == DatabaseEventListener.STATE_RECONNECTED) {
-            try {
-                conn.createStatement().execute("CREATE LOCAL TEMPORARY TABLE TEST(ID INT)");
-            } catch (SQLException e) {
-                throw new RuntimeException(e);
-            }
-        }
+        // ignore
     }
 
 }