Added metadata for com.microsoft.sqlserver:mssql-jdbc (#245)

msupic · web-flow · commit c4b969a26f41 · 2023-03-31T14:59:35.000+02:00
* Added metadata for com.microsoft.sqlserver.mssql-jdbc

* Replaced `awaitility` with custom implementation

* Modified metadata for com.microsoft.sqlserver.mssql-jdbc (added condition)

* Replaced 9.4.1.jre16 with 12.2.0.jre11 version

* Added empty line at the end of files
diff --git a/metadata/com.microsoft.sqlserver/mssql-jdbc/12.2.0.jre11/index.json b/metadata/com.microsoft.sqlserver/mssql-jdbc/12.2.0.jre11/index.json
@@ -0,0 +1,3 @@
+[
+  "resource-config.json"
+]
diff --git a/metadata/com.microsoft.sqlserver/mssql-jdbc/12.2.0.jre11/resource-config.json b/metadata/com.microsoft.sqlserver/mssql-jdbc/12.2.0.jre11/resource-config.json
@@ -0,0 +1,15 @@
+{
+  "resources": {
+    "includes": [
+
+    ]
+  },
+  "bundles": [
+    {
+      "name": "com.microsoft.sqlserver.jdbc.SQLServerResource",
+      "classNames": [
+        "com.microsoft.sqlserver.jdbc.SQLServerResource"
+      ]
+    }
+  ]
+}
diff --git a/metadata/com.microsoft.sqlserver/mssql-jdbc/index.json b/metadata/com.microsoft.sqlserver/mssql-jdbc/index.json
@@ -0,0 +1,10 @@
+[
+  {
+    "latest": true,
+    "metadata-version": "12.2.0.jre11",
+    "module": "com.microsoft.sqlserver:mssql-jdbc",
+    "tested-versions": [
+      "12.2.0.jre11"
+    ]
+  }
+]
diff --git a/metadata/index.json b/metadata/index.json
@@ -23,6 +23,10 @@
     "directory": "com.h2database/h2",
     "module": "com.h2database:h2"
   },
+  {
+    "directory" : "com.microsoft.sqlserver/mssql-jdbc",
+    "module" : "com.microsoft.sqlserver:mssql-jdbc"
+  },
   {
     "directory": "org.opengauss/opengauss-jdbc",
     "module": "org.opengauss:opengauss-jdbc"
diff --git a/tests/src/com.microsoft.sqlserver/mssql-jdbc/12.2.0.jre11/.gitignore b/tests/src/com.microsoft.sqlserver/mssql-jdbc/12.2.0.jre11/.gitignore
@@ -0,0 +1,6 @@
+gradlew.bat
+gradlew
+gradle/
+build/
+mssql-stderr.txt
+mssql-stdout.txt
diff --git a/tests/src/com.microsoft.sqlserver/mssql-jdbc/12.2.0.jre11/build.gradle b/tests/src/com.microsoft.sqlserver/mssql-jdbc/12.2.0.jre11/build.gradle
@@ -0,0 +1,35 @@
+/*
+ * 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 "com.microsoft.sqlserver:mssql-jdbc:$libraryVersion"
+    testImplementation 'org.assertj:assertj-core:3.22.0'
+}
+
+graalvmNative {
+    binaries {
+        all {
+            buildArgs.add("--report-unsupported-elements-at-runtime")
+            buildArgs.add("-H:+AddAllCharsets")
+        }
+    }
+    agent {
+        defaultMode = "conditional"
+        modes {
+            conditional {
+                userCodeFilterPath = "metadata-user-code-filter.json"
+                extraFilterPath = "metadata-extra-filter.json"
+            }
+        }
+    }
+}
diff --git a/tests/src/com.microsoft.sqlserver/mssql-jdbc/12.2.0.jre11/gradle.properties b/tests/src/com.microsoft.sqlserver/mssql-jdbc/12.2.0.jre11/gradle.properties
@@ -0,0 +1,2 @@
+library.version = 12.2.0.jre11
+metadata.dir = com.microsoft.sqlserver/mssql-jdbc/12.2.0.jre11/
diff --git a/tests/src/com.microsoft.sqlserver/mssql-jdbc/12.2.0.jre11/metadata-extra-filter.json b/tests/src/com.microsoft.sqlserver/mssql-jdbc/12.2.0.jre11/metadata-extra-filter.json
@@ -0,0 +1,7 @@
+{
+  "rules": [
+    {
+      "includeClasses": "com.microsoft.**"
+    }
+  ]
+}
diff --git a/tests/src/com.microsoft.sqlserver/mssql-jdbc/12.2.0.jre11/metadata-user-code-filter.json b/tests/src/com.microsoft.sqlserver/mssql-jdbc/12.2.0.jre11/metadata-user-code-filter.json
@@ -0,0 +1,7 @@
+{
+  "rules": [
+    {
+      "includeClasses": "com.microsoft.**"
+    }
+  ]
+}
diff --git a/tests/src/com.microsoft.sqlserver/mssql-jdbc/12.2.0.jre11/required-docker-images.txt b/tests/src/com.microsoft.sqlserver/mssql-jdbc/12.2.0.jre11/required-docker-images.txt
@@ -0,0 +1 @@
+mcr.microsoft.com/mssql/server:2022-RTM-CU2-ubuntu-20.04
diff --git a/tests/src/com.microsoft.sqlserver/mssql-jdbc/12.2.0.jre11/settings.gradle b/tests/src/com.microsoft.sqlserver/mssql-jdbc/12.2.0.jre11/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 = 'com.microsoft.sqlserver.mssql-jdbc_tests'
diff --git a/tests/src/com.microsoft.sqlserver/mssql-jdbc/12.2.0.jre11/src/test/java/com_microsoft_sqlserver/mssql_jdbc/Mssql_jdbcTest.java b/tests/src/com.microsoft.sqlserver/mssql-jdbc/12.2.0.jre11/src/test/java/com_microsoft_sqlserver/mssql_jdbc/Mssql_jdbcTest.java
@@ -0,0 +1,160 @@
+/*
+ * 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 com_microsoft_sqlserver.mssql_jdbc;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.sql.Connection;
+import java.sql.Date;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.Timestamp;
+import java.util.Properties;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class Mssql_jdbcTest {
+
+    private static final String USERNAME = "sa";
+
+    private static final String PASSWORD = "Secret12";
+
+    private static final String JDBC_URL = "jdbc:sqlserver://localhost:1433;encrypt=false";
+
+    private static Process process;
+
+    private static Connection openConnection() throws SQLException {
+        Properties props = new Properties();
+        props.setProperty("user", USERNAME);
+        props.setProperty("password", PASSWORD);
+        return DriverManager.getConnection(JDBC_URL, props);
+    }
+
+    @BeforeAll
+    static void beforeAll() throws IOException {
+        System.out.println("Starting MSSQL ...");
+        process = new ProcessBuilder(
+                "docker", "run", "--rm", "-p", "1433:1433", "-e", "ACCEPT_EULA=Y",
+                "-e", "MSSQL_SA_PASSWORD=" + PASSWORD,
+                "mcr.microsoft.com/mssql/server:2022-RTM-CU2-ubuntu-20.04")
+                .redirectOutput(new File("mssql-stdout.txt"))
+                .redirectError(new File("mssql-stderr.txt"))
+                .start();
+
+        // Wait until connection can be established
+        waitUntilContainerStarted(60);
+
+        System.out.println("MSSQL started");
+    }
+
+    private static 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 (Connection connection = openConnection(); Statement statement = connection.createStatement()) {
+                statement.execute("SELECT 1");
+                return;
+            } catch (Exception e) {
+                lastConnectionException = e;
+            }
+        }
+        throw new IllegalStateException("Database container cannot be accessed by JDBC URL: " + JDBC_URL, lastConnectionException);
+    }
+
+    @AfterAll
+    static void tearDown() {
+        if (process != null && process.isAlive()) {
+            System.out.println("Shutting down MSSQL");
+            process.destroy();
+        }
+    }
+
+    @Test
+    void commitAndRollback() throws Exception {
+        try (Connection conn = openConnection()) {
+            conn.setAutoCommit(false);
+            conn.prepareStatement("CREATE TABLE foo (id INT IDENTITY PRIMARY KEY, name VARCHAR(255))").execute();
+            conn.commit();
+        }
+
+        try (Connection conn = openConnection()) {
+            conn.setAutoCommit(false);
+            PreparedStatement statement = conn.prepareStatement("INSERT INTO foo (name) VALUES (?)");
+            statement.setString(1, "Adam");
+            statement.execute();
+            statement.setString(1, "Eve");
+            statement.execute();
+            conn.commit();
+        }
+
+        try (Connection conn = openConnection()) {
+            // Test rollbacks
+            conn.setAutoCommit(false);
+            conn.prepareStatement("DELETE FROM foo").execute();
+            conn.rollback();
+        }
+
+        try (Connection conn = openConnection()) {
+            conn.setAutoCommit(false);
+            try (ResultSet resultSet = conn.prepareStatement("SELECT * FROM foo").executeQuery()) {
+                assertThat(resultSet.next()).isTrue();
+                assertThat(resultSet.getInt(1)).isEqualTo(1);
+                assertThat(resultSet.getString(2)).isEqualTo("Adam");
+                assertThat(resultSet.next()).isTrue();
+                assertThat(resultSet.getInt(1)).isEqualTo(2);
+                assertThat(resultSet.getString(2)).isEqualTo("Eve");
+                assertThat(resultSet.next()).isFalse();
+            }
+        }
+    }
+
+    @Test
+    void simpleDatatypes() throws Exception {
+        try (Connection connection = openConnection()) {
+            connection.setAutoCommit(false);
+            connection.prepareStatement("CREATE TABLE simple_datatypes " +
+                    "(b1 BIT, t1 TINYINT, s1 SMALLINT, i1 INT, b2 BIGINT, " +
+                    "r1 REAL, f1 FLOAT, d1 DECIMAL, " +
+                    "d2 DATE, d3 DATETIME)").execute();
+            PreparedStatement statement = connection.prepareStatement("INSERT INTO simple_datatypes VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
+            statement.setBoolean(1, true); // BIT
+            statement.setByte(2, (byte) 127); // TINYINT
+            statement.setShort(3, (short) 2); // SMALLINT
+            statement.setInt(4, 4); // INT
+            statement.setLong(5, Long.MAX_VALUE); // BIGINT
+            statement.setFloat(6, 42.2f); // REAL
+            statement.setDouble(7, Math.PI); // FLOAT
+            statement.setBigDecimal(8, BigDecimal.ONE); // DECIMAL
+            statement.setDate(9, new Date(System.currentTimeMillis())); // DATE
+            statement.setTimestamp(10, new Timestamp(System.currentTimeMillis())); // DATETIME
+            statement.execute();
+
+            try (ResultSet resultSet = connection.prepareStatement("SELECT * FROM simple_datatypes").executeQuery()) {
+                assertThat(resultSet.next()).isTrue();
+                for (int i = 1; i <= 10; i++) {
+                    System.out.printf("column %d: %s%n", i, resultSet.getObject(i));
+                }
+            }
+        }
+    }
+}
diff --git a/tests/src/index.json b/tests/src/index.json
@@ -32,6 +32,17 @@
       }
     ]
   },
+  {
+    "test-project-path": "com.microsoft.sqlserver/mssql-jdbc/12.2.0.jre11",
+    "libraries": [
+      {
+        "name": "com.microsoft.sqlserver:mssql-jdbc",
+        "versions": [
+          "12.2.0.jre11"
+        ]
+      }
+    ]
+  },
   {
     "test-project-path": "org.opengauss/opengauss-jdbc/3.1.0-og",
     "libraries": [

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[`
	`2`	`+ "resource-config.json"`
	`3`	`+]`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+library.version = 12.2.0.jre11`
	`2`	`+metadata.dir = com.microsoft.sqlserver/mssql-jdbc/12.2.0.jre11/`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +{
 +  "rules": [
 +    {
 +      "includeClasses": "com.microsoft.**"
 +    }
 +  ]
 +}
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+mcr.microsoft.com/mssql/server:2022-RTM-CU2-ubuntu-20.04`