Merge remote-tracking branch 'origin/master'

Conflicts:
	h2/src/main/org/h2/jdbc/JdbcConnection.java

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

+package org.h2.test.jdbc;
+
+import org.h2.test.TestBase;
+
+import java.sql.Connection;
+import java.sql.SQLClientInfoException;
+import java.sql.SQLException;
+import java.util.Properties;
+
+/**
+ * Tests the client info
+ */
+public class TestConnection extends TestBase {
+
+    /**
+     * Run just this test.
+     *
+     * @param a ignored
+     */
+    public static void main(String... a) throws Exception {
+        TestBase.createCaller().init().test();
+    }
+
+    @Override
+    public void test() throws Exception {
+        testSetSupportedClientInfo();
+        testSetUnsupportedClientInfo();
+        testGetUnsupportedClientInfo();
+        testSetSupportedClientInfoProperties();
+        testSetUnsupportedClientInfoProperties();
+    }
+
+    private void testSetUnsupportedClientInfoProperties() throws SQLException {
+        Connection conn = getConnection("clientInfo");
+
+        Properties properties = new Properties();
+        properties.put("ClientUser", "someuser");
+
+        assertThrows(SQLClientInfoException.class, conn).setClientInfo(properties);
+    }
+
+    private void testSetSupportedClientInfoProperties() throws SQLException {
+        Connection conn = getConnection("clientInfoDB2;MODE=DB2");
+        conn.setClientInfo("ApplicationName", "Connection Test");
+
+        Properties properties = new Properties();
+        properties.put("ClientUser", "someuser");
+        conn.setClientInfo(properties);
+        // old property should have been removed
+        assertNull(conn.getClientInfo("ApplicationName"));
+        // new property has been set
+        assertEquals(conn.getClientInfo("ClientUser"), "someuser");
+    }
+
+    private void testSetSupportedClientInfo() throws SQLException {
+        Connection conn = getConnection("clientInfoDB2;MODE=DB2");
+        conn.setClientInfo("ApplicationName", "Connection Test");
+
+        assertEquals(conn.getClientInfo("ApplicationName"), "Connection Test");
+    }
+
+    private void testSetUnsupportedClientInfo() throws SQLException {
+        Connection conn = getConnection("clientInfoDB2;MODE=DB2");
+        assertThrows(SQLClientInfoException.class, conn).setClientInfo("UnsupportedName", "SomeValue");
+    }
+
+    private void testGetUnsupportedClientInfo() throws SQLException {
+        Connection conn = getConnection("clientInfo");
+        assertNull(conn.getClientInfo("UnknownProperty"));
+    }
+
+}