Merge remote-tracking branch 'origin/master'

pandamonium-theorem-prover/persistence/build.gradle

@@ -1,3 +1,5 @@
+import org.gradle.internal.os.OperatingSystem;
+
 plugins {
     id 'java'
 }
@@ -35,6 +37,11 @@ dependencies {
 }
 
 task loadDb(type: Exec, group: 'Verification', description: 'Reloads the local database.') {
-    workingDir "./scripts/mysql"
-    commandLine './loaddb.sh'
+    if (OperatingSystem.current().isLinux() || OperatingSystem.current().isMacOsX()) {
+        workingDir "./scripts/mysql"
+        commandLine './loaddb.sh'
+    } else {
+        workingDir "./scripts/mysql"
+        commandLine 'loaddb.bat'
+    }
 }

pandamonium-theorem-prover/persistence/scripts/mysql/loaddb.bat

@@ -0,0 +1,5 @@
+SET MYSQL_PWD=secret
+FOR /R %%s IN (.\*.sql) do (
+    echo **** %%s ****
+    echo mysql --batch --quick --raw --line-numbers --force --user=panda < %%s
+)