fixed raw database url

Osiris-Team · Nov 5, 2023 · f3d94e4 · f3d94e4
1 parent 79aa7f5
commit f3d94e4
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/src/main/java/com/osiris/jsqlgen/payhook/Database.java b/src/main/java/com/osiris/jsqlgen/payhook/Database.java
@@ -16,7 +16,7 @@ It holds the database credentials (set by you at first run of jSQL-Gen).<br>
 - Ensures optimal performance (cpu and memory usage) for any type of database from small to huge, with millions of queries per second.
 - Connection status is checked before doing a query (since it could be closed or timed out and thus result in errors).*/
 public class Database{
-public static String rawUrl = "jdbc:mysql://localhost/";
+public static String rawUrl = com.osiris.payhook.PayHook.databaseRawUrl;
 public static String url = com.osiris.payhook.PayHook.databaseUrl;
 public static String name = com.osiris.payhook.PayHook.databaseName;
 public static String username = com.osiris.payhook.PayHook.databaseUsername;

diff --git a/src/main/java/com/osiris/payhook/PayHook.java b/src/main/java/com/osiris/payhook/PayHook.java
@@ -195,6 +195,7 @@ public final class PayHook {
      * Always null, except when doing init of database.
      */
     public static String databaseUrl = null;
+    public static String databaseRawUrl = null;
     /**
      * Always null, except when doing init of database.
      */
@@ -238,12 +239,14 @@ public static synchronized void init(String brandName, String databaseUrl, Strin
         if (isSandbox && (!databaseUrl.contains("sandbox") && !databaseUrl.contains("test")))
             throw new SQLException("You are running in sandbox mode, thus your database-url/name must contain 'sandbox' or 'test'!");
         PayHook.databaseUrl = databaseUrl;
+        PayHook.databaseRawUrl = getRawDbUrlFrom(databaseUrl);
         PayHook.databaseName = Objects.requireNonNull(databaseName);
         PayHook.databaseUsername = Objects.requireNonNull(databaseUsername);
         PayHook.databasePassword = Objects.requireNonNull(databasePassword);
         com.osiris.jsqlgen.payhook.Database.create();
         // Reset values since they aren't needed anymore
         PayHook.databaseUrl = null;
+        PayHook.databaseRawUrl = null;
         PayHook.databaseName = null;
         PayHook.databaseUsername = null;
         PayHook.databasePassword = null;
@@ -287,6 +290,26 @@ public static synchronized void init(String brandName, String databaseUrl, Strin
         isInitialised = true;
     }
 
+    /**
+     * Gets the raw database url without database name. <br>
+     * Before: "jdbc:mysql://localhost/my_database" <br>
+     * After: "jdbc:mysql://localhost" <br>
+     */
+    private static String getRawDbUrlFrom(String databaseUrl) {
+        int index = 0;
+        int count = 0;
+        for (int i = 0; i < databaseUrl.length(); i++) {
+            char c = databaseUrl.charAt(i);
+            if(c == '/'){
+                index = i;
+                count++;
+            }
+            if(count == 3) break;
+        }
+        if(count != 3) return databaseUrl; // Means there is less than 3 "/", thus may already be raw url, or totally wrong url
+        return databaseUrl.substring(0, index);
+    }
+
     public static void initCommandLineTool() {
         if (commandLineThread != null) commandLineThread.interrupt();
         commandLineThread = new Thread(() -> {