Add synchronous support on current thread

.editorconfig

@@ -0,0 +1,13 @@
+# 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,9 +1,10 @@
 ## OSX
 *.DS_Store
 
+## Gradle
+.gradle
+build/
+
 ## IntelliJ
 .idea/
 *.iml
-out/
-target
-compile/

README.md

@@ -3,42 +3,19 @@
  > 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!)
-- Uses newer versions of dependencies (Increased performance and security)
-- Replaced `synchronously execute` with `quickly execute`, which allows to speed up queries by 50ms with some risk
-- If a sql query is detected to be running on non-main thread, it becomes synchronous automatically
-- SQL Driver is configurable both in config and in database connection, comes with shaded MariaDB and PostgreSQL drivers
-- A few variable type related bugs fixed
-- Uses Java 11 instead of Java 8
-
-
-### Installation
-1. Use 1.8+ Minecraft server version.
-2. Use Skript 2.5+ (1.8 Skript fork is needed if you're using 1.8)
-3. Use Java 11+ (If you use 1.8, a spigot fork is needed to support Java 11+)
-4. Put skript-db in plugins folder and restart the server
 ### 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.
 
- The url format for your database may vary depending on database you are using. 
+ The url format for your database may vary! The example provided uses a MySQL database.
- MariaDB/PostgreSQL users: make sure to check `config.yml` to use the correct driver.
 #### Syntax
 ```
-[the] data(base|[ ]source) [(of|at)] %string% [with [a] [max[imum]] [connection] life[ ]time of %timespan%] [[(using|with)] [a] driver %-string%]
+[the] data(base|[ ]source) [(of|at)] %string%
 ```
 
 #### Examples
 ```
 set {sql} to the database "mysql://localhost:3306/mydatabase?user=admin&password=12345&useSSL=false"
-set {sql} to the database "mariadb://localhost:3306/mydatabase?user=admin&password=12345&useSSL=false"
-set {sql} to the database "postgresql://localhost:3306/mydatabase?user=admin&password=12345&ssl=false"
-set {sql} to the database "sqlite:database.db"
-
-# Extra parameters:
-set {sql} to the database "postgresql://localhost:3306/mydatabase?user=admin&password=12345&ssl=false" with a maximum connection lifetime of 30 minutes
-set {sql} to the database "postgresql://localhost:3306/mydatabase?user=admin&password=12345&ssl=false" with a maximum connection lifetime of 30 minutes using driver "org.postgresql.Driver"
 ```
 
 ---
@@ -52,11 +29,9 @@ 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 `quickly` is specified, the SQL query will be done without jumping back to main thread, which speeds it up by 50ms, however that makes code after it to also be on separate thread, you can jump back to main thread by adding `wait a tick`
 #### Syntax
 ```
-[quickly] execute %string% (in|on) %datasource% [and store [[the] (output|result)[s]] (to|in) [the] [var[iable]] %-objects%]
+execute %string% (in|on) %datasource% [and store [[the] (output|result)[s]] (to|in) [the] [var[iable]] %-objects%]
 ```
 
 #### Examples
@@ -80,7 +55,6 @@ Stores the error from the last executed statement, if there was one.
 
 ### Expression `Unsafe Expression` => `text`
 Opts out of automatic SQL injection protection for a specific expression in a statement.
-Note: If using PostgreSQL, this will always be needed, due to skript-db not supporting SQL injection protection for PostgreSQL currently.
 #### Syntax
 ```
 unsafe %text%
@@ -94,23 +68,5 @@ execute "select %unsafe {columns variable}% from %{table variable}%" in {sql}
 execute unsafe {fully dynamic query} in {sql}
 ```
 
-#### FAQ: How to return sql data in a function?
-You can't because functions don't allow delays, but you can use skript-reflect sections for this:
-```
-on load:
-	create new section stored in {-section::getPlayersFromDatabase}:
-		execute "SELECT uuid FROM table" in {-sql} and store the result in {_result::*}
-		return {_result::uuid::*}
-command /showplayers [<text>]:
-	trigger:
-		run section {-section::getPlayersFromDatabase} async and store result in {_uuids::*} and wait
-		send "%{_uuids::*}%"
-```
 ---
-### Configuration
+
-plugins/skript-db/config.yml
-```
-# Only change this if you wish to use a different driver than Java's default, like MariaDB driver.
-# If you use MariaDB, its driver is shaded together with skript-db, so you can just specify: "org.mariadb.jdbc.Driver"
-sql-driver-class-name: "default"
-```

build.gradle

@@ -0,0 +1,56 @@
+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

@@ -0,0 +1,6 @@
+#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

@@ -0,0 +1,172 @@
+#!/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

@@ -0,0 +1,84 @@
+@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

@@ -1,115 +0,0 @@
-<?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.4.0</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>mvnrepository</id>
-            <url>https://mvnrepository.com</url>
-        </repository>
-        <repository>
-            <id>PaperMC</id>
-            <url>https://repo.destroystokyo.com/repository/maven-public/</url>
-        </repository>
-        <repository>
-            <id>sk89q</id>
-            <url>https://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>11</source>
-                    <target>11</target>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.3</version>
-                <configuration>
-                    <createDependencyReducedPom>false</createDependencyReducedPom>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </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>5.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.6.1</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>3.1.2</version>
-            <scope>compile</scope>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/org.postgresql/postgresql -->
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <version>42.6.0</version>
-            <scope>compile</scope>
-        </dependency>
-
-    </dependencies>
-</project>

settings.gradle

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

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

@@ -25,11 +25,9 @@
 
 package com.btk5h.skriptdb;
 
-import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import java.io.*;
+import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.sql.SQLException;
 
 import javax.sql.rowset.RowSetFactory;
@@ -51,7 +49,6 @@ public final class SkriptDB extends JavaPlugin {
   private static SkriptAddon addonInstance;
 
   private static RowSetFactory rowSetFactory;
-  protected FileConfiguration config;
 
   public SkriptDB() {
     if (instance == null) {
@@ -61,46 +58,8 @@ 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 SQL 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() + 2) + "\n");
-        out.write("# How long SQL connections should be kept alive in HikariCP. Default: 1800000 (30 minutes)");
-        out.write("max-connection-lifetime: 1800000");
-        out.write("# Only change this if you wish to use a different driver than Java's default, like MariaDB/PostgreSQL driver.\n");
-        out.write("# If you use MariaDB or PostgreSQL, its driver is shaded together with skript-db, so you can just specify:" + "\"org.mariadb.jdbc.Driver\"" + " or " + "\"org.postgresql.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 {
-      setupConfig();
-    } catch (IOException e) {
-      e.printStackTrace();
-    } finally {
     try {
       rowSetFactory = RowSetProvider.newFactory();
 
@@ -111,7 +70,6 @@ public final class SkriptDB extends JavaPlugin {
       e.printStackTrace();
     }
   }
-  }
 
   public static SkriptAddon getAddonInstance() {
     if (addonInstance == null) {

src/main/java/com/btk5h/skriptdb/events/SQLQueryCompleteEvent.java

@@ -1,35 +0,0 @@
-package com.btk5h.skriptdb.events;
-
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-
-public class SQLQueryCompleteEvent extends Event {
-    private final static HandlerList HANDLERS = new HandlerList();
-    private final String argument;
-
-    public SQLQueryCompleteEvent(String argument) {
-        super(true);
-        this.argument = argument;
-        //  this.variables = variables;
-    }
-
-    public static HandlerList getHandlerList() {
-        return HANDLERS;
-    }
-
-    @Override
-    public String getEventName() {
-        return super.getEventName();
-    }
-
-    @Override
-    public HandlerList getHandlers() {
-        return HANDLERS;
-    }
-
-    public String getQuery() {
-        return argument;
-    }
-
-    //  public String getVariables() {return;}
-}

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

@@ -14,9 +14,6 @@ import org.bukkit.event.Event;
 
 import javax.sql.DataSource;
 import javax.sql.rowset.CachedRowSet;
-import javax.sql.rowset.serial.SerialBlob;
-import javax.sql.rowset.serial.SerialException;
-import java.io.IOException;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSetMetaData;
@@ -43,113 +40,77 @@ 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 Effect {
+public class EffExecuteStatement extends Delay {
-    private static final ExecutorService threadPool = Executors.newFixedThreadPool(SkriptDB.getInstance().getConfig().getInt("thread-pool-size", 10));
-    static String lastError;
-
   static {
     Skript.registerEffect(EffExecuteStatement.class,
         "execute %string% (in|on) %datasource% " +
-                        "[and store [[the] (output|result)[s]] (to|in) [the] [var[iable]] %-objects%]", "quickly 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%]");
   }
 
+  static String lastError;
+
+  private static final ExecutorService threadPool =
+      Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
+
   private Expression<String> query;
   private Expression<HikariDataSource> dataSource;
   private VariableString var;
   private boolean isLocal;
   private boolean isList;
-    private boolean quickly;
+  private Map<String, Object> doLater = new HashMap<>();
-    private boolean isSync = false;
+  private boolean isSync;
 
-    private void continueScriptExecution(Event e, Object populatedVariables) {
+  private void continueScriptExecution(Event e, String res) {
-        lastError = null;
+    lastError = res;
-        if (populatedVariables instanceof String) {
-            lastError = (String) populatedVariables;
-        } else {
 
     if (getNext() != null) {
-                ((Map<String, Object>) populatedVariables).forEach((name, value) -> setVariable(e, name, value));
+      doLater.forEach((name, value) -> setVariable(e, name, value));
-            }
+      doLater.clear();
-        }
       TriggerItem.walk(getNext(), e);
     }
-
+  }
   @Override
   protected void execute(Event e) {
     DataSource ds = dataSource.getSingle(e);
     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;
-        Object locals = Variables.removeLocals(e);
 
-        //execute SQL statement
+    if (ds == null)
-        if (Bukkit.isPrimaryThread()) {
+      return;
-            CompletableFuture<Object> sql = CompletableFuture.supplyAsync(() -> executeStatement(ds, baseVariable, query), threadPool);
+    if (isSync) {
+      String result = executeStatement(ds, baseVariable, query);
+      continueScriptExecution(e, result);
+    } else {
+      Object locals = Variables.removeLocals(e);
+      CompletableFuture<String> sql =
+          CompletableFuture.supplyAsync(() -> executeStatement(ds, baseVariable, query), threadPool);
+
       sql.whenComplete((res, err) -> {
         if (err != null) {
           err.printStackTrace();
         }
-                //handle last error syntax data
+
-                lastError = null;
-                if (res instanceof String) {
-                    lastError = (String) res;
-                }
-                //if local variables are present
-                //bring back local variables
-                //populate SQL data into variables
-                if (!quickly) {
         Bukkit.getScheduler().runTask(SkriptDB.getInstance(), () -> {
-                        if (locals != null && getNext() != null) {
+          lastError = res;
+
+          if (getNext() != null) {
+            if (locals != null)
               Variables.setLocalVariables(e, locals);
-                        }
+            doLater.forEach((name, value) -> setVariable(e, name, value));
-                        if (!(res instanceof String)) {
+            doLater.clear();
-                            ((Map<String, Object>) res).forEach((name, value) -> setVariable(e, name, value));
-                        }
             TriggerItem.walk(getNext(), e);
-                        //the line below is required to prevent memory leaks
-                        Variables.removeLocals(e);
-                    });
-                } else {
-                    if (locals != null && getNext() != null) {
-                        Variables.setLocalVariables(e, locals);
-                    }
-                    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
             Variables.removeLocals(e);
           }
         });
-            // sync executed SQL query, same as above, just sync
+      });
-        } else {
-            isSync = true;
-            Object resources = executeStatement(ds, baseVariable, query);
-            //handle last error syntax data
-            lastError = null;
-            if (resources instanceof String) {
-                lastError = (String) resources;
-            }
-            //if local variables are present
-            //bring back local variables
-            //populate SQL data into variables
-            if (locals != null && getNext() != null) {
-                Variables.setLocalVariables(e, locals);
-            }
-            if (!(resources instanceof String)) {
-                ((Map<String, Object>) resources).forEach((name, value) -> setVariable(e, name, value));
-            }
-            TriggerItem.walk(getNext(), e);
-            Variables.removeLocals(e);
     }
   }
 
   @Override
   protected TriggerItem walk(Event e) {
     debug(e, true);
-        if (!quickly || !isSync) {
+    if (!isSync) {
       Delay.addDelayedEvent(e);
     }
     execute(e);
@@ -174,11 +135,7 @@ public class EffExecuteStatement extends Effect {
       if (o instanceof String) {
         sb.append(o);
       } else {
-                Expression<?> expr;
+        Expression<?> expr = SkriptUtil.getExpressionFromInfo(o);
-                if (o instanceof Expression)
-                    expr = (Expression<?>) o;
-                else
-                    expr = SkriptUtil.getExpressionFromInfo(o);
 
         String before = getString(objects, i - 1);
         String after = getString(objects, i + 1);
@@ -214,11 +171,11 @@ public class EffExecuteStatement extends Effect {
     return new Pair<>(sb.toString(), parameters);
   }
 
-    private Object executeStatement(DataSource ds, String baseVariable, Pair<String, List<Object>> query) {
+  private String 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)) {
 
@@ -234,39 +191,19 @@ public class EffExecuteStatement extends Effect {
           crs.populate(stmt.getResultSet());
 
           if (isList) {
-                        ResultSetMetaData meta = crs.getMetaData();
+            populateVariable(crs, baseVariable);
-                        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();
-                        variableList.put(baseVariable, crs.getRow());
+            doLater.put(baseVariable, crs.getRow());
           }
         } else if (!isList) {
-                    //if no results are returned and the specified variable isn't a list variable, put the affected rows count in the variable
+          doLater.put(baseVariable, stmt.getUpdateCount());
-                    variableList.put(baseVariable, stmt.getUpdateCount());
         }
       }
     } catch (SQLException ex) {
       return ex.getMessage();
     }
-        return variableList;
+    return null;
   }
 
   private PreparedStatement createStatement(Connection conn, Pair<String, List<Object>> query) throws SQLException {
@@ -297,24 +234,29 @@ public class EffExecuteStatement extends Effect {
   }
 
   private void setVariable(Event e, String name, Object obj) {
-
-        //fix mediumblob and similar column types, so they return a String correctly
-        if (obj != null) {
-            if (obj.getClass().getName().equals("[B")) {
-                obj = new String((byte[]) obj);
-
-                //in some servers instead of being byte array, it appears as SerialBlob (depends on mc version, 1.12.2 is bvte array, 1.16.5 SerialBlob)
-            } else if (obj instanceof SerialBlob) {
-                try {
-                    obj = new String(((SerialBlob) obj).getBinaryStream().readAllBytes());
-                } catch (IOException | SerialException ex) {
-                    ex.printStackTrace();
-                }
-            }
-        }
     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);
@@ -335,7 +277,8 @@ public class EffExecuteStatement extends Effect {
     }
     dataSource = (Expression<HikariDataSource>) exprs[1];
     Expression<?> expr = exprs[2];
-        quickly = matchedPattern == 1;
+    System.out.println(matchedPattern);
+    isSync = matchedPattern == 1;
     if (expr instanceof Variable) {
       Variable<?> varExpr = (Variable<?>) expr;
       var = varExpr.getName();

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

@@ -1,29 +0,0 @@
-package com.btk5h.skriptdb.skript;
-
-import ch.njol.skript.Skript;
-import ch.njol.skript.lang.Literal;
-import ch.njol.skript.lang.SkriptEvent;
-import ch.njol.skript.lang.SkriptParser;
-import com.btk5h.skriptdb.events.SQLQueryCompleteEvent;
-import org.bukkit.event.Event;
-
-public class EvtSQLQueryComplete extends SkriptEvent {
-    static {
-        Skript.registerEvent("complete of sql query", EvtSQLQueryComplete.class, SQLQueryCompleteEvent.class, "complete of [(sql|database)] query");
-    }
-
-    @Override
-    public boolean init(final Literal<?>[] literals, final int i, final SkriptParser.ParseResult parseResult) {
-        return true;
-    }
-
-    @Override
-    public boolean check(Event event) {
-        return (event instanceof SQLQueryCompleteEvent);
-    }
-
-    @Override
-    public String toString(Event event, boolean debug) {
-        return "complete of sql query";
-    }
-}

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

@@ -1,12 +1,13 @@
 package com.btk5h.skriptdb.skript;
 
+import org.bukkit.event.Event;
+
 import ch.njol.skript.Skript;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.ExpressionType;
 import ch.njol.skript.lang.SkriptParser;
 import ch.njol.skript.lang.util.SimpleExpression;
 import ch.njol.util.Kleenean;
-import org.bukkit.event.Event;
 
 /**
  * Stores the error from the last executed statement, if there was one.

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

@@ -1,5 +1,12 @@
 package com.btk5h.skriptdb.skript;
 
+import com.zaxxer.hikari.HikariDataSource;
+
+import org.bukkit.event.Event;
+
+import java.util.HashMap;
+import java.util.Map;
+
 import ch.njol.skript.Skript;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.ExpressionType;
@@ -7,38 +14,31 @@ import ch.njol.skript.lang.SkriptParser;
 import ch.njol.skript.lang.util.SimpleExpression;
 import ch.njol.skript.util.Timespan;
 import ch.njol.util.Kleenean;
-import com.btk5h.skriptdb.SkriptDB;
-import com.zaxxer.hikari.HikariDataSource;
-import org.bukkit.event.Event;
-
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * 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.
- * <p>
+ *
  * The url format for your database may vary! The example provided uses a MySQL database.
  *
  * @name Data Source
  * @index -1
- * @pattern [the] data(base|[ ]source) [(of|at)] %string% [with [a] [max[imum]] [connection] life[ ]time of %timespan%] [[(using|with)] [a] driver %-string%]"
+ * @pattern [the] data(base|[ ]source) [(of|at)] %string% [with [a] [max[imum]] [connection] life[ ]time of %timespan%]"
  * @return datasource
  * @example set {sql} to the database "mysql://localhost:3306/mydatabase?user=admin&password=12345&useSSL=false"
  * @since 0.1.0
  */
 public class ExprDataSource extends SimpleExpression<HikariDataSource> {
-    private static final Map<String, HikariDataSource> connectionCache = new HashMap<>();
-
   static {
     Skript.registerExpression(ExprDataSource.class, HikariDataSource.class,
         ExpressionType.COMBINED, "[the] data(base|[ ]source) [(of|at)] %string% " +
-                        "[with [a] [max[imum]] [connection] life[ ]time of %-timespan%] " + "[[(using|with)] [a] driver %-string%]");
+            "[with [a] [max[imum]] [connection] life[ ]time of %-timespan%]");
   }
 
+  private static Map<String, HikariDataSource> connectionCache = new HashMap<>();
+
   private Expression<String> url;
   private Expression<Timespan> maxLifetime;
-    private Expression<String> driver;
 
   @Override
   protected HikariDataSource[] get(Event e) {
@@ -56,18 +56,6 @@ public class ExprDataSource extends SimpleExpression<HikariDataSource> {
     }
 
     HikariDataSource ds = new HikariDataSource();
-        ds.setMaximumPoolSize(SkriptDB.getInstance().getConfig().getInt("thread-pool-size", 10));
-
-        // 30 minutes by default
-        ds.setMaxLifetime(SkriptDB.getInstance().getConfig().getInt("max-connection-lifetime", 1800000));
-
-        // Allow specifying of own sql driver class name
-        if (driver != null && driver.getSingle(e) != null) {
-            ds.setDriverClassName(driver.getSingle(e));
-        } else 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) {
@@ -104,7 +92,6 @@ public class ExprDataSource extends SimpleExpression<HikariDataSource> {
                       SkriptParser.ParseResult parseResult) {
     url = (Expression<String>) exprs[0];
     maxLifetime = (Expression<Timespan>) exprs[1];
-        driver = (Expression<String>) exprs[2];
     return true;
   }
 }

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

@@ -1,60 +0,0 @@
-package com.btk5h.skriptdb.skript;
-
-import ch.njol.skript.ScriptLoader;
-import ch.njol.skript.Skript;
-import ch.njol.skript.lang.Expression;
-import ch.njol.skript.lang.ExpressionType;
-import ch.njol.skript.lang.SkriptParser;
-import ch.njol.skript.lang.util.SimpleExpression;
-import ch.njol.skript.log.ErrorQuality;
-import ch.njol.util.Kleenean;
-import com.btk5h.skriptdb.events.SQLQueryCompleteEvent;
-import org.bukkit.event.Event;
-
-/**
- * Stores the error from the last executed statement, if there was one.
- *
- * @name Last Data Source Error
- * @pattern [the] [last] (sql|db|data(base|[ ]source)) error
- * @return text
- * @since 0.1.0
- */
-public class ExprSQLQuery extends SimpleExpression<String> {
-    static {
-        Skript.registerExpression(ExprSQLQuery.class, String.class,
-                ExpressionType.SIMPLE, "sql query");
-    }
-
-
-    @Override
-    protected String[] get(Event e) {
-        if (e instanceof SQLQueryCompleteEvent) {
-            return new String[]{((SQLQueryCompleteEvent) e).getQuery()};
-        }
-        return null;
-    }
-
-    @Override
-    public boolean isSingle() {
-        return true;
-    }
-
-    @Override
-    public Class<? extends String> getReturnType() {
-        return String.class;
-    }
-
-    @Override
-    public String toString(Event e, boolean debug) {
-        return "sql query";
-    }
-
-    @Override
-    public boolean init(final Expression<?>[] expressions, final int matchedPattern, final Kleenean isDelayed, final SkriptParser.ParseResult parseResult) {
-        if (!ScriptLoader.isCurrentEvent(SQLQueryCompleteEvent.class)) {
-            Skript.error("Cannot use 'sql query' outside of a complete of sql query event", ErrorQuality.SEMANTIC_ERROR);
-            return false;
-        }
-        return true;
-    }
-}

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

@@ -1,12 +1,13 @@
 package com.btk5h.skriptdb.skript;
 
+import org.bukkit.event.Event;
+
 import ch.njol.skript.Skript;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.ExpressionType;
 import ch.njol.skript.lang.SkriptParser;
 import ch.njol.skript.lang.util.SimpleExpression;
 import ch.njol.util.Kleenean;
-import org.bukkit.event.Event;
 
 /**
  * Opts out of automatic SQL injection protection for a specific expression in a statement.

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

@@ -1,14 +1,16 @@
 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;
-import com.zaxxer.hikari.HikariDataSource;
-
-import java.io.StreamCorruptedException;
 
 public class Types {
   static {
@@ -30,21 +32,27 @@ public class Types {
             return o.getJdbcUrl();
           }
 
+          @Override
+          public String getVariableNamePattern() {
+            return "jdbc:.+";
+          }
         })
         .serializer(new Serializer<HikariDataSource>() {
           @Override
-                    public Fields serialize(HikariDataSource o) {
+          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) {
+          public void deserialize(HikariDataSource o, Fields f) throws StreamCorruptedException,
+              NotSerializableException {
           }
 
           @Override
-                    protected HikariDataSource deserialize(Fields fields) throws StreamCorruptedException {
+          protected HikariDataSource deserialize(Fields fields) throws StreamCorruptedException,
+              NotSerializableException {
             HikariDataSource ds = new HikariDataSource();
             ds.setJdbcUrl((String) fields.getObject("jdbcurl"));
             return ds;

src/main/resources/plugin.yml

@@ -1,6 +1,4 @@
 name: skript-db
-version: 1.4.0
+version: 0.1.1
 main: com.btk5h.skriptdb.SkriptDB
 depend: [Skript]
-authors: [btk5h, FranKusmiruk, Govindas, TPGamesNL]
-api-version: 1.13