diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index 06eee9e..0000000 --- a/.editorconfig +++ /dev/null @@ -1,13 +0,0 @@ -# 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 diff --git a/.gitignore b/.gitignore index 54a42c3..e7684f3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,8 @@ ## OSX *.DS_Store -## Gradle -.gradle -build/ - ## IntelliJ .idea/ *.iml +out/ +target diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 1583b56..0000000 --- a/build.gradle +++ /dev/null @@ -1,56 +0,0 @@ -group 'com.btk5h.skript-db' -version '1.2.0' - -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.5' -} - -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 -} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 807526f..0000000 Binary files a/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 4bcfde0..0000000 --- a/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#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 diff --git a/gradlew b/gradlew deleted file mode 100755 index 4453cce..0000000 --- a/gradlew +++ /dev/null @@ -1,172 +0,0 @@ -#!/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" "$@" diff --git a/gradlew.bat b/gradlew.bat deleted file mode 100644 index f955316..0000000 --- a/gradlew.bat +++ /dev/null @@ -1,84 +0,0 @@ -@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 diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..17a568e --- /dev/null +++ b/pom.xml @@ -0,0 +1,84 @@ + + + 4.0.0 + + com.btk5h + skript-db + 1.2.0 + jar + + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/org/spigotmc/spigot-api/ + + + jitpack.io + https://jitpack.io + + + commons-pool2 + https://mvnrepository.com/artifact/org.apache.commons/commons-pool2 + + + PaperMC + https://repo.destroystokyo.com/repository/maven-public/ + + + sk89q + http://maven.sk89q.com/repo + + + + + + + src/main/resources + true + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.6.1 + + 10 + 10 + UTF-8 + + + + org.apache.maven.plugins + maven-jar-plugin + 3.2.0 + + ${project.basedir}/compile + + + + + + + + com.zaxxer + HikariCP + 3.4.5 + compile + + + org.spigotmc + spigot-api + 1.16.5-R0.1-SNAPSHOT + provided + + + com.github.SkriptLang + Skript + 2.5.3 + provided + + + \ No newline at end of file diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 3611235..0000000 --- a/settings.gradle +++ /dev/null @@ -1,2 +0,0 @@ -rootProject.name = 'skript-db' - diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/java/META-INF/MANIFEST.MF similarity index 100% rename from src/main/java/META-INF/MANIFEST.MF rename to src/java/META-INF/MANIFEST.MF diff --git a/src/main/java/com/btk5h/skriptdb/SkriptDB.java b/src/java/com/btk5h/skriptdb/SkriptDB.java similarity index 100% rename from src/main/java/com/btk5h/skriptdb/SkriptDB.java rename to src/java/com/btk5h/skriptdb/SkriptDB.java diff --git a/src/main/java/com/btk5h/skriptdb/SkriptUtil.java b/src/java/com/btk5h/skriptdb/SkriptUtil.java similarity index 100% rename from src/main/java/com/btk5h/skriptdb/SkriptUtil.java rename to src/java/com/btk5h/skriptdb/SkriptUtil.java diff --git a/src/main/java/com/btk5h/skriptdb/skript/EffExecuteStatement.java b/src/java/com/btk5h/skriptdb/skript/EffExecuteStatement.java similarity index 94% rename from src/main/java/com/btk5h/skriptdb/skript/EffExecuteStatement.java rename to src/java/com/btk5h/skriptdb/skript/EffExecuteStatement.java index 9da09a7..2fe6a16 100644 --- a/src/main/java/com/btk5h/skriptdb/skript/EffExecuteStatement.java +++ b/src/java/com/btk5h/skriptdb/skript/EffExecuteStatement.java @@ -78,37 +78,49 @@ public class EffExecuteStatement extends Effect { Pair> query = parseQuery(e); String baseVariable = var != null ? var.toString(e).toLowerCase(Locale.ENGLISH) : null; + //if data source isn't set if (ds == null) return; + + if (isSync) { Object populatedVariables = executeStatement(ds, baseVariable, query); continueScriptExecution(e, populatedVariables); } else { Object locals = Variables.removeLocals(e); + + //execute SQL statement CompletableFuture sql = CompletableFuture.supplyAsync(() -> executeStatement(ds, baseVariable, query), threadPool); + //when SQL statement is completed sql.whenComplete((res, err) -> { if (err != null) { err.printStackTrace(); } Bukkit.getScheduler().runTask(SkriptDB.getInstance(), () -> { + + //handle last error syntax data lastError = null; if (res instanceof String) { lastError = (String) res; } if (getNext() != null) { + //if local variables are present if (locals != null) + + //bring back local variables Variables.setLocalVariables(e, locals); + //populate SQL data into variables if (!(res instanceof String)) { ((Map) res).forEach((name, value) -> setVariable(e, name, value)); } - //doLater.clear(); TriggerItem.walk(getNext(), e); - Variables.removeLocals(e); + //let's try with this commented, as it may be not needed? let's test! + //Variables.removeLocals(e); } }); }); @@ -224,6 +236,7 @@ public class EffExecuteStatement extends Effect { variableList.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 variableList.put(baseVariable, stmt.getUpdateCount()); } } diff --git a/src/main/java/com/btk5h/skriptdb/skript/ExprDBError.java b/src/java/com/btk5h/skriptdb/skript/ExprDBError.java similarity index 100% rename from src/main/java/com/btk5h/skriptdb/skript/ExprDBError.java rename to src/java/com/btk5h/skriptdb/skript/ExprDBError.java diff --git a/src/main/java/com/btk5h/skriptdb/skript/ExprDataSource.java b/src/java/com/btk5h/skriptdb/skript/ExprDataSource.java similarity index 100% rename from src/main/java/com/btk5h/skriptdb/skript/ExprDataSource.java rename to src/java/com/btk5h/skriptdb/skript/ExprDataSource.java diff --git a/src/main/java/com/btk5h/skriptdb/skript/ExprUnsafe.java b/src/java/com/btk5h/skriptdb/skript/ExprUnsafe.java similarity index 100% rename from src/main/java/com/btk5h/skriptdb/skript/ExprUnsafe.java rename to src/java/com/btk5h/skriptdb/skript/ExprUnsafe.java diff --git a/src/java/com/btk5h/skriptdb/skript/Types.java b/src/java/com/btk5h/skriptdb/skript/Types.java new file mode 100644 index 0000000..b37e1b5 --- /dev/null +++ b/src/java/com/btk5h/skriptdb/skript/Types.java @@ -0,0 +1,68 @@ +package com.btk5h.skriptdb.skript; + +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 { + Classes.registerClass(new ClassInfo<>(HikariDataSource.class, "datasource") + .user("datasources?") + .parser(new Parser<>() { + @Override + public HikariDataSource parse(String s, ParseContext context) { + return null; + } + + @Override + public String toString(HikariDataSource o, int flags) { + return o.getJdbcUrl(); + } + + @Override + public String toVariableNameString(HikariDataSource o) { + return o.getJdbcUrl(); + } + + @Override + public String getVariableNamePattern() { + return "jdbc:.+"; + } + }) + .serializer(new Serializer<>() { + @Override + public Fields serialize(HikariDataSource o) { + Fields fields = new Fields(); + fields.putObject("jdbcurl", o.getJdbcUrl()); + return fields; + } + + @Override + public void deserialize(HikariDataSource o, Fields f) { + } + + @Override + protected HikariDataSource deserialize(Fields fields) throws StreamCorruptedException { + HikariDataSource ds = new HikariDataSource(); + ds.setJdbcUrl((String) fields.getObject("jdbcurl")); + return ds; + } + + @Override + public boolean mustSyncDeserialization() { + return false; + } + + @Override + protected boolean canBeInstantiated() { + return false; + } + })); + } +} diff --git a/src/main/java/com/btk5h/skriptdb/skript/Types.java b/src/main/java/com/btk5h/skriptdb/skript/Types.java deleted file mode 100644 index 7a76cbe..0000000 --- a/src/main/java/com/btk5h/skriptdb/skript/Types.java +++ /dev/null @@ -1,72 +0,0 @@ -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; - -public class Types { - static { - Classes.registerClass(new ClassInfo<>(HikariDataSource.class, "datasource") - .user("datasources?") - .parser(new Parser() { - @Override - public HikariDataSource parse(String s, ParseContext context) { - return null; - } - - @Override - public String toString(HikariDataSource o, int flags) { - return o.getJdbcUrl(); - } - - @Override - public String toVariableNameString(HikariDataSource o) { - return o.getJdbcUrl(); - } - - @Override - public String getVariableNamePattern() { - return "jdbc:.+"; - } - }) - .serializer(new Serializer() { - @Override - 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) throws StreamCorruptedException, - NotSerializableException { - } - - @Override - protected HikariDataSource deserialize(Fields fields) throws StreamCorruptedException, - NotSerializableException { - HikariDataSource ds = new HikariDataSource(); - ds.setJdbcUrl((String) fields.getObject("jdbcurl")); - return ds; - } - - @Override - public boolean mustSyncDeserialization() { - return false; - } - - @Override - protected boolean canBeInstantiated() { - return false; - } - })); - } -} diff --git a/src/main/resources/plugin.yml b/src/resources/plugin.yml similarity index 100% rename from src/main/resources/plugin.yml rename to src/resources/plugin.yml diff --git a/tools/skriptdoclet.jar b/tools/skriptdoclet.jar deleted file mode 100644 index 3ccbab4..0000000 Binary files a/tools/skriptdoclet.jar and /dev/null differ