honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SQL: Extract H2 initialization logic (elastic/x-pack-elasticsearch#4260) 

Makes it possible to specify custom initialization logic to the test H2
instance. This is will be used to separate H2 setup between geo and
non-geo use cases.

Relates elastic/x-pack-elasticsearch#4080

Original commit: elastic/x-pack-elasticsearch@fa064e35de
This commit is contained in:
Igor Motov 2018-04-02 09:45:53 -04:00 committed by GitHub
parent 0144d20213
commit 51602ddb97
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qa/sql/src/main/java/org/elasticsearch/xpack/qa/sql/jdbc/LocalH2.java
View File

@ -5,9 +5,8 @@
*/
package org.elasticsearch.xpack.qa.sql.jdbc;
import org.apache.logging.log4j.Logger;
import org.elasticsearch.common.CheckedConsumer;
import org.elasticsearch.common.CheckedSupplier;
import org.elasticsearch.common.logging.Loggers;
import org.junit.rules.ExternalResource;
import java.sql.Connection;
@ -16,7 +15,6 @@ import java.sql.SQLException;
import java.util.Properties;
public class LocalH2 extends ExternalResource implements CheckedSupplier<Connection, SQLException> {
private final Logger logger = Loggers.getLogger(getClass());
static {
try {
@ -41,6 +39,8 @@ public class LocalH2 extends ExternalResource implements CheckedSupplier<Connect
// H2 in-memory will keep the db alive as long as this connection is opened
private Connection keepAlive;
private CheckedConsumer<Connection, SQLException> initializer;
/*
* The syntax on the connection string is fairly particular:
* mem:; creates an anonymous database in memory. The `;` is
@ -52,14 +52,15 @@ public class LocalH2 extends ExternalResource implements CheckedSupplier<Connect
* for MySQL and, by default, H2. Our jdbc driver does it.
*/
// http://www.h2database.com/html/features.html#in_memory_databases
public LocalH2() {
public LocalH2(CheckedConsumer<Connection, SQLException> initializer) {
this.url = "jdbc:h2:mem:essql;DATABASE_TO_UPPER=false;ALIAS_COLUMN_NAME=true";
this.initializer = initializer;
}
@Override
protected void before() throws Throwable {
keepAlive = get();
keepAlive.createStatement().execute("RUNSCRIPT FROM 'classpath:/setup_test_emp.sql'");
initializer.accept(keepAlive);
}
@Override

2
qa/sql/src/main/java/org/elasticsearch/xpack/qa/sql/jdbc/SqlSpecTestCase.java
View File

@ -24,7 +24,7 @@ public abstract class SqlSpecTestCase extends SpecBaseIntegrationTestCase {
private String query;
@ClassRule
public static LocalH2 H2 = new LocalH2();
public static LocalH2 H2 = new LocalH2((c) -> c.createStatement().execute("RUNSCRIPT FROM 'classpath:/setup_test_emp.sql'"));
@ParametersFactory(argumentFormatting = PARAM_FORMATTING)
public static List<Object[]> readScriptSpec() throws Exception {