Skip to content

Commit 43d9f0f

Browse files
SyrentSyrent
committed
fix(core): sqlite connection
1 parent 67e448a commit 43d9f0f

7 files changed

Lines changed: 58 additions & 57 deletions

File tree

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88

99
allprojects {
1010
group = "org.sayandev"
11-
version = "1.10.1.2"
11+
version = "1.10.1.9"
1212
description = "A modular Kotlin framework for Minecraft: JE"
1313

1414
plugins.apply("maven-publish")

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ guava = "31.1-jre"
2222
gson = "2.11.0"
2323
kotlin-reflect = "2.1.20"
2424
netty = "4.1.111.Final"
25-
exposed = "1.0.0-beta-2"
25+
exposed = "0.61.0"
2626
libby = "2.0.0-SNAPSHOT"
2727
mccoroutines = "2.20.0"
2828
kotlinx-coroutines = "1.10.1"
@@ -76,7 +76,6 @@ kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", vers
7676
netty-all = { group = "io.netty", name = "netty-all", version.ref = "netty" }
7777
exposed-core = { group = "org.jetbrains.exposed", name = "exposed-core", version.ref = "exposed" }
7878
exposed-jdbc = { group = "org.jetbrains.exposed", name = "exposed-jdbc",version.ref = "exposed" }
79-
exposed-r2dbc = { group = "org.jetbrains.exposed", name = "exposed-r2dbc",version.ref = "exposed" }
8079
exposed-dao = { group = "org.jetbrains.exposed", name = "exposed-dao",version.ref = "exposed" }
8180
exposed-kotlin-datetime = { group = "org.jetbrains.exposed", name = "exposed-kotlin-datetime",version.ref = "exposed" }
8281
libby = { group = "com.alessiodp.libby", name = "libby-core", version.ref = "libby" }
@@ -167,7 +166,6 @@ implementation-core = [
167166
"gson",
168167
"exposed-core",
169168
"exposed-jdbc",
170-
"exposed-r2dbc",
171169
"exposed-dao",
172170
"exposed-kotlin-datetime",
173171
"kotlinx-coroutines",

‎stickynote-core/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencies {
1818
api(libs.mariadb)
1919
api(libs.exposed.core)
2020
api(libs.exposed.jdbc)
21-
api(libs.exposed.r2dbc)
21+
// api(libs.exposed.r2dbc)
2222
api(libs.exposed.dao)
2323
api(libs.exposed.kotlin.datetime)
2424

‎stickynote-core/src/main/kotlin/org/sayandev/stickynote/core/database/Query.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import java.util.logging.Logger
1010
class Query private constructor(val statement: String) {
1111
private val statementValues: MutableMap<Int, Any> = HashMap()
1212
private val requirements: MutableSet<Query> = HashSet()
13-
val completableFuture: CompletableFuture<ResultSet> = CompletableFuture()
14-
private var consumer: Consumer<ResultSet>? = null
13+
val completableFuture: CompletableFuture<QueryResult> = CompletableFuture()
14+
private var consumer: Consumer<QueryResult>? = null
1515
var failedAttempts: Int = 0
1616
private set
1717

@@ -29,14 +29,14 @@ class Query private constructor(val statement: String) {
2929
/**
3030
* @apiNote internal
3131
*/
32-
fun complete(result: ResultSet) {
32+
fun complete(result: QueryResult) {
3333
completableFuture.complete(result)
3434
if (consumer != null) {
3535
consumer!!.accept(result)
3636
}
3737
}
3838

39-
fun onComplete(consumer: Consumer<ResultSet>?) {
39+
fun onComplete(consumer: Consumer<QueryResult>?) {
4040
this.consumer = consumer
4141
}
4242

‎stickynote-core/src/main/kotlin/org/sayandev/stickynote/core/database/QueryResult.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ import java.sql.Connection
44
import java.sql.ResultSet
55
import java.sql.SQLException
66

7-
class QueryResult(val statusCode: Query.StatusCode, private val resultSet: ResultSet?) : AutoCloseable {
8-
private val connection: Connection? = resultSet?.statement?.connection
7+
class QueryResult(val statusCode: Query.StatusCode, val connection: Connection?, private val resultSet: ResultSet?) : AutoCloseable {
98

109
fun getResult(): ResultSet? = resultSet
1110

‎stickynote-core/src/main/kotlin/org/sayandev/stickynote/core/database/mysql/MySQLExecutor.kt‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,11 @@ abstract class MySQLExecutor(
125125
}
126126

127127
if (resultSet != null) {
128-
query.complete(resultSet)
128+
query.complete(QueryResult(StatusCode.FINISHED, connection, resultSet))
129129
}
130130

131-
return QueryResult(StatusCode.FINISHED, resultSet)
131+
query.statusCode = StatusCode.FINISHED
132+
return QueryResult(StatusCode.FINISHED, connection, resultSet)
132133
} catch (e: SQLException) {
133134
onQueryFail(query)
134135
e.printStackTrace()
@@ -137,11 +138,13 @@ abstract class MySQLExecutor(
137138
if (query.failedAttempts > failAttemptRemoval) {
138139
onQueryRemoveDueToFail(query)
139140

140-
return QueryResult(StatusCode.FINISHED, null)
141+
query.statusCode = StatusCode.FINISHED
142+
return QueryResult(StatusCode.FINISHED, connection, null)
141143
}
142144

143145

144-
return QueryResult(StatusCode.FAILED, null)
146+
query.statusCode = StatusCode.FAILED
147+
return QueryResult(StatusCode.FAILED, connection, null)
145148
}
146149
}
147150
}

‎stickynote-core/src/main/kotlin/org/sayandev/stickynote/core/database/sqlite/SQLiteExecutor.kt‎

Lines changed: 43 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -88,49 +88,50 @@ abstract class SQLiteExecutor protected constructor(protected val dbFile: File,
8888
return executeQuerySync(query)
8989
}
9090

91-
fun executeQuerySync(query: Query): QueryResult {
92-
val connection = getConnection() ?: let {
93-
query.statusCode = Query.StatusCode.FAILED
94-
return QueryResult(Query.StatusCode.FAILED, null)
95-
}
96-
97-
try {
98-
val preparedStatement = query.createPreparedStatement(connection)
99-
var resultSet: ResultSet? = null
100-
101-
if (query.statement.startsWith("INSERT") ||
102-
query.statement.startsWith("UPDATE") ||
103-
query.statement.startsWith("DELETE") ||
104-
query.statement.startsWith("CREATE") ||
105-
query.statement.startsWith("ALTER")
106-
) {
107-
preparedStatement.executeUpdate()
108-
preparedStatement.close()
109-
connection.close()
110-
} else {
111-
resultSet = preparedStatement.executeQuery()
112-
}
113-
114-
if (resultSet != null) {
115-
query.complete(resultSet)
116-
}
117-
118-
query.statusCode = Query.StatusCode.FINISHED
119-
return QueryResult(Query.StatusCode.FINISHED, resultSet)
120-
} catch (e: SQLException) {
121-
connection.close()
122-
onQueryFail(query)
123-
e.printStackTrace()
124-
125-
query.increaseFailedAttempts()
126-
if (query.failedAttempts > failAttemptRemoval) {
127-
onQueryRemoveDueToFail(query)
128-
query.statusCode = Query.StatusCode.FINISHED
129-
return QueryResult(Query.StatusCode.FINISHED, null)
91+
private fun executeQuerySync(query: Query): QueryResult {
92+
getConnection().use { connection ->
93+
try {
94+
val preparedStatement = query.createPreparedStatement(connection)
95+
96+
val isUpdate = query.statement.startsWith("INSERT") ||
97+
query.statement.startsWith("UPDATE") ||
98+
query.statement.startsWith("DELETE") ||
99+
query.statement.startsWith("CREATE") ||
100+
query.statement.startsWith("ALTER")
101+
var resultSet: ResultSet? = null
102+
103+
if (isUpdate) {
104+
preparedStatement.closeOnCompletion()
105+
preparedStatement.executeUpdate()
106+
preparedStatement.close()
107+
}
108+
else {
109+
resultSet = preparedStatement.executeQuery()
110+
}
111+
112+
if (resultSet != null) {
113+
query.complete(QueryResult(StatusCode.FINISHED, connection, resultSet))
114+
}
115+
116+
query.statusCode = StatusCode.FINISHED
117+
return QueryResult(StatusCode.FINISHED, connection, resultSet)
118+
} catch (e: SQLException) {
119+
onQueryFail(query)
120+
e.printStackTrace()
121+
122+
query.increaseFailedAttempts()
123+
if (query.failedAttempts > failAttemptRemoval) {
124+
onQueryRemoveDueToFail(query)
125+
126+
query.statusCode = StatusCode.FINISHED
127+
return QueryResult(StatusCode.FINISHED, connection, null)
128+
}
129+
130+
131+
query.statusCode = StatusCode.FAILED
132+
return QueryResult(StatusCode.FAILED, connection, null)
130133
}
131134
}
132-
query.statusCode = Query.StatusCode.FAILED
133-
return QueryResult(Query.StatusCode.FAILED, null)
134135
}
135136

136137
protected fun tick() {
@@ -143,7 +144,7 @@ abstract class SQLiteExecutor protected constructor(protected val dbFile: File,
143144
}
144145

145146
val queryResult = executeQuerySync(query)
146-
if (queryResult.statusCode != Query.StatusCode.NOT_STARTED) {
147+
if (queryResult.statusCode != StatusCode.NOT_STARTED) {
147148
queries.removeFirstOrNull()
148149
}
149150
break

0 commit comments

Comments
 (0)