1.2.1

.editorconfig

@@ -1,13 +0,0 @@
-# editorconfig.org
-root = true
-
-[*]
-indent_style = space
-indent_size = 2
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.java]
-continuation_indent_size = 4

.gitignore

@@ -1,10 +1,8 @@
 ## OSX
 *.DS_Store
 
-## Gradle
-.gradle
-build/
-
 ## IntelliJ
 .idea/
 *.iml
+out/
+target

README.md

@@ -3,6 +3,12 @@
  > Sensible SQL support for Skript.
 ---
 
+### Difference from original skript-db
+- Fixed local variables disappearance in newer Skript versions (very hacky fix, but it works, so that's good!)
+- Thread-pool size is now configurable
+- Uses a newer version of HikariCP
+- Only meant to be used by newer Minecraft versions (1.8 is not supported)
+
 ### Expression `Data Source` => `datasource`
 Stores the connection information for a data source. This should be saved to a variable in a
  `script load` event or manually through an effect command.
@@ -29,9 +35,11 @@ Executes a statement on a database and optionally stores the result in a variabl
 
  If a list variable, such as `{test::*}`, is passed, the query result will be mapped to the list
  variable in the form `{test::<column name>::<row number>}`
+ 
+ If `synchronously` is specified, the SQL query will be done on the current thread.
 #### Syntax
 ```
-execute %string% (in|on) %datasource% [and store [[the] (output|result)[s]] (to|in) [the] [var[iable]] %-objects%]
+[synchronously] execute %string% (in|on) %datasource% [and store [[the] (output|result)[s]] (to|in) [the] [var[iable]] %-objects%]
 ```
 
 #### Examples

build.gradle

@@ -1,56 +0,0 @@
-group 'com.btk5h.skript-db'
-version '0.1.1'
-
-buildscript {
-  repositories {
-    jcenter()
-  }
-  dependencies {
-    classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.2'
-  }
-}
-
-apply plugin: 'com.github.johnrengelman.shadow'
-apply plugin: 'java'
-
-sourceCompatibility = 1.8
-
-repositories {
-  mavenCentral()
-  maven {
-    url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/'
-  }
-  maven {
-    url 'https://oss.sonatype.org/content/groups/public/'
-  }
-  maven {
-    url 'http://jitpack.io/'
-  }
-}
-
-dependencies {
-  shadow 'org.spigotmc:spigot-api:1.13.2-R0.1-SNAPSHOT'
-  shadow 'com.github.SkriptLang:Skript:2.3.6'
-  compile 'com.zaxxer:HikariCP:3.4.3'
-}
-
-task buildReadme(type: Javadoc) {
-  source = sourceSets.main.allJava
-  classpath = sourceSets.main.compileClasspath
-  destinationDir = projectDir
-  options.docletpath = [file('tools/skriptdoclet.jar')]
-  options.doclet = 'com.btk5h.skriptdoclet.SkriptDoclet'
-  options.addStringOption('file', 'README.md')
-  options.addStringOption('markdown', '-quiet')
-}
-
-task fatJar(type: Jar) {
-  manifest {
-    attributes 'Implementation-Title': 'Gradle Jar File Example',
-      'Implementation-Version': version,
-      'Main-Class': 'com.mkyong.DateUtils'
-  }
-  baseName = project.name + '-all'
-  from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
-  with jar
-}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +0,0 @@
-#Thu Aug 24 18:49:02 PDT 2017
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip

gradlew

@@ -1,172 +0,0 @@
-#!/usr/bin/env sh
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save ( ) {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,84 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega

pom.xml

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.btk5h</groupId>
+    <artifactId>skript-db</artifactId>
+    <version>1.2.1</version>
+    <packaging>jar</packaging>
+
+    <repositories>
+        <repository>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/org/spigotmc/spigot-api/</url>
+        </repository>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
+        <repository>
+            <id>commons-pool2</id>
+            <url>https://mvnrepository.com/artifact/org.apache.commons/commons-pool2</url>
+        </repository>
+        <repository>
+            <id>PaperMC</id>
+            <url>https://repo.destroystokyo.com/repository/maven-public/</url>
+        </repository>
+        <repository>
+            <id>sk89q</id>
+            <url>http://maven.sk89q.com/repo</url>
+        </repository>
+    </repositories>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.6.1</version>
+                <configuration>
+                    <source>10</source>
+                    <target>10</target>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.2.0</version>
+                <configuration>
+                    <outputDirectory>${project.basedir}/compile</outputDirectory>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.zaxxer</groupId>
+            <artifactId>HikariCP</artifactId>
+            <version>4.0.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.16.5-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.SkriptLang</groupId>
+            <artifactId>Skript</artifactId>
+            <version>2.5.3</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.mariadb.jdbc/mariadb-java-client -->
+        <dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <version>2.7.2</version>
+            <scope>compile</scope>
+        </dependency>
+
+    </dependencies>
+</project>

settings.gradle

@@ -1,2 +0,0 @@
-rootProject.name = 'skript-db'
-

src/java/com/btk5h/skriptdb/SkriptDB.java

@@ -25,9 +25,11 @@
 
 package com.btk5h.skriptdb;
 
+import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import java.io.IOException;
+import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.sql.SQLException;
 
 import javax.sql.rowset.RowSetFactory;
@@ -49,6 +51,7 @@ public final class SkriptDB extends JavaPlugin {
   private static SkriptAddon addonInstance;
 
   private static RowSetFactory rowSetFactory;
+  protected FileConfiguration config;
 
   public SkriptDB() {
     if (instance == null) {
@@ -58,16 +61,53 @@ public final class SkriptDB extends JavaPlugin {
     }
   }
 
+  private void setupConfig() throws IOException {
+    //don't check if it exists, because mkdir already does that
+    File file = new File("plugins/skript-db/config.yml");
+    if (file.getParentFile().mkdirs()) {
+      BufferedWriter out = null;
+      try {
+        out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream("plugins/skript-db/config.yml", false), StandardCharsets.UTF_8));
+      } catch (FileNotFoundException e) {
+        e.printStackTrace();
+      }
+      try {
+        if (out == null) return;
+
+        out.write("# How many connections can be awaited for simultaneously, may be useful to increase if mysql database is hosted on a separate machine to account for ping.\n");
+        out.write("# If it is hosted within the same machine, set it to the count of cores your processor has or the count of threads your processor can process at once.\n");
+        out.write("thread-pool-size: " + (Runtime.getRuntime().availableProcessors() + 1) + "\n");
+        out.write("# Only change this if you wish to use a different driver than Java's default, like MariaDB driver.\n");
+        out.write("# If you use MariaDB, its driver is shaded together with skript-db, so you can just specify:" + "\"org.mariadb.jdbc.Driver\"" + ".\n");
+        out.write("sql-driver-class-name:" + "\"default\"" + "\n");
+      } catch (IOException e) {
+        e.printStackTrace();
+      }
+
+      try {
+        out.close();
+      } catch (IOException e) {
+        e.printStackTrace();
+      }
+    }
+  }
+
   @Override
   public void onEnable() {
     try {
-      rowSetFactory = RowSetProvider.newFactory();
-
-      getAddonInstance().loadClasses("com.btk5h.skriptdb.skript");
-    } catch (SQLException e) {
-      throw new RuntimeException(e);
+      setupConfig();
     } catch (IOException e) {
       e.printStackTrace();
+    } finally {
+      try {
+        rowSetFactory = RowSetProvider.newFactory();
+
+        getAddonInstance().loadClasses("com.btk5h.skriptdb.skript");
+      } catch (SQLException e) {
+        throw new RuntimeException(e);
+      } catch (IOException e) {
+        e.printStackTrace();
+      }
     }
   }
 

src/java/com/btk5h/skriptdb/skript/EffExecuteStatement.java

@@ -40,7 +40,7 @@ import java.util.concurrent.Executors;
  * @example execute "select * from %{table variable}%" in {sql} and store the result in {output::*}
  * @since 0.1.0
  */
-public class EffExecuteStatement extends Delay {
+public class EffExecuteStatement extends Effect {
   static {
     Skript.registerEffect(EffExecuteStatement.class,
         "execute %string% (in|on) %datasource% " +
@@ -51,24 +51,26 @@ public class EffExecuteStatement extends Delay {
   static String lastError;
 
   private static final ExecutorService threadPool =
-      Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
+      Executors.newFixedThreadPool(SkriptDB.getInstance().getConfig().getInt("thread-pool-size", 2));
 
   private Expression<String> query;
   private Expression<HikariDataSource> dataSource;
   private VariableString var;
   private boolean isLocal;
   private boolean isList;
-  private Map<String, Object> doLater = new HashMap<>();
   private boolean isSync;
 
-  private void continueScriptExecution(Event e, String res) {
-    lastError = res;
+  private void continueScriptExecution(Event e, Object populatedVariables) {
+    lastError = null;
+    if (populatedVariables instanceof String) {
+      lastError = (String) populatedVariables;
+    } else {
 
-    if (getNext() != null) {
-      doLater.forEach((name, value) -> setVariable(e, name, value));
-      doLater.clear();
-      TriggerItem.walk(getNext(), e);
+      if (getNext() != null) {
+        ((Map<String, Object>) populatedVariables).forEach((name, value) -> setVariable(e, name, value));
+      }
     }
+    TriggerItem.walk(getNext(), e);
   }
   @Override
   protected void execute(Event e) {
@@ -76,30 +78,50 @@ public class EffExecuteStatement extends Delay {
     Pair<String, List<Object>> query = parseQuery(e);
     String baseVariable = var != null ? var.toString(e).toLowerCase(Locale.ENGLISH) : null;
 
+    //if data source isn't set
     if (ds == null)
       return;
+
+
     if (isSync) {
-      String result = executeStatement(ds, baseVariable, query);
-      continueScriptExecution(e, result);
+      Object populatedVariables = executeStatement(ds, baseVariable, query);
+      continueScriptExecution(e, populatedVariables);
     } else {
       Object locals = Variables.removeLocals(e);
-      CompletableFuture<String> sql =
+
+      //execute SQL statement
+      CompletableFuture<Object> sql =
           CompletableFuture.supplyAsync(() -> executeStatement(ds, baseVariable, query), threadPool);
 
+      //when SQL statement is completed
       sql.whenComplete((res, err) -> {
         if (err != null) {
           err.printStackTrace();
         }
 
         Bukkit.getScheduler().runTask(SkriptDB.getInstance(), () -> {
-          lastError = res;
+
+          //handle last error syntax data
+          lastError = null;
+          if (res instanceof String) {
+            lastError = (String) res;
+          }
 
           if (getNext() != null) {
+            //if local variables are present
             if (locals != null)
+
+              //bring back local variables
               Variables.setLocalVariables(e, locals);
-            doLater.forEach((name, value) -> setVariable(e, name, value));
-            doLater.clear();
+
+            //populate SQL data into variables
+            if (!(res instanceof String)) {
+              ((Map<String, Object>) res).forEach((name, value) -> setVariable(e, name, value));
+            }
             TriggerItem.walk(getNext(), e);
+            //the line below is required to prevent memory leaks
+            //no functionality difference notice with it being removed from my test, but the memory gets filled with leaks
+            //so it must be kept
             Variables.removeLocals(e);
           }
         });
@@ -171,11 +193,11 @@ public class EffExecuteStatement extends Delay {
     return new Pair<>(sb.toString(), parameters);
   }
 
-  private String executeStatement(DataSource ds, String baseVariable, Pair<String, List<Object>> query) {
+  private Object executeStatement(DataSource ds, String baseVariable, Pair<String, List<Object>> query) {
     if (ds == null) {
       return "Data source is not set";
     }
-
+    Map<String, Object> variableList = new HashMap<>();
     try (Connection conn = ds.getConnection();
          PreparedStatement stmt = createStatement(conn, query)) {
 
@@ -191,19 +213,39 @@ public class EffExecuteStatement extends Delay {
           crs.populate(stmt.getResultSet());
 
           if (isList) {
-            populateVariable(crs, baseVariable);
+              ResultSetMetaData meta = crs.getMetaData();
+              int columnCount = meta.getColumnCount();
+
+              for (int i = 1; i <= columnCount; i++) {
+                String label = meta.getColumnLabel(i);
+                variableList.put(baseVariable + label, label);
+              }
+
+              int rowNumber = 1;
+              try {
+                while (crs.next()) {
+                  for (int i = 1; i <= columnCount; i++) {
+                    variableList.put(baseVariable + meta.getColumnLabel(i).toLowerCase(Locale.ENGLISH)
+                        + Variable.SEPARATOR + rowNumber, crs.getObject(i));
+                  }
+                  rowNumber++;
+                }
+              } catch (SQLException ex) {
+                return ex.getMessage();
+              }
           } else {
             crs.last();
-            doLater.put(baseVariable, crs.getRow());
+            variableList.put(baseVariable, crs.getRow());
           }
         } else if (!isList) {
-          doLater.put(baseVariable, stmt.getUpdateCount());
+          //if no results are returned and the specified variable isn't a list variable, put the affected rows count in the variable
+          variableList.put(baseVariable, stmt.getUpdateCount());
         }
       }
     } catch (SQLException ex) {
       return ex.getMessage();
     }
-    return null;
+    return variableList;
   }
 
   private PreparedStatement createStatement(Connection conn, Pair<String, List<Object>> query) throws SQLException {
@@ -237,26 +279,6 @@ public class EffExecuteStatement extends Delay {
     Variables.setVariable(name.toLowerCase(Locale.ENGLISH), obj, e, isLocal);
   }
 
-  private void populateVariable(CachedRowSet crs, String baseVariable)
-      throws SQLException {
-    ResultSetMetaData meta = crs.getMetaData();
-    int columnCount = meta.getColumnCount();
-
-    for (int i = 1; i <= columnCount; i++) {
-      String label = meta.getColumnLabel(i);
-       doLater.put(baseVariable + label, label);
-    }
-
-    int rowNumber = 1;
-    while (crs.next()) {
-      for (int i = 1; i <= columnCount; i++) {
-        doLater.put(baseVariable + meta.getColumnLabel(i).toLowerCase(Locale.ENGLISH)
-            + Variable.SEPARATOR + rowNumber, crs.getObject(i));
-      }
-      rowNumber++;
-    }
-  }
-
   @Override
   public String toString(Event e, boolean debug) {
     return "execute " + query.toString(e, debug) + " in " + dataSource.toString(e, debug);
@@ -277,7 +299,6 @@ public class EffExecuteStatement extends Delay {
     }
     dataSource = (Expression<HikariDataSource>) exprs[1];
     Expression<?> expr = exprs[2];
-    System.out.println(matchedPattern);
     isSync = matchedPattern == 1;
     if (expr instanceof Variable) {
       Variable<?> varExpr = (Variable<?>) expr;

src/java/com/btk5h/skriptdb/skript/ExprDataSource.java

@@ -1,5 +1,6 @@
 package com.btk5h.skriptdb.skript;
 
+import com.btk5h.skriptdb.SkriptDB;
 import com.zaxxer.hikari.HikariDataSource;
 
 import org.bukkit.event.Event;
@@ -56,6 +57,11 @@ public class ExprDataSource extends SimpleExpression<HikariDataSource> {
     }
 
     HikariDataSource ds = new HikariDataSource();
+
+    //allow specifying of own sql driver class name
+    if (!SkriptDB.getInstance().getConfig().getString("sql-driver-class-name", "default").equals("default")) {
+      ds.setDriverClassName(SkriptDB.getInstance().getConfig().getString("sql-driver-class-name"));
+    }
     ds.setJdbcUrl(jdbcUrl);
 
     if (maxLifetime != null) {

src/java/com/btk5h/skriptdb/skript/Types.java

@@ -0,0 +1,68 @@
+package com.btk5h.skriptdb.skript;
+
+import ch.njol.skript.classes.ClassInfo;
+import ch.njol.skript.classes.Parser;
+import ch.njol.skript.classes.Serializer;
+import ch.njol.skript.lang.ParseContext;
+import ch.njol.skript.registrations.Classes;
+import ch.njol.yggdrasil.Fields;
+import com.zaxxer.hikari.HikariDataSource;
+
+import java.io.StreamCorruptedException;
+
+public class Types {
+  static {
+    Classes.registerClass(new ClassInfo<>(HikariDataSource.class, "datasource")
+        .user("datasources?")
+        .parser(new Parser<>() {
+            @Override
+            public HikariDataSource parse(String s, ParseContext context) {
+                return null;
+            }
+
+            @Override
+            public String toString(HikariDataSource o, int flags) {
+                return o.getJdbcUrl();
+            }
+
+            @Override
+            public String toVariableNameString(HikariDataSource o) {
+                return o.getJdbcUrl();
+            }
+
+            @Override
+            public String getVariableNamePattern() {
+                return "jdbc:.+";
+            }
+        })
+        .serializer(new Serializer<>() {
+            @Override
+            public Fields serialize(HikariDataSource o) {
+                Fields fields = new Fields();
+                fields.putObject("jdbcurl", o.getJdbcUrl());
+                return fields;
+            }
+
+            @Override
+            public void deserialize(HikariDataSource o, Fields f) {
+            }
+
+            @Override
+            protected HikariDataSource deserialize(Fields fields) throws StreamCorruptedException {
+                HikariDataSource ds = new HikariDataSource();
+                ds.setJdbcUrl((String) fields.getObject("jdbcurl"));
+                return ds;
+            }
+
+            @Override
+            public boolean mustSyncDeserialization() {
+                return false;
+            }
+
+            @Override
+            protected boolean canBeInstantiated() {
+                return false;
+            }
+        }));
+  }
+}

src/main/java/com/btk5h/skriptdb/skript/Types.java

@@ -1,72 +0,0 @@
-package com.btk5h.skriptdb.skript;
-
-import com.zaxxer.hikari.HikariDataSource;
-
-import java.io.NotSerializableException;
-import java.io.StreamCorruptedException;
-
-import ch.njol.skript.classes.ClassInfo;
-import ch.njol.skript.classes.Parser;
-import ch.njol.skript.classes.Serializer;
-import ch.njol.skript.lang.ParseContext;
-import ch.njol.skript.registrations.Classes;
-import ch.njol.yggdrasil.Fields;
-
-public class Types {
-  static {
-    Classes.registerClass(new ClassInfo<>(HikariDataSource.class, "datasource")
-        .user("datasources?")
-        .parser(new Parser<HikariDataSource>() {
-          @Override
-          public HikariDataSource parse(String s, ParseContext context) {
-            return null;
-          }
-
-          @Override
-          public String toString(HikariDataSource o, int flags) {
-            return o.getJdbcUrl();
-          }
-
-          @Override
-          public String toVariableNameString(HikariDataSource o) {
-            return o.getJdbcUrl();
-          }
-
-          @Override
-          public String getVariableNamePattern() {
-            return "jdbc:.+";
-          }
-        })
-        .serializer(new Serializer<HikariDataSource>() {
-          @Override
-          public Fields serialize(HikariDataSource o) throws NotSerializableException {
-            Fields fields = new Fields();
-            fields.putObject("jdbcurl", o.getJdbcUrl());
-            return fields;
-          }
-
-          @Override
-          public void deserialize(HikariDataSource o, Fields f) throws StreamCorruptedException,
-              NotSerializableException {
-          }
-
-          @Override
-          protected HikariDataSource deserialize(Fields fields) throws StreamCorruptedException,
-              NotSerializableException {
-            HikariDataSource ds = new HikariDataSource();
-            ds.setJdbcUrl((String) fields.getObject("jdbcurl"));
-            return ds;
-          }
-
-          @Override
-          public boolean mustSyncDeserialization() {
-            return false;
-          }
-
-          @Override
-          protected boolean canBeInstantiated() {
-            return false;
-          }
-        }));
-  }
-}

src/resources/plugin.yml

@@ -1,4 +1,5 @@
 name: skript-db
-version: 0.1.1
+version: 1.2.0
 main: com.btk5h.skriptdb.SkriptDB
 depend: [Skript]
+authors: [btk5h, FranKusmiruk, Govindas]