fix(sql): Catch all SQLExceptions right way

Author: osipxd

core/src/main/kotlin/internal/data/repository/InventoriesRepository.kt

@@ -28,6 +28,7 @@ import ru.endlesscode.inventory.internal.data.sql.InventoryDao
 import ru.endlesscode.inventory.internal.data.sql.entity.toDomain
 import ru.endlesscode.inventory.internal.data.sql.entity.toSqlEntity
 import ru.endlesscode.inventory.internal.di.DI
+import ru.endlesscode.inventory.internal.util.Log
 import java.util.*
 
 internal class InventoriesRepository(
@@ -55,7 +56,12 @@ internal class InventoriesRepository(
 
     fun loadInventories(player: Player) {
         scheduler.runAsync {
-            val holderInventories = dao.getInventories(player.uniqueId).asSequence()
+            val holderInventories = dao.getInventories(player.uniqueId)
+                .getOrElse { exception ->
+                    Log.e("Error on loading inventories of player ${player.name}", exception)
+                    return@runAsync
+                }
+                .asSequence()
                 .map { it.toDomain(getLayout(it.layout), player) }
                 .associateBy { it.id }
 

core/src/main/kotlin/internal/data/sql/BaseDao.kt

@@ -45,7 +45,7 @@ internal abstract class BaseDao(private var dataSource: DataSource) {
         }
     }
 
-    protected inline fun <T> statement(sql: String, crossinline block: PreparedStatement.() -> T): T {
+    protected inline fun <T> statement(sql: String, crossinline block: PreparedStatement.() -> T): Result<T> {
         return dataSource.statement(sql.trimIndent(), block)
     }
 

core/src/main/kotlin/internal/data/sql/InventoryDao.kt

@@ -74,7 +74,7 @@ internal class InventoryDao(dataSource: DataSource) : BaseDao(dataSource) {
         }
     }
 
-    fun getInventories(holderId: UUID): List<InventorySqlEntity> {
+    fun getInventories(holderId: UUID): Result<List<InventorySqlEntity>> {
         return statement(
             """
             SELECT $INVENTORIES.*

core/src/main/kotlin/internal/data/sql/Jdbc.kt

@@ -22,14 +22,16 @@ package ru.endlesscode.inventory.internal.data.sql
 import java.sql.Connection
 import java.sql.PreparedStatement
 import java.sql.ResultSet
+import java.sql.SQLException
 import javax.sql.DataSource
 
-internal inline fun <T> DataSource.statement(sql: String, block: PreparedStatement.() -> T): T {
+internal inline fun <T> DataSource.statement(sql: String, block: PreparedStatement.() -> T): Result<T> {
     return connection.use { it.statement(sql, block) }
 }
 
-internal inline fun <T> Connection.statement(sql: String, block: PreparedStatement.() -> T): T {
-    return prepareStatement(sql).use(block)
+internal inline fun <T> Connection.statement(sql: String, block: PreparedStatement.() -> T): Result<T> {
+    return runCatching { prepareStatement(sql).use(block) }
+        .onFailure { exception -> if (exception !is SQLException) throw exception }
 }
 
 internal fun ResultSet.asSequence(): Sequence<ResultSet> = sequence {

core/src/main/kotlin/internal/data/sql/MainTableDao.kt

@@ -19,7 +19,6 @@
 
 package ru.endlesscode.inventory.internal.data.sql
 
-import java.sql.SQLException
 import javax.sql.DataSource
 
 // language=SQL
@@ -38,13 +37,9 @@ internal class MainTableDao(dataSource: DataSource) : BaseDao(dataSource) {
             LIMIT 1;
             """
         ) {
-            try {
-                val resultSet = executeQuery()
-                if (resultSet.next()) resultSet.getInt(COLUMN_VERSION) else -1
-            } catch (_: SQLException) {
-                -1
-            }
-        }
+            val resultSet = executeQuery()
+            if (resultSet.next()) resultSet.getInt(COLUMN_VERSION) else -1
+        }.getOrElse { -1 }
     }
 
     private companion object {