skywalker3200/MobArenaStats
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: skywalker3200/MobArenaStats:dev
Branches Tags
skywalker3200/MobArenaStats:dev skywalker3200/MobArenaStats:master
skywalker3200/MobArenaStats:1.0
..
compare: skywalker3200/MobArenaStats:1.0
Branches Tags
skywalker3200/MobArenaStats:master skywalker3200/MobArenaStats:dev
skywalker3200/MobArenaStats:1.0
4 Commits
dev .. 1.0
Author SHA1 Message Date
Andreas Troelsen eb77193fbd Release 1.0. 2022-07-30 15:58:05 +02:00
Andreas Troelsen 2c65d88c62 Link to releases/actions in README. 
After the first release we should be able to link to the `/latest` URL
just fine, so we'll just prep it now. We don't really want to maintain
an "official" test builds channel on Discord, so that's out as well.
 2022-07-30 15:58:05 +02:00
Andreas Troelsen 627205d39a Qualify getTables() with catalog and schema. 
Without these qualifiers, the tables returned by the metadata object
will include tables from _all_ databases in the database instance, which
is definitely not something we want. Not only does this pose a potential
performance impact, it can also return very false positives, which then
result in an (inaptly named) SQLSyntaxErrorException when the subsequent
query to the potentially non-existent table fails.

To reproduce the issue:

- Create two new, empty databases in a fresh MySQL/MariaDB instance.
- Point the extension at one of them.
- Spin up the server, let the extension initialize the database.
- Stop the server.
- Point the extension at the other database.
- Spin the server back up and watch it crash.

By qualifying the `getTables()` call with the catalog and schema of the
underlying connection object, we limit the search to _just_ that catalog
and schema, which is what we wanted all along. According to the method
documentation, the args are _patterns_, where `%` matches substrings and
`_` matches "any character". So by being hyper-specific, we shouldn't
get any more false positives. In testing on MySQL and MariaDB, only the
`catalog` value is non-null (matches the database name), while `schema`
remains null.
 2022-07-30 15:58:05 +02:00
Andreas Troelsen 3f7796772e Upgrade Mockito to 3.12.2. 
This fixes an issue with the mock maker not running properly on recent
versions of the JVM, and it also matches the version in the base plugin.
 2022-07-30 12:10:50 +02:00
3 changed files with 11 additions and 5 deletions
Expand all files Collapse all files
README.md
+6 -2
View File
@@ -9,8 +9,12 @@ It hooks into MobArena's command handler to provide commands for querying and ma
## Getting Started ## Getting Started
Download a copy of the latest MobArenaStats build and place it in your server's `plugins` folder. Download a copy of MobArenaStats from one of these release channels:
You can grab a build from the _Artifacts_ section of the latest run of the [build workflow](https://github.com/mobarena/MobArenaStats/actions/workflows/build.yml) in GitHub Actions, or you can join the MobArena Discord server and grab one from the `#test-builds` channel.
- Stable (recommended): [Latest release](https://github.com/mobarena/MobArenaStats/releases/latest)
- Dev (experimental): [Latest build](https://github.com/mobarena/MobArenaStats/actions/workflows/build.yml)
Place the jar-file in your server's `plugins` folder like you would any other plugin.
Start your server and let the plugin load. Start your server and let the plugin load.
It will generate a default `config.yml` file and set up a default SQLite data store. It will generate a default `config.yml` file and set up a default SQLite data store.
pom.xml
+2 -2
View File
@@ -6,7 +6,7 @@
<groupId>org.mobarena</groupId> <groupId>org.mobarena</groupId>
<artifactId>mobarena-stats</artifactId> <artifactId>mobarena-stats</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0</version>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -86,7 +86,7 @@
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId> <artifactId>mockito-junit-jupiter</artifactId>
<version>3.11.2</version> <version>3.12.2</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
src/main/java/org/mobarena/stats/store/jdbc/SchemaMigrator.java
+3 -1
View File
@@ -70,8 +70,10 @@ class SchemaMigrator {
// (available via the underlying JDBC connection object) to find // (available via the underlying JDBC connection object) to find
// out if the schema migrations table exists. // out if the schema migrations table exists.
Connection connection = handle.getConnection(); Connection connection = handle.getConnection();
String catalog = connection.getCatalog();
String schema = connection.getSchema();
DatabaseMetaData meta = connection.getMetaData(); DatabaseMetaData meta = connection.getMetaData();
try (ResultSet tables = meta.getTables(null, null, "schema_migrations", null)) { try (ResultSet tables = meta.getTables(catalog, schema, "schema_migrations", null)) {
while (tables.next()) { while (tables.next()) {
String name = tables.getString("TABLE_NAME"); String name = tables.getString("TABLE_NAME");
if (name.equals("schema_migrations")) { if (name.equals("schema_migrations")) {