diff --git a/.github/workflows/test-h2remote.yml b/.github/workflows/test-h2remote.yml new file mode 100644 index 00000000..c4569711 --- /dev/null +++ b/.github/workflows/test-h2remote.yml @@ -0,0 +1,36 @@ +# This workflow will build a Java project with Maven +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven + +name: PDB tests with H2 remote + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + test: + runs-on: ubuntu-latest + name: Test H2 remote PDB Java ${{ matrix.java-version }} + + strategy: + matrix: + java-version: [ 8, 11, 17 ] + steps: + - uses: actions/checkout@v2 + - name: Set up JDK ${{ matrix.java-version }} + uses: actions/setup-java@v2.3.1 + with: + java-version: ${{ matrix.java-version }} + distribution: zulu + + - name: Cache Maven packages + uses: actions/cache@v2.1.6 + with: + path: ~/.m2 + key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} + restore-keys: ${{ runner.os }}-m2-java${{ matrix.java-version }} + + - name: Test with H2 remote + run: mvn -B clean test -Ph2remote diff --git a/.github/workflows/test-h2v2.yml b/.github/workflows/test-h2v2.yml index 78e67b86..bd2f8eb3 100644 --- a/.github/workflows/test-h2v2.yml +++ b/.github/workflows/test-h2v2.yml @@ -1,7 +1,7 @@ # This workflow will build a Java project with Maven # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven -name: PDB tests with H2v2 +name: PDB tests with H2v2 embedded on: push: @@ -33,4 +33,4 @@ jobs: restore-keys: ${{ runner.os }}-m2-java${{ matrix.java-version }} - name: Test with H2v2 - run: mvn -B clean test -Ph2v2remote + run: mvn -B clean test -Ph2v2 diff --git a/.github/workflows/test-h2v2remote.yml b/.github/workflows/test-h2v2remote.yml new file mode 100644 index 00000000..ae5e3307 --- /dev/null +++ b/.github/workflows/test-h2v2remote.yml @@ -0,0 +1,36 @@ +# This workflow will build a Java project with Maven +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven + +name: PDB tests with H2v2 remote + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + test: + runs-on: ubuntu-latest + name: Test H2V2 remote PDB Java ${{ matrix.java-version }} + + strategy: + matrix: + java-version: [ 8, 11, 17 ] + steps: + - uses: actions/checkout@v2 + - name: Set up JDK ${{ matrix.java-version }} + uses: actions/setup-java@v2.3.1 + with: + java-version: ${{ matrix.java-version }} + distribution: zulu + + - name: Cache Maven packages + uses: actions/cache@v2.1.6 + with: + path: ~/.m2 + key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} + restore-keys: ${{ runner.os }}-m2-java${{ matrix.java-version }} + + - name: Test with H2v2 remote + run: mvn -B clean test -Ph2v2remote diff --git a/pom.xml b/pom.xml index aae3ead9..f7fddd2b 100644 --- a/pom.xml +++ b/pom.xml @@ -277,6 +277,11 @@ maven-surefire-plugin 2.22.2 + + org.codehaus.mojo + exec-maven-plugin + 3.0.0 + org.apache.maven.plugins maven-source-plugin @@ -348,6 +353,10 @@ ${default.test.cmdArgs} + + org.codehaus.mojo + exec-maven-plugin + com.mycila license-maven-plugin @@ -376,7 +385,6 @@ org.apache.maven.plugins maven-source-plugin - ${maven-source-plugin.version} attach-sources @@ -390,7 +398,6 @@ org.apache.maven.plugins maven-javadoc-plugin - ${maven-javadoc-plugin.version} none @@ -407,7 +414,6 @@ org.apache.maven.plugins maven-gpg-plugin - ${maven-gpg-plugin.version} sign-artifacts @@ -445,13 +451,6 @@ h2remote - - - com.h2database - h2 - - - @@ -467,7 +466,6 @@ org.codehaus.mojo exec-maven-plugin - 3.0.0 test-compile @@ -478,6 +476,8 @@ java + + test -classpath + test -classpath -tcp + + -tcpPort + 9093 -baseDir ${project.build.testOutputDirectory}/pdb-h2v2-remote @@ -713,7 +727,7 @@ cockroach - cockroachdb/cockroach:v19.2.0 + cockroachdb/cockroach:v21.2.5 @@ -743,7 +757,7 @@ 8080:8080 26257:26257 - start --insecure + start-single-node --insecure CockroachDB node starting diff --git a/src/main/java/com/feedzai/commons/sql/abstraction/dml/result/ResultColumn.java b/src/main/java/com/feedzai/commons/sql/abstraction/dml/result/ResultColumn.java index 51d75b9b..cd4dfadb 100644 --- a/src/main/java/com/feedzai/commons/sql/abstraction/dml/result/ResultColumn.java +++ b/src/main/java/com/feedzai/commons/sql/abstraction/dml/result/ResultColumn.java @@ -111,6 +111,10 @@ public Double toDouble() { return null; } + if (val instanceof Number) { + return ((Number) val).doubleValue(); + } + return Double.parseDouble(val.toString()); } diff --git a/src/test/java/com/feedzai/commons/sql/abstraction/engine/impl/abs/AbstractEngineSchemaTest.java b/src/test/java/com/feedzai/commons/sql/abstraction/engine/impl/abs/AbstractEngineSchemaTest.java index ed7e3b36..824100ac 100644 --- a/src/test/java/com/feedzai/commons/sql/abstraction/engine/impl/abs/AbstractEngineSchemaTest.java +++ b/src/test/java/com/feedzai/commons/sql/abstraction/engine/impl/abs/AbstractEngineSchemaTest.java @@ -140,7 +140,7 @@ protected Ieee754Support getIeee754Support() { /** - * Gets the test schema to be used in tests that need a schema other then the default/configured. + * Gets the test schema to be used in tests that need a schema other than the default/configured. * * @return The test schema. * @since 2.1.13 @@ -811,8 +811,7 @@ protected EntityEntry createSpecialValueEntry(final Object columnValue) { * @param engine The database engine. * @throws DatabaseEngineException If anything goes wrong creating the UDF. */ - protected void defineUDFGetOne(final DatabaseEngine engine) throws DatabaseEngineException { - } + protected abstract void defineUDFGetOne(final DatabaseEngine engine) throws DatabaseEngineException; /** * Defines the UDF "TimesTwo" in the database engine. @@ -822,8 +821,7 @@ protected void defineUDFGetOne(final DatabaseEngine engine) throws DatabaseEngin * @param engine The database engine. * @throws DatabaseEngineException If anything goes wrong creating the UDF. */ - protected void defineUDFTimesTwo(final DatabaseEngine engine) throws DatabaseEngineException { - } + protected abstract void defineUDFTimesTwo(final DatabaseEngine engine) throws DatabaseEngineException; /** * Creates the {@link #getTestSchema() test schema} in the database, dropping it first if necessary. diff --git a/src/test/java/com/feedzai/commons/sql/abstraction/engine/impl/cockroach/CockroachDBEngineSchemaTest.java b/src/test/java/com/feedzai/commons/sql/abstraction/engine/impl/cockroach/CockroachDBEngineSchemaTest.java new file mode 100644 index 00000000..f89c505f --- /dev/null +++ b/src/test/java/com/feedzai/commons/sql/abstraction/engine/impl/cockroach/CockroachDBEngineSchemaTest.java @@ -0,0 +1,52 @@ +/* + * Copyright 2022 Feedzai + * + * 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 com.feedzai.commons.sql.abstraction.engine.impl.cockroach; + +import com.feedzai.commons.sql.abstraction.engine.impl.postgresql.PostgreSqlEngineSchemaTest; +import com.feedzai.commons.sql.abstraction.engine.testconfig.DatabaseConfiguration; +import com.feedzai.commons.sql.abstraction.engine.testconfig.DatabaseTestUtil; +import org.junit.Ignore; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + +import java.util.Collection; + +/** + * Schema related tests for CockroachDB. + * + * @author José Fidalgo (jose.fidalgo@feedzai.com) + */ +@RunWith(Parameterized.class) +public class CockroachDBEngineSchemaTest extends PostgreSqlEngineSchemaTest { + + @Parameterized.Parameters + public static Collection data() throws Exception { + return DatabaseTestUtil.loadConfigurations("cockroach"); + } + + @Override + @Test + @Ignore("CockroachDB doesn't support stored procedures; see https://github.com/cockroachdb/cockroach/issues/17511") + public void udfGetOneTest() { + } + + @Override + @Test + @Ignore("CockroachDB doesn't support stored procedures; see https://github.com/cockroachdb/cockroach/issues/17511") + public void udfTimesTwoTest() { + } +} diff --git a/src/test/java/com/feedzai/commons/sql/abstraction/engine/impl/db2/DB2EngineSchemaTest.java b/src/test/java/com/feedzai/commons/sql/abstraction/engine/impl/db2/DB2EngineSchemaTest.java index 558cc4bc..52cab2f6 100644 --- a/src/test/java/com/feedzai/commons/sql/abstraction/engine/impl/db2/DB2EngineSchemaTest.java +++ b/src/test/java/com/feedzai/commons/sql/abstraction/engine/impl/db2/DB2EngineSchemaTest.java @@ -44,24 +44,24 @@ public static Collection data() throws Exception { @Override protected void defineUDFGetOne(final DatabaseEngine engine) throws DatabaseEngineException { engine.executeUpdate( - "CREATE OR REPLACE FUNCTION GETONE () " + - " RETURNS INTEGER " + - " NO EXTERNAL ACTION " + - "F1: BEGIN ATOMIC " + - "RETURN 1; " + - "END" + "CREATE OR REPLACE FUNCTION GETONE()" + + " RETURNS INTEGER" + + " NO EXTERNAL ACTION" + + " F1: BEGIN ATOMIC" + + " RETURN 1;" + + " END" ); } @Override protected void defineUDFTimesTwo(final DatabaseEngine engine) throws DatabaseEngineException { engine.executeUpdate( - "CREATE OR REPLACE FUNCTION \"" + getTestSchema() + "\".TimesTwo (VARNAME VARCHAR(128)) " + - " RETURNS INTEGER " + - " NO EXTERNAL ACTION " + - "F1: BEGIN ATOMIC " + - " RETURN VARNAME * 2; " + - "END" + "CREATE OR REPLACE FUNCTION \"" + getTestSchema() + "\".TimesTwo(N VARCHAR(128))" + + " RETURNS INTEGER" + + " NO EXTERNAL ACTION" + + " F1: BEGIN ATOMIC" + + " RETURN N * 2;" + + " END" ); } diff --git a/src/test/java/com/feedzai/commons/sql/abstraction/engine/impl/h2/H2EngineSchemaTest.java b/src/test/java/com/feedzai/commons/sql/abstraction/engine/impl/h2/H2EngineSchemaTest.java index f18deab2..7cdec236 100644 --- a/src/test/java/com/feedzai/commons/sql/abstraction/engine/impl/h2/H2EngineSchemaTest.java +++ b/src/test/java/com/feedzai/commons/sql/abstraction/engine/impl/h2/H2EngineSchemaTest.java @@ -27,7 +27,6 @@ import java.util.Collection; import static com.feedzai.commons.sql.abstraction.engine.impl.abs.AbstractEngineSchemaTest.Ieee754Support.SUPPORTED_STRINGS; -import static org.junit.Assume.assumeTrue; /** * @author Joao Silva (joao.silva@feedzai.com) @@ -46,53 +45,17 @@ protected Ieee754Support getIeee754Support() { return SUPPORTED_STRINGS; } - /** - * This test overrides the superclass in order to check if the H2 engine is local or remote; if it is remote - * the test is skipped. - * - * This was done because the UDF is defined by static methods in this class, which needs to be available (compiled) - * to the H2 engine. This is already assumed when H2 is embedded, but making the class available in remote H2 - * would require copying this to the location of the remote server. - * Since this is already being tested with H2 embedded, we just skip the test when the server is remote. - * - * @throws Exception If something goes wrong with the test. - * @see AbstractEngineSchemaTest#udfGetOneTest() - */ - @Override - public void udfGetOneTest() throws Exception { - assumeTrue("Test not supported when using H2 remote - skipped", checkIsLocalH2()); - super.udfGetOneTest(); - } - - /** - * This test overrides the superclass in order to check if the H2 engine is local or remote; if it is remote - * the test is skipped. - * - * This was done because the UDF is defined by static methods in this class, which needs to be available (compiled) - * to the H2 engine. This is already assumed when H2 is embedded, but making the class available in remote H2 - * would require copying this to the location of the remote server. - * Since this is already being tested with H2 embedded, we just skip the test when the server is remote. - * - * @throws Exception If something goes wrong with the test. - * @see AbstractEngineSchemaTest#udfTimesTwoTest() - */ - @Override - public void udfTimesTwoTest() throws Exception { - assumeTrue("Test not supported when using H2 remote - skipped", checkIsLocalH2()); - super.udfTimesTwoTest(); - } - @Override protected void defineUDFGetOne(final DatabaseEngine engine) throws DatabaseEngineException { - engine.executeUpdate( - "CREATE ALIAS IF NOT EXISTS GetOne FOR \"com.feedzai.commons.sql.abstraction.engine.impl.h2.H2EngineSchemaTest.GetOne\";" - ); + engine.executeUpdate("DROP ALIAS IF EXISTS GetOne"); + engine.executeUpdate("CREATE ALIAS IF NOT EXISTS GetOne FOR \"" + this.getClass().getName() + ".GetOne\""); } @Override protected void defineUDFTimesTwo(final DatabaseEngine engine) throws DatabaseEngineException { + engine.executeUpdate("DROP ALIAS IF EXISTS \"" + getTestSchema() + "\".TimesTwo"); engine.executeUpdate( - "CREATE ALIAS IF NOT EXISTS \"" + getTestSchema() + "\".TimesTwo FOR \"com.feedzai.commons.sql.abstraction.engine.impl.h2.H2EngineSchemaTest.TimesTwo\";" + "CREATE ALIAS IF NOT EXISTS \"" + getTestSchema() + "\".TimesTwo FOR \"" + this.getClass().getName() + ".TimesTwo\"" ); } diff --git a/src/test/java/com/feedzai/commons/sql/abstraction/engine/impl/mysql/MySqlEngineSchemaTest.java b/src/test/java/com/feedzai/commons/sql/abstraction/engine/impl/mysql/MySqlEngineSchemaTest.java index 964e023d..ab417647 100644 --- a/src/test/java/com/feedzai/commons/sql/abstraction/engine/impl/mysql/MySqlEngineSchemaTest.java +++ b/src/test/java/com/feedzai/commons/sql/abstraction/engine/impl/mysql/MySqlEngineSchemaTest.java @@ -41,9 +41,9 @@ public static Collection data() throws Exception { protected void defineUDFGetOne(final DatabaseEngine engine) throws DatabaseEngineException { engine.executeUpdate("DROP FUNCTION IF EXISTS GetOne"); engine.executeUpdate( - "CREATE FUNCTION GetOne() " + - "RETURNS INTEGER " + - "RETURN 1;" + "CREATE FUNCTION GetOne()" + + " RETURNS INTEGER DETERMINISTIC" + + " RETURN 1;" ); } @@ -51,9 +51,9 @@ protected void defineUDFGetOne(final DatabaseEngine engine) throws DatabaseEngin protected void defineUDFTimesTwo(final DatabaseEngine engine) throws DatabaseEngineException { engine.executeUpdate("DROP FUNCTION IF EXISTS " + getTestSchema() + ".TimesTwo"); engine.executeUpdate( - "CREATE FUNCTION " + getTestSchema() + ".TimesTwo(number INT) " + - "RETURNS INTEGER " + - "RETURN number * 2;" + "CREATE FUNCTION " + getTestSchema() + ".TimesTwo(number INT)" + + " RETURNS INTEGER DETERMINISTIC" + + " RETURN number * 2;" ); } diff --git a/src/test/java/com/feedzai/commons/sql/abstraction/engine/impl/oracle/OracleEngineSchemaTest.java b/src/test/java/com/feedzai/commons/sql/abstraction/engine/impl/oracle/OracleEngineSchemaTest.java index 1ff9db33..a24f4937 100644 --- a/src/test/java/com/feedzai/commons/sql/abstraction/engine/impl/oracle/OracleEngineSchemaTest.java +++ b/src/test/java/com/feedzai/commons/sql/abstraction/engine/impl/oracle/OracleEngineSchemaTest.java @@ -85,24 +85,22 @@ protected String getTestSchema() { @Override protected void defineUDFGetOne(final DatabaseEngine engine) throws DatabaseEngineException { engine.executeUpdate( - "CREATE OR REPLACE FUNCTION GetOne " + - "RETURN INTEGER " + - "AS " + - "BEGIN " + - " RETURN 1;" + - "END GetOne;" + "CREATE OR REPLACE FUNCTION GetOne" + + " RETURN INTEGER AS" + + " BEGIN" + + " RETURN 1;" + + " END;" ); } @Override protected void defineUDFTimesTwo(final DatabaseEngine engine) throws DatabaseEngineException { engine.executeUpdate( - "CREATE OR REPLACE FUNCTION " + getTestSchema() + ".TimesTwo (n IN INTEGER) " + - "RETURN INTEGER " + - "AS " + - "BEGIN " + - " RETURN n * 2;" + - "END TimesTwo;" + "CREATE OR REPLACE FUNCTION " + getTestSchema() + ".TimesTwo(n IN INTEGER)" + + " RETURN INTEGER AS" + + " BEGIN" + + " RETURN n * 2;" + + " END;" ); } @@ -111,8 +109,8 @@ protected void createSchema(final DatabaseEngine engine, final String schema) th // create user (=schema) with all privileges granted // schema needs to be quotized to have proper case; assume it already is if it starts with double quote engine.executeUpdate( - "GRANT ALL PRIVILEGES TO " + (schema.startsWith("\"") ? schema : quotize(schema)) - + " IDENTIFIED BY " + engine.getProperties().getPassword() + " WITH ADMIN OPTION" + "GRANT ALL PRIVILEGES TO " + (schema.startsWith("\"") ? schema : quotize(schema)) + + " IDENTIFIED BY " + engine.getProperties().getPassword() + " WITH ADMIN OPTION" ); } @@ -121,13 +119,13 @@ protected void dropSchema(final DatabaseEngine engine, final String schema) thro // schema needs to be quotized to have proper case; assume it already is if it starts with double quote engine.executeUpdate( "DECLARE\n" + - " not_exists EXCEPTION;" + - " PRAGMA EXCEPTION_INIT(not_exists, -01918);" + - "BEGIN\n" + - " EXECUTE IMMEDIATE 'DROP USER " + (schema.startsWith("\"") ? schema : quotize(schema)) + " CASCADE';" + - "EXCEPTION\n" + - " WHEN not_exists THEN null; -- ignore the error\n" + - "END;" + " not_exists EXCEPTION;" + + " PRAGMA EXCEPTION_INIT(not_exists, -01918);" + + "BEGIN\n" + + " EXECUTE IMMEDIATE 'DROP USER " + (schema.startsWith("\"") ? schema : quotize(schema)) + " CASCADE';" + + "EXCEPTION\n" + + " WHEN not_exists THEN null; -- ignore the error\n" + + "END;" ); } @@ -208,7 +206,7 @@ public void testCompressLobs() throws Exception { final List> results = engine.query(query); - assertEquals("Check that two lines are returned",2, results.size()); + assertEquals("Check that two lines are returned", 2, results.size()); for (final Map result : results) { assertEquals("Check that compression is defined as MEDIUM", result.get(compression).toString(), "MEDIUM"); @@ -347,7 +345,7 @@ public void testLobBatchInsertClearsLobResources() throws Exception { * @param tablespace the name of the tablespace * @param user the user for which its default tablespace will be assigned * @param engine the database engine used to create the tablespace - * @throws DatabaseEngineException if there is a problem when executing the update tablespace query + * @throws DatabaseEngineException if there is a problem when executing the update tablespace query */ private void createUserTablespace(final String tablespace, final String user, diff --git a/src/test/java/com/feedzai/commons/sql/abstraction/engine/impl/postgresql/PostgreSqlEngineSchemaTest.java b/src/test/java/com/feedzai/commons/sql/abstraction/engine/impl/postgresql/PostgreSqlEngineSchemaTest.java index 1573aa85..7dc19670 100644 --- a/src/test/java/com/feedzai/commons/sql/abstraction/engine/impl/postgresql/PostgreSqlEngineSchemaTest.java +++ b/src/test/java/com/feedzai/commons/sql/abstraction/engine/impl/postgresql/PostgreSqlEngineSchemaTest.java @@ -47,26 +47,26 @@ protected Ieee754Support getIeee754Support() { @Override protected void defineUDFGetOne(final DatabaseEngine engine) throws DatabaseEngineException { engine.executeUpdate( - "CREATE OR REPLACE FUNCTION GetOne() " + - "RETURNS INTEGER " + - "AS 'SELECT 1;' " + - "LANGUAGE SQL;" + "CREATE OR REPLACE FUNCTION GetOne()" + + " RETURNS INTEGER" + + " AS 'SELECT 1;'" + + " LANGUAGE SQL;" ); } @Override protected void defineUDFTimesTwo(final DatabaseEngine engine) throws DatabaseEngineException { engine.executeUpdate( - "CREATE OR REPLACE FUNCTION \"" + getTestSchema() + "\".TimesTwo(INTEGER) " + - "RETURNS INTEGER " + - "AS 'SELECT $1 * 2;' " + - "LANGUAGE SQL;" + "CREATE OR REPLACE FUNCTION " + getTestSchema() + ".TimesTwo(INTEGER) " + + " RETURNS INTEGER" + + " AS 'SELECT $1 * 2;'" + + " LANGUAGE SQL;" ); } @Override protected void createSchema(final DatabaseEngine engine, final String schema) throws DatabaseEngineException { - engine.executeUpdate("CREATE SCHEMA IF NOT EXISTS \"" + schema + "\""); + engine.executeUpdate("CREATE SCHEMA \"" + schema + "\""); } diff --git a/src/test/java/com/feedzai/commons/sql/abstraction/engine/impl/sqlserver/SqlServerEngineSchemaTest.java b/src/test/java/com/feedzai/commons/sql/abstraction/engine/impl/sqlserver/SqlServerEngineSchemaTest.java index 81f1aed0..4311eb37 100644 --- a/src/test/java/com/feedzai/commons/sql/abstraction/engine/impl/sqlserver/SqlServerEngineSchemaTest.java +++ b/src/test/java/com/feedzai/commons/sql/abstraction/engine/impl/sqlserver/SqlServerEngineSchemaTest.java @@ -53,38 +53,24 @@ public void testCreateSameEntityDifferentSchemas() { } @Override - protected void defineUDFGetOne(DatabaseEngine engine) throws DatabaseEngineException { + protected void defineUDFGetOne(final DatabaseEngine engine) throws DatabaseEngineException { engine.executeUpdate( - "IF OBJECT_ID (N'GetOne', N'FN') IS NOT NULL " + - " DROP FUNCTION GetOne" - ); - - engine.executeUpdate( - "CREATE FUNCTION GetOne() " + - "RETURNS INTEGER " + - "AS " + - "BEGIN " + - " RETURN(1) " + - "END" + "CREATE OR ALTER FUNCTION GetOne() " + + " RETURNS INTEGER AS" + + " BEGIN" + + " RETURN(1)" + + " END" ); } @Override - protected void defineUDFTimesTwo(DatabaseEngine engine) throws DatabaseEngineException { - engine.executeUpdate( - "IF OBJECT_ID (N'" + getTestSchema() + ".TimesTwo', N'FN') IS NOT NULL " + - "BEGIN " + - " DROP FUNCTION " + getTestSchema() + ".TimesTwo;" + - "END" - ); - + protected void defineUDFTimesTwo(final DatabaseEngine engine) throws DatabaseEngineException { engine.executeUpdate( - "CREATE FUNCTION " + getTestSchema() + ".TimesTwo(@number INTEGER) " + - "RETURNS INTEGER " + - "AS " + - "BEGIN " + - " RETURN(@number * 2) " + - "END" + "CREATE OR ALTER FUNCTION " + getTestSchema() + ".TimesTwo(@number INTEGER) " + + " RETURNS INTEGER AS" + + " BEGIN" + + " RETURN(@number * 2) " + + " END" ); } @@ -95,6 +81,6 @@ protected void createSchema(final DatabaseEngine engine, final String schema) th @Override protected void dropSchema(final DatabaseEngine engine, final String schema) throws DatabaseEngineException { - engine.executeUpdate("DROP SCHEMA " + schema); + engine.executeUpdate("DROP SCHEMA IF EXISTS " + schema); } } diff --git a/src/test/java/com/feedzai/commons/sql/abstraction/engine/testconfig/DatabaseTestUtil.java b/src/test/java/com/feedzai/commons/sql/abstraction/engine/testconfig/DatabaseTestUtil.java index 39bf9d26..0d8ab5b7 100644 --- a/src/test/java/com/feedzai/commons/sql/abstraction/engine/testconfig/DatabaseTestUtil.java +++ b/src/test/java/com/feedzai/commons/sql/abstraction/engine/testconfig/DatabaseTestUtil.java @@ -20,6 +20,7 @@ import java.io.FileInputStream; import java.io.InputStream; +import java.util.Arrays; import java.util.Collection; import java.util.Set; import java.util.stream.Collectors; @@ -66,8 +67,8 @@ public static Collection loadConfigurations() throws Exce /** * Filters the instances given by {@code vendor}. - *

- * The match is performed by contains, i.e. oracle matches oracle11 and oracle12. + *

+ * The match is performed by the start of vendor name, i.e. h2 matches h2, h2remote, h2v2 and h2v2remote. * * @param vendors The list of instances to test. * @return The filtered instances to test. @@ -75,16 +76,8 @@ public static Collection loadConfigurations() throws Exce */ public static Collection loadConfigurations(final String... vendors) throws Exception { return loadConfigurations().stream() - .filter(dbConfig -> { - for (String vendor : vendors) { - if (dbConfig.vendor.contains(vendor)) { - return true; - } - } - - return false; - }) - .collect(Collectors.toList()); + .filter(dbConfig -> Arrays.stream(vendors).anyMatch(dbConfig.vendor::startsWith)) + .collect(Collectors.toList()); } /** diff --git a/src/test/resources/connections.properties b/src/test/resources/connections.properties index 3d14aaa1..a546383e 100644 --- a/src/test/resources/connections.properties +++ b/src/test/resources/connections.properties @@ -6,7 +6,7 @@ ############################################################################################### h2.engine=com.feedzai.commons.sql.abstraction.engine.impl.H2Engine -h2.jdbc=jdbc:h2:./target/pdb;AUTO_SERVER=FALSE +h2.jdbc=jdbc:h2:./target/pdb_h2;AUTO_SERVER=FALSE h2.username=pdb h2.password=pdb @@ -16,18 +16,19 @@ h2remote.username=sa h2remote.password=sa h2v2.engine=com.feedzai.commons.sql.abstraction.engine.impl.H2EngineV2 -h2v2.jdbc=jdbc:h2:./target/pdb;AUTO_SERVER=FALSE +h2v2.jdbc=jdbc:h2:./target/pdb_h2v2;AUTO_SERVER=FALSE h2v2.username=pdb h2v2.password=pdb h2v2remote.engine=com.feedzai.commons.sql.abstraction.engine.impl.H2EngineV2 -h2v2remote.jdbc=jdbc:h2:tcp://localhost:9092/public +h2v2remote.jdbc=jdbc:h2:tcp://localhost:9093/public h2v2remote.username=sa h2v2remote.password=sa mysql.engine=com.feedzai.commons.sql.abstraction.engine.impl.MySqlEngine -mysql.jdbc=jdbc:mysql://localhost:3306/mysql?useSSL=false +mysql.jdbc=jdbc:mysql://localhost:3306/mysql?useSSL=false&allowPublicKeyRetrieval=true # appended "useSSL=false" to jdbc url to avoid a warning about not using SSL; +# appended "allowPublicKeyRetrieval=true" to jdbc url to avoid "key retrieval not allowed" error in newer MySQL versions # for mysql, schema and database is the same thing # default database/schema: none, it must be specified either in jdbc url or in schema property # example when used in jdbc url: jdbc:mysql://localhost:3306/mysql