Compare commits
53 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0332ad9334 | |||
| 32f40af484 | |||
| 2a24a974ef | |||
| d80df616c3 | |||
| 0b3b183a14 | |||
| 70fa7b7105 | |||
| c85d579645 | |||
| 1e039c1bfe | |||
| 2a4d7f6a6d | |||
| 2dcd4edf58 | |||
| 9b694206d3 | |||
| d8cb6fedb5 | |||
| 2eda1418cf | |||
| 83d2795519 | |||
| 66459c6190 | |||
| b1ef437b96 | |||
|
|
35cfb0b4bb | ||
| 4da64624d8 | |||
| 0c16b98553 | |||
| 9e7c5fcbee | |||
| 8b3d26cf78 | |||
| 5a22864650 | |||
| 05554a0043 | |||
| f6a43f0b53 | |||
| 5803be55b7 | |||
| d57b921b4f | |||
| 4fd654c743 | |||
| 233d21a30b | |||
| 8e760c4d8b | |||
| fe2231ae23 | |||
| a132912f6b | |||
| d4f9a394fd | |||
| a63a4c6d6f | |||
| 11063c166d | |||
| b5f2d56263 | |||
| 8b5121d5fb | |||
| b435696385 | |||
| 4d795edf01 | |||
| 2570408906 | |||
| 8d94a85779 | |||
| 6d0ec81e2e | |||
| c4379d45b7 | |||
| 434ea07410 | |||
| 8ca308802f | |||
| 2ce1dd924e | |||
| b20740b020 | |||
|
|
7906dd8eb1 | ||
|
|
33f4d5ff54 | ||
|
|
9a20da02a0 | ||
|
|
f13bf78007 | ||
|
|
55081e5d28 | ||
|
|
d88e431f07 | ||
|
|
e6606a012a |
12
pom.xml
12
pom.xml
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<groupId>com.btk5h</groupId>
|
<groupId>com.btk5h</groupId>
|
||||||
<artifactId>skript-db</artifactId>
|
<artifactId>skript-db</artifactId>
|
||||||
<version>1.3.3</version>
|
<version>1.3.5</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<repositories>
|
<repositories>
|
||||||
@@ -45,8 +45,8 @@
|
|||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
<version>3.6.1</version>
|
<version>3.6.1</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<source>8</source>
|
<source>11</source>
|
||||||
<target>8</target>
|
<target>11</target>
|
||||||
<encoding>UTF-8</encoding>
|
<encoding>UTF-8</encoding>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
@@ -81,7 +81,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.zaxxer</groupId>
|
<groupId>com.zaxxer</groupId>
|
||||||
<artifactId>HikariCP</artifactId>
|
<artifactId>HikariCP</artifactId>
|
||||||
<version>4.0.3</version>
|
<version>5.0.1</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
@@ -93,14 +93,14 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.github.SkriptLang</groupId>
|
<groupId>com.github.SkriptLang</groupId>
|
||||||
<artifactId>Skript</artifactId>
|
<artifactId>Skript</artifactId>
|
||||||
<version>2.6-alpha1</version>
|
<version>2.6-beta3</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- https://mvnrepository.com/artifact/org.mariadb.jdbc/mariadb-java-client -->
|
<!-- https://mvnrepository.com/artifact/org.mariadb.jdbc/mariadb-java-client -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.mariadb.jdbc</groupId>
|
<groupId>org.mariadb.jdbc</groupId>
|
||||||
<artifactId>mariadb-java-client</artifactId>
|
<artifactId>mariadb-java-client</artifactId>
|
||||||
<version>2.7.2</version>
|
<version>3.0.3</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
|||||||
@@ -10,10 +10,14 @@ import com.btk5h.skriptdb.SkriptDB;
|
|||||||
import com.btk5h.skriptdb.SkriptUtil;
|
import com.btk5h.skriptdb.SkriptUtil;
|
||||||
import com.zaxxer.hikari.HikariDataSource;
|
import com.zaxxer.hikari.HikariDataSource;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.event.Event;
|
import org.bukkit.event.Event;
|
||||||
|
|
||||||
import javax.sql.DataSource;
|
import javax.sql.DataSource;
|
||||||
import javax.sql.rowset.CachedRowSet;
|
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.Connection;
|
||||||
import java.sql.PreparedStatement;
|
import java.sql.PreparedStatement;
|
||||||
import java.sql.ResultSetMetaData;
|
import java.sql.ResultSetMetaData;
|
||||||
@@ -299,6 +303,19 @@ public class EffExecuteStatement extends Effect {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void setVariable(Event e, String name, Object obj) {
|
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);
|
Variables.setVariable(name.toLowerCase(Locale.ENGLISH), obj, e, isLocal);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import ch.njol.skript.lang.SkriptEvent;
|
|||||||
import ch.njol.skript.lang.SkriptParser;
|
import ch.njol.skript.lang.SkriptParser;
|
||||||
import com.btk5h.skriptdb.events.SQLQueryCompleteEvent;
|
import com.btk5h.skriptdb.events.SQLQueryCompleteEvent;
|
||||||
import org.bukkit.event.Event;
|
import org.bukkit.event.Event;
|
||||||
import org.eclipse.jdt.annotation.Nullable;
|
|
||||||
|
|
||||||
public class EvtSQLQueryComplete extends SkriptEvent {
|
public class EvtSQLQueryComplete extends SkriptEvent {
|
||||||
static {
|
static {
|
||||||
@@ -24,7 +23,7 @@ public class EvtSQLQueryComplete extends SkriptEvent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString(@Nullable Event event, boolean debug) {
|
public String toString(Event event, boolean debug) {
|
||||||
return "complete of sql query";
|
return "complete of sql query";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
name: skript-db
|
name: skript-db
|
||||||
version: 1.3.3
|
version: 1.3.5
|
||||||
main: com.btk5h.skriptdb.SkriptDB
|
main: com.btk5h.skriptdb.SkriptDB
|
||||||
depend: [Skript]
|
depend: [Skript]
|
||||||
authors: [btk5h, FranKusmiruk, Govindas, TPGamesNL]
|
authors: [btk5h, FranKusmiruk, Govindas, TPGamesNL]
|
||||||
|
|||||||
Reference in New Issue
Block a user