Merge pull request #1 from Dico200/master

Update with outstanding commits from Dico200/Parcels2

1 files changed, 9 insertions, 0 deletions

diff --git a/src/main/kotlin/io/dico/parcels2/storage/ExposedBacking.kt b/src/main/kotlin/io/dico/parcels2/storage/ExposedBacking.kt
index 9a26acc..cbcb6f4 100644
--- a/src/main/kotlin/io/dico/parcels2/storage/ExposedBacking.kt
+++ b/src/main/kotlin/io/dico/parcels2/storage/ExposedBacking.kt
@@ -9,6 +9,7 @@ import kotlinx.coroutines.experimental.channels.ProducerScope
 import org.jetbrains.exposed.sql.*
 import org.jetbrains.exposed.sql.SchemaUtils.create
 import org.jetbrains.exposed.sql.transactions.transaction
+import org.jetbrains.exposed.sql.vendors.DatabaseDialect
 import org.joda.time.DateTime
 import java.util.*
 import javax.sql.DataSource
@@ -62,6 +63,14 @@ class ExposedBacking(private val dataSourceFactory: () -> DataSource) : Backing
 
     override val isConnected get() = database != null
 
+    companion object {
+        init {
+            Database.registerDialect("mariadb") {
+                Class.forName("org.jetbrains.exposed.sql.vendors.MysqlDialect").newInstance() as DatabaseDialect
+            }
+        }
+    }
+
     override suspend fun init() {
         if (isShutdown) throw IllegalStateException()
         dataSource = dataSourceFactory()