Make SQL output verbosable

That's a word now, I declare it
DenizenScript · Jan 14, 2015 · 80ddc90 · 80ddc90
1 parent 6fc7716
commit 80ddc90
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/DenizenCommandHandler.java b/src/main/java/net/aufdemrand/denizen/DenizenCommandHandler.java
@@ -197,7 +197,8 @@ public void debug(CommandContext args, CommandSender sender) throws CommandExcep
         }
         if (args.hasFlag('r')) {
             if (!dB.showDebug) dB.toggle();
-            dB.verbose = !dB.verbose;
+            net.aufdemrand.denizencore.utilities.debugging.dB.verbose =
+                    !net.aufdemrand.denizencore.utilities.debugging.dB.verbose;
             Messaging.sendInfo(sender, (dB.record ? "Denizen dBugger is now verbose.":
                     "Denizen dBugger verbosity disabled."));
         }

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/SQLCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/SQLCommand.java
@@ -7,7 +7,7 @@
 import net.aufdemrand.denizencore.scripts.commands.AbstractCommand;
 import net.aufdemrand.denizencore.scripts.commands.Holdable;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
-import net.aufdemrand.denizen.utilities.debugging.dB;
+import net.aufdemrand.denizencore.utilities.debugging.dB;
 import org.bukkit.Bukkit;
 
 import java.sql.*;
@@ -129,6 +129,7 @@ public void execute(final ScriptEntry scriptEntry) throws CommandExecutionExcept
                     @Override
                     public void run() {
                         Connection con = null;
+                        if (dB.verbose) dB.echoDebug(scriptEntry, "Connecting to " + server.asString());
                         try {
                             con = getConnection(username.asString(), password.asString(), server.asString());
                         }
@@ -138,9 +139,11 @@ public void run() {
                                 public void run() {
                                     dB.echoError(scriptEntry.getResidingQueue(), "SQL Exception: " + e.getMessage());
                                     scriptEntry.setFinished(true);
+                                    if (dB.verbose) dB.echoError(scriptEntry.getResidingQueue(), e);
                                 }
                             }, 1);
                         }
+                        if (dB.verbose) dB.echoDebug(scriptEntry, "Connection did not error");
                         final Connection conn = con;
                         if (con != null) {
                             Bukkit.getScheduler().runTaskLater(DenizenAPI.getCurrentInstance(), new Runnable() {
@@ -152,6 +155,15 @@ public void run() {
                                 }
                             }, 1);
                         }
+                        else {
+                            Bukkit.getScheduler().runTaskLater(DenizenAPI.getCurrentInstance(), new Runnable() {
+                                @Override
+                                public void run() {
+                                    scriptEntry.setFinished(true);
+                                    if (dB.verbose) dB.echoDebug(scriptEntry, "Connecting errored!");
+                                }
+                            }, 1);
+                        }
                     }
                 }, 1);
             }
@@ -222,6 +234,7 @@ else if (action.asString().equalsIgnoreCase("update")) {
                     }
                     rows.add(current.toString());
                 }
+                // TODO: add(count)?
                 scriptEntry.addObject("result", rows);
                 dB.echoDebug(scriptEntry, "Updated " + affected + " rows");
             }
@@ -231,6 +244,7 @@ else if (action.asString().equalsIgnoreCase("update")) {
         }
         catch (SQLException e) {
             dB.echoError(scriptEntry.getResidingQueue(), "SQL Exception: " + e.getMessage());
+            if (dB.verbose) dB.echoError(scriptEntry.getResidingQueue(), e);
         }
     }
 

diff --git a/src/main/java/net/aufdemrand/denizen/utilities/debugging/dB.java b/src/main/java/net/aufdemrand/denizen/utilities/debugging/dB.java
@@ -68,7 +68,6 @@ public class dB {
     public static boolean showStackTraces = true;
     public static boolean showColor = true;
     public static boolean debugOverride = false;
-    public static boolean verbose = false;
 
     public static List<String> filter = new ArrayList<String>();