Update h2_v2 dependency (JetBrains#1462)

* update Gradle to 7.4 * update h2_v2 to 2.0.206; remove workaround for bug in previous version of h2_v2 * update h2_v2 to 2.1.210; adjust tests for new behaviour of H2
naftalmm · Feb 22, 2022 · 4015c04 · 4015c04
1 parent 5fd50f1
commit 4015c04
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/exposed/gradle/Versions.kt b/buildSrc/src/main/kotlin/org/jetbrains/exposed/gradle/Versions.kt
@@ -9,7 +9,7 @@ object Versions {
 
     /** JDBC drivers **/
     const val h2 = "1.4.199"
-    const val h2_v2 = "2.0.202"
+    const val h2_v2 = "2.1.210"
     const val mariaDB = "2.7.4"
     const val mysql51 = "5.1.49"
     const val mysql80 = "8.0.27"

diff --git a/exposed-tests/src/main/kotlin/org/jetbrains/exposed/sql/tests/DatabaseTestsBase.kt b/exposed-tests/src/main/kotlin/org/jetbrains/exposed/sql/tests/DatabaseTestsBase.kt
@@ -34,10 +34,8 @@ enum class TestDB(
                 val mode = Mode.getInstance("MySQL")
                 (field as KMutableProperty1<Mode, Boolean>).set(mode, false)
             }
-        },
-        dbConfig = {
-            defaultIsolationLevel = Connection.TRANSACTION_READ_COMMITTED
-        }),
+        }
+    ),
     SQLITE({ "jdbc:sqlite:file:test?mode=memory&cache=shared" }, "org.sqlite.JDBC"),
     MYSQL(
         connection = {

diff --git a/exposed-tests/src/test/kotlin/org/jetbrains/exposed/sql/tests/shared/dml/UnionTests.kt b/exposed-tests/src/test/kotlin/org/jetbrains/exposed/sql/tests/shared/dml/UnionTests.kt
@@ -7,6 +7,7 @@ import org.jetbrains.exposed.sql.tests.shared.assertEqualCollections
 import org.jetbrains.exposed.sql.tests.shared.assertEqualLists
 import org.jetbrains.exposed.sql.tests.shared.assertEquals
 import org.jetbrains.exposed.sql.tests.shared.expectException
+import org.jetbrains.exposed.sql.vendors.H2Dialect
 import org.jetbrains.exposed.sql.vendors.MariaDBDialect
 import org.jetbrains.exposed.sql.vendors.PostgreSQLDialect
 import org.jetbrains.exposed.sql.vendors.SQLServerDialect
@@ -85,6 +86,7 @@ class UnionTests : DatabaseTestsBase() {
             val expectedUsers = usersQuery.map { it[users.id] } + "sergey"
             val intersectAppliedFirst = when (currentDialect) {
                 is PostgreSQLDialect, is SQLServerDialect, is MariaDBDialect -> true
+                is H2Dialect -> (currentDialect as H2Dialect).isSecondVersion
                 else -> false
             }
             usersQuery.unionAll(usersQuery).intersect(sergeyQuery).map { it[users.id] }.apply {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists