fix database access

NastasiyaT · Oct 13, 2023 · 6c58562 · 6c58562
1 parent 5d054c7
commit 6c58562
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -36,8 +36,8 @@ dependencies {
     implementation("org.postgresql:postgresql:42.6.0")
 
     testImplementation("org.assertj:assertj-core:3.24.2")
-    testImplementation(platform("org.junit:junit-bom:5.9.1"))
-    testImplementation("org.junit.jupiter:junit-jupiter")
+    testImplementation(platform("org.junit:junit-bom:5.9.2"))
+    testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
 }
 
 tasks.test {

diff --git a/app/src/main/java/hexlet/code/App.java b/app/src/main/java/hexlet/code/App.java
@@ -24,7 +24,7 @@ public class App {
 
     private static String getDatabaseUrl() {
         return System.getenv()
-                .getOrDefault("APP_ENV", "jdbc:h2:mem:webapp;DB_CLOSE_DELAY=-1;");
+                .getOrDefault("JDBC_ENV", "jdbc:h2:mem:webapp;DB_CLOSE_DELAY=-1;");
     }
 
     private static InputStream getFileFromResourceAsStream(String fileName) {
@@ -53,7 +53,11 @@ private static int getPort() {
     public static Javalin getApp() throws IOException, SQLException {
 
         var hikariConfig = new HikariConfig();
-        hikariConfig.setJdbcUrl(getDatabaseUrl());
+        String databaseUrl = getDatabaseUrl();
+        if (databaseUrl.contains("postgresql")) {
+            hikariConfig.setDriverClassName(org.postgresql.Driver.class.getName());
+        }
+        hikariConfig.setJdbcUrl(databaseUrl);
 
         var dataSource = new HikariDataSource(hikariConfig);
         String sql = getContentFromStream(getFileFromResourceAsStream("schema.sql"));