If we're moving to Java 9, let's move to Java 11 as it is LTS

I think this will help with performance in 1.13+ version, but will keep working in 1.9+

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.btk5h</groupId>
     <artifactId>skript-db</artifactId>
-    <version>1.3.1</version>
+    <version>1.3.5</version>
     <packaging>jar</packaging>
 
     <repositories>
@@ -45,8 +45,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.6.1</version>
                 <configuration>
-                    <source>8</source>
+                    <source>11</source>
-                    <target>8</target>
+                    <target>11</target>
                     <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
@@ -81,7 +81,7 @@
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
-            <version>4.0.3</version>
+            <version>5.0.1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -93,14 +93,14 @@
         <dependency>
             <groupId>com.github.SkriptLang</groupId>
             <artifactId>Skript</artifactId>
-            <version>2.6-alpha1</version>
+            <version>2.6-beta3</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>
+            <version>3.0.3</version>
             <scope>compile</scope>
         </dependency>
 

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

@@ -10,10 +10,14 @@ import com.btk5h.skriptdb.SkriptDB;
 import com.btk5h.skriptdb.SkriptUtil;
 import com.zaxxer.hikari.HikariDataSource;
 import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
 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;
@@ -105,41 +109,43 @@ public class EffExecuteStatement extends Effect {
 
             if (getNext() != null) {
                 //if local variables are present
-                if (locals != null) {
+                //bring back local variables
-                    //bring back local variables
 
-                    //populate SQL data into variables
+                //populate SQL data into variables
-                    if (!(res instanceof String)) {
+                if (!(res instanceof String)) {
 
-                        //also set variables in the sql query complete event
+                    //also set variables in the sql query complete event
 
-                        //TEMPORARILY DISABLED, AS THIS WOULD WORSEN PERFORMANCE OF THE QUERIES AND NOT BE USED BY MOST PEOPLE.
+                    //TEMPORARILY DISABLED, AS THIS WOULD WORSEN PERFORMANCE OF THE QUERIES AND NOT BE USED BY MOST PEOPLE.
-                        //I may add config option to enable this later?
+                    //I may add config option to enable this later?
 
-                        //SQLQueryCompleteEvent event = new SQLQueryCompleteEvent(this.query.getSingle(e));
+                    //SQLQueryCompleteEvent event = new SQLQueryCompleteEvent(this.query.getSingle(e));
-                        //((Map<String, Object>) res).forEach((name, value) -> setVariable(event, name, value));
+                    //((Map<String, Object>) res).forEach((name, value) -> setVariable(event, name, value));
-                        //SkriptDB.getPlugin(SkriptDB.class).getServer().getPluginManager().callEvent(event);
+                    //SkriptDB.getPlugin(SkriptDB.class).getServer().getPluginManager().callEvent(event);
-                    }
+                }
-                    if (isSync || finalSync) {
+                if (isSync || finalSync) {
+                    if (locals != null) {
                         Variables.setLocalVariables(e, locals);
+                    }
+                    if (!(res instanceof String)) {
+                        ((Map<String, Object>) res).forEach((name, value) -> setVariable(e, name, value));
+                    }
+                    TriggerItem.walk(getNext(), e);
+                    Variables.removeLocals(e);
+                } else {
+                    Bukkit.getScheduler().runTask(SkriptDB.getInstance(), () -> {
+                        if (locals != 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
+                        //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);
-                    } else {
+                    });
-                        Bukkit.getScheduler().runTask(SkriptDB.getInstance(), () -> {
-                            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
-                            //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);
-                        });
-                    }
                 }
             }
         });
@@ -174,7 +180,11 @@ public class EffExecuteStatement extends Effect {
             if (o instanceof String) {
                 sb.append(o);
             } else {
-                Expression<?> expr = SkriptUtil.getExpressionFromInfo(o);
+                Expression<?> expr;
+                if (o instanceof Expression)
+                    expr = (Expression<?>) o;
+                else
+                    expr = SkriptUtil.getExpressionFromInfo(o);
 
                 String before = getString(objects, i - 1);
                 String after = getString(objects, i + 1);
@@ -293,6 +303,19 @@ 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.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);
     }
 
@@ -328,4 +351,4 @@ public class EffExecuteStatement extends Effect {
         }
         return true;
     }
-}
+}

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

@@ -6,7 +6,6 @@ import ch.njol.skript.lang.SkriptEvent;
 import ch.njol.skript.lang.SkriptParser;
 import com.btk5h.skriptdb.events.SQLQueryCompleteEvent;
 import org.bukkit.event.Event;
-import org.eclipse.jdt.annotation.Nullable;
 
 public class EvtSQLQueryComplete extends SkriptEvent {
     static {
@@ -24,7 +23,7 @@ public class EvtSQLQueryComplete extends SkriptEvent {
     }
 
     @Override
-    public String toString(@Nullable Event event, boolean debug) {
+    public String toString(Event event, boolean debug) {
         return "complete of sql query";
     }
 }

src/main/resources/plugin.yml

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