fix: restore mysql docker build
This commit is contained in:
@@ -3704,8 +3704,8 @@ func (a *adapter) MessageGetAll(topic string, forUser t.Uid, opts *t.QueryOpt) (
|
||||
// Get ranges of deleted messages
|
||||
func (a *adapter) MessageGetDeleted(topic string, forUser t.Uid, opts *t.QueryOpt) ([]t.DelMessage, error) {
|
||||
var limit = a.maxResults
|
||||
var lower = 0
|
||||
var upper = 1<<31 - 1
|
||||
var lower int64 = 0
|
||||
var upper int64 = 1<<31 - 1
|
||||
|
||||
if opts != nil {
|
||||
if opts.Since > 0 {
|
||||
@@ -3738,8 +3738,8 @@ func (a *adapter) MessageGetDeleted(topic string, forUser t.Uid, opts *t.QueryOp
|
||||
Topic string
|
||||
Deletedfor int64
|
||||
Delid int
|
||||
Low int
|
||||
Hi int
|
||||
Low int64
|
||||
Hi int64
|
||||
}
|
||||
var dmsgs []t.DelMessage
|
||||
var dmsg t.DelMessage
|
||||
@@ -3817,7 +3817,7 @@ func messageDeleteList(tx *sqlx.Tx, topic string, toDel *t.DelMessage) error {
|
||||
}
|
||||
|
||||
// Find the actual IDs still present in the database.
|
||||
var seqIDs []int
|
||||
var seqIDs []int64
|
||||
err = tx.Select(&seqIDs, "SELECT seqid FROM im_messages AS m WHERE "+where, args...)
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -3829,7 +3829,7 @@ func messageDeleteList(tx *sqlx.Tx, topic string, toDel *t.DelMessage) error {
|
||||
}
|
||||
|
||||
// Recalculate the actual ranges to delete.
|
||||
sort.Ints(seqIDs)
|
||||
sort.Slice(seqIDs, func(i, j int) bool { return seqIDs[i] < seqIDs[j] })
|
||||
delRanges = t.SliceToRanges(seqIDs)
|
||||
|
||||
// Compose a new query with the new ranges.
|
||||
|
||||
Reference in New Issue
Block a user