From 9f1f12318dc9bd2eb45a4c0ff975e19fea8d68f3 Mon Sep 17 00:00:00 2001 From: Potatoboy9999 <51728317+PotatoPresident@users.noreply.github.com> Date: Wed, 10 Apr 2024 10:14:10 -0700 Subject: [PATCH] Minor fixes --- README.md | 11 +++++++++++ gradle.properties | 5 +---- .../ledger/databases/databases/MySQL.kt | 3 +++ .../ledger/databases/databases/PostgreSQL.kt | 1 + .../ledger/databases/databases/SQLite.kt | 3 ++- src/main/resources/fabric.mod.json | 4 ++-- 6 files changed, 20 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 3cd3578..8bf46d4 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,8 @@ url = "" username = "" password = "" properties = [] +maxPoolSize = 10 +connectionTimeout = 60000 ``` `url`: Must be URL of database with `/` appended. An example URL would be `localhost/ledger`. You can optionally add port information such as `localhost:3000/ledger` @@ -41,6 +43,15 @@ url = "" username = "" password = "" properties = [] +maxPoolSize = 10 +connectionTimeout = 60000 +``` + +## SQLite + +```toml +[database_extensions] +database = "SQLITE" ``` ## Connector properties diff --git a/gradle.properties b/gradle.properties index bc70814..f79bc17 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,4 @@ org.gradle.jvmargs=-Xmx2G # Mod Properties mod_version = 1.2.0 maven_group = net.quiltservertools - archives_base_name = ledger-databases - -# Dependencies - fabric_version=0.58.0+1.19 + archives_base_name = ledger-databases \ No newline at end of file diff --git a/src/main/kotlin/net/quiltservertools/ledger/databases/databases/MySQL.kt b/src/main/kotlin/net/quiltservertools/ledger/databases/databases/MySQL.kt index f362422..684de79 100644 --- a/src/main/kotlin/net/quiltservertools/ledger/databases/databases/MySQL.kt +++ b/src/main/kotlin/net/quiltservertools/ledger/databases/databases/MySQL.kt @@ -26,6 +26,9 @@ object MySQL : LedgerDatabase { addDataSourceProperty("useLocalSessionState", true) addDataSourceProperty("elideSetAutoCommits", true) addDataSourceProperty("alwaysSendSetIsolation", false) + addDataSourceProperty("useJDBCCompliantTimezoneShift", true) + addDataSourceProperty("useLegacyDatetimeCode", false) + addDataSourceProperty("serverTimezone", "UTC") for ((key, value) in Ledger.config[DatabaseExtensionSpec.properties]) { addDataSourceProperty(key, value) } diff --git a/src/main/kotlin/net/quiltservertools/ledger/databases/databases/PostgreSQL.kt b/src/main/kotlin/net/quiltservertools/ledger/databases/databases/PostgreSQL.kt index 9628fe7..59d0ba7 100644 --- a/src/main/kotlin/net/quiltservertools/ledger/databases/databases/PostgreSQL.kt +++ b/src/main/kotlin/net/quiltservertools/ledger/databases/databases/PostgreSQL.kt @@ -14,6 +14,7 @@ object PostgreSQL : LedgerDatabase { username = Ledger.config[DatabaseExtensionSpec.userName] password = Ledger.config[DatabaseExtensionSpec.password] maximumPoolSize = Ledger.config[DatabaseExtensionSpec.maxPoolSize] + addDataSourceProperty("reWriteBatchedInserts", "true") for ((key, value) in Ledger.config[DatabaseExtensionSpec.properties]) { addDataSourceProperty(key, value) } diff --git a/src/main/kotlin/net/quiltservertools/ledger/databases/databases/SQLite.kt b/src/main/kotlin/net/quiltservertools/ledger/databases/databases/SQLite.kt index c740291..5458767 100644 --- a/src/main/kotlin/net/quiltservertools/ledger/databases/databases/SQLite.kt +++ b/src/main/kotlin/net/quiltservertools/ledger/databases/databases/SQLite.kt @@ -3,10 +3,11 @@ package net.quiltservertools.ledger.databases.databases import com.github.quiltservertools.ledger.Ledger import org.sqlite.SQLiteDataSource import java.nio.file.Path +import kotlin.io.path.pathString object SQLite : LedgerDatabase { override fun getDataSource(savePath: Path) = SQLiteDataSource().apply { - url = "jdbc:sqlite:$savePath" + url = "jdbc:sqlite:${savePath.pathString}" } override fun getDatabaseIdentifier() = Ledger.identifier(Ledger.DEFAULT_DATABASE) diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index b01b8ea..16c33eb 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -9,8 +9,8 @@ "yitzy299" ], "contact": { - "homepage": "https://fabricmc.net/", - "sources": "https://github.com/FabricMC/fabric-example-mod" + "homepage": "https://modrinth.com/project/ledger-databases", + "sources": "https://github.com/QuiltServerTools/Ledger-Databases" }, "license": "LGPL-3.0",