Schema changes for SASL support

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/src/core/SQL/PostgreSQL/15/insert_network.sql b/src/core/SQL/PostgreSQL/16/insert_network.sql
similarity index 79%
rename from src/core/SQL/PostgreSQL/15/insert_network.sql
rename to src/core/SQL/PostgreSQL/16/insert_network.sql
index 4f94b43..56fbef8 100644 (file)
--- a/src/core/SQL/PostgreSQL/15/insert_network.sql
+++ b/src/core/SQL/PostgreSQL/16/insert_network.sql
@@ -1,3 +1,3 @@
-INSERT INTO network (userid, networkname, identityid, servercodec, encodingcodec, decodingcodec, userandomserver, perform, useautoidentify, autoidentifyservice, autoidentifypassword, useautoreconnect, autoreconnectinterval, autoreconnectretries, unlimitedconnectretries, rejoinchannels)
-VALUES (:userid, :networkname, :identityid, :servercodec, :encodingcodec, :decodingcodec, :userandomserver, :perform, :useautoidentify, :autoidentifyservice, :autoidentifypassword, :useautoreconnect, :autoreconnectinterval, :autoreconnectretries, :unlimitedconnectretries, :rejoinchannels)
+INSERT INTO network (userid, networkname, identityid, servercodec, encodingcodec, decodingcodec, userandomserver, perform, useautoidentify, autoidentifyservice, autoidentifypassword, useautoreconnect, autoreconnectinterval, autoreconnectretries, unlimitedconnectretries, rejoinchannels, usesasl, saslaccount, saslpassword)
+VALUES (:userid, :networkname, :identityid, :servercodec, :encodingcodec, :decodingcodec, :userandomserver, :perform, :useautoidentify, :autoidentifyservice, :autoidentifypassword, :useautoreconnect, :autoreconnectinterval, :autoreconnectretries, :unlimitedconnectretries, :rejoinchannels, :usesasl, :saslaccount, :saslpassword)

 RETURNING networkid
 RETURNING networkid

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

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

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

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

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

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

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

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

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

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

diff --git a/src/core/SQL/PostgreSQL/15/migrate_write_network.sql b/src/core/SQL/PostgreSQL/16/migrate_write_network.sql
similarity index 79%
rename from src/core/SQL/PostgreSQL/15/migrate_write_network.sql
rename to src/core/SQL/PostgreSQL/16/migrate_write_network.sql
index eeae51a..45576ee 100644 (file)
--- a/src/core/SQL/PostgreSQL/15/migrate_write_network.sql
+++ b/src/core/SQL/PostgreSQL/16/migrate_write_network.sql
@@ -1,2 +1,2 @@
-INSERT INTO network (networkid, userid, networkname, identityid, encodingcodec, decodingcodec, servercodec, userandomserver, perform, useautoidentify, autoidentifyservice, autoidentifypassword, useautoreconnect, autoreconnectinterval, autoreconnectretries, unlimitedconnectretries, rejoinchannels, connected, usermode, awaymessage, attachperform, detachperform)
-VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+INSERT INTO network (networkid, userid, networkname, identityid, encodingcodec, decodingcodec, servercodec, userandomserver, perform, useautoidentify, autoidentifyservice, autoidentifypassword, useautoreconnect, autoreconnectinterval, autoreconnectretries, unlimitedconnectretries, rejoinchannels, connected, usermode, awaymessage, attachperform, detachperform, usesasl, saslaccount, saslpassword)
+VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/src/core/SQL/PostgreSQL/15/select_messages.sql b/src/core/SQL/PostgreSQL/16/select_messages.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/15/select_messages.sql
rename to src/core/SQL/PostgreSQL/16/select_messages.sql

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

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

diff --git a/src/core/SQL/PostgreSQL/15/select_messagesNewerThan.sql b/src/core/SQL/PostgreSQL/16/select_messagesNewerThan.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/15/select_messagesNewerThan.sql
rename to src/core/SQL/PostgreSQL/16/select_messagesNewerThan.sql

diff --git a/src/core/SQL/PostgreSQL/15/select_messagesRange.sql b/src/core/SQL/PostgreSQL/16/select_messagesRange.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/15/select_messagesRange.sql
rename to src/core/SQL/PostgreSQL/16/select_messagesRange.sql

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

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

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

diff --git a/src/core/SQL/SQLite/16/select_networks_for_user.sql b/src/core/SQL/PostgreSQL/16/select_networks_for_user.sql
similarity index 69%
rename from src/core/SQL/SQLite/16/select_networks_for_user.sql
rename to src/core/SQL/PostgreSQL/16/select_networks_for_user.sql
index 08855c9..9bef405 100644 (file)
--- a/src/core/SQL/SQLite/16/select_networks_for_user.sql
+++ b/src/core/SQL/PostgreSQL/16/select_networks_for_user.sql
@@ -1,5 +1,6 @@
 SELECT networkid, networkname, identityid, servercodec, encodingcodec, decodingcodec,
        userandomserver, perform, useautoidentify, autoidentifyservice, autoidentifypassword,
 SELECT networkid, networkname, identityid, servercodec, encodingcodec, decodingcodec,
        userandomserver, perform, useautoidentify, autoidentifyservice, autoidentifypassword,

-       useautoreconnect, autoreconnectinterval, autoreconnectretries, unlimitedconnectretries, rejoinchannels
+       useautoreconnect, autoreconnectinterval, autoreconnectretries, unlimitedconnectretries, rejoinchannels,
+       usesasl, saslaccount, saslpassword

 FROM network
 FROM network

-WHERE userid = :userid
\ No newline at end of file
+WHERE userid = :userid

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

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

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

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

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

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

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

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

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

diff --git a/src/core/SQL/PostgreSQL/15/setup_040_network.sql b/src/core/SQL/PostgreSQL/16/setup_040_network.sql
similarity index 91%
rename from src/core/SQL/PostgreSQL/15/setup_040_network.sql
rename to src/core/SQL/PostgreSQL/16/setup_040_network.sql
index 87f48b4..8515c95 100644 (file)
--- a/src/core/SQL/PostgreSQL/15/setup_040_network.sql
+++ b/src/core/SQL/PostgreSQL/16/setup_040_network.sql
@@ -11,6 +11,9 @@ CREATE TABLE network (
        useautoidentify boolean NOT NULL DEFAULT FALSE,
        autoidentifyservice varchar(128),
        autoidentifypassword varchar(128),
        useautoidentify boolean NOT NULL DEFAULT FALSE,
        autoidentifyservice varchar(128),
        autoidentifypassword varchar(128),

+       usesasl boolean NOT NULL DEFAULT FALSE,
+       saslaccount varchar(128),
+       saslpassword varchar(128),

        useautoreconnect boolean NOT NULL DEFAULT TRUE,
        autoreconnectinterval integer NOT NULL DEFAULT 0,
        autoreconnectretries integer NOT NULL DEFAULT 0,
        useautoreconnect boolean NOT NULL DEFAULT TRUE,
        autoreconnectinterval integer NOT NULL DEFAULT 0,
        autoreconnectretries integer NOT NULL DEFAULT 0,

diff --git a/src/core/SQL/PostgreSQL/15/setup_050_buffer.sql b/src/core/SQL/PostgreSQL/16/setup_050_buffer.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/15/setup_050_buffer.sql
rename to src/core/SQL/PostgreSQL/16/setup_050_buffer.sql

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

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

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

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

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

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

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

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

diff --git a/src/core/SQL/PostgreSQL/15/update_buffer_lastseen.sql b/src/core/SQL/PostgreSQL/16/update_buffer_lastseen.sql
similarity index 100%
rename from src/core/SQL/PostgreSQL/15/update_buffer_lastseen.sql
rename to src/core/SQL/PostgreSQL/16/update_buffer_lastseen.sql

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

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

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

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

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

diff --git a/src/core/SQL/PostgreSQL/15/update_network.sql b/src/core/SQL/PostgreSQL/16/update_network.sql
similarity index 83%
rename from src/core/SQL/PostgreSQL/15/update_network.sql
rename to src/core/SQL/PostgreSQL/16/update_network.sql
index 8d5a462..a000f61 100644 (file)
--- a/src/core/SQL/PostgreSQL/15/update_network.sql
+++ b/src/core/SQL/PostgreSQL/16/update_network.sql
@@ -13,5 +13,8 @@ useautoreconnect = :useautoreconnect,
 autoreconnectinterval = :autoreconnectinterval,
 autoreconnectretries = :autoreconnectretries,
 unlimitedconnectretries = :unlimitedconnectretries,
 autoreconnectinterval = :autoreconnectinterval,
 autoreconnectretries = :autoreconnectretries,
 unlimitedconnectretries = :unlimitedconnectretries,

-rejoinchannels = :rejoinchannels
+rejoinchannels = :rejoinchannels,
+usesasl = :usesasl,
+saslaccount = :saslaccount,
+saslpassword = :saslpassword

 WHERE networkid = :networkid
 WHERE networkid = :networkid

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

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

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

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

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

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

diff --git a/src/core/SQL/PostgreSQL/16/upgrade_000_alter_network_add_sasl.sql b/src/core/SQL/PostgreSQL/16/upgrade_000_alter_network_add_sasl.sql
new file mode 100644 (file)
index 0000000..62b75be
--- /dev/null
+++ b/src/core/SQL/PostgreSQL/16/upgrade_000_alter_network_add_sasl.sql
@@ -0,0 +1,4 @@
+ALTER TABLE network
+ADD COLUMN usesasl boolean NOT NULL DEFAULT FALSE,
+ADD COLUMN saslaccount varchar(128),
+ADD COLUMN saslpassword varchar(128)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/src/core/SQL/SQLite/16/insert_network.sql b/src/core/SQL/SQLite/17/insert_network.sql
similarity index 79%
rename from src/core/SQL/SQLite/16/insert_network.sql
rename to src/core/SQL/SQLite/17/insert_network.sql
index c64cbe1..4d9ff01 100644 (file)
--- a/src/core/SQL/SQLite/16/insert_network.sql
+++ b/src/core/SQL/SQLite/17/insert_network.sql
@@ -1,4 +1,4 @@
 INSERT INTO network (userid, networkname, identityid, servercodec, encodingcodec, decodingcodec, userandomserver,
 INSERT INTO network (userid, networkname, identityid, servercodec, encodingcodec, decodingcodec, userandomserver,

-                     perform, useautoidentify, autoidentifyservice, autoidentifypassword, useautoreconnect, autoreconnectinterval, autoreconnectretries, unlimitedconnectretries, rejoinchannels)
+                     perform, useautoidentify, autoidentifyservice, autoidentifypassword, useautoreconnect, autoreconnectinterval, autoreconnectretries, unlimitedconnectretries, rejoinchannels, usesasl, saslaccount, saslpassword)

 VALUES (:userid, :networkname, :identityid, :servercodec, :encodingcodec, :decodingcodec, :userandomserver,
 VALUES (:userid, :networkname, :identityid, :servercodec, :encodingcodec, :decodingcodec, :userandomserver,

-        :perform, :useautoidentify, :autoidentifyservice, :autoidentifypassword, :useautoreconnect, :autoreconnectinterval, :autoreconnectretries, :unlimitedconnectretries, :rejoinchannels)
+        :perform, :useautoidentify, :autoidentifyservice, :autoidentifypassword, :useautoreconnect, :autoreconnectinterval, :autoreconnectretries, :unlimitedconnectretries, :rejoinchannels, :usesasl, :saslaccount, :saslpassword)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/src/core/SQL/PostgreSQL/15/select_networks_for_user.sql b/src/core/SQL/SQLite/17/select_networks_for_user.sql
similarity index 69%
rename from src/core/SQL/PostgreSQL/15/select_networks_for_user.sql
rename to src/core/SQL/SQLite/17/select_networks_for_user.sql
index 08855c9..9bef405 100644 (file)
--- a/src/core/SQL/PostgreSQL/15/select_networks_for_user.sql
+++ b/src/core/SQL/SQLite/17/select_networks_for_user.sql
@@ -1,5 +1,6 @@
 SELECT networkid, networkname, identityid, servercodec, encodingcodec, decodingcodec,
        userandomserver, perform, useautoidentify, autoidentifyservice, autoidentifypassword,
 SELECT networkid, networkname, identityid, servercodec, encodingcodec, decodingcodec,
        userandomserver, perform, useautoidentify, autoidentifyservice, autoidentifypassword,

-       useautoreconnect, autoreconnectinterval, autoreconnectretries, unlimitedconnectretries, rejoinchannels
+       useautoreconnect, autoreconnectinterval, autoreconnectretries, unlimitedconnectretries, rejoinchannels,
+       usesasl, saslaccount, saslpassword

 FROM network
 FROM network

-WHERE userid = :userid
\ No newline at end of file
+WHERE userid = :userid

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

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

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

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

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

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

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

diff --git a/src/core/SQL/SQLite/16/setup_020_network.sql b/src/core/SQL/SQLite/17/setup_020_network.sql
similarity index 92%
rename from src/core/SQL/SQLite/16/setup_020_network.sql
rename to src/core/SQL/SQLite/17/setup_020_network.sql
index c4e864e..efa1f8d 100644 (file)
--- a/src/core/SQL/SQLite/16/setup_020_network.sql
+++ b/src/core/SQL/SQLite/17/setup_020_network.sql
@@ -11,6 +11,9 @@ CREATE TABLE network (
        useautoidentify INTEGER NOT NULL DEFAULT 0, -- BOOL
        autoidentifyservice TEXT,
        autoidentifypassword TEXT,
        useautoidentify INTEGER NOT NULL DEFAULT 0, -- BOOL
        autoidentifyservice TEXT,
        autoidentifypassword TEXT,

+       usesasl INTEGER NOT NULL DEFAULT 0, -- BOOL
+       saslaccount TEXT,
+       saslpassword TEXT,

        useautoreconnect INTEGER NOT NULL DEFAULT 0, -- BOOL
        autoreconnectinterval INTEGER NOT NULL DEFAULT 0,
        autoreconnectretries INTEGER NOT NULL DEFAULT 0,
        useautoreconnect INTEGER NOT NULL DEFAULT 0, -- BOOL
        autoreconnectinterval INTEGER NOT NULL DEFAULT 0,
        autoreconnectretries INTEGER NOT NULL DEFAULT 0,

diff --git a/src/core/SQL/SQLite/16/setup_030_buffer.sql b/src/core/SQL/SQLite/17/setup_030_buffer.sql
similarity index 100%
rename from src/core/SQL/SQLite/16/setup_030_buffer.sql
rename to src/core/SQL/SQLite/17/setup_030_buffer.sql

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/src/core/SQL/SQLite/16/update_buffer_lastseen.sql b/src/core/SQL/SQLite/17/update_buffer_lastseen.sql
similarity index 100%
rename from src/core/SQL/SQLite/16/update_buffer_lastseen.sql
rename to src/core/SQL/SQLite/17/update_buffer_lastseen.sql

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

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

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

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

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

diff --git a/src/core/SQL/SQLite/16/update_network.sql b/src/core/SQL/SQLite/17/update_network.sql
similarity index 83%
rename from src/core/SQL/SQLite/16/update_network.sql
rename to src/core/SQL/SQLite/17/update_network.sql
index 21afc3f..84c8195 100644 (file)
--- a/src/core/SQL/SQLite/16/update_network.sql
+++ b/src/core/SQL/SQLite/17/update_network.sql
@@ -13,5 +13,8 @@ useautoreconnect = :useautoreconnect,
 autoreconnectinterval = :autoreconnectinterval,
 autoreconnectretries = :autoreconnectretries,
 unlimitedconnectretries = :unlimitedconnectretries,
 autoreconnectinterval = :autoreconnectinterval,
 autoreconnectretries = :autoreconnectretries,
 unlimitedconnectretries = :unlimitedconnectretries,

-rejoinchannels = :rejoinchannels
+rejoinchannels = :rejoinchannels,
+usesasl = :usesasl,
+saslaccount = :saslaccount,
+saslpassword = :saslpassword

 WHERE networkid = :networkid AND userid = :userid
 WHERE networkid = :networkid AND userid = :userid

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

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

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

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

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

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

diff --git a/src/core/SQL/SQLite/17/upgrade_000_alter_network_add_sasl.sql b/src/core/SQL/SQLite/17/upgrade_000_alter_network_add_sasl.sql
new file mode 100644 (file)
index 0000000..f03eec5
--- /dev/null
+++ b/src/core/SQL/SQLite/17/upgrade_000_alter_network_add_sasl.sql
@@ -0,0 +1,3 @@
+ALTER TABLE network
+ADD COLUMN
+usesasl INTEGER NOT NULL DEFAULT 0

diff --git a/src/core/SQL/SQLite/17/upgrade_001_alter_network_add_sasl.sql b/src/core/SQL/SQLite/17/upgrade_001_alter_network_add_sasl.sql
new file mode 100644 (file)
index 0000000..c3e3582
--- /dev/null
+++ b/src/core/SQL/SQLite/17/upgrade_001_alter_network_add_sasl.sql
@@ -0,0 +1,3 @@
+ALTER TABLE network
+ADD COLUMN
+saslaccount TEXT

diff --git a/src/core/SQL/SQLite/17/upgrade_002_alter_network_add_sasl.sql b/src/core/SQL/SQLite/17/upgrade_002_alter_network_add_sasl.sql
new file mode 100644 (file)
index 0000000..91c9980
--- /dev/null
+++ b/src/core/SQL/SQLite/17/upgrade_002_alter_network_add_sasl.sql
@@ -0,0 +1,3 @@
+ALTER TABLE network
+ADD COLUMN
+saslpassword TEXT

diff --git a/src/core/sql.qrc b/src/core/sql.qrc
index 07c1fdf..f713861 100644 (file)
--- a/src/core/sql.qrc
+++ b/src/core/sql.qrc
@@ -1,89 +1,90 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>

-    <file>./SQL/PostgreSQL/15/delete_backlog_by_uid.sql</file>
-    <file>./SQL/PostgreSQL/15/delete_backlog_for_buffer.sql</file>
-    <file>./SQL/PostgreSQL/15/delete_backlog_for_network.sql</file>
-    <file>./SQL/PostgreSQL/15/delete_buffer_for_bufferid.sql</file>
-    <file>./SQL/PostgreSQL/15/delete_buffers_by_uid.sql</file>
-    <file>./SQL/PostgreSQL/15/delete_buffers_for_network.sql</file>
-    <file>./SQL/PostgreSQL/15/delete_identity.sql</file>
-    <file>./SQL/PostgreSQL/15/delete_ircservers_for_network.sql</file>
-    <file>./SQL/PostgreSQL/15/delete_network.sql</file>
-    <file>./SQL/PostgreSQL/15/delete_networks_by_uid.sql</file>
-    <file>./SQL/PostgreSQL/15/delete_nicks.sql</file>
-    <file>./SQL/PostgreSQL/15/delete_quasseluser.sql</file>
-    <file>./SQL/PostgreSQL/15/insert_buffer.sql</file>
-    <file>./SQL/PostgreSQL/15/insert_identity.sql</file>
-    <file>./SQL/PostgreSQL/15/insert_message.sql</file>
-    <file>./SQL/PostgreSQL/15/insert_network.sql</file>
-    <file>./SQL/PostgreSQL/15/insert_nick.sql</file>
-    <file>./SQL/PostgreSQL/15/insert_quasseluser.sql</file>
-    <file>./SQL/PostgreSQL/15/insert_sender.sql</file>
-    <file>./SQL/PostgreSQL/15/insert_server.sql</file>
-    <file>./SQL/PostgreSQL/15/insert_user_setting.sql</file>
-    <file>./SQL/PostgreSQL/15/migrate_write_backlog.sql</file>
-    <file>./SQL/PostgreSQL/15/migrate_write_buffer.sql</file>
-    <file>./SQL/PostgreSQL/15/migrate_write_identity.sql</file>
-    <file>./SQL/PostgreSQL/15/migrate_write_identity_nick.sql</file>
-    <file>./SQL/PostgreSQL/15/migrate_write_ircserver.sql</file>
-    <file>./SQL/PostgreSQL/15/migrate_write_network.sql</file>
-    <file>./SQL/PostgreSQL/15/migrate_write_quasseluser.sql</file>
-    <file>./SQL/PostgreSQL/15/migrate_write_sender.sql</file>
-    <file>./SQL/PostgreSQL/15/migrate_write_usersetting.sql</file>
-    <file>./SQL/PostgreSQL/15/select_authuser.sql</file>
-    <file>./SQL/PostgreSQL/15/select_buffer_by_id.sql</file>
-    <file>./SQL/PostgreSQL/15/select_buffer_lastseen_messages.sql</file>
-    <file>./SQL/PostgreSQL/15/select_buffer_markerlinemsgids.sql</file>
-    <file>./SQL/PostgreSQL/15/select_bufferByName.sql</file>
-    <file>./SQL/PostgreSQL/15/select_bufferExists.sql</file>
-    <file>./SQL/PostgreSQL/15/select_buffers.sql</file>
-    <file>./SQL/PostgreSQL/15/select_buffers_for_network.sql</file>
-    <file>./SQL/PostgreSQL/15/select_checkidentity.sql</file>
-    <file>./SQL/PostgreSQL/15/select_connected_networks.sql</file>
-    <file>./SQL/PostgreSQL/15/select_identities.sql</file>
-    <file>./SQL/PostgreSQL/15/select_internaluser.sql</file>
-    <file>./SQL/PostgreSQL/15/select_messages.sql</file>
-    <file>./SQL/PostgreSQL/15/select_messagesAll.sql</file>
-    <file>./SQL/PostgreSQL/15/select_messagesAllNew.sql</file>
-    <file>./SQL/PostgreSQL/15/select_messagesNewerThan.sql</file>
-    <file>./SQL/PostgreSQL/15/select_messagesRange.sql</file>
-    <file>./SQL/PostgreSQL/15/select_network_awaymsg.sql</file>
-    <file>./SQL/PostgreSQL/15/select_network_usermode.sql</file>
-    <file>./SQL/PostgreSQL/15/select_networkExists.sql</file>
-    <file>./SQL/PostgreSQL/15/select_networks_for_user.sql</file>
-    <file>./SQL/PostgreSQL/15/select_nicks.sql</file>
-    <file>./SQL/PostgreSQL/15/select_persistent_channels.sql</file>
-    <file>./SQL/PostgreSQL/15/select_servers_for_network.sql</file>
-    <file>./SQL/PostgreSQL/15/select_user_setting.sql</file>
-    <file>./SQL/PostgreSQL/15/select_userid.sql</file>
-    <file>./SQL/PostgreSQL/15/setup_000_quasseluser.sql</file>
-    <file>./SQL/PostgreSQL/15/setup_010_sender.sql</file>
-    <file>./SQL/PostgreSQL/15/setup_020_identity.sql</file>
-    <file>./SQL/PostgreSQL/15/setup_030_identity_nick.sql</file>
-    <file>./SQL/PostgreSQL/15/setup_040_network.sql</file>
-    <file>./SQL/PostgreSQL/15/setup_050_buffer.sql</file>
-    <file>./SQL/PostgreSQL/15/setup_060_backlog.sql</file>
-    <file>./SQL/PostgreSQL/15/setup_070_coreinfo.sql</file>
-    <file>./SQL/PostgreSQL/15/setup_080_ircservers.sql</file>
-    <file>./SQL/PostgreSQL/15/setup_090_backlog_idx.sql</file>
-    <file>./SQL/PostgreSQL/15/setup_100_user_setting.sql</file>
-    <file>./SQL/PostgreSQL/15/setup_110_alter_sender_seq.sql</file>
-    <file>./SQL/PostgreSQL/15/setup_120_alter_messageid_seq.sql</file>
-    <file>./SQL/PostgreSQL/15/update_backlog_bufferid.sql</file>
-    <file>./SQL/PostgreSQL/15/update_buffer_lastseen.sql</file>
-    <file>./SQL/PostgreSQL/15/update_buffer_markerlinemsgid.sql</file>
-    <file>./SQL/PostgreSQL/15/update_buffer_name.sql</file>
-    <file>./SQL/PostgreSQL/15/update_buffer_persistent_channel.sql</file>
-    <file>./SQL/PostgreSQL/15/update_buffer_set_channel_key.sql</file>
-    <file>./SQL/PostgreSQL/15/update_identity.sql</file>
-    <file>./SQL/PostgreSQL/15/update_network.sql</file>
-    <file>./SQL/PostgreSQL/15/update_network_connected.sql</file>
-    <file>./SQL/PostgreSQL/15/update_network_set_awaymsg.sql</file>
-    <file>./SQL/PostgreSQL/15/update_network_set_usermode.sql</file>
-    <file>./SQL/PostgreSQL/15/update_user_setting.sql</file>
-    <file>./SQL/PostgreSQL/15/update_username.sql</file>
-    <file>./SQL/PostgreSQL/15/update_userpassword.sql</file>

     <file>./SQL/PostgreSQL/15/upgrade_000_alter_buffer_add_markerlinemsgid.sql</file>
     <file>./SQL/PostgreSQL/15/upgrade_000_alter_buffer_add_markerlinemsgid.sql</file>

+    <file>./SQL/PostgreSQL/16/delete_backlog_by_uid.sql</file>
+    <file>./SQL/PostgreSQL/16/delete_backlog_for_buffer.sql</file>
+    <file>./SQL/PostgreSQL/16/delete_backlog_for_network.sql</file>
+    <file>./SQL/PostgreSQL/16/delete_buffer_for_bufferid.sql</file>
+    <file>./SQL/PostgreSQL/16/delete_buffers_by_uid.sql</file>
+    <file>./SQL/PostgreSQL/16/delete_buffers_for_network.sql</file>
+    <file>./SQL/PostgreSQL/16/delete_identity.sql</file>
+    <file>./SQL/PostgreSQL/16/delete_ircservers_for_network.sql</file>
+    <file>./SQL/PostgreSQL/16/delete_network.sql</file>
+    <file>./SQL/PostgreSQL/16/delete_networks_by_uid.sql</file>
+    <file>./SQL/PostgreSQL/16/delete_nicks.sql</file>
+    <file>./SQL/PostgreSQL/16/delete_quasseluser.sql</file>
+    <file>./SQL/PostgreSQL/16/insert_buffer.sql</file>
+    <file>./SQL/PostgreSQL/16/insert_identity.sql</file>
+    <file>./SQL/PostgreSQL/16/insert_message.sql</file>
+    <file>./SQL/PostgreSQL/16/insert_network.sql</file>
+    <file>./SQL/PostgreSQL/16/insert_nick.sql</file>
+    <file>./SQL/PostgreSQL/16/insert_quasseluser.sql</file>
+    <file>./SQL/PostgreSQL/16/insert_sender.sql</file>
+    <file>./SQL/PostgreSQL/16/insert_server.sql</file>
+    <file>./SQL/PostgreSQL/16/insert_user_setting.sql</file>
+    <file>./SQL/PostgreSQL/16/migrate_write_backlog.sql</file>
+    <file>./SQL/PostgreSQL/16/migrate_write_buffer.sql</file>
+    <file>./SQL/PostgreSQL/16/migrate_write_identity.sql</file>
+    <file>./SQL/PostgreSQL/16/migrate_write_identity_nick.sql</file>
+    <file>./SQL/PostgreSQL/16/migrate_write_ircserver.sql</file>
+    <file>./SQL/PostgreSQL/16/migrate_write_network.sql</file>
+    <file>./SQL/PostgreSQL/16/migrate_write_quasseluser.sql</file>
+    <file>./SQL/PostgreSQL/16/migrate_write_sender.sql</file>
+    <file>./SQL/PostgreSQL/16/migrate_write_usersetting.sql</file>
+    <file>./SQL/PostgreSQL/16/select_authuser.sql</file>
+    <file>./SQL/PostgreSQL/16/select_bufferByName.sql</file>
+    <file>./SQL/PostgreSQL/16/select_bufferExists.sql</file>
+    <file>./SQL/PostgreSQL/16/select_buffer_by_id.sql</file>
+    <file>./SQL/PostgreSQL/16/select_buffer_lastseen_messages.sql</file>
+    <file>./SQL/PostgreSQL/16/select_buffer_markerlinemsgids.sql</file>
+    <file>./SQL/PostgreSQL/16/select_buffers.sql</file>
+    <file>./SQL/PostgreSQL/16/select_buffers_for_network.sql</file>
+    <file>./SQL/PostgreSQL/16/select_checkidentity.sql</file>
+    <file>./SQL/PostgreSQL/16/select_connected_networks.sql</file>
+    <file>./SQL/PostgreSQL/16/select_identities.sql</file>
+    <file>./SQL/PostgreSQL/16/select_internaluser.sql</file>
+    <file>./SQL/PostgreSQL/16/select_messages.sql</file>
+    <file>./SQL/PostgreSQL/16/select_messagesAll.sql</file>
+    <file>./SQL/PostgreSQL/16/select_messagesAllNew.sql</file>
+    <file>./SQL/PostgreSQL/16/select_messagesNewerThan.sql</file>
+    <file>./SQL/PostgreSQL/16/select_messagesRange.sql</file>
+    <file>./SQL/PostgreSQL/16/select_networkExists.sql</file>
+    <file>./SQL/PostgreSQL/16/select_network_awaymsg.sql</file>
+    <file>./SQL/PostgreSQL/16/select_network_usermode.sql</file>
+    <file>./SQL/PostgreSQL/16/select_networks_for_user.sql</file>
+    <file>./SQL/PostgreSQL/16/select_nicks.sql</file>
+    <file>./SQL/PostgreSQL/16/select_persistent_channels.sql</file>
+    <file>./SQL/PostgreSQL/16/select_servers_for_network.sql</file>
+    <file>./SQL/PostgreSQL/16/select_user_setting.sql</file>
+    <file>./SQL/PostgreSQL/16/select_userid.sql</file>
+    <file>./SQL/PostgreSQL/16/setup_000_quasseluser.sql</file>
+    <file>./SQL/PostgreSQL/16/setup_010_sender.sql</file>
+    <file>./SQL/PostgreSQL/16/setup_020_identity.sql</file>
+    <file>./SQL/PostgreSQL/16/setup_030_identity_nick.sql</file>
+    <file>./SQL/PostgreSQL/16/setup_040_network.sql</file>
+    <file>./SQL/PostgreSQL/16/setup_050_buffer.sql</file>
+    <file>./SQL/PostgreSQL/16/setup_060_backlog.sql</file>
+    <file>./SQL/PostgreSQL/16/setup_070_coreinfo.sql</file>
+    <file>./SQL/PostgreSQL/16/setup_080_ircservers.sql</file>
+    <file>./SQL/PostgreSQL/16/setup_090_backlog_idx.sql</file>
+    <file>./SQL/PostgreSQL/16/setup_100_user_setting.sql</file>
+    <file>./SQL/PostgreSQL/16/setup_110_alter_sender_seq.sql</file>
+    <file>./SQL/PostgreSQL/16/setup_120_alter_messageid_seq.sql</file>
+    <file>./SQL/PostgreSQL/16/update_backlog_bufferid.sql</file>
+    <file>./SQL/PostgreSQL/16/update_buffer_lastseen.sql</file>
+    <file>./SQL/PostgreSQL/16/update_buffer_markerlinemsgid.sql</file>
+    <file>./SQL/PostgreSQL/16/update_buffer_name.sql</file>
+    <file>./SQL/PostgreSQL/16/update_buffer_persistent_channel.sql</file>
+    <file>./SQL/PostgreSQL/16/update_buffer_set_channel_key.sql</file>
+    <file>./SQL/PostgreSQL/16/update_identity.sql</file>
+    <file>./SQL/PostgreSQL/16/update_network.sql</file>
+    <file>./SQL/PostgreSQL/16/update_network_connected.sql</file>
+    <file>./SQL/PostgreSQL/16/update_network_set_awaymsg.sql</file>
+    <file>./SQL/PostgreSQL/16/update_network_set_usermode.sql</file>
+    <file>./SQL/PostgreSQL/16/update_user_setting.sql</file>
+    <file>./SQL/PostgreSQL/16/update_username.sql</file>
+    <file>./SQL/PostgreSQL/16/update_userpassword.sql</file>
+    <file>./SQL/PostgreSQL/16/upgrade_000_alter_network_add_sasl.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/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>


@@ -108,92 +109,6 @@
     <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/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/delete_backlog_by_uid.sql</file>
-    <file>./SQL/SQLite/16/delete_backlog_for_buffer.sql</file>
-    <file>./SQL/SQLite/16/delete_backlog_for_network.sql</file>
-    <file>./SQL/SQLite/16/delete_buffer_for_bufferid.sql</file>
-    <file>./SQL/SQLite/16/delete_buffers_by_uid.sql</file>
-    <file>./SQL/SQLite/16/delete_buffers_for_network.sql</file>
-    <file>./SQL/SQLite/16/delete_identity.sql</file>
-    <file>./SQL/SQLite/16/delete_ircservers_for_network.sql</file>
-    <file>./SQL/SQLite/16/delete_network.sql</file>
-    <file>./SQL/SQLite/16/delete_networks_by_uid.sql</file>
-    <file>./SQL/SQLite/16/delete_nicks.sql</file>
-    <file>./SQL/SQLite/16/delete_quasseluser.sql</file>
-    <file>./SQL/SQLite/16/insert_buffer.sql</file>
-    <file>./SQL/SQLite/16/insert_identity.sql</file>
-    <file>./SQL/SQLite/16/insert_message.sql</file>
-    <file>./SQL/SQLite/16/insert_network.sql</file>
-    <file>./SQL/SQLite/16/insert_nick.sql</file>
-    <file>./SQL/SQLite/16/insert_quasseluser.sql</file>
-    <file>./SQL/SQLite/16/insert_sender.sql</file>
-    <file>./SQL/SQLite/16/insert_server.sql</file>
-    <file>./SQL/SQLite/16/insert_user_setting.sql</file>
-    <file>./SQL/SQLite/16/migrate_read_backlog.sql</file>
-    <file>./SQL/SQLite/16/migrate_read_buffer.sql</file>
-    <file>./SQL/SQLite/16/migrate_read_identity.sql</file>
-    <file>./SQL/SQLite/16/migrate_read_identity_nick.sql</file>
-    <file>./SQL/SQLite/16/migrate_read_ircserver.sql</file>
-    <file>./SQL/SQLite/16/migrate_read_network.sql</file>
-    <file>./SQL/SQLite/16/migrate_read_quasseluser.sql</file>
-    <file>./SQL/SQLite/16/migrate_read_sender.sql</file>
-    <file>./SQL/SQLite/16/migrate_read_usersetting.sql</file>
-    <file>./SQL/SQLite/16/select_authuser.sql</file>
-    <file>./SQL/SQLite/16/select_buffer_by_id.sql</file>
-    <file>./SQL/SQLite/16/select_buffer_lastseen_messages.sql</file>
-    <file>./SQL/SQLite/16/select_buffer_markerlinemsgids.sql</file>
-    <file>./SQL/SQLite/16/select_bufferByName.sql</file>
-    <file>./SQL/SQLite/16/select_bufferExists.sql</file>
-    <file>./SQL/SQLite/16/select_buffers.sql</file>
-    <file>./SQL/SQLite/16/select_buffers_for_merge.sql</file>
-    <file>./SQL/SQLite/16/select_buffers_for_network.sql</file>
-    <file>./SQL/SQLite/16/select_checkidentity.sql</file>
-    <file>./SQL/SQLite/16/select_connected_networks.sql</file>
-    <file>./SQL/SQLite/16/select_identities.sql</file>
-    <file>./SQL/SQLite/16/select_internaluser.sql</file>
-    <file>./SQL/SQLite/16/select_messages.sql</file>
-    <file>./SQL/SQLite/16/select_messagesAll.sql</file>
-    <file>./SQL/SQLite/16/select_messagesAllNew.sql</file>
-    <file>./SQL/SQLite/16/select_messagesNewerThan.sql</file>
-    <file>./SQL/SQLite/16/select_messagesNewestK.sql</file>
-    <file>./SQL/SQLite/16/select_network_awaymsg.sql</file>
-    <file>./SQL/SQLite/16/select_network_usermode.sql</file>
-    <file>./SQL/SQLite/16/select_networkExists.sql</file>
-    <file>./SQL/SQLite/16/select_networks_for_user.sql</file>
-    <file>./SQL/SQLite/16/select_nicks.sql</file>
-    <file>./SQL/SQLite/16/select_persistent_channels.sql</file>
-    <file>./SQL/SQLite/16/select_servers_for_network.sql</file>
-    <file>./SQL/SQLite/16/select_user_setting.sql</file>
-    <file>./SQL/SQLite/16/select_userid.sql</file>
-    <file>./SQL/SQLite/16/setup_000_quasseluser.sql</file>
-    <file>./SQL/SQLite/16/setup_010_sender.sql</file>
-    <file>./SQL/SQLite/16/setup_020_network.sql</file>
-    <file>./SQL/SQLite/16/setup_030_buffer.sql</file>
-    <file>./SQL/SQLite/16/setup_040_buffer_idx.sql</file>
-    <file>./SQL/SQLite/16/setup_050_buffer_cname_idx.sql</file>
-    <file>./SQL/SQLite/16/setup_060_backlog.sql</file>
-    <file>./SQL/SQLite/16/setup_070_coreinfo.sql</file>
-    <file>./SQL/SQLite/16/setup_080_ircservers.sql</file>
-    <file>./SQL/SQLite/16/setup_090_backlog_idx.sql</file>
-    <file>./SQL/SQLite/16/setup_100_backlog_idx2.sql</file>
-    <file>./SQL/SQLite/16/setup_110_buffer_user_idx.sql</file>
-    <file>./SQL/SQLite/16/setup_120_user_setting.sql</file>
-    <file>./SQL/SQLite/16/setup_130_identity.sql</file>
-    <file>./SQL/SQLite/16/setup_140_identity_nick.sql</file>
-    <file>./SQL/SQLite/16/update_backlog_bufferid.sql</file>
-    <file>./SQL/SQLite/16/update_buffer_lastseen.sql</file>
-    <file>./SQL/SQLite/16/update_buffer_markerlinemsgid.sql</file>
-    <file>./SQL/SQLite/16/update_buffer_name.sql</file>
-    <file>./SQL/SQLite/16/update_buffer_persistent_channel.sql</file>
-    <file>./SQL/SQLite/16/update_buffer_set_channel_key.sql</file>
-    <file>./SQL/SQLite/16/update_identity.sql</file>
-    <file>./SQL/SQLite/16/update_network.sql</file>
-    <file>./SQL/SQLite/16/update_network_connected.sql</file>
-    <file>./SQL/SQLite/16/update_network_set_awaymsg.sql</file>
-    <file>./SQL/SQLite/16/update_network_set_usermode.sql</file>
-    <file>./SQL/SQLite/16/update_user_setting.sql</file>
-    <file>./SQL/SQLite/16/update_username.sql</file>
-    <file>./SQL/SQLite/16/update_userpassword.sql</file>

     <file>./SQL/SQLite/16/upgrade_000_alter_buffer_add_markerlinemsgid.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/16/upgrade_000_alter_buffer_add_markerlinemsgid.sql</file>
     <file>./SQL/SQLite/2/upgrade_000_drop_buffergroup.sql</file>
     <file>./SQL/SQLite/2/upgrade_010_update_schemaversion.sql</file>


@@ -239,5 +154,94 @@
     <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/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/17/delete_backlog_by_uid.sql</file>
+    <file>./SQL/SQLite/17/delete_backlog_for_buffer.sql</file>
+    <file>./SQL/SQLite/17/delete_backlog_for_network.sql</file>
+    <file>./SQL/SQLite/17/delete_buffer_for_bufferid.sql</file>
+    <file>./SQL/SQLite/17/delete_buffers_by_uid.sql</file>
+    <file>./SQL/SQLite/17/delete_buffers_for_network.sql</file>
+    <file>./SQL/SQLite/17/delete_identity.sql</file>
+    <file>./SQL/SQLite/17/delete_ircservers_for_network.sql</file>
+    <file>./SQL/SQLite/17/delete_network.sql</file>
+    <file>./SQL/SQLite/17/delete_networks_by_uid.sql</file>
+    <file>./SQL/SQLite/17/delete_nicks.sql</file>
+    <file>./SQL/SQLite/17/delete_quasseluser.sql</file>
+    <file>./SQL/SQLite/17/insert_buffer.sql</file>
+    <file>./SQL/SQLite/17/insert_identity.sql</file>
+    <file>./SQL/SQLite/17/insert_message.sql</file>
+    <file>./SQL/SQLite/17/insert_network.sql</file>
+    <file>./SQL/SQLite/17/insert_nick.sql</file>
+    <file>./SQL/SQLite/17/insert_quasseluser.sql</file>
+    <file>./SQL/SQLite/17/insert_sender.sql</file>
+    <file>./SQL/SQLite/17/insert_server.sql</file>
+    <file>./SQL/SQLite/17/insert_user_setting.sql</file>
+    <file>./SQL/SQLite/17/migrate_read_backlog.sql</file>
+    <file>./SQL/SQLite/17/migrate_read_buffer.sql</file>
+    <file>./SQL/SQLite/17/migrate_read_identity.sql</file>
+    <file>./SQL/SQLite/17/migrate_read_identity_nick.sql</file>
+    <file>./SQL/SQLite/17/migrate_read_ircserver.sql</file>
+    <file>./SQL/SQLite/17/migrate_read_network.sql</file>
+    <file>./SQL/SQLite/17/migrate_read_quasseluser.sql</file>
+    <file>./SQL/SQLite/17/migrate_read_sender.sql</file>
+    <file>./SQL/SQLite/17/migrate_read_usersetting.sql</file>
+    <file>./SQL/SQLite/17/select_authuser.sql</file>
+    <file>./SQL/SQLite/17/select_bufferByName.sql</file>
+    <file>./SQL/SQLite/17/select_bufferExists.sql</file>
+    <file>./SQL/SQLite/17/select_buffer_by_id.sql</file>
+    <file>./SQL/SQLite/17/select_buffer_lastseen_messages.sql</file>
+    <file>./SQL/SQLite/17/select_buffer_markerlinemsgids.sql</file>
+    <file>./SQL/SQLite/17/select_buffers.sql</file>
+    <file>./SQL/SQLite/17/select_buffers_for_merge.sql</file>
+    <file>./SQL/SQLite/17/select_buffers_for_network.sql</file>
+    <file>./SQL/SQLite/17/select_checkidentity.sql</file>
+    <file>./SQL/SQLite/17/select_connected_networks.sql</file>
+    <file>./SQL/SQLite/17/select_identities.sql</file>
+    <file>./SQL/SQLite/17/select_internaluser.sql</file>
+    <file>./SQL/SQLite/17/select_messages.sql</file>
+    <file>./SQL/SQLite/17/select_messagesAll.sql</file>
+    <file>./SQL/SQLite/17/select_messagesAllNew.sql</file>
+    <file>./SQL/SQLite/17/select_messagesNewerThan.sql</file>
+    <file>./SQL/SQLite/17/select_messagesNewestK.sql</file>
+    <file>./SQL/SQLite/17/select_networkExists.sql</file>
+    <file>./SQL/SQLite/17/select_network_awaymsg.sql</file>
+    <file>./SQL/SQLite/17/select_network_usermode.sql</file>
+    <file>./SQL/SQLite/17/select_networks_for_user.sql</file>
+    <file>./SQL/SQLite/17/select_nicks.sql</file>
+    <file>./SQL/SQLite/17/select_persistent_channels.sql</file>
+    <file>./SQL/SQLite/17/select_servers_for_network.sql</file>
+    <file>./SQL/SQLite/17/select_user_setting.sql</file>
+    <file>./SQL/SQLite/17/select_userid.sql</file>
+    <file>./SQL/SQLite/17/setup_000_quasseluser.sql</file>
+    <file>./SQL/SQLite/17/setup_010_sender.sql</file>
+    <file>./SQL/SQLite/17/setup_020_network.sql</file>
+    <file>./SQL/SQLite/17/setup_030_buffer.sql</file>
+    <file>./SQL/SQLite/17/setup_040_buffer_idx.sql</file>
+    <file>./SQL/SQLite/17/setup_050_buffer_cname_idx.sql</file>
+    <file>./SQL/SQLite/17/setup_060_backlog.sql</file>
+    <file>./SQL/SQLite/17/setup_070_coreinfo.sql</file>
+    <file>./SQL/SQLite/17/setup_080_ircservers.sql</file>
+    <file>./SQL/SQLite/17/setup_090_backlog_idx.sql</file>
+    <file>./SQL/SQLite/17/setup_100_backlog_idx2.sql</file>
+    <file>./SQL/SQLite/17/setup_110_buffer_user_idx.sql</file>
+    <file>./SQL/SQLite/17/setup_120_user_setting.sql</file>
+    <file>./SQL/SQLite/17/setup_130_identity.sql</file>
+    <file>./SQL/SQLite/17/setup_140_identity_nick.sql</file>
+    <file>./SQL/SQLite/17/update_backlog_bufferid.sql</file>
+    <file>./SQL/SQLite/17/update_buffer_lastseen.sql</file>
+    <file>./SQL/SQLite/17/update_buffer_markerlinemsgid.sql</file>
+    <file>./SQL/SQLite/17/update_buffer_name.sql</file>
+    <file>./SQL/SQLite/17/update_buffer_persistent_channel.sql</file>
+    <file>./SQL/SQLite/17/update_buffer_set_channel_key.sql</file>
+    <file>./SQL/SQLite/17/update_identity.sql</file>
+    <file>./SQL/SQLite/17/update_network.sql</file>
+    <file>./SQL/SQLite/17/update_network_connected.sql</file>
+    <file>./SQL/SQLite/17/update_network_set_awaymsg.sql</file>
+    <file>./SQL/SQLite/17/update_network_set_usermode.sql</file>
+    <file>./SQL/SQLite/17/update_user_setting.sql</file>
+    <file>./SQL/SQLite/17/update_username.sql</file>
+    <file>./SQL/SQLite/17/update_userpassword.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>

 </qresource>
 </RCC>
 </qresource>
 </RCC>