From 378ff06c385af45af40005b83914f4b9fb1504b3 Mon Sep 17 00:00:00 2001
From: Yvan Peter <yvan.peter@univ-lille.fr>
Date: Wed, 12 Feb 2020 15:50:05 +0100
Subject: [PATCH] =?UTF-8?q?Changement=20du=20chemin=20de=20la=20base=20pou?=
=?UTF-8?q?r=20=C3=A9viter=20les=20conflits=20de=20noms?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../fr/ulille/iut/pizzaland/BDDFactory.java | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/fr/ulille/iut/pizzaland/BDDFactory.java b/src/main/java/fr/ulille/iut/pizzaland/BDDFactory.java
index 9f601c1..31845d1 100644
--- a/src/main/java/fr/ulille/iut/pizzaland/BDDFactory.java
+++ b/src/main/java/fr/ulille/iut/pizzaland/BDDFactory.java
@@ -10,12 +10,15 @@ import org.jdbi.v3.sqlobject.SqlObjectPlugin;
public class BDDFactory {
private static Jdbi jdbi = null;
-
+ private static String dbPath = "jdbc:sqlite:"
+ + System.getProperty("java.io.tmpdir")
+ + System.getProperty("file.separator")
+ + System.getProperty("user.name")
+ + "_";
+
public static Jdbi getJdbi() {
if ( jdbi == null ) {
- jdbi = Jdbi.create("jdbc:sqlite:"
- + System.getProperty("java.io.tmpdir")
- + System.getProperty("file.separator") + "pizza.db")
+ jdbi = Jdbi.create(dbPath + "pizza.db")
.installPlugin(new SQLitePlugin())
.installPlugin(new SqlObjectPlugin());
}
@@ -24,9 +27,7 @@ public class BDDFactory {
public static void setJdbiForTests() {
if ( jdbi == null ) {
- jdbi = Jdbi.create("jdbc:sqlite:"
- + System.getProperty("java.io.tmpdir")
- + System.getProperty("file.separator") + "pizza_test.db")
+ jdbi = Jdbi.create(dbPath + "pizza_test.db")
.installPlugin(new SQLitePlugin())
.installPlugin(new SqlObjectPlugin());
}
@@ -43,4 +44,4 @@ public class BDDFactory {
public static <T> T buildDao(Class<T> daoClass) {
return getJdbi().onDemand(daoClass);
}
-}
\ No newline at end of file
+}
--
GitLab