From a43ac7f19c720cbe509dd4e59399d29711513e08 Mon Sep 17 00:00:00 2001 From: lukaseder Date: Thu, 4 Jan 2018 12:23:44 +0100 Subject: [PATCH] [#6980] DDLDatabase and JPADatabase should use unique in-memory database name --- .../src/main/java/org/jooq/util/ddl/DDLDatabase.java | 3 ++- .../src/main/java/org/jooq/util/jpa/JPADatabase.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/jOOQ-meta-extensions/src/main/java/org/jooq/util/ddl/DDLDatabase.java b/jOOQ-meta-extensions/src/main/java/org/jooq/util/ddl/DDLDatabase.java index 526f7a8fd2..2de24d05b6 100644 --- a/jOOQ-meta-extensions/src/main/java/org/jooq/util/ddl/DDLDatabase.java +++ b/jOOQ-meta-extensions/src/main/java/org/jooq/util/ddl/DDLDatabase.java @@ -49,6 +49,7 @@ import java.util.Iterator; import java.util.List; import java.util.Properties; import java.util.Scanner; +import java.util.UUID; import org.jooq.DSLContext; import org.jooq.Queries; @@ -94,7 +95,7 @@ public class DDLDatabase extends H2Database { Properties info = new Properties(); info.put("user", "sa"); info.put("password", ""); - connection = new org.h2.Driver().connect("jdbc:h2:mem:jooq-meta-extensions", info); + connection = new org.h2.Driver().connect("jdbc:h2:mem:jooq-meta-extensions-" + UUID.randomUUID(), info); InputStream in = null; try { diff --git a/jOOQ-meta-extensions/src/main/java/org/jooq/util/jpa/JPADatabase.java b/jOOQ-meta-extensions/src/main/java/org/jooq/util/jpa/JPADatabase.java index d99f7c71a2..490490a1d8 100644 --- a/jOOQ-meta-extensions/src/main/java/org/jooq/util/jpa/JPADatabase.java +++ b/jOOQ-meta-extensions/src/main/java/org/jooq/util/jpa/JPADatabase.java @@ -50,6 +50,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map.Entry; import java.util.Properties; +import java.util.UUID; import javax.persistence.AttributeConverter; import javax.persistence.Entity; @@ -123,7 +124,7 @@ public class JPADatabase extends H2Database { Properties info = new Properties(); info.put("user", "sa"); info.put("password", ""); - connection = new org.h2.Driver().connect("jdbc:h2:mem:jooq-meta-extensions", info); + connection = new org.h2.Driver().connect("jdbc:h2:mem:jooq-meta-extensions-" + UUID.randomUUID(), info); MetadataSources metadata = new MetadataSources( new StandardServiceRegistryBuilder()