Force drop table before test

JetBrains · Sep 4, 2023 · e790e91 · e790e91
1 parent 195b1e8
commit e790e91
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 0 deletions.
diff --git a/exposed-core/api/exposed-core.api b/exposed-core/api/exposed-core.api
@@ -3459,6 +3459,7 @@ public class org/jetbrains/exposed/sql/vendors/H2Dialect : org/jetbrains/exposed
 	public fun isAllowedAsColumnDefault (Lorg/jetbrains/exposed/sql/Expression;)Z
 	public final fun isSecondVersion ()Z
 	public fun modifyColumn (Lorg/jetbrains/exposed/sql/Column;Lorg/jetbrains/exposed/sql/ColumnDiff;)Ljava/util/List;
+	public fun toString ()Ljava/lang/String;
 }
 
 public final class org/jetbrains/exposed/sql/vendors/H2Dialect$Companion : org/jetbrains/exposed/sql/vendors/VendorDialect$DialectNameProvider {

diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/vendors/H2.kt b/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/vendors/H2.kt
@@ -122,6 +122,9 @@ internal object H2FunctionProvider : FunctionProvider() {
  * H2 dialect implementation.
  */
 open class H2Dialect : VendorDialect(dialectName, H2DataTypeProvider, H2FunctionProvider) {
+
+    override fun toString(): String = "H2Dialect[$dialectName, $h2Mode]"
+
     internal enum class H2MajorVersion {
         One, Two
     }

diff --git a/exposed-java-time/src/test/kotlin/org/jetbrains/exposed/DefaultsTest.kt b/exposed-java-time/src/test/kotlin/org/jetbrains/exposed/DefaultsTest.kt
@@ -194,9 +194,11 @@ class DefaultsTest : DatabaseTestsBase() {
 
     @Test
     fun testDefaults01() {
+        println("Start test")
         val currentDT = CurrentDateTime
         val nowExpression = object : Expression<LocalDateTime>() {
             override fun toQueryBuilder(queryBuilder: QueryBuilder) = queryBuilder {
+                println("currentDialectTest = $currentDialectTest")
                 +when (val dialect = currentDialectTest) {
                     is OracleDialect -> "SYSDATE"
                     is SQLServerDialect -> "GETDATE()"

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
@@ -113,6 +113,11 @@ abstract class DatabaseTestsBase {
         Assume.assumeFalse(testDB in excludeSettings)
 
         withDb(testDB) {
+            try {
+                SchemaUtils.drop(*tables)
+            } catch (_: Throwable) {
+            }
+
             SchemaUtils.create(*tables)
             try {
                 statement(testDB)