Added metadata for org.mariadb:r2dbc-mariadb:1.1.3 (#251)

msupic · web-flow · commit 82dee035bbc2 · 2023-03-21T19:01:57.000+01:00
* Added metadata for org.mariadb:r2dbc-mariadb:1.1.3
diff --git a/metadata/index.json b/metadata/index.json
@@ -244,5 +244,9 @@
   {
     "directory" : "samples/docker",
     "module" : "samples:docker"
+  },
+  {
+    "directory" : "org.mariadb/r2dbc-mariadb",
+    "module" : "org.mariadb:r2dbc-mariadb"
   }
 ]
diff --git a/metadata/org.mariadb/r2dbc-mariadb/1.1.3/index.json b/metadata/org.mariadb/r2dbc-mariadb/1.1.3/index.json
@@ -0,0 +1,4 @@
+[
+  "reflect-config.json",
+  "resource-config.json"
+]
diff --git a/metadata/org.mariadb/r2dbc-mariadb/1.1.3/reflect-config.json b/metadata/org.mariadb/r2dbc-mariadb/1.1.3/reflect-config.json
@@ -0,0 +1,8 @@
+[
+  {
+    "name": "org.mariadb.r2dbc.client.MariadbFrameDecoder",
+    "condition": {
+      "typeReachable": "org.mariadb.r2dbc.client.SimpleClient"
+    }
+  }
+]
diff --git a/metadata/org.mariadb/r2dbc-mariadb/1.1.3/resource-config.json b/metadata/org.mariadb/r2dbc-mariadb/1.1.3/resource-config.json
@@ -0,0 +1,15 @@
+{
+  "resources": {
+    "includes": [
+      {
+        "pattern": "\\Qproject.properties\\E",
+        "condition": {
+          "typeReachable": "org.mariadb.r2dbc.message.client.HandshakeResponse"
+        }
+      }
+    ]
+  },
+  "bundles": [
+
+  ]
+}
diff --git a/metadata/org.mariadb/r2dbc-mariadb/index.json b/metadata/org.mariadb/r2dbc-mariadb/index.json
@@ -0,0 +1,10 @@
+[
+  {
+    "latest": true,
+    "metadata-version": "1.1.3",
+    "module": "org.mariadb:r2dbc-mariadb",
+    "tested-versions": [
+      "1.1.3"
+    ]
+  }
+]
diff --git a/tests/src/index.json b/tests/src/index.json
@@ -647,5 +647,16 @@
         ]
       }
     ]
+  },
+  {
+    "test-project-path" : "org.mariadb/r2dbc-mariadb/1.1.3",
+    "libraries" : [
+      {
+        "name" : "org.mariadb:r2dbc-mariadb",
+        "versions" : [
+          "1.1.3"
+        ]
+      }
+    ]
   }
 ]
diff --git a/tests/src/org.mariadb/r2dbc-mariadb/1.1.3/.gitignore b/tests/src/org.mariadb/r2dbc-mariadb/1.1.3/.gitignore
@@ -0,0 +1,6 @@
+gradlew.bat
+gradlew
+gradle/
+build/
+mariadb-stderr.txt
+mariadb-stdout.txt
diff --git a/tests/src/org.mariadb/r2dbc-mariadb/1.1.3/build.gradle b/tests/src/org.mariadb/r2dbc-mariadb/1.1.3/build.gradle
@@ -0,0 +1,29 @@
+/*
+ * Copyright and related rights waived via CC0
+ *
+ * You should have received a copy of the CC0 legalcode along with this
+ * work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+ */
+
+plugins {
+    id "org.graalvm.internal.tck"
+}
+
+String libraryVersion = tck.testedLibraryVersion.get()
+
+dependencies {
+    testImplementation "org.mariadb:r2dbc-mariadb:$libraryVersion"
+    testImplementation 'org.assertj:assertj-core:3.22.0'
+}
+
+graalvmNative {
+    agent {
+        defaultMode = "conditional"
+        modes {
+            conditional {
+                userCodeFilterPath = "metadata-user-code-filter.json"
+                extraFilterPath = "metadata-extra-filter.json"
+            }
+        }
+    }
+}
diff --git a/tests/src/org.mariadb/r2dbc-mariadb/1.1.3/gradle.properties b/tests/src/org.mariadb/r2dbc-mariadb/1.1.3/gradle.properties
@@ -0,0 +1,2 @@
+library.version = 1.1.3
+metadata.dir = org.mariadb/r2dbc-mariadb/1.1.3/
diff --git a/tests/src/org.mariadb/r2dbc-mariadb/1.1.3/metadata-extra-filter.json b/tests/src/org.mariadb/r2dbc-mariadb/1.1.3/metadata-extra-filter.json
@@ -0,0 +1,7 @@
+{
+  "rules": [
+    {
+      "includeClasses": "org.mariadb.r2dbc.**"
+    }
+  ]
+}
diff --git a/tests/src/org.mariadb/r2dbc-mariadb/1.1.3/metadata-user-code-filter.json b/tests/src/org.mariadb/r2dbc-mariadb/1.1.3/metadata-user-code-filter.json
@@ -0,0 +1,7 @@
+{
+  "rules": [
+    {
+      "includeClasses": "org.mariadb.r2dbc.**"
+    }
+  ]
+}
diff --git a/tests/src/org.mariadb/r2dbc-mariadb/1.1.3/required-docker-images.txt b/tests/src/org.mariadb/r2dbc-mariadb/1.1.3/required-docker-images.txt
@@ -0,0 +1 @@
+mariadb:10.8
diff --git a/tests/src/org.mariadb/r2dbc-mariadb/1.1.3/settings.gradle b/tests/src/org.mariadb/r2dbc-mariadb/1.1.3/settings.gradle
@@ -0,0 +1,13 @@
+pluginManagement {
+    def tckPath = Objects.requireNonNullElse(
+            System.getenv("GVM_TCK_TCKDIR"),
+            "../../../../tck-build-logic"
+    )
+    includeBuild(tckPath)
+}
+
+plugins {
+    id "org.graalvm.internal.tck-settings" version "1.0.0-SNAPSHOT"
+}
+
+rootProject.name = 'org.mariadb.r2dbc-mariadb_tests'
diff --git a/tests/src/org.mariadb/r2dbc-mariadb/1.1.3/src/test/java/org_mariadb/r2dbc_mariadb/R2DBCMariaDBTest.java b/tests/src/org.mariadb/r2dbc-mariadb/1.1.3/src/test/java/org_mariadb/r2dbc_mariadb/R2DBCMariaDBTest.java
@@ -0,0 +1,215 @@
+/*
+ * Copyright and related rights waived via CC0
+ *
+ * You should have received a copy of the CC0 legalcode along with this
+ * work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+ */
+package org_mariadb.r2dbc_mariadb;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.mariadb.r2dbc.MariadbConnectionConfiguration;
+import org.mariadb.r2dbc.MariadbConnectionFactory;
+import org.mariadb.r2dbc.api.MariadbConnection;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * This test uses docker to start a MariaDB database to test against.
+ */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class R2DBCMariaDBTest {
+
+    private static final String USERNAME = "fred";
+
+    private static final String PASSWORD = "secret";
+
+    private static final String DATABASE = "test";
+
+    private Process process;
+
+    private MariadbConnectionFactory connectionFactory;
+
+    @BeforeAll
+    void beforeAll() throws IOException {
+        System.out.println("Starting MariaDB ...");
+
+        process = new ProcessBuilder(
+                "docker", "run", "--rm", "-p", "3306:3306", "-e", "MARIADB_DATABASE=" + DATABASE, "-e", "MARIADB_USER=" + USERNAME,
+                "-e", "MARIADB_PASSWORD=" + PASSWORD, "-e", "MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=true", "mariadb:10.8")
+                .redirectOutput(new File("mariadb-stdout.txt"))
+                .redirectError(new File("mariadb-stderr.txt"))
+                .start();
+
+        connectionFactory = createConnectionFactory();
+
+        // Wait until connection can be established
+        waitUntilContainerStarted(60);
+
+        System.out.println("MariaDB started");
+    }
+
+    @AfterAll
+    void tearDown() {
+        if (process != null && process.isAlive()) {
+            System.out.println("Shutting down MariaDB");
+            process.destroy();
+        }
+    }
+
+    private void waitUntilContainerStarted(int startupTimeoutSeconds) {
+        System.out.println("Waiting for database container to become available");
+
+        Exception lastConnectionException = null;
+
+        long end  = System.currentTimeMillis() + startupTimeoutSeconds * 1000;
+        while (System.currentTimeMillis() < end) {
+            try {
+                Thread.sleep(100L);
+            } catch (InterruptedException e) {
+                // continue
+            }
+            try {
+                MariadbConnection connection = openConnection();
+                connection.createStatement("SELECT 1").execute().blockFirst();
+                closeConnection(connection);
+                return;
+            } catch (Exception e) {
+                lastConnectionException = e;
+            }
+        }
+        throw new IllegalStateException("Database container cannot be accessed", lastConnectionException);
+    }
+
+    private MariadbConnectionFactory createConnectionFactory() {
+        MariadbConnectionConfiguration conf = MariadbConnectionConfiguration.builder()
+                .host("localhost")
+                .port(3306)
+                .username(USERNAME)
+                .password(PASSWORD)
+                .database(DATABASE)
+                .build();
+        return new MariadbConnectionFactory(conf);
+    }
+
+    private MariadbConnection openConnection() {
+        return connectionFactory.create().block();
+    }
+
+    private void closeConnection(MariadbConnection connection) {
+        connection.close().block();
+    }
+
+    private void beginTransaction(MariadbConnection connection) {
+        if (connection.isAutoCommit()) {
+            connection.setAutoCommit(false).block();
+        }
+        connection.beginTransaction().block();
+    }
+
+    private void commitTransaction(MariadbConnection connection) {
+        connection.commitTransaction().block();
+    }
+
+    private void rollbackTransaction(MariadbConnection connection) {
+        connection.rollbackTransaction().block();
+    }
+
+    @Test
+    void commitAndRollback() {
+        MariadbConnection connection = openConnection();
+        try {
+            beginTransaction(connection);
+            connection.createStatement("CREATE TABLE foo (id INT AUTO_INCREMENT, name VARCHAR(255), PRIMARY KEY (id))")
+                    .execute()
+                    .blockFirst();
+            commitTransaction(connection);
+        } finally {
+            closeConnection(connection);
+        }
+
+        connection = openConnection();
+        try {
+            beginTransaction(connection);
+            connection.createStatement("INSERT INTO foo (name) VALUES (?), (?)")
+                    .bind(0, "Adam")
+                    .bind(1, "Eve")
+                    .execute()
+                    .blockFirst();
+            commitTransaction(connection);
+        } finally {
+            closeConnection(connection);
+        }
+
+        connection = openConnection();
+        try {
+            beginTransaction(connection);
+            connection.createStatement("DELETE FROM foo")
+                    .execute()
+                    .blockFirst();
+            rollbackTransaction(connection);
+        } finally {
+            closeConnection(connection);
+        }
+
+        List<String> rows = new ArrayList<>();
+
+        connection = openConnection();
+        try {
+            connection.createStatement("SELECT * FROM foo")
+                    .execute()
+                    .flatMap(result -> result.map((row, metadata) -> String.format("%s - %s", row.get("id"), row.get("name"))))
+                    .subscribe(result -> rows.add(result));
+            commitTransaction(connection);
+        } finally {
+            closeConnection(connection);
+        }
+
+        assertThat(rows.get(0)).isEqualTo("1 - Adam");
+        assertThat(rows.get(1)).isEqualTo("2 - Eve");
+    }
+
+    @Test
+    void simpleDatatypes() {
+        MariadbConnection connection = openConnection();
+        try {
+            beginTransaction(connection);
+            connection.createStatement("CREATE TABLE simple_datatypes " +
+                    "(b1 BIT, t1 TINYINT, b2 BOOLEAN, s1 SMALLINT, m1 MEDIUMINT, c2 INT, d1 BIGINT, d2 DECIMAL, " +
+                    "i1 FLOAT, j1 DOUBLE)")
+                    .execute()
+                    .blockFirst();
+
+            connection.createStatement("INSERT INTO simple_datatypes VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")
+                    .bind(0, 1)  // BIT
+                    .bind(1, (byte) 127) // TINYINT
+                    .bind(2, true) // BOOLEAN
+                    .bind(3, (short) 2) // SMALLINT
+                    .bind(4, 3) // MEDIUMINT
+                    .bind(5, 4) // INT
+                    .bind(6, Long.MAX_VALUE) // BIGINT
+                    .bind(7, Math.PI) // DECIMAL
+                    .bind(8, 42.2f) // FLOAT
+                    .bind(9, Math.PI) // DOUBLE
+                    .execute()
+                    .blockFirst();
+
+            connection.createStatement("SELECT * FROM simple_datatypes")
+                    .execute()
+                    .flatMap(result -> result.map((row, metadata) -> String.format("%s, %s, %s, %s, %s, %s, %s, %s, %s, %s",
+                            row.get("b1"), row.get("t1"), row.get("b2"), row.get("s1"), row.get("m1"),
+                            row.get("c2"), row.get("d1"), row.get("d2"), row.get("i1"), row.get("j1"))))
+                    .subscribe(result -> System.out.println(result));
+            commitTransaction(connection);
+        } finally {
+            closeConnection(connection);
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -244,5 +244,9 @@`
`244`	`244`	`{`
`245`	`245`	`"directory" : "samples/docker",`
`246`	`246`	`"module" : "samples:docker"`
	`247`	`+ },`
	`248`	`+ {`
	`249`	`+ "directory" : "org.mariadb/r2dbc-mariadb",`
	`250`	`+ "module" : "org.mariadb:r2dbc-mariadb"`
`247`	`251`	`}`
`248`	`252`	`]`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +[
 +  "reflect-config.json",
 +  "resource-config.json"
 +]
Original file line number	Diff line number	Diff line change
`@@ -647,5 +647,16 @@`
`647`	`647`	`]`
`648`	`648`	`}`
`649`	`649`	`]`
	`650`	`+ },`
	`651`	`+ {`
	`652`	`+ "test-project-path" : "org.mariadb/r2dbc-mariadb/1.1.3",`
	`653`	`+ "libraries" : [`
	`654`	`+ {`
	`655`	`+ "name" : "org.mariadb:r2dbc-mariadb",`
	`656`	`+ "versions" : [`
	`657`	`+ "1.1.3"`
	`658`	`+ ]`
	`659`	`+ }`
	`660`	`+ ]`
`650`	`661`	`}`
`651`	`662`	`]`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+library.version = 1.1.3`
	`2`	`+metadata.dir = org.mariadb/r2dbc-mariadb/1.1.3/`