Merge pull request #273 from ReimuHakurei/master

Improve performance of PostgreSQL database in instances where buffers exist with no recent activity

diff --git a/src/core/SQL/PostgreSQL/19/select_messages.sql b/src/core/SQL/PostgreSQL/19/select_messages.sql
deleted file mode 100644 (file)
index 1bd2683..0000000
--- a/src/core/SQL/PostgreSQL/19/select_messages.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-SELECT messageid, time,  type, flags, sender, message
-FROM backlog
-LEFT JOIN sender ON backlog.senderid = sender.senderid
-WHERE bufferid = $1
-ORDER BY messageid DESC
-LIMIT $2
\ No newline at end of file

diff --git a/src/core/SQL/PostgreSQL/19/select_messagesNewerThan.sql b/src/core/SQL/PostgreSQL/19/select_messagesNewerThan.sql
deleted file mode 100644 (file)
index 393d3cf..0000000
--- a/src/core/SQL/PostgreSQL/19/select_messagesNewerThan.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-SELECT messageid, time,  type, flags, sender, message
-FROM backlog
-LEFT JOIN sender ON backlog.senderid = sender.senderid
-WHERE backlog.messageid >= $1 AND bufferid = $2
-ORDER BY messageid DESC
-LIMIT $3
\ No newline at end of file

diff --git a/src/core/SQL/PostgreSQL/19/delete_backlog_by_uid.sql b/src/core/SQL/PostgreSQL/20/delete_backlog_by_uid.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/delete_backlog_by_uid.sql
rename to src/core/SQL/PostgreSQL/20/delete_backlog_by_uid.sql

diff --git a/src/core/SQL/PostgreSQL/19/delete_backlog_for_buffer.sql b/src/core/SQL/PostgreSQL/20/delete_backlog_for_buffer.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/delete_backlog_for_buffer.sql
rename to src/core/SQL/PostgreSQL/20/delete_backlog_for_buffer.sql

diff --git a/src/core/SQL/PostgreSQL/19/delete_backlog_for_network.sql b/src/core/SQL/PostgreSQL/20/delete_backlog_for_network.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/delete_backlog_for_network.sql
rename to src/core/SQL/PostgreSQL/20/delete_backlog_for_network.sql

diff --git a/src/core/SQL/PostgreSQL/19/delete_buffer_for_bufferid.sql b/src/core/SQL/PostgreSQL/20/delete_buffer_for_bufferid.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/delete_buffer_for_bufferid.sql
rename to src/core/SQL/PostgreSQL/20/delete_buffer_for_bufferid.sql

diff --git a/src/core/SQL/PostgreSQL/19/delete_buffers_by_uid.sql b/src/core/SQL/PostgreSQL/20/delete_buffers_by_uid.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/delete_buffers_by_uid.sql
rename to src/core/SQL/PostgreSQL/20/delete_buffers_by_uid.sql

diff --git a/src/core/SQL/PostgreSQL/19/delete_buffers_for_network.sql b/src/core/SQL/PostgreSQL/20/delete_buffers_for_network.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/delete_buffers_for_network.sql
rename to src/core/SQL/PostgreSQL/20/delete_buffers_for_network.sql

diff --git a/src/core/SQL/PostgreSQL/19/delete_identity.sql b/src/core/SQL/PostgreSQL/20/delete_identity.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/delete_identity.sql
rename to src/core/SQL/PostgreSQL/20/delete_identity.sql

diff --git a/src/core/SQL/PostgreSQL/19/delete_ircservers_for_network.sql b/src/core/SQL/PostgreSQL/20/delete_ircservers_for_network.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/delete_ircservers_for_network.sql
rename to src/core/SQL/PostgreSQL/20/delete_ircservers_for_network.sql

diff --git a/src/core/SQL/PostgreSQL/19/delete_network.sql b/src/core/SQL/PostgreSQL/20/delete_network.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/delete_network.sql
rename to src/core/SQL/PostgreSQL/20/delete_network.sql

diff --git a/src/core/SQL/PostgreSQL/19/delete_networks_by_uid.sql b/src/core/SQL/PostgreSQL/20/delete_networks_by_uid.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/delete_networks_by_uid.sql
rename to src/core/SQL/PostgreSQL/20/delete_networks_by_uid.sql

diff --git a/src/core/SQL/PostgreSQL/19/delete_nicks.sql b/src/core/SQL/PostgreSQL/20/delete_nicks.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/delete_nicks.sql
rename to src/core/SQL/PostgreSQL/20/delete_nicks.sql

diff --git a/src/core/SQL/PostgreSQL/19/delete_quasseluser.sql b/src/core/SQL/PostgreSQL/20/delete_quasseluser.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/delete_quasseluser.sql
rename to src/core/SQL/PostgreSQL/20/delete_quasseluser.sql

diff --git a/src/core/SQL/PostgreSQL/19/insert_buffer.sql b/src/core/SQL/PostgreSQL/20/insert_buffer.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/insert_buffer.sql
rename to src/core/SQL/PostgreSQL/20/insert_buffer.sql

diff --git a/src/core/SQL/PostgreSQL/19/insert_identity.sql b/src/core/SQL/PostgreSQL/20/insert_identity.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/insert_identity.sql
rename to src/core/SQL/PostgreSQL/20/insert_identity.sql

diff --git a/src/core/SQL/PostgreSQL/19/insert_message.sql b/src/core/SQL/PostgreSQL/20/insert_message.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/insert_message.sql
rename to src/core/SQL/PostgreSQL/20/insert_message.sql

diff --git a/src/core/SQL/PostgreSQL/19/insert_network.sql b/src/core/SQL/PostgreSQL/20/insert_network.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/insert_network.sql
rename to src/core/SQL/PostgreSQL/20/insert_network.sql

diff --git a/src/core/SQL/PostgreSQL/19/insert_nick.sql b/src/core/SQL/PostgreSQL/20/insert_nick.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/insert_nick.sql
rename to src/core/SQL/PostgreSQL/20/insert_nick.sql

diff --git a/src/core/SQL/PostgreSQL/19/insert_quasseluser.sql b/src/core/SQL/PostgreSQL/20/insert_quasseluser.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/insert_quasseluser.sql
rename to src/core/SQL/PostgreSQL/20/insert_quasseluser.sql

diff --git a/src/core/SQL/PostgreSQL/19/insert_sender.sql b/src/core/SQL/PostgreSQL/20/insert_sender.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/insert_sender.sql
rename to src/core/SQL/PostgreSQL/20/insert_sender.sql

diff --git a/src/core/SQL/PostgreSQL/19/insert_server.sql b/src/core/SQL/PostgreSQL/20/insert_server.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/insert_server.sql
rename to src/core/SQL/PostgreSQL/20/insert_server.sql

diff --git a/src/core/SQL/PostgreSQL/19/insert_user_setting.sql b/src/core/SQL/PostgreSQL/20/insert_user_setting.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/insert_user_setting.sql
rename to src/core/SQL/PostgreSQL/20/insert_user_setting.sql

diff --git a/src/core/SQL/PostgreSQL/19/migrate_write_backlog.sql b/src/core/SQL/PostgreSQL/20/migrate_write_backlog.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/migrate_write_backlog.sql
rename to src/core/SQL/PostgreSQL/20/migrate_write_backlog.sql

diff --git a/src/core/SQL/PostgreSQL/19/migrate_write_buffer.sql b/src/core/SQL/PostgreSQL/20/migrate_write_buffer.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/migrate_write_buffer.sql
rename to src/core/SQL/PostgreSQL/20/migrate_write_buffer.sql

diff --git a/src/core/SQL/PostgreSQL/19/migrate_write_identity.sql b/src/core/SQL/PostgreSQL/20/migrate_write_identity.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/migrate_write_identity.sql
rename to src/core/SQL/PostgreSQL/20/migrate_write_identity.sql

diff --git a/src/core/SQL/PostgreSQL/19/migrate_write_identity_nick.sql b/src/core/SQL/PostgreSQL/20/migrate_write_identity_nick.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/migrate_write_identity_nick.sql
rename to src/core/SQL/PostgreSQL/20/migrate_write_identity_nick.sql

diff --git a/src/core/SQL/PostgreSQL/19/migrate_write_ircserver.sql b/src/core/SQL/PostgreSQL/20/migrate_write_ircserver.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/migrate_write_ircserver.sql
rename to src/core/SQL/PostgreSQL/20/migrate_write_ircserver.sql

diff --git a/src/core/SQL/PostgreSQL/19/migrate_write_network.sql b/src/core/SQL/PostgreSQL/20/migrate_write_network.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/migrate_write_network.sql
rename to src/core/SQL/PostgreSQL/20/migrate_write_network.sql

diff --git a/src/core/SQL/PostgreSQL/19/migrate_write_quasseluser.sql b/src/core/SQL/PostgreSQL/20/migrate_write_quasseluser.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/migrate_write_quasseluser.sql
rename to src/core/SQL/PostgreSQL/20/migrate_write_quasseluser.sql

diff --git a/src/core/SQL/PostgreSQL/19/migrate_write_sender.sql b/src/core/SQL/PostgreSQL/20/migrate_write_sender.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/migrate_write_sender.sql
rename to src/core/SQL/PostgreSQL/20/migrate_write_sender.sql

diff --git a/src/core/SQL/PostgreSQL/19/migrate_write_usersetting.sql b/src/core/SQL/PostgreSQL/20/migrate_write_usersetting.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/migrate_write_usersetting.sql
rename to src/core/SQL/PostgreSQL/20/migrate_write_usersetting.sql

diff --git a/src/core/SQL/PostgreSQL/19/select_authuser.sql b/src/core/SQL/PostgreSQL/20/select_authuser.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/select_authuser.sql
rename to src/core/SQL/PostgreSQL/20/select_authuser.sql

diff --git a/src/core/SQL/PostgreSQL/19/select_bufferByName.sql b/src/core/SQL/PostgreSQL/20/select_bufferByName.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/select_bufferByName.sql
rename to src/core/SQL/PostgreSQL/20/select_bufferByName.sql

diff --git a/src/core/SQL/PostgreSQL/19/select_bufferExists.sql b/src/core/SQL/PostgreSQL/20/select_bufferExists.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/select_bufferExists.sql
rename to src/core/SQL/PostgreSQL/20/select_bufferExists.sql

diff --git a/src/core/SQL/PostgreSQL/19/select_buffer_by_id.sql b/src/core/SQL/PostgreSQL/20/select_buffer_by_id.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/select_buffer_by_id.sql
rename to src/core/SQL/PostgreSQL/20/select_buffer_by_id.sql

diff --git a/src/core/SQL/PostgreSQL/19/select_buffer_lastseen_messages.sql b/src/core/SQL/PostgreSQL/20/select_buffer_lastseen_messages.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/select_buffer_lastseen_messages.sql
rename to src/core/SQL/PostgreSQL/20/select_buffer_lastseen_messages.sql

diff --git a/src/core/SQL/PostgreSQL/19/select_buffer_markerlinemsgids.sql b/src/core/SQL/PostgreSQL/20/select_buffer_markerlinemsgids.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/select_buffer_markerlinemsgids.sql
rename to src/core/SQL/PostgreSQL/20/select_buffer_markerlinemsgids.sql

diff --git a/src/core/SQL/PostgreSQL/19/select_buffers.sql b/src/core/SQL/PostgreSQL/20/select_buffers.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/select_buffers.sql
rename to src/core/SQL/PostgreSQL/20/select_buffers.sql

diff --git a/src/core/SQL/PostgreSQL/19/select_buffers_for_network.sql b/src/core/SQL/PostgreSQL/20/select_buffers_for_network.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/select_buffers_for_network.sql
rename to src/core/SQL/PostgreSQL/20/select_buffers_for_network.sql

diff --git a/src/core/SQL/PostgreSQL/19/select_checkidentity.sql b/src/core/SQL/PostgreSQL/20/select_checkidentity.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/select_checkidentity.sql
rename to src/core/SQL/PostgreSQL/20/select_checkidentity.sql

diff --git a/src/core/SQL/PostgreSQL/19/select_connected_networks.sql b/src/core/SQL/PostgreSQL/20/select_connected_networks.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/select_connected_networks.sql
rename to src/core/SQL/PostgreSQL/20/select_connected_networks.sql

diff --git a/src/core/SQL/PostgreSQL/19/select_identities.sql b/src/core/SQL/PostgreSQL/20/select_identities.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/select_identities.sql
rename to src/core/SQL/PostgreSQL/20/select_identities.sql

diff --git a/src/core/SQL/PostgreSQL/19/select_internaluser.sql b/src/core/SQL/PostgreSQL/20/select_internaluser.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/select_internaluser.sql
rename to src/core/SQL/PostgreSQL/20/select_internaluser.sql

diff --git a/src/core/SQL/PostgreSQL/20/select_messages.sql b/src/core/SQL/PostgreSQL/20/select_messages.sql
new file mode 100644 (file)
index 0000000..50be2e3
--- /dev/null
+++ b/src/core/SQL/PostgreSQL/20/select_messages.sql
@@ -0,0 +1,7 @@
+SELECT messageid, time,  type, flags, sender, message
+FROM backlog
+JOIN sender ON backlog.senderid = sender.senderid
+WHERE bufferid = $1
+AND backlog.messageid <= (SELECT buffer.lastmsgid FROM buffer WHERE buffer.bufferid = $1)
+ORDER BY messageid DESC
+LIMIT $2

diff --git a/src/core/SQL/PostgreSQL/19/select_messagesAll.sql b/src/core/SQL/PostgreSQL/20/select_messagesAll.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/select_messagesAll.sql
rename to src/core/SQL/PostgreSQL/20/select_messagesAll.sql

diff --git a/src/core/SQL/PostgreSQL/19/select_messagesAllNew.sql b/src/core/SQL/PostgreSQL/20/select_messagesAllNew.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/select_messagesAllNew.sql
rename to src/core/SQL/PostgreSQL/20/select_messagesAllNew.sql

diff --git a/src/core/SQL/PostgreSQL/20/select_messagesNewerThan.sql b/src/core/SQL/PostgreSQL/20/select_messagesNewerThan.sql
new file mode 100644 (file)
index 0000000..881ce5e
--- /dev/null
+++ b/src/core/SQL/PostgreSQL/20/select_messagesNewerThan.sql
@@ -0,0 +1,8 @@
+SELECT messageid, time,  type, flags, sender, message
+FROM backlog
+JOIN sender ON backlog.senderid = sender.senderid
+WHERE backlog.messageid >= $1
+AND backlog.messageid <= (SELECT buffer.lastmsgid FROM buffer WHERE buffer.bufferid = $1)
+AND bufferid = $2
+ORDER BY messageid DESC
+LIMIT $3

diff --git a/src/core/SQL/PostgreSQL/19/select_messagesRange.sql b/src/core/SQL/PostgreSQL/20/select_messagesRange.sql
similarity index 73%
rename from src/core/SQL/PostgreSQL/19/select_messagesRange.sql
rename to src/core/SQL/PostgreSQL/20/select_messagesRange.sql
index 9bd8613..b7af909 100644 (file)
--- a/src/core/SQL/PostgreSQL/19/select_messagesRange.sql
+++ b/src/core/SQL/PostgreSQL/20/select_messagesRange.sql
@@ -1,8 +1,8 @@
 SELECT messageid, time,  type, flags, sender, message
 FROM backlog
-LEFT JOIN sender ON backlog.senderid = sender.senderid
+JOIN sender ON backlog.senderid = sender.senderid
 WHERE backlog.messageid >= $1
     AND backlog.messageid < $2
     AND bufferid = $3
 ORDER BY messageid DESC
-LIMIT $4
\ No newline at end of file
+LIMIT $4

diff --git a/src/core/SQL/PostgreSQL/19/select_networkExists.sql b/src/core/SQL/PostgreSQL/20/select_networkExists.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/select_networkExists.sql
rename to src/core/SQL/PostgreSQL/20/select_networkExists.sql

diff --git a/src/core/SQL/PostgreSQL/19/select_network_awaymsg.sql b/src/core/SQL/PostgreSQL/20/select_network_awaymsg.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/select_network_awaymsg.sql
rename to src/core/SQL/PostgreSQL/20/select_network_awaymsg.sql

diff --git a/src/core/SQL/PostgreSQL/19/select_network_usermode.sql b/src/core/SQL/PostgreSQL/20/select_network_usermode.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/select_network_usermode.sql
rename to src/core/SQL/PostgreSQL/20/select_network_usermode.sql

diff --git a/src/core/SQL/PostgreSQL/19/select_networks_for_user.sql b/src/core/SQL/PostgreSQL/20/select_networks_for_user.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/select_networks_for_user.sql
rename to src/core/SQL/PostgreSQL/20/select_networks_for_user.sql

diff --git a/src/core/SQL/PostgreSQL/19/select_nicks.sql b/src/core/SQL/PostgreSQL/20/select_nicks.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/select_nicks.sql
rename to src/core/SQL/PostgreSQL/20/select_nicks.sql

diff --git a/src/core/SQL/PostgreSQL/19/select_persistent_channels.sql b/src/core/SQL/PostgreSQL/20/select_persistent_channels.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/select_persistent_channels.sql
rename to src/core/SQL/PostgreSQL/20/select_persistent_channels.sql

diff --git a/src/core/SQL/PostgreSQL/19/select_senderid.sql b/src/core/SQL/PostgreSQL/20/select_senderid.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/select_senderid.sql
rename to src/core/SQL/PostgreSQL/20/select_senderid.sql

diff --git a/src/core/SQL/PostgreSQL/19/select_servers_for_network.sql b/src/core/SQL/PostgreSQL/20/select_servers_for_network.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/select_servers_for_network.sql
rename to src/core/SQL/PostgreSQL/20/select_servers_for_network.sql

diff --git a/src/core/SQL/PostgreSQL/19/select_user_setting.sql b/src/core/SQL/PostgreSQL/20/select_user_setting.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/select_user_setting.sql
rename to src/core/SQL/PostgreSQL/20/select_user_setting.sql

diff --git a/src/core/SQL/PostgreSQL/19/select_userid.sql b/src/core/SQL/PostgreSQL/20/select_userid.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/select_userid.sql
rename to src/core/SQL/PostgreSQL/20/select_userid.sql

diff --git a/src/core/SQL/PostgreSQL/19/setup_000_quasseluser.sql b/src/core/SQL/PostgreSQL/20/setup_000_quasseluser.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/setup_000_quasseluser.sql
rename to src/core/SQL/PostgreSQL/20/setup_000_quasseluser.sql

diff --git a/src/core/SQL/PostgreSQL/19/setup_010_sender.sql b/src/core/SQL/PostgreSQL/20/setup_010_sender.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/setup_010_sender.sql
rename to src/core/SQL/PostgreSQL/20/setup_010_sender.sql

diff --git a/src/core/SQL/PostgreSQL/19/setup_020_identity.sql b/src/core/SQL/PostgreSQL/20/setup_020_identity.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/setup_020_identity.sql
rename to src/core/SQL/PostgreSQL/20/setup_020_identity.sql

diff --git a/src/core/SQL/PostgreSQL/19/setup_030_identity_nick.sql b/src/core/SQL/PostgreSQL/20/setup_030_identity_nick.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/setup_030_identity_nick.sql
rename to src/core/SQL/PostgreSQL/20/setup_030_identity_nick.sql

diff --git a/src/core/SQL/PostgreSQL/19/setup_040_network.sql b/src/core/SQL/PostgreSQL/20/setup_040_network.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/setup_040_network.sql
rename to src/core/SQL/PostgreSQL/20/setup_040_network.sql

diff --git a/src/core/SQL/PostgreSQL/19/setup_050_buffer.sql b/src/core/SQL/PostgreSQL/20/setup_050_buffer.sql
similarity index 79%
rename from src/core/SQL/PostgreSQL/19/setup_050_buffer.sql
rename to src/core/SQL/PostgreSQL/20/setup_050_buffer.sql
index a4b0ce5..a6665b5 100644 (file)
--- a/src/core/SQL/PostgreSQL/19/setup_050_buffer.sql
+++ b/src/core/SQL/PostgreSQL/20/setup_050_buffer.sql
@@ -6,9 +6,11 @@ create TABLE buffer (
        buffername varchar(128) NOT NULL,
        buffercname varchar(128) NOT NULL, -- CANONICAL BUFFER NAME (lowercase version)
        buffertype integer NOT NULL DEFAULT 0,
+        lastmsgid integer NOT NULL DEFAULT 0,
        lastseenmsgid integer NOT NULL DEFAULT 0,
        markerlinemsgid integer NOT NULL DEFAULT 0,
        key varchar(128),
        joined boolean NOT NULL DEFAULT FALSE, -- BOOL
-       UNIQUE(userid, networkid, buffercname)
+       UNIQUE(userid, networkid, buffercname),
+       CHECK (buffer.lastseenmsgid <= buffer.lastmsgid)
 )

diff --git a/src/core/SQL/PostgreSQL/19/setup_060_backlog.sql b/src/core/SQL/PostgreSQL/20/setup_060_backlog.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/setup_060_backlog.sql
rename to src/core/SQL/PostgreSQL/20/setup_060_backlog.sql

diff --git a/src/core/SQL/PostgreSQL/19/setup_070_coreinfo.sql b/src/core/SQL/PostgreSQL/20/setup_070_coreinfo.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/setup_070_coreinfo.sql
rename to src/core/SQL/PostgreSQL/20/setup_070_coreinfo.sql

diff --git a/src/core/SQL/PostgreSQL/19/setup_080_ircservers.sql b/src/core/SQL/PostgreSQL/20/setup_080_ircservers.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/setup_080_ircservers.sql
rename to src/core/SQL/PostgreSQL/20/setup_080_ircservers.sql

diff --git a/src/core/SQL/PostgreSQL/19/setup_090_backlog_idx.sql b/src/core/SQL/PostgreSQL/20/setup_090_backlog_idx.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/setup_090_backlog_idx.sql
rename to src/core/SQL/PostgreSQL/20/setup_090_backlog_idx.sql

diff --git a/src/core/SQL/PostgreSQL/19/setup_100_user_setting.sql b/src/core/SQL/PostgreSQL/20/setup_100_user_setting.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/setup_100_user_setting.sql
rename to src/core/SQL/PostgreSQL/20/setup_100_user_setting.sql

diff --git a/src/core/SQL/PostgreSQL/19/setup_110_alter_sender_seq.sql b/src/core/SQL/PostgreSQL/20/setup_110_alter_sender_seq.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/setup_110_alter_sender_seq.sql
rename to src/core/SQL/PostgreSQL/20/setup_110_alter_sender_seq.sql

diff --git a/src/core/SQL/PostgreSQL/19/setup_120_alter_messageid_seq.sql b/src/core/SQL/PostgreSQL/20/setup_120_alter_messageid_seq.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/setup_120_alter_messageid_seq.sql
rename to src/core/SQL/PostgreSQL/20/setup_120_alter_messageid_seq.sql

diff --git a/src/core/SQL/PostgreSQL/20/setup_130_function_lastmsgid.sql b/src/core/SQL/PostgreSQL/20/setup_130_function_lastmsgid.sql
new file mode 100644 (file)
index 0000000..561422a
--- /dev/null
+++ b/src/core/SQL/PostgreSQL/20/setup_130_function_lastmsgid.sql
@@ -0,0 +1,18 @@
+CREATE OR REPLACE FUNCTION populate_lastmsgid() RETURNS void AS $$
+DECLARE
+       i buffer%rowtype;
+BEGIN
+       FOR i IN SELECT * FROM buffer
+       LOOP
+               UPDATE buffer
+                       SET lastmsgid = (
+                               SELECT backlog.messageid
+                               FROM backlog
+                               WHERE backlog.bufferid = i.bufferid
+                               ORDER BY messageid DESC LIMIT 1
+                       )
+                       WHERE buffer.bufferid = i.bufferid;
+       END LOOP;
+       RETURN;
+END
+$$ LANGUAGE plpgsql;

diff --git a/src/core/SQL/PostgreSQL/19/update_backlog_bufferid.sql b/src/core/SQL/PostgreSQL/20/update_backlog_bufferid.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/update_backlog_bufferid.sql
rename to src/core/SQL/PostgreSQL/20/update_backlog_bufferid.sql

diff --git a/src/core/SQL/PostgreSQL/20/update_buffer_lastmsgid.sql b/src/core/SQL/PostgreSQL/20/update_buffer_lastmsgid.sql
new file mode 100644 (file)
index 0000000..b0f1711
--- /dev/null
+++ b/src/core/SQL/PostgreSQL/20/update_buffer_lastmsgid.sql
@@ -0,0 +1,3 @@
+UPDATE buffer
+SET lastmsgid = :lastmsgid
+WHERE bufferid = :bufferid

diff --git a/src/core/SQL/PostgreSQL/19/update_buffer_lastseen.sql b/src/core/SQL/PostgreSQL/20/update_buffer_lastseen.sql
similarity index 51%
rename from src/core/SQL/PostgreSQL/19/update_buffer_lastseen.sql
rename to src/core/SQL/PostgreSQL/20/update_buffer_lastseen.sql
index 5541505..98218a6 100644 (file)
--- a/src/core/SQL/PostgreSQL/19/update_buffer_lastseen.sql
+++ b/src/core/SQL/PostgreSQL/20/update_buffer_lastseen.sql
@@ -1,3 +1,3 @@
 UPDATE buffer
-SET lastseenmsgid = :lastseenmsgid
+SET lastseenmsgid = min(:lastseenmsgid, buffer.lastmsgid)
 WHERE userid = :userid AND bufferid = :bufferid

diff --git a/src/core/SQL/PostgreSQL/19/update_buffer_markerlinemsgid.sql b/src/core/SQL/PostgreSQL/20/update_buffer_markerlinemsgid.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/update_buffer_markerlinemsgid.sql
rename to src/core/SQL/PostgreSQL/20/update_buffer_markerlinemsgid.sql

diff --git a/src/core/SQL/PostgreSQL/19/update_buffer_name.sql b/src/core/SQL/PostgreSQL/20/update_buffer_name.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/update_buffer_name.sql
rename to src/core/SQL/PostgreSQL/20/update_buffer_name.sql

diff --git a/src/core/SQL/PostgreSQL/19/update_buffer_persistent_channel.sql b/src/core/SQL/PostgreSQL/20/update_buffer_persistent_channel.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/update_buffer_persistent_channel.sql
rename to src/core/SQL/PostgreSQL/20/update_buffer_persistent_channel.sql

diff --git a/src/core/SQL/PostgreSQL/19/update_buffer_set_channel_key.sql b/src/core/SQL/PostgreSQL/20/update_buffer_set_channel_key.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/update_buffer_set_channel_key.sql
rename to src/core/SQL/PostgreSQL/20/update_buffer_set_channel_key.sql

diff --git a/src/core/SQL/PostgreSQL/19/update_identity.sql b/src/core/SQL/PostgreSQL/20/update_identity.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/update_identity.sql
rename to src/core/SQL/PostgreSQL/20/update_identity.sql

diff --git a/src/core/SQL/PostgreSQL/19/update_network.sql b/src/core/SQL/PostgreSQL/20/update_network.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/update_network.sql
rename to src/core/SQL/PostgreSQL/20/update_network.sql

diff --git a/src/core/SQL/PostgreSQL/19/update_network_connected.sql b/src/core/SQL/PostgreSQL/20/update_network_connected.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/update_network_connected.sql
rename to src/core/SQL/PostgreSQL/20/update_network_connected.sql

diff --git a/src/core/SQL/PostgreSQL/19/update_network_set_awaymsg.sql b/src/core/SQL/PostgreSQL/20/update_network_set_awaymsg.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/update_network_set_awaymsg.sql
rename to src/core/SQL/PostgreSQL/20/update_network_set_awaymsg.sql

diff --git a/src/core/SQL/PostgreSQL/19/update_network_set_usermode.sql b/src/core/SQL/PostgreSQL/20/update_network_set_usermode.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/update_network_set_usermode.sql
rename to src/core/SQL/PostgreSQL/20/update_network_set_usermode.sql

diff --git a/src/core/SQL/PostgreSQL/19/update_user_setting.sql b/src/core/SQL/PostgreSQL/20/update_user_setting.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/update_user_setting.sql
rename to src/core/SQL/PostgreSQL/20/update_user_setting.sql

diff --git a/src/core/SQL/PostgreSQL/19/update_username.sql b/src/core/SQL/PostgreSQL/20/update_username.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/update_username.sql
rename to src/core/SQL/PostgreSQL/20/update_username.sql

diff --git a/src/core/SQL/PostgreSQL/19/update_userpassword.sql b/src/core/SQL/PostgreSQL/20/update_userpassword.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/19/update_userpassword.sql
rename to src/core/SQL/PostgreSQL/20/update_userpassword.sql

diff --git a/src/core/SQL/PostgreSQL/20/upgrade_000_alter_buffer_add_lastmsgid.sql b/src/core/SQL/PostgreSQL/20/upgrade_000_alter_buffer_add_lastmsgid.sql
new file mode 100644 (file)
index 0000000..509dc68
--- /dev/null
+++ b/src/core/SQL/PostgreSQL/20/upgrade_000_alter_buffer_add_lastmsgid.sql
@@ -0,0 +1,2 @@
+ALTER TABLE buffer
+ADD COLUMN lastmsgid integer NOT NULL DEFAULT 0

diff --git a/src/core/SQL/PostgreSQL/20/upgrade_001_add_function_populate_lastmsgid.sql b/src/core/SQL/PostgreSQL/20/upgrade_001_add_function_populate_lastmsgid.sql
new file mode 100644 (file)
index 0000000..561422a
--- /dev/null
+++ b/src/core/SQL/PostgreSQL/20/upgrade_001_add_function_populate_lastmsgid.sql
@@ -0,0 +1,18 @@
+CREATE OR REPLACE FUNCTION populate_lastmsgid() RETURNS void AS $$
+DECLARE
+       i buffer%rowtype;
+BEGIN
+       FOR i IN SELECT * FROM buffer
+       LOOP
+               UPDATE buffer
+                       SET lastmsgid = (
+                               SELECT backlog.messageid
+                               FROM backlog
+                               WHERE backlog.bufferid = i.bufferid
+                               ORDER BY messageid DESC LIMIT 1
+                       )
+                       WHERE buffer.bufferid = i.bufferid;
+       END LOOP;
+       RETURN;
+END
+$$ LANGUAGE plpgsql;

diff --git a/src/core/SQL/PostgreSQL/20/upgrade_002_run_function_populate_lastmsgid.sql b/src/core/SQL/PostgreSQL/20/upgrade_002_run_function_populate_lastmsgid.sql
new file mode 100644 (file)
index 0000000..a3ba124
--- /dev/null
+++ b/src/core/SQL/PostgreSQL/20/upgrade_002_run_function_populate_lastmsgid.sql
@@ -0,0 +1 @@
+SELECT populate_lastmsgid()

diff --git a/src/core/SQL/PostgreSQL/20/upgrade_003_correct_bad_lastseenmsgid.sql b/src/core/SQL/PostgreSQL/20/upgrade_003_correct_bad_lastseenmsgid.sql
new file mode 100644 (file)
index 0000000..a09dea1
--- /dev/null
+++ b/src/core/SQL/PostgreSQL/20/upgrade_003_correct_bad_lastseenmsgid.sql
@@ -0,0 +1,3 @@
+UPDATE buffer
+SET lastseenmsgid = buffer.lastmsgid
+WHERE buffer.lastseenmsgid > buffer.lastmsgid

diff --git a/src/core/SQL/PostgreSQL/20/upgrade_004_add_lastseenmsgid_constraint.sql b/src/core/SQL/PostgreSQL/20/upgrade_004_add_lastseenmsgid_constraint.sql
new file mode 100644 (file)
index 0000000..da37927
--- /dev/null
+++ b/src/core/SQL/PostgreSQL/20/upgrade_004_add_lastseenmsgid_constraint.sql
@@ -0,0 +1 @@
+ALTER TABLE buffer ADD CONSTRAINT badLastSeenMsgId CHECK (buffer.lastseenmsgid <= buffer.lastmsgid)

diff --git a/src/core/SQL/SQLite/20/delete_backlog_by_uid.sql b/src/core/SQL/SQLite/21/delete_backlog_by_uid.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/delete_backlog_by_uid.sql
rename to src/core/SQL/SQLite/21/delete_backlog_by_uid.sql

diff --git a/src/core/SQL/SQLite/20/delete_backlog_for_buffer.sql b/src/core/SQL/SQLite/21/delete_backlog_for_buffer.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/delete_backlog_for_buffer.sql
rename to src/core/SQL/SQLite/21/delete_backlog_for_buffer.sql

diff --git a/src/core/SQL/SQLite/20/delete_backlog_for_network.sql b/src/core/SQL/SQLite/21/delete_backlog_for_network.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/delete_backlog_for_network.sql
rename to src/core/SQL/SQLite/21/delete_backlog_for_network.sql

diff --git a/src/core/SQL/SQLite/20/delete_buffer_for_bufferid.sql b/src/core/SQL/SQLite/21/delete_buffer_for_bufferid.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/delete_buffer_for_bufferid.sql
rename to src/core/SQL/SQLite/21/delete_buffer_for_bufferid.sql

diff --git a/src/core/SQL/SQLite/20/delete_buffers_by_uid.sql b/src/core/SQL/SQLite/21/delete_buffers_by_uid.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/delete_buffers_by_uid.sql
rename to src/core/SQL/SQLite/21/delete_buffers_by_uid.sql

diff --git a/src/core/SQL/SQLite/20/delete_buffers_for_network.sql b/src/core/SQL/SQLite/21/delete_buffers_for_network.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/delete_buffers_for_network.sql
rename to src/core/SQL/SQLite/21/delete_buffers_for_network.sql

diff --git a/src/core/SQL/SQLite/20/delete_identity.sql b/src/core/SQL/SQLite/21/delete_identity.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/delete_identity.sql
rename to src/core/SQL/SQLite/21/delete_identity.sql

diff --git a/src/core/SQL/SQLite/20/delete_ircservers_for_network.sql b/src/core/SQL/SQLite/21/delete_ircservers_for_network.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/delete_ircservers_for_network.sql
rename to src/core/SQL/SQLite/21/delete_ircservers_for_network.sql

diff --git a/src/core/SQL/SQLite/20/delete_network.sql b/src/core/SQL/SQLite/21/delete_network.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/delete_network.sql
rename to src/core/SQL/SQLite/21/delete_network.sql

diff --git a/src/core/SQL/SQLite/20/delete_networks_by_uid.sql b/src/core/SQL/SQLite/21/delete_networks_by_uid.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/delete_networks_by_uid.sql
rename to src/core/SQL/SQLite/21/delete_networks_by_uid.sql

diff --git a/src/core/SQL/SQLite/20/delete_nicks.sql b/src/core/SQL/SQLite/21/delete_nicks.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/delete_nicks.sql
rename to src/core/SQL/SQLite/21/delete_nicks.sql

diff --git a/src/core/SQL/SQLite/20/delete_quasseluser.sql b/src/core/SQL/SQLite/21/delete_quasseluser.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/delete_quasseluser.sql
rename to src/core/SQL/SQLite/21/delete_quasseluser.sql

diff --git a/src/core/SQL/SQLite/20/insert_buffer.sql b/src/core/SQL/SQLite/21/insert_buffer.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/insert_buffer.sql
rename to src/core/SQL/SQLite/21/insert_buffer.sql

diff --git a/src/core/SQL/SQLite/20/insert_identity.sql b/src/core/SQL/SQLite/21/insert_identity.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/insert_identity.sql
rename to src/core/SQL/SQLite/21/insert_identity.sql

diff --git a/src/core/SQL/SQLite/20/insert_message.sql b/src/core/SQL/SQLite/21/insert_message.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/insert_message.sql
rename to src/core/SQL/SQLite/21/insert_message.sql

diff --git a/src/core/SQL/SQLite/20/insert_network.sql b/src/core/SQL/SQLite/21/insert_network.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/insert_network.sql
rename to src/core/SQL/SQLite/21/insert_network.sql

diff --git a/src/core/SQL/SQLite/20/insert_nick.sql b/src/core/SQL/SQLite/21/insert_nick.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/insert_nick.sql
rename to src/core/SQL/SQLite/21/insert_nick.sql

diff --git a/src/core/SQL/SQLite/20/insert_quasseluser.sql b/src/core/SQL/SQLite/21/insert_quasseluser.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/insert_quasseluser.sql
rename to src/core/SQL/SQLite/21/insert_quasseluser.sql

diff --git a/src/core/SQL/SQLite/20/insert_sender.sql b/src/core/SQL/SQLite/21/insert_sender.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/insert_sender.sql
rename to src/core/SQL/SQLite/21/insert_sender.sql

diff --git a/src/core/SQL/SQLite/20/insert_server.sql b/src/core/SQL/SQLite/21/insert_server.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/insert_server.sql
rename to src/core/SQL/SQLite/21/insert_server.sql

diff --git a/src/core/SQL/SQLite/20/insert_user_setting.sql b/src/core/SQL/SQLite/21/insert_user_setting.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/insert_user_setting.sql
rename to src/core/SQL/SQLite/21/insert_user_setting.sql

diff --git a/src/core/SQL/SQLite/20/migrate_read_backlog.sql b/src/core/SQL/SQLite/21/migrate_read_backlog.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/migrate_read_backlog.sql
rename to src/core/SQL/SQLite/21/migrate_read_backlog.sql

diff --git a/src/core/SQL/SQLite/20/migrate_read_buffer.sql b/src/core/SQL/SQLite/21/migrate_read_buffer.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/migrate_read_buffer.sql
rename to src/core/SQL/SQLite/21/migrate_read_buffer.sql

diff --git a/src/core/SQL/SQLite/20/migrate_read_identity.sql b/src/core/SQL/SQLite/21/migrate_read_identity.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/migrate_read_identity.sql
rename to src/core/SQL/SQLite/21/migrate_read_identity.sql

diff --git a/src/core/SQL/SQLite/20/migrate_read_identity_nick.sql b/src/core/SQL/SQLite/21/migrate_read_identity_nick.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/migrate_read_identity_nick.sql
rename to src/core/SQL/SQLite/21/migrate_read_identity_nick.sql

diff --git a/src/core/SQL/SQLite/20/migrate_read_ircserver.sql b/src/core/SQL/SQLite/21/migrate_read_ircserver.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/migrate_read_ircserver.sql
rename to src/core/SQL/SQLite/21/migrate_read_ircserver.sql

diff --git a/src/core/SQL/SQLite/20/migrate_read_network.sql b/src/core/SQL/SQLite/21/migrate_read_network.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/migrate_read_network.sql
rename to src/core/SQL/SQLite/21/migrate_read_network.sql

diff --git a/src/core/SQL/SQLite/20/migrate_read_quasseluser.sql b/src/core/SQL/SQLite/21/migrate_read_quasseluser.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/migrate_read_quasseluser.sql
rename to src/core/SQL/SQLite/21/migrate_read_quasseluser.sql

diff --git a/src/core/SQL/SQLite/20/migrate_read_sender.sql b/src/core/SQL/SQLite/21/migrate_read_sender.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/migrate_read_sender.sql
rename to src/core/SQL/SQLite/21/migrate_read_sender.sql

diff --git a/src/core/SQL/SQLite/20/migrate_read_usersetting.sql b/src/core/SQL/SQLite/21/migrate_read_usersetting.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/migrate_read_usersetting.sql
rename to src/core/SQL/SQLite/21/migrate_read_usersetting.sql

diff --git a/src/core/SQL/SQLite/20/select_authuser.sql b/src/core/SQL/SQLite/21/select_authuser.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/select_authuser.sql
rename to src/core/SQL/SQLite/21/select_authuser.sql

diff --git a/src/core/SQL/SQLite/20/select_bufferByName.sql b/src/core/SQL/SQLite/21/select_bufferByName.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/select_bufferByName.sql
rename to src/core/SQL/SQLite/21/select_bufferByName.sql

diff --git a/src/core/SQL/SQLite/20/select_bufferExists.sql b/src/core/SQL/SQLite/21/select_bufferExists.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/select_bufferExists.sql
rename to src/core/SQL/SQLite/21/select_bufferExists.sql

diff --git a/src/core/SQL/SQLite/20/select_buffer_by_id.sql b/src/core/SQL/SQLite/21/select_buffer_by_id.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/select_buffer_by_id.sql
rename to src/core/SQL/SQLite/21/select_buffer_by_id.sql

diff --git a/src/core/SQL/SQLite/20/select_buffer_lastseen_messages.sql b/src/core/SQL/SQLite/21/select_buffer_lastseen_messages.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/select_buffer_lastseen_messages.sql
rename to src/core/SQL/SQLite/21/select_buffer_lastseen_messages.sql

diff --git a/src/core/SQL/SQLite/20/select_buffer_markerlinemsgids.sql b/src/core/SQL/SQLite/21/select_buffer_markerlinemsgids.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/select_buffer_markerlinemsgids.sql
rename to src/core/SQL/SQLite/21/select_buffer_markerlinemsgids.sql

diff --git a/src/core/SQL/SQLite/20/select_buffers.sql b/src/core/SQL/SQLite/21/select_buffers.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/select_buffers.sql
rename to src/core/SQL/SQLite/21/select_buffers.sql

diff --git a/src/core/SQL/SQLite/20/select_buffers_for_merge.sql b/src/core/SQL/SQLite/21/select_buffers_for_merge.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/select_buffers_for_merge.sql
rename to src/core/SQL/SQLite/21/select_buffers_for_merge.sql

diff --git a/src/core/SQL/SQLite/20/select_buffers_for_network.sql b/src/core/SQL/SQLite/21/select_buffers_for_network.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/select_buffers_for_network.sql
rename to src/core/SQL/SQLite/21/select_buffers_for_network.sql

diff --git a/src/core/SQL/SQLite/20/select_checkidentity.sql b/src/core/SQL/SQLite/21/select_checkidentity.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/select_checkidentity.sql
rename to src/core/SQL/SQLite/21/select_checkidentity.sql

diff --git a/src/core/SQL/SQLite/20/select_connected_networks.sql b/src/core/SQL/SQLite/21/select_connected_networks.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/select_connected_networks.sql
rename to src/core/SQL/SQLite/21/select_connected_networks.sql

diff --git a/src/core/SQL/SQLite/20/select_identities.sql b/src/core/SQL/SQLite/21/select_identities.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/select_identities.sql
rename to src/core/SQL/SQLite/21/select_identities.sql

diff --git a/src/core/SQL/SQLite/20/select_internaluser.sql b/src/core/SQL/SQLite/21/select_internaluser.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/select_internaluser.sql
rename to src/core/SQL/SQLite/21/select_internaluser.sql

diff --git a/src/core/SQL/SQLite/20/select_messages.sql b/src/core/SQL/SQLite/21/select_messages.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/select_messages.sql
rename to src/core/SQL/SQLite/21/select_messages.sql

diff --git a/src/core/SQL/SQLite/20/select_messagesAll.sql b/src/core/SQL/SQLite/21/select_messagesAll.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/select_messagesAll.sql
rename to src/core/SQL/SQLite/21/select_messagesAll.sql

diff --git a/src/core/SQL/SQLite/20/select_messagesAllNew.sql b/src/core/SQL/SQLite/21/select_messagesAllNew.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/select_messagesAllNew.sql
rename to src/core/SQL/SQLite/21/select_messagesAllNew.sql

diff --git a/src/core/SQL/SQLite/20/select_messagesNewerThan.sql b/src/core/SQL/SQLite/21/select_messagesNewerThan.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/select_messagesNewerThan.sql
rename to src/core/SQL/SQLite/21/select_messagesNewerThan.sql

diff --git a/src/core/SQL/SQLite/20/select_messagesNewestK.sql b/src/core/SQL/SQLite/21/select_messagesNewestK.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/select_messagesNewestK.sql
rename to src/core/SQL/SQLite/21/select_messagesNewestK.sql

diff --git a/src/core/SQL/SQLite/20/select_networkExists.sql b/src/core/SQL/SQLite/21/select_networkExists.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/select_networkExists.sql
rename to src/core/SQL/SQLite/21/select_networkExists.sql

diff --git a/src/core/SQL/SQLite/20/select_network_awaymsg.sql b/src/core/SQL/SQLite/21/select_network_awaymsg.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/select_network_awaymsg.sql
rename to src/core/SQL/SQLite/21/select_network_awaymsg.sql

diff --git a/src/core/SQL/SQLite/20/select_network_usermode.sql b/src/core/SQL/SQLite/21/select_network_usermode.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/select_network_usermode.sql
rename to src/core/SQL/SQLite/21/select_network_usermode.sql

diff --git a/src/core/SQL/SQLite/20/select_networks_for_user.sql b/src/core/SQL/SQLite/21/select_networks_for_user.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/select_networks_for_user.sql
rename to src/core/SQL/SQLite/21/select_networks_for_user.sql

diff --git a/src/core/SQL/SQLite/20/select_nicks.sql b/src/core/SQL/SQLite/21/select_nicks.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/select_nicks.sql
rename to src/core/SQL/SQLite/21/select_nicks.sql

diff --git a/src/core/SQL/SQLite/20/select_persistent_channels.sql b/src/core/SQL/SQLite/21/select_persistent_channels.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/select_persistent_channels.sql
rename to src/core/SQL/SQLite/21/select_persistent_channels.sql

diff --git a/src/core/SQL/SQLite/20/select_servers_for_network.sql b/src/core/SQL/SQLite/21/select_servers_for_network.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/select_servers_for_network.sql
rename to src/core/SQL/SQLite/21/select_servers_for_network.sql

diff --git a/src/core/SQL/SQLite/20/select_user_setting.sql b/src/core/SQL/SQLite/21/select_user_setting.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/select_user_setting.sql
rename to src/core/SQL/SQLite/21/select_user_setting.sql

diff --git a/src/core/SQL/SQLite/20/select_userid.sql b/src/core/SQL/SQLite/21/select_userid.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/select_userid.sql
rename to src/core/SQL/SQLite/21/select_userid.sql

diff --git a/src/core/SQL/SQLite/20/setup_000_quasseluser.sql b/src/core/SQL/SQLite/21/setup_000_quasseluser.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/setup_000_quasseluser.sql
rename to src/core/SQL/SQLite/21/setup_000_quasseluser.sql

diff --git a/src/core/SQL/SQLite/20/setup_010_sender.sql b/src/core/SQL/SQLite/21/setup_010_sender.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/setup_010_sender.sql
rename to src/core/SQL/SQLite/21/setup_010_sender.sql

diff --git a/src/core/SQL/SQLite/20/setup_020_network.sql b/src/core/SQL/SQLite/21/setup_020_network.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/setup_020_network.sql
rename to src/core/SQL/SQLite/21/setup_020_network.sql

diff --git a/src/core/SQL/SQLite/20/setup_030_buffer.sql b/src/core/SQL/SQLite/21/setup_030_buffer.sql
similarity index 74%
rename from src/core/SQL/SQLite/20/setup_030_buffer.sql
rename to src/core/SQL/SQLite/21/setup_030_buffer.sql
index facb75c..53ea542 100644 (file)
--- a/src/core/SQL/SQLite/20/setup_030_buffer.sql
+++ b/src/core/SQL/SQLite/21/setup_030_buffer.sql
@@ -6,8 +6,10 @@ CREATE TABLE buffer (
        buffername TEXT NOT NULL,
        buffercname TEXT NOT NULL, -- CANONICAL BUFFER NAME (lowercase version)
        buffertype INTEGER NOT NULL DEFAULT 0,
+        lastmsgid INTEGER NOT NULL DEFAULT 0,
        lastseenmsgid INTEGER NOT NULL DEFAULT 0,
        markerlinemsgid INTEGER NOT NULL DEFAULT 0,
        key TEXT,
-       joined INTEGER NOT NULL DEFAULT 0 -- BOOL
+       joined INTEGER NOT NULL DEFAULT 0, -- BOOL
+       ALTER TABLE buffer_new RENAME TO buffer;
 )

diff --git a/src/core/SQL/SQLite/20/setup_040_buffer_idx.sql b/src/core/SQL/SQLite/21/setup_040_buffer_idx.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/setup_040_buffer_idx.sql
rename to src/core/SQL/SQLite/21/setup_040_buffer_idx.sql

diff --git a/src/core/SQL/SQLite/20/setup_050_buffer_cname_idx.sql b/src/core/SQL/SQLite/21/setup_050_buffer_cname_idx.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/setup_050_buffer_cname_idx.sql
rename to src/core/SQL/SQLite/21/setup_050_buffer_cname_idx.sql

diff --git a/src/core/SQL/SQLite/20/setup_060_backlog.sql b/src/core/SQL/SQLite/21/setup_060_backlog.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/setup_060_backlog.sql
rename to src/core/SQL/SQLite/21/setup_060_backlog.sql

diff --git a/src/core/SQL/SQLite/20/setup_070_coreinfo.sql b/src/core/SQL/SQLite/21/setup_070_coreinfo.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/setup_070_coreinfo.sql
rename to src/core/SQL/SQLite/21/setup_070_coreinfo.sql

diff --git a/src/core/SQL/SQLite/20/setup_080_ircservers.sql b/src/core/SQL/SQLite/21/setup_080_ircservers.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/setup_080_ircservers.sql
rename to src/core/SQL/SQLite/21/setup_080_ircservers.sql

diff --git a/src/core/SQL/SQLite/20/setup_090_backlog_idx.sql b/src/core/SQL/SQLite/21/setup_090_backlog_idx.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/setup_090_backlog_idx.sql
rename to src/core/SQL/SQLite/21/setup_090_backlog_idx.sql

diff --git a/src/core/SQL/SQLite/20/setup_100_backlog_idx2.sql b/src/core/SQL/SQLite/21/setup_100_backlog_idx2.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/setup_100_backlog_idx2.sql
rename to src/core/SQL/SQLite/21/setup_100_backlog_idx2.sql

diff --git a/src/core/SQL/SQLite/20/setup_110_buffer_user_idx.sql b/src/core/SQL/SQLite/21/setup_110_buffer_user_idx.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/setup_110_buffer_user_idx.sql
rename to src/core/SQL/SQLite/21/setup_110_buffer_user_idx.sql

diff --git a/src/core/SQL/SQLite/20/setup_120_user_setting.sql b/src/core/SQL/SQLite/21/setup_120_user_setting.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/setup_120_user_setting.sql
rename to src/core/SQL/SQLite/21/setup_120_user_setting.sql

diff --git a/src/core/SQL/SQLite/20/setup_130_identity.sql b/src/core/SQL/SQLite/21/setup_130_identity.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/setup_130_identity.sql
rename to src/core/SQL/SQLite/21/setup_130_identity.sql

diff --git a/src/core/SQL/SQLite/20/setup_140_identity_nick.sql b/src/core/SQL/SQLite/21/setup_140_identity_nick.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/setup_140_identity_nick.sql
rename to src/core/SQL/SQLite/21/setup_140_identity_nick.sql

diff --git a/src/core/SQL/SQLite/20/update_backlog_bufferid.sql b/src/core/SQL/SQLite/21/update_backlog_bufferid.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/update_backlog_bufferid.sql
rename to src/core/SQL/SQLite/21/update_backlog_bufferid.sql

diff --git a/src/core/SQL/SQLite/21/update_buffer_lastmsgid.sql b/src/core/SQL/SQLite/21/update_buffer_lastmsgid.sql
new file mode 100644 (file)
index 0000000..b0f1711
--- /dev/null
+++ b/src/core/SQL/SQLite/21/update_buffer_lastmsgid.sql
@@ -0,0 +1,3 @@
+UPDATE buffer
+SET lastmsgid = :lastmsgid
+WHERE bufferid = :bufferid

diff --git a/src/core/SQL/SQLite/20/update_buffer_lastseen.sql b/src/core/SQL/SQLite/21/update_buffer_lastseen.sql
similarity index 51%
rename from src/core/SQL/SQLite/20/update_buffer_lastseen.sql
rename to src/core/SQL/SQLite/21/update_buffer_lastseen.sql
index 5541505..98218a6 100644 (file)
--- a/src/core/SQL/SQLite/20/update_buffer_lastseen.sql
+++ b/src/core/SQL/SQLite/21/update_buffer_lastseen.sql
@@ -1,3 +1,3 @@
 UPDATE buffer
-SET lastseenmsgid = :lastseenmsgid
+SET lastseenmsgid = min(:lastseenmsgid, buffer.lastmsgid)
 WHERE userid = :userid AND bufferid = :bufferid

diff --git a/src/core/SQL/SQLite/20/update_buffer_markerlinemsgid.sql b/src/core/SQL/SQLite/21/update_buffer_markerlinemsgid.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/update_buffer_markerlinemsgid.sql
rename to src/core/SQL/SQLite/21/update_buffer_markerlinemsgid.sql

diff --git a/src/core/SQL/SQLite/20/update_buffer_name.sql b/src/core/SQL/SQLite/21/update_buffer_name.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/update_buffer_name.sql
rename to src/core/SQL/SQLite/21/update_buffer_name.sql

diff --git a/src/core/SQL/SQLite/20/update_buffer_persistent_channel.sql b/src/core/SQL/SQLite/21/update_buffer_persistent_channel.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/update_buffer_persistent_channel.sql
rename to src/core/SQL/SQLite/21/update_buffer_persistent_channel.sql

diff --git a/src/core/SQL/SQLite/20/update_buffer_set_channel_key.sql b/src/core/SQL/SQLite/21/update_buffer_set_channel_key.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/update_buffer_set_channel_key.sql
rename to src/core/SQL/SQLite/21/update_buffer_set_channel_key.sql

diff --git a/src/core/SQL/SQLite/20/update_identity.sql b/src/core/SQL/SQLite/21/update_identity.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/update_identity.sql
rename to src/core/SQL/SQLite/21/update_identity.sql

diff --git a/src/core/SQL/SQLite/20/update_network.sql b/src/core/SQL/SQLite/21/update_network.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/update_network.sql
rename to src/core/SQL/SQLite/21/update_network.sql

diff --git a/src/core/SQL/SQLite/20/update_network_connected.sql b/src/core/SQL/SQLite/21/update_network_connected.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/update_network_connected.sql
rename to src/core/SQL/SQLite/21/update_network_connected.sql

diff --git a/src/core/SQL/SQLite/20/update_network_set_awaymsg.sql b/src/core/SQL/SQLite/21/update_network_set_awaymsg.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/update_network_set_awaymsg.sql
rename to src/core/SQL/SQLite/21/update_network_set_awaymsg.sql

diff --git a/src/core/SQL/SQLite/20/update_network_set_usermode.sql b/src/core/SQL/SQLite/21/update_network_set_usermode.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/update_network_set_usermode.sql
rename to src/core/SQL/SQLite/21/update_network_set_usermode.sql

diff --git a/src/core/SQL/SQLite/20/update_user_setting.sql b/src/core/SQL/SQLite/21/update_user_setting.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/update_user_setting.sql
rename to src/core/SQL/SQLite/21/update_user_setting.sql

diff --git a/src/core/SQL/SQLite/20/update_username.sql b/src/core/SQL/SQLite/21/update_username.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/update_username.sql
rename to src/core/SQL/SQLite/21/update_username.sql

diff --git a/src/core/SQL/SQLite/20/update_userpassword.sql b/src/core/SQL/SQLite/21/update_userpassword.sql
similarity index 100%
rename from src/core/SQL/SQLite/20/update_userpassword.sql
rename to src/core/SQL/SQLite/21/update_userpassword.sql

diff --git a/src/core/SQL/SQLite/21/upgrade_000_alter_buffer_add_lastmsgid.sql b/src/core/SQL/SQLite/21/upgrade_000_alter_buffer_add_lastmsgid.sql
new file mode 100644 (file)
index 0000000..35a9017
--- /dev/null
+++ b/src/core/SQL/SQLite/21/upgrade_000_alter_buffer_add_lastmsgid.sql
@@ -0,0 +1,2 @@
+ALTER TABLE buffer
+ADD COLUMN lastmsgid INTEGER NOT NULL DEFAULT 0;

diff --git a/src/core/SQL/SQLite/21/upgrade_001_update_buffer_set_lastmsgid.sql b/src/core/SQL/SQLite/21/upgrade_001_update_buffer_set_lastmsgid.sql
new file mode 100644 (file)
index 0000000..221e814
--- /dev/null
+++ b/src/core/SQL/SQLite/21/upgrade_001_update_buffer_set_lastmsgid.sql
@@ -0,0 +1,8 @@
+UPDATE buffer
+SET lastmsgid = (
+       SELECT messageid 
+       FROM backlog 
+       WHERE backlog.bufferid = buffer.bufferid
+       ORDER BY messageid 
+       DESC LIMIT 1
+);

diff --git a/src/core/SQL/SQLite/21/upgrade_002_update_buffer_fix_lastseenmsgid_over_lastmsgid.sql b/src/core/SQL/SQLite/21/upgrade_002_update_buffer_fix_lastseenmsgid_over_lastmsgid.sql
new file mode 100644 (file)
index 0000000..0b71b69
--- /dev/null
+++ b/src/core/SQL/SQLite/21/upgrade_002_update_buffer_fix_lastseenmsgid_over_lastmsgid.sql
@@ -0,0 +1,3 @@
+UPDATE buffer
+SET lastseenmsgid = buffer.lastmsgid
+WHERE buffer.lastseenmsgid > buffer.lastmsgid;

diff --git a/src/core/SQL/SQLite/21/upgrade_003_create_table_buffer_new.sql b/src/core/SQL/SQLite/21/upgrade_003_create_table_buffer_new.sql
new file mode 100644 (file)
index 0000000..d0f54e1
--- /dev/null
+++ b/src/core/SQL/SQLite/21/upgrade_003_create_table_buffer_new.sql
@@ -0,0 +1,15 @@
+CREATE TABLE buffer_new (
+        bufferid INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+        userid INTEGER NOT NULL,
+        groupid INTEGER,
+        networkid INTEGER NOT NULL,
+        buffername TEXT NOT NULL,
+        buffercname TEXT NOT NULL, -- CANONICAL BUFFER NAME (lowercase version)
+        buffertype INTEGER NOT NULL DEFAULT 0,
+        lastmsgid INTEGER NOT NULL DEFAULT 0,
+        lastseenmsgid INTEGER NOT NULL DEFAULT 0,
+        markerlinemsgid INTEGER NOT NULL DEFAULT 0,
+        key TEXT,
+        joined INTEGER NOT NULL DEFAULT 0, -- BOOL
+        CHECK (lastseenmsgid <= lastmsgid)
+);

diff --git a/src/core/SQL/SQLite/21/upgrade_004_insert_into_buffer_new_from_buffer.sql b/src/core/SQL/SQLite/21/upgrade_004_insert_into_buffer_new_from_buffer.sql
new file mode 100644 (file)
index 0000000..08468c3
--- /dev/null
+++ b/src/core/SQL/SQLite/21/upgrade_004_insert_into_buffer_new_from_buffer.sql
@@ -0,0 +1,28 @@
+INSERT INTO buffer_new (
+       bufferid, 
+       userid, 
+       groupid, 
+       networkid, 
+       buffername, 
+       buffercname, 
+       buffertype, 
+       lastmsgid, 
+       lastseenmsgid,
+       markerlinemsgid,
+       key,
+       joined
+)
+SELECT 
+       bufferid,
+       userid,
+       groupid,
+       networkid,
+       buffername,
+       buffercname,
+       buffertype,
+       lastmsgid,
+       lastseenmsgid,
+       markerlinemsgid,
+       key,
+       joined
+FROM buffer;

diff --git a/src/core/SQL/SQLite/21/upgrade_005_drop_table_buffer.sql b/src/core/SQL/SQLite/21/upgrade_005_drop_table_buffer.sql
new file mode 100644 (file)
index 0000000..f99ea6a
--- /dev/null
+++ b/src/core/SQL/SQLite/21/upgrade_005_drop_table_buffer.sql
@@ -0,0 +1 @@
+DROP TABLE buffer;

diff --git a/src/core/SQL/SQLite/21/upgrade_006_alter_table_buffer_new_rename_to_buffer.sql b/src/core/SQL/SQLite/21/upgrade_006_alter_table_buffer_new_rename_to_buffer.sql
new file mode 100644 (file)
index 0000000..cda4714
--- /dev/null
+++ b/src/core/SQL/SQLite/21/upgrade_006_alter_table_buffer_new_rename_to_buffer.sql
@@ -0,0 +1,2 @@
+ALTER TABLE buffer_new RENAME TO buffer;
+

diff --git a/src/core/postgresqlstorage.cpp b/src/core/postgresqlstorage.cpp
index d6b8244..05da7a1 100644 (file)
--- a/src/core/postgresqlstorage.cpp
+++ b/src/core/postgresqlstorage.cpp
@@ -1370,6 +1370,16 @@ QHash<BufferId, MsgId> PostgreSqlStorage::bufferMarkerLineMsgIds(UserId user)
     return markerLineHash;
 }
 
+void PostgreSqlStorage::setBufferLastMsg(const BufferId &bufferId, const MsgId &msgId)
+{
+    QSqlQuery query(logDb());
+    query.prepare(queryString("update_buffer_lastmsgid"));
+
+    query.bindValue(":bufferid", bufferId.toInt());
+    query.bindValue(":lastmsgid", msgId.toInt());
+    safeExec(query);
+    watchQuery(query);
+}
 
 bool PostgreSqlStorage::logMessage(Message &msg)
 {
@@ -1424,6 +1434,9 @@ bool PostgreSqlStorage::logMessage(Message &msg)
     db.commit();
     if (msgId.isValid()) {
         msg.setMsgId(msgId);
+
+        setBufferLastMsg(msg.bufferInfo().bufferId(), msgId);
+
         return true;
     }
     else {
@@ -2029,5 +2042,9 @@ bool PostgreSqlMigrationWriter::postProcess()
         if (!exec())
             return false;
     }
+
+    newQuery(QString("SELECT populate_lastmsgid()"), db);
+    if (!exec())
+        return false;
     return true;
 }

diff --git a/src/core/postgresqlstorage.h b/src/core/postgresqlstorage.h
index c96687e..062aa0a 100644 (file)
--- a/src/core/postgresqlstorage.h
+++ b/src/core/postgresqlstorage.h
@@ -95,6 +95,7 @@ public slots:
     virtual QHash<BufferId, MsgId> bufferLastSeenMsgIds(UserId user);
     virtual void setBufferMarkerLineMsg(UserId user, const BufferId &bufferId, const MsgId &msgId);
     virtual QHash<BufferId, MsgId> bufferMarkerLineMsgIds(UserId user);
+    virtual void setBufferLastMsg(const BufferId &bufferId, const MsgId &msgId);
 
     /* Message handling */
     virtual bool logMessage(Message &msg);

diff --git a/src/core/sql.qrc b/src/core/sql.qrc
index be7a843..bbf41ac 100644 (file)
--- a/src/core/sql.qrc
+++ b/src/core/sql.qrc
@@ -1,10 +1,140 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
+    <file>./SQL/PostgreSQL/15/upgrade_000_alter_buffer_add_markerlinemsgid.sql</file>
+    <file>./SQL/PostgreSQL/16/upgrade_000_alter_network_add_sasl.sql</file>
+    <file>./SQL/PostgreSQL/17/upgrade_000_alter_quasseluser_add_passwordversion.sql</file>
+    <file>./SQL/PostgreSQL/18/upgrade_000_alter_ircserver_add_sslverify.sql</file>
+    <file>./SQL/PostgreSQL/19/upgrade_000_alter_network_add_ratelimit_usecustom.sql</file>
+    <file>./SQL/PostgreSQL/19/upgrade_001_alter_network_add_ratelimit_burstsize.sql</file>
+    <file>./SQL/PostgreSQL/19/upgrade_002_alter_network_add_ratelimit_delay.sql</file>
+    <file>./SQL/PostgreSQL/19/upgrade_003_alter_network_add_ratelimit_unlimited.sql</file>
+    <file>./SQL/PostgreSQL/20/delete_backlog_by_uid.sql</file>
+    <file>./SQL/PostgreSQL/20/delete_backlog_for_buffer.sql</file>
+    <file>./SQL/PostgreSQL/20/delete_backlog_for_network.sql</file>
+    <file>./SQL/PostgreSQL/20/delete_buffer_for_bufferid.sql</file>
+    <file>./SQL/PostgreSQL/20/delete_buffers_by_uid.sql</file>
+    <file>./SQL/PostgreSQL/20/delete_buffers_for_network.sql</file>
+    <file>./SQL/PostgreSQL/20/delete_identity.sql</file>
+    <file>./SQL/PostgreSQL/20/delete_ircservers_for_network.sql</file>
+    <file>./SQL/PostgreSQL/20/delete_network.sql</file>
+    <file>./SQL/PostgreSQL/20/delete_networks_by_uid.sql</file>
+    <file>./SQL/PostgreSQL/20/delete_nicks.sql</file>
+    <file>./SQL/PostgreSQL/20/delete_quasseluser.sql</file>
+    <file>./SQL/PostgreSQL/20/insert_buffer.sql</file>
+    <file>./SQL/PostgreSQL/20/insert_identity.sql</file>
+    <file>./SQL/PostgreSQL/20/insert_message.sql</file>
+    <file>./SQL/PostgreSQL/20/insert_network.sql</file>
+    <file>./SQL/PostgreSQL/20/insert_nick.sql</file>
+    <file>./SQL/PostgreSQL/20/insert_quasseluser.sql</file>
+    <file>./SQL/PostgreSQL/20/insert_sender.sql</file>
+    <file>./SQL/PostgreSQL/20/insert_server.sql</file>
+    <file>./SQL/PostgreSQL/20/insert_user_setting.sql</file>
+    <file>./SQL/PostgreSQL/20/migrate_write_backlog.sql</file>
+    <file>./SQL/PostgreSQL/20/migrate_write_buffer.sql</file>
+    <file>./SQL/PostgreSQL/20/migrate_write_identity.sql</file>
+    <file>./SQL/PostgreSQL/20/migrate_write_identity_nick.sql</file>
+    <file>./SQL/PostgreSQL/20/migrate_write_ircserver.sql</file>
+    <file>./SQL/PostgreSQL/20/migrate_write_network.sql</file>
+    <file>./SQL/PostgreSQL/20/migrate_write_quasseluser.sql</file>
+    <file>./SQL/PostgreSQL/20/migrate_write_sender.sql</file>
+    <file>./SQL/PostgreSQL/20/migrate_write_usersetting.sql</file>
+    <file>./SQL/PostgreSQL/20/select_authuser.sql</file>
+    <file>./SQL/PostgreSQL/20/select_bufferByName.sql</file>
+    <file>./SQL/PostgreSQL/20/select_bufferExists.sql</file>
+    <file>./SQL/PostgreSQL/20/select_buffer_by_id.sql</file>
+    <file>./SQL/PostgreSQL/20/select_buffer_lastseen_messages.sql</file>
+    <file>./SQL/PostgreSQL/20/select_buffer_markerlinemsgids.sql</file>
+    <file>./SQL/PostgreSQL/20/select_buffers.sql</file>
+    <file>./SQL/PostgreSQL/20/select_buffers_for_network.sql</file>
+    <file>./SQL/PostgreSQL/20/select_checkidentity.sql</file>
+    <file>./SQL/PostgreSQL/20/select_connected_networks.sql</file>
+    <file>./SQL/PostgreSQL/20/select_identities.sql</file>
+    <file>./SQL/PostgreSQL/20/select_internaluser.sql</file>
+    <file>./SQL/PostgreSQL/20/select_messages.sql</file>
+    <file>./SQL/PostgreSQL/20/select_messagesAll.sql</file>
+    <file>./SQL/PostgreSQL/20/select_messagesAllNew.sql</file>
+    <file>./SQL/PostgreSQL/20/select_messagesNewerThan.sql</file>
+    <file>./SQL/PostgreSQL/20/select_messagesRange.sql</file>
+    <file>./SQL/PostgreSQL/20/select_networkExists.sql</file>
+    <file>./SQL/PostgreSQL/20/select_network_awaymsg.sql</file>
+    <file>./SQL/PostgreSQL/20/select_network_usermode.sql</file>
+    <file>./SQL/PostgreSQL/20/select_networks_for_user.sql</file>
+    <file>./SQL/PostgreSQL/20/select_nicks.sql</file>
+    <file>./SQL/PostgreSQL/20/select_persistent_channels.sql</file>
+    <file>./SQL/PostgreSQL/20/select_senderid.sql</file>
+    <file>./SQL/PostgreSQL/20/select_servers_for_network.sql</file>
+    <file>./SQL/PostgreSQL/20/select_user_setting.sql</file>
+    <file>./SQL/PostgreSQL/20/select_userid.sql</file>
+    <file>./SQL/PostgreSQL/20/setup_000_quasseluser.sql</file>
+    <file>./SQL/PostgreSQL/20/setup_010_sender.sql</file>
+    <file>./SQL/PostgreSQL/20/setup_020_identity.sql</file>
+    <file>./SQL/PostgreSQL/20/setup_030_identity_nick.sql</file>
+    <file>./SQL/PostgreSQL/20/setup_040_network.sql</file>
+    <file>./SQL/PostgreSQL/20/setup_050_buffer.sql</file>
+    <file>./SQL/PostgreSQL/20/setup_060_backlog.sql</file>
+    <file>./SQL/PostgreSQL/20/setup_070_coreinfo.sql</file>
+    <file>./SQL/PostgreSQL/20/setup_080_ircservers.sql</file>
+    <file>./SQL/PostgreSQL/20/setup_090_backlog_idx.sql</file>
+    <file>./SQL/PostgreSQL/20/setup_100_user_setting.sql</file>
+    <file>./SQL/PostgreSQL/20/setup_110_alter_sender_seq.sql</file>
+    <file>./SQL/PostgreSQL/20/setup_120_alter_messageid_seq.sql</file>
+    <file>./SQL/PostgreSQL/20/setup_130_function_lastmsgid.sql</file>
+    <file>./SQL/PostgreSQL/20/update_backlog_bufferid.sql</file>
+    <file>./SQL/PostgreSQL/20/update_buffer_lastmsgid.sql</file>
+    <file>./SQL/PostgreSQL/20/update_buffer_markerlinemsgid.sql</file>
+    <file>./SQL/PostgreSQL/20/update_buffer_name.sql</file>
+    <file>./SQL/PostgreSQL/20/update_buffer_persistent_channel.sql</file>
+    <file>./SQL/PostgreSQL/20/update_buffer_set_channel_key.sql</file>
+    <file>./SQL/PostgreSQL/20/update_identity.sql</file>
+    <file>./SQL/PostgreSQL/20/update_network.sql</file>
+    <file>./SQL/PostgreSQL/20/update_network_connected.sql</file>
+    <file>./SQL/PostgreSQL/20/update_network_set_awaymsg.sql</file>
+    <file>./SQL/PostgreSQL/20/update_network_set_usermode.sql</file>
+    <file>./SQL/PostgreSQL/20/update_user_setting.sql</file>
+    <file>./SQL/PostgreSQL/20/update_username.sql</file>
+    <file>./SQL/PostgreSQL/20/update_userpassword.sql</file>
+    <file>./SQL/PostgreSQL/20/upgrade_000_alter_buffer_add_lastmsgid.sql</file>
+    <file>./SQL/PostgreSQL/20/upgrade_001_add_function_populate_lastmsgid.sql</file>
+    <file>./SQL/PostgreSQL/20/upgrade_002_run_function_populate_lastmsgid.sql</file>
+    <file>./SQL/PostgreSQL/20/upgrade_003_correct_bad_lastseenmsgid.sql</file>
+    <file>./SQL/PostgreSQL/20/upgrade_004_add_lastseenmsgid_constraint.sql</file>
+    <file>./SQL/PostgreSQL/20/update_buffer_lastseen.sql</file>
     <file>./SQL/SQLite/1/upgrade_000_drop_coreinfo.sql</file>
     <file>./SQL/SQLite/1/upgrade_010_create_coreinfo.sql</file>
     <file>./SQL/SQLite/1/upgrade_020_update_schemaversion.sql</file>
+    <file>./SQL/SQLite/10/upgrade_000_switch_to_msgid.sql</file>
+    <file>./SQL/SQLite/10/upgrade_010_rename_buffer_table.sql</file>
+    <file>./SQL/SQLite/10/upgrade_020_create_buffer_table.sql</file>
+    <file>./SQL/SQLite/10/upgrade_030_copy_buffer_table.sql</file>
+    <file>./SQL/SQLite/10/upgrade_040_drop_buffer_old_table.sql</file>
+    <file>./SQL/SQLite/11/upgrade_000_create_user_setting.sql</file>
+    <file>./SQL/SQLite/12/upgrade_000_create_identity.sql</file>
+    <file>./SQL/SQLite/12/upgrade_010_create_identity_nick.sql</file>
+    <file>./SQL/SQLite/12/upgrade_020_rename_servertable.sql</file>
+    <file>./SQL/SQLite/12/upgrade_030_create_ircserver.sql</file>
+    <file>./SQL/SQLite/12/upgrade_040_copy_ircserver.sql</file>
+    <file>./SQL/SQLite/12/upgrade_050_drop_ircserverold.sql</file>
+    <file>./SQL/SQLite/13/upgrade_000_create_buffer_user_idx.sql</file>
+    <file>./SQL/SQLite/13/upgrade_010_create_buffer_cname_idx.sql</file>
+    <file>./SQL/SQLite/13/upgrade_020_create_buffer_cname_idx.sql</file>
+    <file>./SQL/SQLite/14/upgrade_000_rename_networktable.sql</file>
+    <file>./SQL/SQLite/14/upgrade_010_create_networktable.sql</file>
+    <file>./SQL/SQLite/14/upgrade_030_copy_networktable.sql</file>
+    <file>./SQL/SQLite/14/upgrade_040_drop_networkold.sql</file>
+    <file>./SQL/SQLite/15/upgrade_000_fix_ircservers.sql</file>
+    <file>./SQL/SQLite/15/upgrade_000_fix_network.sql</file>
+    <file>./SQL/SQLite/16/upgrade_000_alter_buffer_add_markerlinemsgid.sql</file>
+    <file>./SQL/SQLite/17/upgrade_000_alter_network_add_sasl.sql</file>
+    <file>./SQL/SQLite/17/upgrade_001_alter_network_add_sasl.sql</file>
+    <file>./SQL/SQLite/17/upgrade_002_alter_network_add_sasl.sql</file>
+    <file>./SQL/SQLite/18/upgrade_000_alter_quasseluser_add_passwordversion.sql</file>
+    <file>./SQL/SQLite/19/upgrade_000_alter_ircserver_add_sslverify.sql</file>
     <file>./SQL/SQLite/2/upgrade_000_drop_buffergroup.sql</file>
     <file>./SQL/SQLite/2/upgrade_010_update_schemaversion.sql</file>
+    <file>./SQL/SQLite/20/upgrade_000_alter_network_add_ratelimit_usecustom.sql</file>
+    <file>./SQL/SQLite/20/upgrade_001_alter_network_add_ratelimit_burstsize.sql</file>
+    <file>./SQL/SQLite/20/upgrade_002_alter_network_add_ratelimit_delay.sql</file>
+    <file>./SQL/SQLite/20/upgrade_003_alter_network_add_ratelimit_unlimited.sql</file>
     <file>./SQL/SQLite/3/upgrade_000_update_backlog_flags.sql</file>
     <file>./SQL/SQLite/3/upgrade_010_update_schemaversion.sql</file>
     <file>./SQL/SQLite/4/upgrade_000_rename_buffertable.sql</file>
@@ -47,214 +177,99 @@
     <file>./SQL/SQLite/9/upgrade_000_create_backlog_idx.sql</file>
     <file>./SQL/SQLite/9/upgrade_010_create_backlog_idx2.sql</file>
     <file>./SQL/SQLite/9/upgrade_020_create_buffer_idx.sql</file>
-    <file>./SQL/SQLite/10/upgrade_000_switch_to_msgid.sql</file>
-    <file>./SQL/SQLite/10/upgrade_010_rename_buffer_table.sql</file>
-    <file>./SQL/SQLite/10/upgrade_020_create_buffer_table.sql</file>
-    <file>./SQL/SQLite/10/upgrade_030_copy_buffer_table.sql</file>
-    <file>./SQL/SQLite/10/upgrade_040_drop_buffer_old_table.sql</file>
-    <file>./SQL/SQLite/11/upgrade_000_create_user_setting.sql</file>
-    <file>./SQL/SQLite/12/upgrade_000_create_identity.sql</file>
-    <file>./SQL/SQLite/12/upgrade_010_create_identity_nick.sql</file>
-    <file>./SQL/SQLite/12/upgrade_020_rename_servertable.sql</file>
-    <file>./SQL/SQLite/12/upgrade_030_create_ircserver.sql</file>
-    <file>./SQL/SQLite/12/upgrade_040_copy_ircserver.sql</file>
-    <file>./SQL/SQLite/12/upgrade_050_drop_ircserverold.sql</file>
-    <file>./SQL/SQLite/13/upgrade_000_create_buffer_user_idx.sql</file>
-    <file>./SQL/SQLite/13/upgrade_010_create_buffer_cname_idx.sql</file>
-    <file>./SQL/SQLite/13/upgrade_020_create_buffer_cname_idx.sql</file>
-    <file>./SQL/SQLite/14/upgrade_000_rename_networktable.sql</file>
-    <file>./SQL/SQLite/14/upgrade_010_create_networktable.sql</file>
-    <file>./SQL/SQLite/14/upgrade_030_copy_networktable.sql</file>
-    <file>./SQL/SQLite/14/upgrade_040_drop_networkold.sql</file>
-    <file>./SQL/SQLite/15/upgrade_000_fix_ircservers.sql</file>
-    <file>./SQL/SQLite/15/upgrade_000_fix_network.sql</file>
-    <file>./SQL/SQLite/16/upgrade_000_alter_buffer_add_markerlinemsgid.sql</file>
-    <file>./SQL/SQLite/17/upgrade_000_alter_network_add_sasl.sql</file>
-    <file>./SQL/SQLite/17/upgrade_001_alter_network_add_sasl.sql</file>
-    <file>./SQL/SQLite/17/upgrade_002_alter_network_add_sasl.sql</file>
-    <file>./SQL/SQLite/18/upgrade_000_alter_quasseluser_add_passwordversion.sql</file>
-    <file>./SQL/SQLite/19/upgrade_000_alter_ircserver_add_sslverify.sql</file>
-    <file>./SQL/SQLite/20/delete_backlog_by_uid.sql</file>
-    <file>./SQL/SQLite/20/delete_backlog_for_buffer.sql</file>
-    <file>./SQL/SQLite/20/delete_backlog_for_network.sql</file>
-    <file>./SQL/SQLite/20/delete_buffer_for_bufferid.sql</file>
-    <file>./SQL/SQLite/20/delete_buffers_by_uid.sql</file>
-    <file>./SQL/SQLite/20/delete_buffers_for_network.sql</file>
-    <file>./SQL/SQLite/20/delete_identity.sql</file>
-    <file>./SQL/SQLite/20/delete_ircservers_for_network.sql</file>
-    <file>./SQL/SQLite/20/delete_networks_by_uid.sql</file>
-    <file>./SQL/SQLite/20/delete_network.sql</file>
-    <file>./SQL/SQLite/20/delete_nicks.sql</file>
-    <file>./SQL/SQLite/20/delete_quasseluser.sql</file>
-    <file>./SQL/SQLite/20/insert_buffer.sql</file>
-    <file>./SQL/SQLite/20/insert_identity.sql</file>
-    <file>./SQL/SQLite/20/insert_message.sql</file>
-    <file>./SQL/SQLite/20/insert_network.sql</file>
-    <file>./SQL/SQLite/20/insert_nick.sql</file>
-    <file>./SQL/SQLite/20/insert_quasseluser.sql</file>
-    <file>./SQL/SQLite/20/insert_sender.sql</file>
-    <file>./SQL/SQLite/20/insert_server.sql</file>
-    <file>./SQL/SQLite/20/insert_user_setting.sql</file>
-    <file>./SQL/SQLite/20/migrate_read_backlog.sql</file>
-    <file>./SQL/SQLite/20/migrate_read_buffer.sql</file>
-    <file>./SQL/SQLite/20/migrate_read_identity_nick.sql</file>
-    <file>./SQL/SQLite/20/migrate_read_identity.sql</file>
-    <file>./SQL/SQLite/20/migrate_read_ircserver.sql</file>
-    <file>./SQL/SQLite/20/migrate_read_network.sql</file>
-    <file>./SQL/SQLite/20/migrate_read_quasseluser.sql</file>
-    <file>./SQL/SQLite/20/migrate_read_sender.sql</file>
-    <file>./SQL/SQLite/20/migrate_read_usersetting.sql</file>
-    <file>./SQL/SQLite/20/select_authuser.sql</file>
-    <file>./SQL/SQLite/20/select_buffer_by_id.sql</file>
-    <file>./SQL/SQLite/20/select_bufferByName.sql</file>
-    <file>./SQL/SQLite/20/select_bufferExists.sql</file>
-    <file>./SQL/SQLite/20/select_buffer_lastseen_messages.sql</file>
-    <file>./SQL/SQLite/20/select_buffer_markerlinemsgids.sql</file>
-    <file>./SQL/SQLite/20/select_buffers_for_merge.sql</file>
-    <file>./SQL/SQLite/20/select_buffers_for_network.sql</file>
-    <file>./SQL/SQLite/20/select_buffers.sql</file>
-    <file>./SQL/SQLite/20/select_checkidentity.sql</file>
-    <file>./SQL/SQLite/20/select_connected_networks.sql</file>
-    <file>./SQL/SQLite/20/select_identities.sql</file>
-    <file>./SQL/SQLite/20/select_internaluser.sql</file>
-    <file>./SQL/SQLite/20/select_messagesAllNew.sql</file>
-    <file>./SQL/SQLite/20/select_messagesAll.sql</file>
-    <file>./SQL/SQLite/20/select_messagesNewerThan.sql</file>
-    <file>./SQL/SQLite/20/select_messagesNewestK.sql</file>
-    <file>./SQL/SQLite/20/select_messages.sql</file>
-    <file>./SQL/SQLite/20/select_network_awaymsg.sql</file>
-    <file>./SQL/SQLite/20/select_networkExists.sql</file>
-    <file>./SQL/SQLite/20/select_networks_for_user.sql</file>
-    <file>./SQL/SQLite/20/select_network_usermode.sql</file>
-    <file>./SQL/SQLite/20/select_nicks.sql</file>
-    <file>./SQL/SQLite/20/select_persistent_channels.sql</file>
-    <file>./SQL/SQLite/20/select_servers_for_network.sql</file>
-    <file>./SQL/SQLite/20/select_userid.sql</file>
-    <file>./SQL/SQLite/20/select_user_setting.sql</file>
-    <file>./SQL/SQLite/20/setup_000_quasseluser.sql</file>
-    <file>./SQL/SQLite/20/setup_010_sender.sql</file>
-    <file>./SQL/SQLite/20/setup_020_network.sql</file>
-    <file>./SQL/SQLite/20/setup_030_buffer.sql</file>
-    <file>./SQL/SQLite/20/setup_040_buffer_idx.sql</file>
-    <file>./SQL/SQLite/20/setup_050_buffer_cname_idx.sql</file>
-    <file>./SQL/SQLite/20/setup_060_backlog.sql</file>
-    <file>./SQL/SQLite/20/setup_070_coreinfo.sql</file>
-    <file>./SQL/SQLite/20/setup_080_ircservers.sql</file>
-    <file>./SQL/SQLite/20/setup_090_backlog_idx.sql</file>
-    <file>./SQL/SQLite/20/setup_100_backlog_idx2.sql</file>
-    <file>./SQL/SQLite/20/setup_110_buffer_user_idx.sql</file>
-    <file>./SQL/SQLite/20/setup_120_user_setting.sql</file>
-    <file>./SQL/SQLite/20/setup_130_identity.sql</file>
-    <file>./SQL/SQLite/20/setup_140_identity_nick.sql</file>
-    <file>./SQL/SQLite/20/update_backlog_bufferid.sql</file>
-    <file>./SQL/SQLite/20/update_buffer_lastseen.sql</file>
-    <file>./SQL/SQLite/20/update_buffer_markerlinemsgid.sql</file>
-    <file>./SQL/SQLite/20/update_buffer_name.sql</file>
-    <file>./SQL/SQLite/20/update_buffer_persistent_channel.sql</file>
-    <file>./SQL/SQLite/20/update_buffer_set_channel_key.sql</file>
-    <file>./SQL/SQLite/20/update_identity.sql</file>
-    <file>./SQL/SQLite/20/update_network_connected.sql</file>
-    <file>./SQL/SQLite/20/update_network_set_awaymsg.sql</file>
-    <file>./SQL/SQLite/20/update_network_set_usermode.sql</file>
-    <file>./SQL/SQLite/20/update_network.sql</file>
-    <file>./SQL/SQLite/20/update_username.sql</file>
-    <file>./SQL/SQLite/20/update_userpassword.sql</file>
-    <file>./SQL/SQLite/20/update_user_setting.sql</file>
-    <file>./SQL/SQLite/20/upgrade_000_alter_network_add_ratelimit_usecustom.sql</file>
-    <file>./SQL/SQLite/20/upgrade_001_alter_network_add_ratelimit_burstsize.sql</file>
-    <file>./SQL/SQLite/20/upgrade_002_alter_network_add_ratelimit_delay.sql</file>
-    <file>./SQL/SQLite/20/upgrade_003_alter_network_add_ratelimit_unlimited.sql</file>
-    <file>./SQL/PostgreSQL/15/upgrade_000_alter_buffer_add_markerlinemsgid.sql</file>
-    <file>./SQL/PostgreSQL/16/upgrade_000_alter_network_add_sasl.sql</file>
-    <file>./SQL/PostgreSQL/17/upgrade_000_alter_quasseluser_add_passwordversion.sql</file>
-    <file>./SQL/PostgreSQL/18/upgrade_000_alter_ircserver_add_sslverify.sql</file>
-    <file>./SQL/PostgreSQL/19/delete_backlog_by_uid.sql</file>
-    <file>./SQL/PostgreSQL/19/delete_backlog_for_buffer.sql</file>
-    <file>./SQL/PostgreSQL/19/delete_backlog_for_network.sql</file>
-    <file>./SQL/PostgreSQL/19/delete_buffer_for_bufferid.sql</file>
-    <file>./SQL/PostgreSQL/19/delete_buffers_by_uid.sql</file>
-    <file>./SQL/PostgreSQL/19/delete_buffers_for_network.sql</file>
-    <file>./SQL/PostgreSQL/19/delete_identity.sql</file>
-    <file>./SQL/PostgreSQL/19/delete_ircservers_for_network.sql</file>
-    <file>./SQL/PostgreSQL/19/delete_networks_by_uid.sql</file>
-    <file>./SQL/PostgreSQL/19/delete_network.sql</file>
-    <file>./SQL/PostgreSQL/19/delete_nicks.sql</file>
-    <file>./SQL/PostgreSQL/19/delete_quasseluser.sql</file>
-    <file>./SQL/PostgreSQL/19/insert_buffer.sql</file>
-    <file>./SQL/PostgreSQL/19/insert_identity.sql</file>
-    <file>./SQL/PostgreSQL/19/insert_message.sql</file>
-    <file>./SQL/PostgreSQL/19/insert_network.sql</file>
-    <file>./SQL/PostgreSQL/19/insert_nick.sql</file>
-    <file>./SQL/PostgreSQL/19/insert_quasseluser.sql</file>
-    <file>./SQL/PostgreSQL/19/insert_sender.sql</file>
-    <file>./SQL/PostgreSQL/19/insert_server.sql</file>
-    <file>./SQL/PostgreSQL/19/insert_user_setting.sql</file>
-    <file>./SQL/PostgreSQL/19/migrate_write_backlog.sql</file>
-    <file>./SQL/PostgreSQL/19/migrate_write_buffer.sql</file>
-    <file>./SQL/PostgreSQL/19/migrate_write_identity_nick.sql</file>
-    <file>./SQL/PostgreSQL/19/migrate_write_identity.sql</file>
-    <file>./SQL/PostgreSQL/19/migrate_write_ircserver.sql</file>
-    <file>./SQL/PostgreSQL/19/migrate_write_network.sql</file>
-    <file>./SQL/PostgreSQL/19/migrate_write_quasseluser.sql</file>
-    <file>./SQL/PostgreSQL/19/migrate_write_sender.sql</file>
-    <file>./SQL/PostgreSQL/19/migrate_write_usersetting.sql</file>
-    <file>./SQL/PostgreSQL/19/select_authuser.sql</file>
-    <file>./SQL/PostgreSQL/19/select_buffer_by_id.sql</file>
-    <file>./SQL/PostgreSQL/19/select_bufferByName.sql</file>
-    <file>./SQL/PostgreSQL/19/select_bufferExists.sql</file>
-    <file>./SQL/PostgreSQL/19/select_buffer_lastseen_messages.sql</file>
-    <file>./SQL/PostgreSQL/19/select_buffer_markerlinemsgids.sql</file>
-    <file>./SQL/PostgreSQL/19/select_buffers_for_network.sql</file>
-    <file>./SQL/PostgreSQL/19/select_buffers.sql</file>
-    <file>./SQL/PostgreSQL/19/select_checkidentity.sql</file>
-    <file>./SQL/PostgreSQL/19/select_connected_networks.sql</file>
-    <file>./SQL/PostgreSQL/19/select_identities.sql</file>
-    <file>./SQL/PostgreSQL/19/select_internaluser.sql</file>
-    <file>./SQL/PostgreSQL/19/select_messagesAllNew.sql</file>
-    <file>./SQL/PostgreSQL/19/select_messagesAll.sql</file>
-    <file>./SQL/PostgreSQL/19/select_messagesNewerThan.sql</file>
-    <file>./SQL/PostgreSQL/19/select_messagesRange.sql</file>
-    <file>./SQL/PostgreSQL/19/select_messages.sql</file>
-    <file>./SQL/PostgreSQL/19/select_network_awaymsg.sql</file>
-    <file>./SQL/PostgreSQL/19/select_networkExists.sql</file>
-    <file>./SQL/PostgreSQL/19/select_networks_for_user.sql</file>
-    <file>./SQL/PostgreSQL/19/select_network_usermode.sql</file>
-    <file>./SQL/PostgreSQL/19/select_nicks.sql</file>
-    <file>./SQL/PostgreSQL/19/select_persistent_channels.sql</file>
-    <file>./SQL/PostgreSQL/19/select_senderid.sql</file>
-    <file>./SQL/PostgreSQL/19/select_servers_for_network.sql</file>
-    <file>./SQL/PostgreSQL/19/select_userid.sql</file>
-    <file>./SQL/PostgreSQL/19/select_user_setting.sql</file>
-    <file>./SQL/PostgreSQL/19/setup_000_quasseluser.sql</file>
-    <file>./SQL/PostgreSQL/19/setup_010_sender.sql</file>
-    <file>./SQL/PostgreSQL/19/setup_020_identity.sql</file>
-    <file>./SQL/PostgreSQL/19/setup_030_identity_nick.sql</file>
-    <file>./SQL/PostgreSQL/19/setup_040_network.sql</file>
-    <file>./SQL/PostgreSQL/19/setup_050_buffer.sql</file>
-    <file>./SQL/PostgreSQL/19/setup_060_backlog.sql</file>
-    <file>./SQL/PostgreSQL/19/setup_070_coreinfo.sql</file>
-    <file>./SQL/PostgreSQL/19/setup_080_ircservers.sql</file>
-    <file>./SQL/PostgreSQL/19/setup_090_backlog_idx.sql</file>
-    <file>./SQL/PostgreSQL/19/setup_100_user_setting.sql</file>
-    <file>./SQL/PostgreSQL/19/setup_110_alter_sender_seq.sql</file>
-    <file>./SQL/PostgreSQL/19/setup_120_alter_messageid_seq.sql</file>
-    <file>./SQL/PostgreSQL/19/update_backlog_bufferid.sql</file>
-    <file>./SQL/PostgreSQL/19/update_buffer_lastseen.sql</file>
-    <file>./SQL/PostgreSQL/19/update_buffer_markerlinemsgid.sql</file>
-    <file>./SQL/PostgreSQL/19/update_buffer_name.sql</file>
-    <file>./SQL/PostgreSQL/19/update_buffer_persistent_channel.sql</file>
-    <file>./SQL/PostgreSQL/19/update_buffer_set_channel_key.sql</file>
-    <file>./SQL/PostgreSQL/19/update_identity.sql</file>
-    <file>./SQL/PostgreSQL/19/update_network_connected.sql</file>
-    <file>./SQL/PostgreSQL/19/update_network_set_awaymsg.sql</file>
-    <file>./SQL/PostgreSQL/19/update_network_set_usermode.sql</file>
-    <file>./SQL/PostgreSQL/19/update_network.sql</file>
-    <file>./SQL/PostgreSQL/19/update_username.sql</file>
-    <file>./SQL/PostgreSQL/19/update_userpassword.sql</file>
-    <file>./SQL/PostgreSQL/19/update_user_setting.sql</file>
-    <file>./SQL/PostgreSQL/19/upgrade_000_alter_network_add_ratelimit_usecustom.sql</file>
-    <file>./SQL/PostgreSQL/19/upgrade_001_alter_network_add_ratelimit_burstsize.sql</file>
-    <file>./SQL/PostgreSQL/19/upgrade_002_alter_network_add_ratelimit_delay.sql</file>
-    <file>./SQL/PostgreSQL/19/upgrade_003_alter_network_add_ratelimit_unlimited.sql</file>
+    <file>./SQL/SQLite/21/delete_backlog_by_uid.sql</file>
+    <file>./SQL/SQLite/21/delete_backlog_for_buffer.sql</file>
+    <file>./SQL/SQLite/21/delete_backlog_for_network.sql</file>
+    <file>./SQL/SQLite/21/delete_buffer_for_bufferid.sql</file>
+    <file>./SQL/SQLite/21/delete_buffers_by_uid.sql</file>
+    <file>./SQL/SQLite/21/delete_buffers_for_network.sql</file>
+    <file>./SQL/SQLite/21/delete_identity.sql</file>
+    <file>./SQL/SQLite/21/delete_ircservers_for_network.sql</file>
+    <file>./SQL/SQLite/21/delete_network.sql</file>
+    <file>./SQL/SQLite/21/delete_networks_by_uid.sql</file>
+    <file>./SQL/SQLite/21/delete_nicks.sql</file>
+    <file>./SQL/SQLite/21/delete_quasseluser.sql</file>
+    <file>./SQL/SQLite/21/insert_buffer.sql</file>
+    <file>./SQL/SQLite/21/insert_identity.sql</file>
+    <file>./SQL/SQLite/21/insert_message.sql</file>
+    <file>./SQL/SQLite/21/insert_network.sql</file>
+    <file>./SQL/SQLite/21/insert_nick.sql</file>
+    <file>./SQL/SQLite/21/insert_quasseluser.sql</file>
+    <file>./SQL/SQLite/21/insert_sender.sql</file>
+    <file>./SQL/SQLite/21/insert_server.sql</file>
+    <file>./SQL/SQLite/21/insert_user_setting.sql</file>
+    <file>./SQL/SQLite/21/migrate_read_backlog.sql</file>
+    <file>./SQL/SQLite/21/migrate_read_buffer.sql</file>
+    <file>./SQL/SQLite/21/migrate_read_identity.sql</file>
+    <file>./SQL/SQLite/21/migrate_read_identity_nick.sql</file>
+    <file>./SQL/SQLite/21/migrate_read_ircserver.sql</file>
+    <file>./SQL/SQLite/21/migrate_read_network.sql</file>
+    <file>./SQL/SQLite/21/migrate_read_quasseluser.sql</file>
+    <file>./SQL/SQLite/21/migrate_read_sender.sql</file>
+    <file>./SQL/SQLite/21/migrate_read_usersetting.sql</file>
+    <file>./SQL/SQLite/21/select_authuser.sql</file>
+    <file>./SQL/SQLite/21/select_bufferByName.sql</file>
+    <file>./SQL/SQLite/21/select_bufferExists.sql</file>
+    <file>./SQL/SQLite/21/select_buffer_by_id.sql</file>
+    <file>./SQL/SQLite/21/select_buffer_lastseen_messages.sql</file>
+    <file>./SQL/SQLite/21/select_buffer_markerlinemsgids.sql</file>
+    <file>./SQL/SQLite/21/select_buffers.sql</file>
+    <file>./SQL/SQLite/21/select_buffers_for_merge.sql</file>
+    <file>./SQL/SQLite/21/select_buffers_for_network.sql</file>
+    <file>./SQL/SQLite/21/select_checkidentity.sql</file>
+    <file>./SQL/SQLite/21/select_connected_networks.sql</file>
+    <file>./SQL/SQLite/21/select_identities.sql</file>
+    <file>./SQL/SQLite/21/select_internaluser.sql</file>
+    <file>./SQL/SQLite/21/select_messages.sql</file>
+    <file>./SQL/SQLite/21/select_messagesAll.sql</file>
+    <file>./SQL/SQLite/21/select_messagesAllNew.sql</file>
+    <file>./SQL/SQLite/21/select_messagesNewerThan.sql</file>
+    <file>./SQL/SQLite/21/select_messagesNewestK.sql</file>
+    <file>./SQL/SQLite/21/select_networkExists.sql</file>
+    <file>./SQL/SQLite/21/select_network_awaymsg.sql</file>
+    <file>./SQL/SQLite/21/select_network_usermode.sql</file>
+    <file>./SQL/SQLite/21/select_networks_for_user.sql</file>
+    <file>./SQL/SQLite/21/select_nicks.sql</file>
+    <file>./SQL/SQLite/21/select_persistent_channels.sql</file>
+    <file>./SQL/SQLite/21/select_servers_for_network.sql</file>
+    <file>./SQL/SQLite/21/select_user_setting.sql</file>
+    <file>./SQL/SQLite/21/select_userid.sql</file>
+    <file>./SQL/SQLite/21/setup_000_quasseluser.sql</file>
+    <file>./SQL/SQLite/21/setup_010_sender.sql</file>
+    <file>./SQL/SQLite/21/setup_020_network.sql</file>
+    <file>./SQL/SQLite/21/setup_030_buffer.sql</file>
+    <file>./SQL/SQLite/21/setup_040_buffer_idx.sql</file>
+    <file>./SQL/SQLite/21/setup_050_buffer_cname_idx.sql</file>
+    <file>./SQL/SQLite/21/setup_060_backlog.sql</file>
+    <file>./SQL/SQLite/21/setup_070_coreinfo.sql</file>
+    <file>./SQL/SQLite/21/setup_080_ircservers.sql</file>
+    <file>./SQL/SQLite/21/setup_090_backlog_idx.sql</file>
+    <file>./SQL/SQLite/21/setup_100_backlog_idx2.sql</file>
+    <file>./SQL/SQLite/21/setup_110_buffer_user_idx.sql</file>
+    <file>./SQL/SQLite/21/setup_120_user_setting.sql</file>
+    <file>./SQL/SQLite/21/setup_130_identity.sql</file>
+    <file>./SQL/SQLite/21/setup_140_identity_nick.sql</file>
+    <file>./SQL/SQLite/21/update_backlog_bufferid.sql</file>
+    <file>./SQL/SQLite/21/update_buffer_markerlinemsgid.sql</file>
+    <file>./SQL/SQLite/21/update_buffer_name.sql</file>
+    <file>./SQL/SQLite/21/update_buffer_persistent_channel.sql</file>
+    <file>./SQL/SQLite/21/update_buffer_set_channel_key.sql</file>
+    <file>./SQL/SQLite/21/update_identity.sql</file>
+    <file>./SQL/SQLite/21/update_network.sql</file>
+    <file>./SQL/SQLite/21/update_network_connected.sql</file>
+    <file>./SQL/SQLite/21/update_network_set_awaymsg.sql</file>
+    <file>./SQL/SQLite/21/update_network_set_usermode.sql</file>
+    <file>./SQL/SQLite/21/update_user_setting.sql</file>
+    <file>./SQL/SQLite/21/update_username.sql</file>
+    <file>./SQL/SQLite/21/update_userpassword.sql</file>
+    <file>./SQL/SQLite/21/upgrade_000_alter_buffer_add_lastmsgid.sql</file>
+    <file>./SQL/SQLite/21/upgrade_001_update_buffer_set_lastmsgid.sql</file>
+    <file>./SQL/SQLite/21/upgrade_002_update_buffer_fix_lastseenmsgid_over_lastmsgid.sql</file>
+    <file>./SQL/SQLite/21/upgrade_003_create_table_buffer_new.sql</file>
+    <file>./SQL/SQLite/21/upgrade_004_insert_into_buffer_new_from_buffer.sql</file>
+    <file>./SQL/SQLite/21/upgrade_006_alter_table_buffer_new_rename_to_buffer.sql</file>
+    <file>./SQL/SQLite/21/update_buffer_lastmsgid.sql</file>
+    <file>./SQL/SQLite/21/update_buffer_lastseen.sql</file>
+    <file>./SQL/SQLite/21/upgrade_005_drop_table_buffer.sql</file>
 </qresource>
 </RCC>

diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp
index 53601e0..022db0e 100644 (file)
--- a/src/core/sqlitestorage.cpp
+++ b/src/core/sqlitestorage.cpp
@@ -1475,6 +1475,16 @@ QHash<BufferId, MsgId> SqliteStorage::bufferMarkerLineMsgIds(UserId user)
     return markerLineHash;
 }
 
+void SqliteStorage::setBufferLastMsg(const BufferId &bufferId, const MsgId &msgId)
+{
+    QSqlQuery query(logDb());
+    query.prepare(queryString("update_buffer_lastmsgid"));
+
+    query.bindValue(":bufferid", bufferId.toInt());
+    query.bindValue(":lastmsgid", msgId.toInt());
+    safeExec(query);
+    watchQuery(query);
+}
 
 bool SqliteStorage::logMessage(Message &msg)
 {
@@ -1514,6 +1524,8 @@ bool SqliteStorage::logMessage(Message &msg)
             MsgId msgId = logMessageQuery.lastInsertId().toInt();
             if (msgId.isValid()) {
                 msg.setMsgId(msgId);
+
+                setBufferLastMsg(msg.bufferInfo().bufferId(), msgId);
             }
             else {
                 error = true;

diff --git a/src/core/sqlitestorage.h b/src/core/sqlitestorage.h
index 9a12fbe..f66e70f 100644 (file)
--- a/src/core/sqlitestorage.h
+++ b/src/core/sqlitestorage.h
@@ -96,6 +96,7 @@ public slots:
     virtual QHash<BufferId, MsgId> bufferLastSeenMsgIds(UserId user);
     virtual void setBufferMarkerLineMsg(UserId user, const BufferId &bufferId, const MsgId &msgId);
     virtual QHash<BufferId, MsgId> bufferMarkerLineMsgIds(UserId user);
+    virtual void setBufferLastMsg(const BufferId &bufferId, const MsgId &msgId);
 
     /* Message handling */
     virtual bool logMessage(Message &msg);