Skip to content

The "on duplicate" does not work in hsql DB, changed to "on conflict" #21

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

Open
Awwabsiddiqui wants to merge 2 commits into
base: main
Choose a base branch
from
Open

The "on duplicate" does not work in hsql DB, changed to "on conflict" #21

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cd18fc
The "on duplicate" does not work in hsql DB, changed to on conflict
Jun 22, 2025
e92c480
ISSUE FIXED
Jun 24, 2025
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
196 changes: 170 additions & 26 deletions src/java/org/igniterealtime/openfire/plugins/pushserver/dao/PushServerDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,29 @@ object PushServerDao {

private const val TABLE_NAME = "ofPushServer"

private const val PUSH_RECORD_COUNT = """
SELECT COUNT(1)
FROM $TABLE_NAME
WHERE domain = ?
AND deviceId = ?
"""
private const val ADD_PUSH_RECORD = """
INSERT INTO $TABLE_NAME (domain, deviceId, token, node, secret, type)
VALUES (?, ?, ?, ?, ?, ?)
ON DUPLICATE KEY UPDATE token = VALUES(token)
VALUES (?, ?, ?, ?, ?, ?);
"""
private const val UPDATE_PUSH_RECORD = """
UPDATE $TABLE_NAME SET token = ?
WHERE domain = ? AND deviceId = ?
"""
private const val UPSERT_PUSH_RECORD = """
INSERT INTO $TABLE_NAME (domain, deviceId, token, node, secret, type)
VALUES (?, ?, ?, ?, ?, ?)
ON CONFLICT (domain, deviceId) DO UPDATE SET token=?
"""
private const val UPSERT_PUSH_RECORD_SQL = """
INSERT INTO $TABLE_NAME (domain, deviceId, token, node, secret, type)
VALUES (?, ?, ?, ?, ?, ?)
ON DUPLICATE KEY UPDATE token = VALUES(token);
"""
private const val DELETE_PUSH_RECORD = """
DELETE FROM $TABLE_NAME
Expand All @@ -30,36 +49,161 @@ object PushServerDao {
WHERE domain = ? AND node = ?
"""

fun addPushRecord(pushRecord: PushRecord): PushRecord? {
return DbUtils.doWithConnection(
ADD_PUSH_RECORD
, listOf(pushRecord.domain, pushRecord.deviceId, pushRecord.token, pushRecord.node, pushRecord.secret, pushRecord.type.name)
, { conn, statement ->
statement.executeUpdate()
fun addPushRecord(pushRecord: PushRecord): PushRecord? { //select based
try {
val count = DbUtils.doWithConnection(
sql = PUSH_RECORD_COUNT,
parameterList = listOf(pushRecord.domain, pushRecord.deviceId),
closure = { _, stmt ->
val rs = stmt.executeQuery()
val count = if (rs.next()) rs.getInt(1) else 0
rs.close()
count
},
onFailed = {
logger.error("Failed to check existing push record count.", it)
}
) ?: 0

val rs = DbUtils.createStatement(
conn
, SELECT_PUSH_RECORD
, listOf(pushRecord.domain, pushRecord.deviceId)
)?.executeQuery()
if (count > 0) {
DbUtils.doWithConnection(
sql = UPDATE_PUSH_RECORD,
parameterList = listOf(
pushRecord.token,
pushRecord.domain,
pushRecord.deviceId
),
closure = { _, stmt ->
stmt.executeUpdate()
},
onFailed = {
logger.error("Failed to update push record.", it)
}
)
} else {
DbUtils.doWithConnection(
sql = ADD_PUSH_RECORD,
parameterList = listOf(
pushRecord.domain,
pushRecord.deviceId,
pushRecord.token,
pushRecord.node,
pushRecord.secret,
pushRecord.type.name
),
closure = { _, stmt ->
stmt.executeUpdate()
},
onFailed = {
logger.error("Failed to insert push record.", it)
}
)
}

if (rs?.next() == true) {
return DbUtils.doWithConnection(
sql = SELECT_PUSH_RECORD,
parameterList = listOf(pushRecord.domain, pushRecord.deviceId),
closure = { _, stmt ->
val rs = stmt.executeQuery()
if (rs.next()) {
PushRecord(
domain = pushRecord.domain
, deviceId = pushRecord.deviceId
, token = rs.getString("token")
, type = rs.getString("type")
, node = rs.getString("node")
, secret = rs.getString("secret")
domain = pushRecord.domain,
deviceId = pushRecord.deviceId,
token = rs.getString("token"),
node = rs.getString("node"),
secret = rs.getString("secret"),
type = rs.getString("type")
)
} else {
null
}
} else null
},
onFailed = {
logger.error("Failed to fetch push record after insert/update.", it)
}
) {
logger.error("PushRecord couldn't be inserted.", it)
}
)
} catch (e: Exception) {
logger.error("Unexpected failure in addPushRecord()", e)
return null
}
}

// fun addPushRecord(pushRecord: PushRecord): PushRecord? { // try catch based
// return DbUtils.doWithConnection(
// UPSERT_PUSH_RECORD
// , listOf(pushRecord.domain, pushRecord.deviceId, pushRecord.token, pushRecord.node, pushRecord.secret, pushRecord.type.name, pushRecord.token)
// , { conn, statement ->
// try {
// statement.executeUpdate()
// } catch (e: Exception) {
// val insertStatement = DbUtils.createStatement(
// conn,
// UPSERT_PUSH_RECORD_SQL,
// listOf(
// pushRecord.domain,
// pushRecord.deviceId,
// pushRecord.token,
// pushRecord.node,
// pushRecord.secret,
// pushRecord.type.name
// )
// )
// insertStatement?.executeUpdate()
// }

// val rs = DbUtils.createStatement(
// conn
// , SELECT_PUSH_RECORD
// , listOf(pushRecord.domain, pushRecord.deviceId)
// )?.executeQuery()

// if (rs?.next() == true) {
// PushRecord(
// domain = pushRecord.domain
// , deviceId = pushRecord.deviceId
// , token = rs.getString("token")
// , type = rs.getString("type")
// , node = rs.getString("node")
// , secret = rs.getString("secret")
// )
// } else {
// null
// }
// }
// ) {

// logger.error("PushRecord couldn't be inserted.", it)
// }
// }

// fun addPushRecordOld(pushRecord: PushRecord): PushRecord? {
// return DbUtils.doWithConnection(
// ADD_PUSH_RECORD
// , listOf(pushRecord.domain, pushRecord.deviceId, pushRecord.token, pushRecord.node, pushRecord.secret, pushRecord.type.name, pushRecord.token)
// , { conn, statement ->
// statement.executeUpdate()

// val rs = DbUtils.createStatement(
// conn
// , SELECT_PUSH_RECORD
// , listOf(pushRecord.domain, pushRecord.deviceId)
// )?.executeQuery()

// if (rs?.next() == true) {
// PushRecord(
// domain = pushRecord.domain
// , deviceId = pushRecord.deviceId
// , token = rs.getString("token")
// , type = rs.getString("type")
// , node = rs.getString("node")
// , secret = rs.getString("secret")
// )
// } else {
// null
// }
// }
// ) {
// logger.error("PushRecord couldn't be inserted.", it)
// }
// }

fun deletePushRecord(domain: String, deviceId: String): Boolean? {
return DbUtils.doWithConnection(
Expand Down