diff --git a/.github/workflows/Java.yml b/.github/workflows/Java.yml index a98732a0d..53c8e903c 100644 --- a/.github/workflows/Java.yml +++ b/.github/workflows/Java.yml @@ -159,8 +159,6 @@ jobs: name: Linux Spark (amd64) runs-on: ubuntu-latest needs: java-linux-amd64 - # todo: enable me - if: ${{ false }} env: MANYLINUX_IMAGE: quay.io/pypa/manylinux_2_28_x86_64 DUCKDB_JDBC_JAR: ${{ github.workspace }}/build/release/duckdb_jdbc.jar @@ -849,7 +847,7 @@ jobs: needs: - java-linux-amd64 - java-linux-amd64-tck - # - java-linux-amd64-spark + - java-linux-amd64-spark - java-linux-amd64-asan - java-linux-amd64-jepsen - java-linux-aarch64 @@ -934,7 +932,7 @@ jobs: needs: - java-linux-amd64 - java-linux-amd64-tck - # - java-linux-amd64-spark + - java-linux-amd64-spark - java-linux-amd64-asan - java-linux-amd64-jepsen - java-linux-aarch64 diff --git a/src/test/java/org/duckdb/TestDuckDBJDBC.java b/src/test/java/org/duckdb/TestDuckDBJDBC.java index 599e743a5..cc857257a 100644 --- a/src/test/java/org/duckdb/TestDuckDBJDBC.java +++ b/src/test/java/org/duckdb/TestDuckDBJDBC.java @@ -2264,8 +2264,7 @@ public static void test_ignore_unsupported_options() throws Exception { DriverManager.getConnection("jdbc:duckdb:;foo=bar;jdbc_ignore_unsupported_options=yes;", config).close(); } - // TODO: enable me - public static void DISABLED_test_extension_excel() throws Exception { + public static void test_extension_excel() throws Exception { // Check whether the Excel extension can be installed and loaded automatically try (Connection conn = DriverManager.getConnection(JDBC_URL); Statement stmt = conn.createStatement(); ResultSet rs = stmt.executeQuery("SELECT excel_text(1_234_567.897, 'h:mm AM/PM')")) { @@ -2287,7 +2286,7 @@ public static void main(String[] args) throws Exception { TestAppenderCollection2D.class, TestAppenderComposite.class, TestSingleValueAppender.class, TestBatch.class, TestBindings.class, TestChunkedResult.class, TestClosure.class, TestExtensionTypes.class, TestJfrEvents.class, TestMetadata.class, /* TestNoLib.class ,*/ - /* TestSpatial.class,*/ TestParameterMetadata.class, TestPrepare.class, TestResults.class, + TestSpatial.class, TestParameterMetadata.class, TestPrepare.class, TestResults.class, TestScalarFunctions.class, TestSessionInit.class, TestTableFunctions.class, TestTimestamp.class, TestVariant.class); } diff --git a/src/test/java/org/duckdb/TestVariant.java b/src/test/java/org/duckdb/TestVariant.java index efa2861af..2e94c1a95 100644 --- a/src/test/java/org/duckdb/TestVariant.java +++ b/src/test/java/org/duckdb/TestVariant.java @@ -240,9 +240,8 @@ public static void test_variant_struct() throws Exception { } } - // TODO: enable me // https://github.com/duckdb/duckdb/issues/23274 - public static void DISABLED_test_variant_struct_with_variant() throws Exception { + public static void test_variant_struct_with_variant() throws Exception { try (Connection conn = DriverManager.getConnection(JDBC_URL); Statement stmt = conn.createStatement()) { stmt.execute("CREATE TABLE tab1 (col1 INTEGER, col2 STRUCT(s1 INTEGER, s2 VARIANT))");