forked from Limework/skript-db
Compare commits
No commits in common. "0670f88a4e0b23923f2e3cae9460d051d2796de6" and "110f3982adc8ae5eec73e1415763862040dab1e6" have entirely different histories.
0670f88a4e
...
110f3982ad
@ -1,39 +1,37 @@
|
||||
package com.btk5h.skriptdb;
|
||||
|
||||
import ch.njol.skript.Skript;
|
||||
import ch.njol.skript.lang.Expression;
|
||||
import ch.njol.skript.lang.VariableString;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.Arrays;
|
||||
import java.util.Optional;
|
||||
|
||||
import org.bukkit.event.Event;
|
||||
|
||||
import ch.njol.skript.ScriptLoader;
|
||||
import ch.njol.skript.Skript;
|
||||
import ch.njol.skript.lang.Expression;
|
||||
import ch.njol.skript.lang.VariableString;
|
||||
import ch.njol.skript.lang.parser.ParserInstance;
|
||||
|
||||
public class SkriptUtil {
|
||||
|
||||
private static final Field STRING;
|
||||
private static final Field EXPR;
|
||||
|
||||
static {
|
||||
STRING = tryGetOldStringField()
|
||||
.or(() -> tryGetNewStringField())
|
||||
.orElseGet(() -> {
|
||||
Field _FIELD = null;
|
||||
try {
|
||||
_FIELD = VariableString.class.getDeclaredField("string");
|
||||
_FIELD.setAccessible(true);
|
||||
} catch (NoSuchFieldException e) {
|
||||
Skript.error("Skript's 'string' field could not be resolved.");
|
||||
return null;
|
||||
});
|
||||
e.printStackTrace();
|
||||
}
|
||||
STRING = _FIELD;
|
||||
|
||||
Field f = null;
|
||||
try {
|
||||
Optional<Class<?>> expressionInfo = Arrays.stream(VariableString.class.getDeclaredClasses())
|
||||
.filter(cls -> cls.getSimpleName().equals("ExpressionInfo"))
|
||||
.findFirst();
|
||||
if (expressionInfo.isPresent()) {
|
||||
Class<?> expressionInfoClass = expressionInfo.get();
|
||||
f = expressionInfoClass.getDeclaredField("expr");
|
||||
f.setAccessible(true);
|
||||
_FIELD = expressionInfoClass.getDeclaredField("expr");
|
||||
_FIELD.setAccessible(true);
|
||||
} else {
|
||||
Skript.error("Skript's 'ExpressionInfo' class could not be resolved.");
|
||||
}
|
||||
@ -41,7 +39,7 @@ public class SkriptUtil {
|
||||
e.printStackTrace();
|
||||
Skript.error("Skript's 'expr' field could not be resolved.");
|
||||
}
|
||||
EXPR = f;
|
||||
EXPR = _FIELD;
|
||||
}
|
||||
|
||||
public static Object[] getTemplateString(VariableString vs) {
|
||||
@ -60,35 +58,4 @@ public class SkriptUtil {
|
||||
}
|
||||
}
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
public static boolean isCurrentEvent(Class<? extends Event> event) {
|
||||
try {
|
||||
Class.forName("ch.njol.skript.lang.parser.ParserInstance");
|
||||
return ParserInstance.get().isCurrentEvent(event);
|
||||
} catch (ClassNotFoundException e) {
|
||||
return ScriptLoader.isCurrentEvent(event);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private static Optional<Field> tryGetOldStringField() {
|
||||
try {
|
||||
Field f = VariableString.class.getDeclaredField("string");
|
||||
f.setAccessible(true);
|
||||
return Optional.of(f);
|
||||
} catch (NoSuchFieldException e) {
|
||||
return Optional.empty();
|
||||
}
|
||||
}
|
||||
|
||||
private static Optional<Field> tryGetNewStringField() {
|
||||
try {
|
||||
Field f = VariableString.class.getDeclaredField("strings");
|
||||
f.setAccessible(true);
|
||||
return Optional.of(f);
|
||||
} catch (NoSuchFieldException e) {
|
||||
return Optional.empty();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -4,26 +4,32 @@ import org.bukkit.event.Event;
|
||||
import org.bukkit.event.HandlerList;
|
||||
|
||||
public class SQLQueryCompleteEvent extends Event {
|
||||
|
||||
private static final HandlerList HANDLERS = new HandlerList();
|
||||
|
||||
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 getHandlerList();
|
||||
return HANDLERS;
|
||||
}
|
||||
|
||||
public String getQuery() {
|
||||
return argument;
|
||||
}
|
||||
|
||||
public static HandlerList getHandlerList() {
|
||||
return HANDLERS;
|
||||
}
|
||||
// public String getVariables() {return;}
|
||||
}
|
||||
|
||||
@ -51,79 +51,104 @@ public class EffExecuteStatement extends Effect {
|
||||
|
||||
static {
|
||||
Skript.registerEffect(EffExecuteStatement.class,
|
||||
"[quickly:quickly] execute %string% (in|on) %datasource% " +
|
||||
"execute %string% (in|on) %datasource% " +
|
||||
"[with arg[ument][s] %-objects%] [and store [[the] (output|result)[s]] (to|in) [the] [var[iable]] %-objects%]",
|
||||
"quickly execute %string% (in|on) %datasource% " +
|
||||
"[with arg[ument][s] %-objects%] [and store [[the] (output|result)[s]] (to|in) [the] [var[iable]] %-objects%]");
|
||||
}
|
||||
|
||||
private Expression<String> query;
|
||||
private Expression<HikariDataSource> dataSource;
|
||||
private Expression<Object> queryArguments;
|
||||
private VariableString resultVariableName;
|
||||
private VariableString var;
|
||||
private boolean isLocal;
|
||||
private boolean isList;
|
||||
private boolean quickly;
|
||||
private boolean isSync = false;
|
||||
|
||||
private void continueScriptExecution(Event e, Object populatedVariables) {
|
||||
lastError = null;
|
||||
if (populatedVariables instanceof String) {
|
||||
lastError = (String) populatedVariables;
|
||||
} else {
|
||||
|
||||
if (getNext() != null) {
|
||||
((Map<String, Object>) populatedVariables).forEach((name, value) -> setVariable(e, name, value));
|
||||
}
|
||||
}
|
||||
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;
|
||||
}
|
||||
Pair<String, List<Object>> parsedQuery = parseQuery(e);
|
||||
String baseVariable = resultVariableName != null ? resultVariableName.toString(e).toLowerCase(Locale.ENGLISH) : null;
|
||||
|
||||
if (ds == null) return;
|
||||
Object locals = Variables.removeLocals(e);
|
||||
|
||||
//execute SQL statement
|
||||
if (Bukkit.isPrimaryThread()) {
|
||||
CompletableFuture.supplyAsync(() -> executeStatement(ds, baseVariable, parsedQuery), threadPool)
|
||||
.whenComplete((resources, err) -> {
|
||||
CompletableFuture<Object> sql = CompletableFuture.supplyAsync(() -> executeStatement(ds, baseVariable, query), threadPool);
|
||||
sql.whenComplete((res, err) -> {
|
||||
if (err != null) {
|
||||
err.printStackTrace();
|
||||
}
|
||||
//handle last error syntax data
|
||||
resetLastSQLError();
|
||||
if (err instanceof SkriptDBQueryException) {
|
||||
setLastSQLError(err.getMessage());
|
||||
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(),
|
||||
() -> postExecution(e, locals, resources));
|
||||
Bukkit.getScheduler().runTask(SkriptDB.getInstance(), () -> {
|
||||
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);
|
||||
});
|
||||
} else {
|
||||
postExecution(e, locals, resources);
|
||||
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;
|
||||
Map<String, Object> resources = null;
|
||||
try {
|
||||
resources = executeStatement(ds, baseVariable, parsedQuery);
|
||||
resetLastSQLError();
|
||||
} catch (SkriptDBQueryException err) {
|
||||
Object resources = executeStatement(ds, baseVariable, query);
|
||||
//handle last error syntax data
|
||||
setLastSQLError(err.getMessage());
|
||||
lastError = null;
|
||||
if (resources instanceof String) {
|
||||
lastError = (String) resources;
|
||||
}
|
||||
//if local variables are present
|
||||
//bring back local variables
|
||||
//populate SQL data into variables
|
||||
postExecution(e, locals, resources);
|
||||
}
|
||||
}
|
||||
|
||||
private void postExecution(Event e, Object locals, Map<String, Object> resources) {
|
||||
if (locals != null && getNext() != null) {
|
||||
Variables.setLocalVariables(e, locals);
|
||||
}
|
||||
if (resources != null) {
|
||||
resources.forEach((name, value) -> setVariable(e, name, value));
|
||||
if (!(resources instanceof String)) {
|
||||
((Map<String, Object>) resources).forEach((name, value) -> setVariable(e, name, value));
|
||||
}
|
||||
TriggerItem.walk(getNext(), e);
|
||||
//the line below is required to prevent memory leaks
|
||||
Variables.removeLocals(e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected TriggerItem walk(Event e) {
|
||||
@ -190,9 +215,9 @@ public class EffExecuteStatement extends Effect {
|
||||
}
|
||||
}
|
||||
|
||||
private Map<String, Object> executeStatement(DataSource ds, String baseVariable, Pair<String, List<Object>> query) throws SkriptDBQueryException {
|
||||
private Object executeStatement(DataSource ds, String baseVariable, Pair<String, List<Object>> query) {
|
||||
if (ds == null) {
|
||||
throw new SkriptDBQueryException("Data source is not set");
|
||||
return "Data source is not set";
|
||||
}
|
||||
try (Connection conn = ds.getConnection()) {
|
||||
try (PreparedStatement stmt = createStatement(conn, query)) {
|
||||
@ -204,11 +229,11 @@ public class EffExecuteStatement extends Effect {
|
||||
return Map.of();
|
||||
}
|
||||
} catch (SQLException ex) {
|
||||
throw new SkriptDBQueryException(ex.getMessage());
|
||||
return ex.getMessage();
|
||||
}
|
||||
}
|
||||
|
||||
private Map<String, Object> processBaseVariable(String baseVariable, PreparedStatement stmt, boolean hasResultSet) throws SQLException {
|
||||
private Object processBaseVariable(String baseVariable, PreparedStatement stmt, boolean hasResultSet) throws SQLException {
|
||||
Map<String, Object> variableList = new HashMap<>();
|
||||
if (isList) {
|
||||
baseVariable = baseVariable.substring(0, baseVariable.length() - 1);
|
||||
@ -281,7 +306,7 @@ public class EffExecuteStatement extends Effect {
|
||||
|
||||
//fix mediumblob and similar column types, so they return a String correctly
|
||||
if (obj != null) {
|
||||
if (obj instanceof byte[]) {
|
||||
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)
|
||||
@ -296,14 +321,6 @@ public class EffExecuteStatement extends Effect {
|
||||
Variables.setVariable(name.toLowerCase(Locale.ENGLISH), obj, e, isLocal);
|
||||
}
|
||||
|
||||
private static void resetLastSQLError() {
|
||||
lastError = null;
|
||||
}
|
||||
|
||||
private static void setLastSQLError(String error) {
|
||||
lastError = error;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString(Event e, boolean debug) {
|
||||
return "execute " + query.toString(e, debug) + " in " + dataSource.toString(e, debug);
|
||||
@ -311,7 +328,8 @@ public class EffExecuteStatement extends Effect {
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@Override
|
||||
public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) {
|
||||
public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed,
|
||||
SkriptParser.ParseResult parseResult) {
|
||||
Expression<String> statementExpr = (Expression<String>) exprs[0];
|
||||
if (statementExpr instanceof VariableString || statementExpr instanceof ExprUnsafe) {
|
||||
query = statementExpr;
|
||||
@ -329,10 +347,10 @@ public class EffExecuteStatement extends Effect {
|
||||
queryArguments = (Expression<Object>) exprs[2];
|
||||
}
|
||||
Expression<?> resultHolder = exprs[3];
|
||||
quickly = parseResult.hasTag("quickly");
|
||||
quickly = matchedPattern == 1;
|
||||
if (resultHolder instanceof Variable) {
|
||||
Variable<?> varExpr = (Variable<?>) resultHolder;
|
||||
resultVariableName = varExpr.getName();
|
||||
var = varExpr.getName();
|
||||
isLocal = varExpr.isLocal();
|
||||
isList = varExpr.isList();
|
||||
} else if (resultHolder != null) {
|
||||
@ -341,15 +359,4 @@ public class EffExecuteStatement extends Effect {
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public static class SkriptDBQueryException extends RuntimeException {
|
||||
|
||||
private static final long serialVersionUID = -1869895286406538884L;
|
||||
|
||||
public SkriptDBQueryException(String message) {
|
||||
super(message);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -32,9 +32,8 @@ public class ExprDataSource extends SimpleExpression<HikariDataSource> {
|
||||
|
||||
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%]");
|
||||
ExpressionType.COMBINED, "[the] data(base|[ ]source) [(of|at)] %string% " +
|
||||
"[with [a] [max[imum]] [connection] life[ ]time of %-timespan%] " + "[[(using|with)] [a] driver %-string%]");
|
||||
}
|
||||
|
||||
private Expression<String> url;
|
||||
@ -101,7 +100,8 @@ public class ExprDataSource extends SimpleExpression<HikariDataSource> {
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@Override
|
||||
public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) {
|
||||
public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed,
|
||||
SkriptParser.ParseResult parseResult) {
|
||||
url = (Expression<String>) exprs[0];
|
||||
maxLifetime = (Expression<Timespan>) exprs[1];
|
||||
driver = (Expression<String>) exprs[2];
|
||||
|
||||
@ -1,10 +1,6 @@
|
||||
package com.btk5h.skriptdb.skript;
|
||||
|
||||
import org.bukkit.event.Event;
|
||||
|
||||
import com.btk5h.skriptdb.SkriptUtil;
|
||||
import com.btk5h.skriptdb.events.SQLQueryCompleteEvent;
|
||||
|
||||
import ch.njol.skript.ScriptLoader;
|
||||
import ch.njol.skript.Skript;
|
||||
import ch.njol.skript.lang.Expression;
|
||||
import ch.njol.skript.lang.ExpressionType;
|
||||
@ -12,6 +8,8 @@ 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.
|
||||
@ -53,7 +51,7 @@ public class ExprSQLQuery extends SimpleExpression<String> {
|
||||
|
||||
@Override
|
||||
public boolean init(final Expression<?>[] expressions, final int matchedPattern, final Kleenean isDelayed, final SkriptParser.ParseResult parseResult) {
|
||||
if (!SkriptUtil.isCurrentEvent(SQLQueryCompleteEvent.class)) {
|
||||
if (!ScriptLoader.isCurrentEvent(SQLQueryCompleteEvent.class)) {
|
||||
Skript.error("Cannot use 'sql query' outside of a complete of sql query event", ErrorQuality.SEMANTIC_ERROR);
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -53,7 +53,8 @@ public class ExprUnsafe extends SimpleExpression<String> {
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@Override
|
||||
public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) {
|
||||
public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed,
|
||||
SkriptParser.ParseResult parseResult) {
|
||||
stringExpression = (Expression<String>) exprs[0];
|
||||
rawExpression = parseResult.expr.substring("unsafe".length()).trim();
|
||||
return true;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user