H2 version 2 support

morf-h2/pom.xml

@@ -52,6 +52,7 @@
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
+      <version>1.4.200</version>
     </dependency>
   </dependencies>
 </project>

morf-h2/src/main/java/org/alfasoftware/morf/jdbc/h2/H2Dialect.java

@@ -36,8 +36,6 @@
 import org.alfasoftware.morf.sql.element.AliasedField;
 import org.alfasoftware.morf.sql.element.Function;
 import org.alfasoftware.morf.sql.element.FunctionType;
-import org.alfasoftware.morf.sql.element.PortableSqlExpression;
-import org.alfasoftware.morf.sql.element.PortableSqlFunction;
 import org.alfasoftware.morf.sql.element.SequenceReference;
 import org.alfasoftware.morf.sql.element.SqlParameter;
 import org.alfasoftware.morf.sql.element.TableReference;

morf-h2v2/.gitignore

@@ -0,0 +1 @@
+/ivy.xml

morf-h2v2/pom.xml

@@ -0,0 +1,58 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.alfasoftware</groupId>
+    <artifactId>morf-parent</artifactId>
+    <version>2.30.1-SNAPSHOT</version>
+  </parent>
+
+  <name>Morf - H2 version 2</name>
+  <description>Morf is a library for cross-platform evolutionary relational database mechanics, database access and database imaging/cloning.</description>
+  <url>https://github.com/alfasoftware/morf</url>
+
+  <artifactId>morf-h2v2</artifactId>
+
+  <properties>
+    <sonar.coverage.jacoco.xmlReportPaths>${basedir}/../${aggregate.report.dir}</sonar.coverage.jacoco.xmlReportPaths>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.alfasoftware</groupId>
+      <artifactId>morf-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.alfasoftware</groupId>
+      <artifactId>morf-testsupport</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+      <version>2.3.232</version>
+    </dependency>
+  </dependencies>
+</project>

morf-h2v2/src/main/java/org/alfasoftware/morf/jdbc/h2/H2.java

@@ -0,0 +1,149 @@
+/* Copyright 2017 Alfa Financial Software
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.alfasoftware.morf.jdbc.h2;
+
+import java.io.File;
+import java.sql.Connection;
+import java.util.Optional;
+
+import javax.sql.XADataSource;
+
+import org.alfasoftware.morf.jdbc.AbstractDatabaseType;
+import org.alfasoftware.morf.jdbc.JdbcUrlElements;
+import org.alfasoftware.morf.jdbc.SqlDialect;
+import org.alfasoftware.morf.metadata.Schema;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Support for H2 database hosts.
+ *
+ * @author Copyright (c) Alfa Financial Software 2017
+ */
+public final class H2 extends AbstractDatabaseType {
+
+  public static final String IDENTIFIER = "H2";
+
+
+  /**
+   * Constructor.
+   */
+  public H2() {
+    super("org.h2.Driver", IDENTIFIER);
+  }
+
+
+  /**
+   * @see org.alfasoftware.morf.jdbc.DatabaseType#formatJdbcUrl(JdbcUrlElements)
+   */
+  @Override
+  public String formatJdbcUrl(JdbcUrlElements jdbcUrlElements) {
+    // http://www.h2database.com/html/features.html#database_url
+
+    StringBuilder builder = new StringBuilder()
+      .append("jdbc:h2:");
+
+    if (StringUtils.isNotBlank(jdbcUrlElements.getHostName()) && !"localhost".equals(jdbcUrlElements.getHostName()) || jdbcUrlElements.getPort() > 0) {
+      builder
+        .append("tcp://")
+        .append(jdbcUrlElements.getHostName())
+        .append(jdbcUrlElements.getPort() == 0 ? "" : ":" + jdbcUrlElements.getPort())
+        .append("/mem:") // this means we're going to use a remote in-memory DB which isn't ideal
+        .append(jdbcUrlElements.getDatabaseName());
+
+    } else {
+      // no host, try the instanceName
+      if (StringUtils.isBlank(jdbcUrlElements.getInstanceName())) {
+        builder
+          .append("mem:")
+          .append(jdbcUrlElements.getDatabaseName());
+      } else {
+        // Allow the instanceName to have a trailing slash, or not.
+        builder
+          .append("file:")
+          .append(jdbcUrlElements.getInstanceName())
+          .append(jdbcUrlElements.getInstanceName().endsWith(File.separator) ? "" : File.separator)
+          .append(jdbcUrlElements.getDatabaseName());
+      }
+    }
+
+    // The DB_CLOSE_DELAY=-1 prevents the database being lost when the last connection is closed.
+    // The DEFAULT_LOCK_TIMEOUT=150000 sets the default lock timeout to 150
+    //    seconds. When the value is not set, it takes default
+    //    org.h2.engine.Constants.INITIAL_LOCK_TIMEOUT=2000 value
+    // The LOB_TIMEOUT defines how long a lob returned from a ResultSet is available post-commit, defaulting to 5 minutes (300000 ms)
+    //    Set this to 2 seconds to allow certain tests using lob fields to work
+    // The MV_STORE is a flag that governs whether to use the new storage engine (defaulting to true as of H2 version 1.4, false in prior versions)
+    //  Note that implementations of H2 prior to version 1.4.199 had an MVCC parameter used to allow higher concurrency.
+    //  This configuration has been removed and the old "PageStore" implementation (MV_STORE=FALSE) is no longer supported.
+    builder.append(";DB_CLOSE_DELAY=-1;DEFAULT_LOCK_TIMEOUT=150000;LOB_TIMEOUT=2000;MV_STORE=TRUE;NON_KEYWORDS=YEAR,MONTH");
+
+    return builder.toString();
+  }
+
+  /**
+   * @see org.alfasoftware.morf.jdbc.DatabaseType#openSchema(Connection, String, String)
+   */
+  @Override
+  public Schema openSchema(Connection connection, String databaseName, String schemaName) {
+    return new H2MetaDataProvider(connection);
+  }
+
+
+  /**
+   * @see org.alfasoftware.morf.jdbc.DatabaseType#getXADataSource(java.lang.String, java.lang.String, java.lang.String)
+   */
+  @Override
+  public XADataSource getXADataSource(String jdbcUrl, String username, String password) {
+    throw new UnsupportedOperationException("H2 does not fully support XA connections. "
+        + "It may cause many different problems while running integration tests with H2. "
+        + "Please switch off Atomikos or change database engine. See WEB-31172 for details");
+    // JdbcDataSource xaDataSource = new JdbcDataSource();
+    // xaDataSource.setURL(jdbcUrl);
+    // xaDataSource.setUser(username);
+    // xaDataSource.setPassword(password);
+    // return xaDataSource;
+  }
+
+
+  /**
+   * @see org.alfasoftware.morf.jdbc.DatabaseType#sqlDialect(java.lang.String)
+   */
+  @Override
+  public SqlDialect sqlDialect(String schemaName) {
+    return new H2Dialect(schemaName);
+  }
+
+
+  /**
+   * @see org.alfasoftware.morf.jdbc.DatabaseType#matchesProduct(java.lang.String)
+   */
+  @Override
+  public boolean matchesProduct(String product) {
+    return product.equalsIgnoreCase("H2");
+  }
+
+
+  /**
+   * We don't need to support extracting connection details from H2.  It's only
+   * used for in-memory databases currently.
+   *
+   * @see org.alfasoftware.morf.jdbc.DatabaseType#extractJdbcUrl(java.lang.String)
+   */
+  @Override
+  public Optional<JdbcUrlElements> extractJdbcUrl(String url) {
+    return Optional.empty();
+  }
+}