forked from Limework/skript-db
Compare commits
67 Commits
Author | SHA1 | Date |
---|---|---|
rigbot | bf5429634a | |
rigbot | abd2d6fe03 | |
rigbot | 2cc46fdae5 | |
rigbot | 4fee9f2898 | |
rigbot | bbbfb83518 | |
Govindas | f51db586ef | |
Govindas | 3466a04ec8 | |
Govindas | d0191007a5 | |
Govindas | b1df041ccb | |
Govindas | b9e14652ea | |
Govindas | 0098450441 | |
Govindas | 9c41039217 | |
Govindas | 46a72639af | |
Govindas | cbd1565896 | |
Govindas | 0332ad9334 | |
Govindas | 32f40af484 | |
Govindas | 2a24a974ef | |
Govindas | d80df616c3 | |
Govindas | 0b3b183a14 | |
Govindas | 70fa7b7105 | |
Govindas | c85d579645 | |
Govindas | 1e039c1bfe | |
Govindas | 2a4d7f6a6d | |
Govindas | 2dcd4edf58 | |
Govindas | 9b694206d3 | |
Govindas | d8cb6fedb5 | |
Govindas | 2eda1418cf | |
Govindas | 83d2795519 | |
Govindas | 66459c6190 | |
Govindas | b1ef437b96 | |
mohammed jasem alaajel | 35cfb0b4bb | |
Govindas | 4da64624d8 | |
Govindas | 0c16b98553 | |
Govindas | 9e7c5fcbee | |
Govindas | 8b3d26cf78 | |
Govindas | 5a22864650 | |
Govindas | 05554a0043 | |
Govindas | f6a43f0b53 | |
Govindas | 5803be55b7 | |
Govindas | d57b921b4f | |
Govindas | 4fd654c743 | |
Govindas | 233d21a30b | |
Govindas | 8e760c4d8b | |
Govindas | fe2231ae23 | |
Govindas | a132912f6b | |
Govindas | d4f9a394fd | |
Govindas | a63a4c6d6f | |
Govindas | 11063c166d | |
Govindas | b5f2d56263 | |
Govindas | 8b5121d5fb | |
Govindas | b435696385 | |
Govindas | 4d795edf01 | |
Govindas | 2570408906 | |
Govindas | 8d94a85779 | |
Govindas | 6d0ec81e2e | |
Govindas | c4379d45b7 | |
Govindas | 434ea07410 | |
Govindas | 8ca308802f | |
Govindas | 2ce1dd924e | |
Govindas | b20740b020 | |
Bryan Terce | 7906dd8eb1 | |
Bryan Terce | 33f4d5ff54 | |
Bryan Terce | 9a20da02a0 | |
Bryan Terce | f13bf78007 | |
Bryan Terce | 55081e5d28 | |
Bryan Terce | d88e431f07 | |
Bryan Terce | e6606a012a |
20
README.md
20
README.md
|
@ -5,11 +5,18 @@
|
|||
|
||||
### 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 automatically increasing on demand to use of CachedThreadPool, instead of a fixed hard-coded number
|
||||
- Uses a newer version of HikariCP
|
||||
- Only meant to be used by newer Minecraft versions (1.8 is not supported)
|
||||
- Thread-pool size is now automatically increasing on demand with use of CachedThreadPool, instead of a fixed hard-coded number
|
||||
- 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
|
||||
- SQL Driver is configurable
|
||||
- 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.
|
||||
|
@ -78,3 +85,10 @@ execute unsafe {fully dynamic query} in {sql}
|
|||
```
|
||||
|
||||
---
|
||||
### 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"
|
||||
```
|
13
pom.xml
13
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>
|
||||
<target>8</target>
|
||||
<source>11</source>
|
||||
<target>11</target>
|
||||
<encoding>UTF-8</encoding>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
@ -56,6 +56,7 @@
|
|||
<version>3.2.3</version>
|
||||
<configuration>
|
||||
<createDependencyReducedPom>false</createDependencyReducedPom>
|
||||
<minimizeJar>true</minimizeJar>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
|
@ -81,7 +82,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 +94,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>
|
||||
|
||||
|
|
|
@ -14,6 +14,9 @@ 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 +108,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
|
||||
if (!(res instanceof String)) {
|
||||
//populate SQL data into variables
|
||||
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.
|
||||
//I may add config option to enable this later?
|
||||
//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?
|
||||
|
||||
//SQLQueryCompleteEvent event = new SQLQueryCompleteEvent(this.query.getSingle(e));
|
||||
//((Map<String, Object>) res).forEach((name, value) -> setVariable(event, name, value));
|
||||
//SkriptDB.getPlugin(SkriptDB.class).getServer().getPluginManager().callEvent(event);
|
||||
}
|
||||
if (isSync || finalSync) {
|
||||
//SQLQueryCompleteEvent event = new SQLQueryCompleteEvent(this.query.getSingle(e));
|
||||
//((Map<String, Object>) res).forEach((name, value) -> setVariable(event, name, value));
|
||||
//SkriptDB.getPlugin(SkriptDB.class).getServer().getPluginManager().callEvent(event);
|
||||
}
|
||||
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 +179,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 +302,21 @@ 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);
|
||||
}
|
||||
|
||||
|
@ -328,4 +352,4 @@ public class EffExecuteStatement extends Effect {
|
|||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
|
@ -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";
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue