Skip to content

Fix sql exception #356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
CrazyDev05 wants to merge 1 commit into from
Closed

Fix sql exception #356

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions src/main/kotlin/com/github/quiltservertools/ledger/database/DatabaseManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ object DatabaseManager {
this[Tables.Actions.blockState] = action.objectState
this[Tables.Actions.oldBlockState] = action.oldObjectState
this[Tables.Actions.sourceName] = getOrCreateSourceId(action.sourceName)
this[Tables.Actions.sourcePlayer] = action.sourceProfile?.let { getOrCreatePlayerId(it.id) }
this[Tables.Actions.sourcePlayer] = action.sourceProfile?.let { getOrCreatePlayerId(it.id, it.name) }
this[Tables.Actions.extraData] = action.extraData
}
}
Expand Down Expand Up @@ -594,8 +594,16 @@ object DatabaseManager {
].id.value.also { cache.put(obj!!, it) }
}

private fun getOrCreatePlayerId(playerId: UUID): Int =
getOrCreateObjectId(playerId, cache.playerKeys, Tables.Player, Tables.Players, Tables.Players.playerId)
private fun getOrCreatePlayerId(playerId: UUID, playerName: String): Int {
getObjectId(playerId, cache.playerKeys, Tables.Player, Tables.Players.playerId)?.let { return it }

return Tables.Player[
Tables.Players.insertAndGetId {
it[Tables.Players.playerId] = playerId
it[Tables.Players.playerName] = playerName
}
].id.value.also { cache.playerKeys[playerId] = it }
}

private fun getOrCreateSourceId(source: String): Int =
getOrCreateObjectId(source, cache.sourceKeys, Tables.Source, Tables.Sources, Tables.Sources.name)
Expand Down