From b795a7b7b42ab546b1a6db2cba6091f5c3aa91fc Mon Sep 17 00:00:00 2001 From: Marcus Eggenberger Date: Wed, 11 Feb 2009 13:06:55 +0100 Subject: [PATCH] preparing storage backend to store usermode and awaymessage for session restore --- .../{13 => 14}/delete_backlog_by_uid.sql | 0 .../{13 => 14}/delete_backlog_for_buffer.sql | 0 .../{13 => 14}/delete_backlog_for_network.sql | 0 .../{13 => 14}/delete_buffer_for_bufferid.sql | 0 .../{13 => 14}/delete_buffers_by_uid.sql | 0 .../{13 => 14}/delete_buffers_for_network.sql | 0 .../SQL/SQLite/{13 => 14}/delete_identity.sql | 0 .../delete_ircservers_for_network.sql | 0 .../SQL/SQLite/{13 => 14}/delete_network.sql | 0 .../{13 => 14}/delete_networks_by_uid.sql | 0 .../SQL/SQLite/{13 => 14}/delete_nicks.sql | 0 .../SQLite/{13 => 14}/delete_quasseluser.sql | 0 .../SQL/SQLite/{13 => 14}/insert_buffer.sql | 0 .../SQL/SQLite/{13 => 14}/insert_identity.sql | 0 .../SQL/SQLite/{13 => 14}/insert_message.sql | 0 .../SQL/SQLite/{13 => 14}/insert_network.sql | 0 .../SQL/SQLite/{13 => 14}/insert_nick.sql | 0 .../SQLite/{13 => 14}/insert_quasseluser.sql | 0 .../SQL/SQLite/{13 => 14}/insert_sender.sql | 0 .../SQL/SQLite/{13 => 14}/insert_server.sql | 0 .../SQLite/{13 => 14}/insert_user_setting.sql | 0 .../SQL/SQLite/{13 => 14}/select_authuser.sql | 0 .../SQLite/{13 => 14}/select_bufferByName.sql | 0 .../SQLite/{13 => 14}/select_bufferExists.sql | 0 .../SQLite/{13 => 14}/select_buffer_by_id.sql | 0 .../select_buffer_lastseen_messages.sql | 0 .../SQL/SQLite/{13 => 14}/select_buffers.sql | 0 .../{13 => 14}/select_buffers_for_network.sql | 0 .../{13 => 14}/select_checkidentity.sql | 0 .../{13 => 14}/select_connected_networks.sql | 0 .../SQLite/{13 => 14}/select_identities.sql | 0 .../SQLite/{13 => 14}/select_internaluser.sql | 0 .../SQL/SQLite/{13 => 14}/select_messages.sql | 0 .../SQLite/{13 => 14}/select_messagesAll.sql | 0 .../{13 => 14}/select_messagesAllNew.sql | 0 .../{13 => 14}/select_messagesNewerThan.sql | 0 .../{13 => 14}/select_messagesNewestK.sql | 0 .../{13 => 14}/select_networkExists.sql | 0 .../{13 => 14}/select_networks_for_user.sql | 0 .../SQL/SQLite/{13 => 14}/select_nicks.sql | 0 .../{13 => 14}/select_persistent_channels.sql | 0 .../{13 => 14}/select_servers_for_network.sql | 0 .../SQLite/{13 => 14}/select_user_setting.sql | 0 .../SQL/SQLite/{13 => 14}/select_userid.sql | 0 .../{13 => 14}/setup_000_quasseluser.sql | 0 .../SQLite/{13 => 14}/setup_010_sender.sql | 0 .../SQLite/{13 => 14}/setup_020_network.sql | 6 +- .../SQLite/{13 => 14}/setup_030_buffer.sql | 0 .../{13 => 14}/setup_040_buffer_idx.sql | 0 .../{13 => 14}/setup_050_buffer_cname_idx.sql | 0 .../SQLite/{13 => 14}/setup_060_backlog.sql | 0 .../SQLite/{13 => 14}/setup_070_coreinfo.sql | 0 .../{13 => 14}/setup_080_ircservers.sql | 0 .../{13 => 14}/setup_090_backlog_idx.sql | 0 .../{13 => 14}/setup_100_backlog_idx2.sql | 0 .../{13 => 14}/setup_110_buffer_user_idx.sql | 0 .../{13 => 14}/setup_120_user_setting.sql | 0 .../SQLite/{13 => 14}/setup_130_identity.sql | 0 .../{13 => 14}/setup_140_identity_nick.sql | 0 .../{13 => 14}/update_backlog_bufferid.sql | 0 .../{13 => 14}/update_buffer_lastseen.sql | 0 .../SQLite/{13 => 14}/update_buffer_name.sql | 0 .../update_buffer_persistent_channel.sql | 0 .../update_buffer_set_channel_key.sql | 0 .../SQL/SQLite/{13 => 14}/update_identity.sql | 0 .../SQL/SQLite/{13 => 14}/update_network.sql | 0 .../{13 => 14}/update_network_connected.sql | 0 .../SQLite/{13 => 14}/update_user_setting.sql | 0 .../SQL/SQLite/{13 => 14}/update_username.sql | 0 .../SQLite/{13 => 14}/update_userpassword.sql | 0 .../14/upgrade_000_rename_networktable.sql | 1 + .../14/upgrade_010_create_networktable.sql | 25 +++ .../14/upgrade_030_copy_networktable.sql | 2 + .../SQLite/14/upgrade_040_drop_networkold.sql | 1 + src/core/sql.qrc | 144 +++++++++--------- 75 files changed, 108 insertions(+), 71 deletions(-) rename src/core/SQL/SQLite/{13 => 14}/delete_backlog_by_uid.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/delete_backlog_for_buffer.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/delete_backlog_for_network.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/delete_buffer_for_bufferid.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/delete_buffers_by_uid.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/delete_buffers_for_network.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/delete_identity.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/delete_ircservers_for_network.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/delete_network.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/delete_networks_by_uid.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/delete_nicks.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/delete_quasseluser.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/insert_buffer.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/insert_identity.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/insert_message.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/insert_network.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/insert_nick.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/insert_quasseluser.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/insert_sender.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/insert_server.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/insert_user_setting.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/select_authuser.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/select_bufferByName.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/select_bufferExists.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/select_buffer_by_id.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/select_buffer_lastseen_messages.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/select_buffers.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/select_buffers_for_network.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/select_checkidentity.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/select_connected_networks.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/select_identities.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/select_internaluser.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/select_messages.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/select_messagesAll.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/select_messagesAllNew.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/select_messagesNewerThan.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/select_messagesNewestK.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/select_networkExists.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/select_networks_for_user.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/select_nicks.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/select_persistent_channels.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/select_servers_for_network.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/select_user_setting.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/select_userid.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/setup_000_quasseluser.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/setup_010_sender.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/setup_020_network.sql (75%) rename src/core/SQL/SQLite/{13 => 14}/setup_030_buffer.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/setup_040_buffer_idx.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/setup_050_buffer_cname_idx.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/setup_060_backlog.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/setup_070_coreinfo.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/setup_080_ircservers.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/setup_090_backlog_idx.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/setup_100_backlog_idx2.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/setup_110_buffer_user_idx.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/setup_120_user_setting.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/setup_130_identity.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/setup_140_identity_nick.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/update_backlog_bufferid.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/update_buffer_lastseen.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/update_buffer_name.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/update_buffer_persistent_channel.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/update_buffer_set_channel_key.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/update_identity.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/update_network.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/update_network_connected.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/update_user_setting.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/update_username.sql (100%) rename src/core/SQL/SQLite/{13 => 14}/update_userpassword.sql (100%) create mode 100644 src/core/SQL/SQLite/14/upgrade_000_rename_networktable.sql create mode 100644 src/core/SQL/SQLite/14/upgrade_010_create_networktable.sql create mode 100644 src/core/SQL/SQLite/14/upgrade_030_copy_networktable.sql create mode 100644 src/core/SQL/SQLite/14/upgrade_040_drop_networkold.sql diff --git a/src/core/SQL/SQLite/13/delete_backlog_by_uid.sql b/src/core/SQL/SQLite/14/delete_backlog_by_uid.sql similarity index 100% rename from src/core/SQL/SQLite/13/delete_backlog_by_uid.sql rename to src/core/SQL/SQLite/14/delete_backlog_by_uid.sql diff --git a/src/core/SQL/SQLite/13/delete_backlog_for_buffer.sql b/src/core/SQL/SQLite/14/delete_backlog_for_buffer.sql similarity index 100% rename from src/core/SQL/SQLite/13/delete_backlog_for_buffer.sql rename to src/core/SQL/SQLite/14/delete_backlog_for_buffer.sql diff --git a/src/core/SQL/SQLite/13/delete_backlog_for_network.sql b/src/core/SQL/SQLite/14/delete_backlog_for_network.sql similarity index 100% rename from src/core/SQL/SQLite/13/delete_backlog_for_network.sql rename to src/core/SQL/SQLite/14/delete_backlog_for_network.sql diff --git a/src/core/SQL/SQLite/13/delete_buffer_for_bufferid.sql b/src/core/SQL/SQLite/14/delete_buffer_for_bufferid.sql similarity index 100% rename from src/core/SQL/SQLite/13/delete_buffer_for_bufferid.sql rename to src/core/SQL/SQLite/14/delete_buffer_for_bufferid.sql diff --git a/src/core/SQL/SQLite/13/delete_buffers_by_uid.sql b/src/core/SQL/SQLite/14/delete_buffers_by_uid.sql similarity index 100% rename from src/core/SQL/SQLite/13/delete_buffers_by_uid.sql rename to src/core/SQL/SQLite/14/delete_buffers_by_uid.sql diff --git a/src/core/SQL/SQLite/13/delete_buffers_for_network.sql b/src/core/SQL/SQLite/14/delete_buffers_for_network.sql similarity index 100% rename from src/core/SQL/SQLite/13/delete_buffers_for_network.sql rename to src/core/SQL/SQLite/14/delete_buffers_for_network.sql diff --git a/src/core/SQL/SQLite/13/delete_identity.sql b/src/core/SQL/SQLite/14/delete_identity.sql similarity index 100% rename from src/core/SQL/SQLite/13/delete_identity.sql rename to src/core/SQL/SQLite/14/delete_identity.sql diff --git a/src/core/SQL/SQLite/13/delete_ircservers_for_network.sql b/src/core/SQL/SQLite/14/delete_ircservers_for_network.sql similarity index 100% rename from src/core/SQL/SQLite/13/delete_ircservers_for_network.sql rename to src/core/SQL/SQLite/14/delete_ircservers_for_network.sql diff --git a/src/core/SQL/SQLite/13/delete_network.sql b/src/core/SQL/SQLite/14/delete_network.sql similarity index 100% rename from src/core/SQL/SQLite/13/delete_network.sql rename to src/core/SQL/SQLite/14/delete_network.sql diff --git a/src/core/SQL/SQLite/13/delete_networks_by_uid.sql b/src/core/SQL/SQLite/14/delete_networks_by_uid.sql similarity index 100% rename from src/core/SQL/SQLite/13/delete_networks_by_uid.sql rename to src/core/SQL/SQLite/14/delete_networks_by_uid.sql diff --git a/src/core/SQL/SQLite/13/delete_nicks.sql b/src/core/SQL/SQLite/14/delete_nicks.sql similarity index 100% rename from src/core/SQL/SQLite/13/delete_nicks.sql rename to src/core/SQL/SQLite/14/delete_nicks.sql diff --git a/src/core/SQL/SQLite/13/delete_quasseluser.sql b/src/core/SQL/SQLite/14/delete_quasseluser.sql similarity index 100% rename from src/core/SQL/SQLite/13/delete_quasseluser.sql rename to src/core/SQL/SQLite/14/delete_quasseluser.sql diff --git a/src/core/SQL/SQLite/13/insert_buffer.sql b/src/core/SQL/SQLite/14/insert_buffer.sql similarity index 100% rename from src/core/SQL/SQLite/13/insert_buffer.sql rename to src/core/SQL/SQLite/14/insert_buffer.sql diff --git a/src/core/SQL/SQLite/13/insert_identity.sql b/src/core/SQL/SQLite/14/insert_identity.sql similarity index 100% rename from src/core/SQL/SQLite/13/insert_identity.sql rename to src/core/SQL/SQLite/14/insert_identity.sql diff --git a/src/core/SQL/SQLite/13/insert_message.sql b/src/core/SQL/SQLite/14/insert_message.sql similarity index 100% rename from src/core/SQL/SQLite/13/insert_message.sql rename to src/core/SQL/SQLite/14/insert_message.sql diff --git a/src/core/SQL/SQLite/13/insert_network.sql b/src/core/SQL/SQLite/14/insert_network.sql similarity index 100% rename from src/core/SQL/SQLite/13/insert_network.sql rename to src/core/SQL/SQLite/14/insert_network.sql diff --git a/src/core/SQL/SQLite/13/insert_nick.sql b/src/core/SQL/SQLite/14/insert_nick.sql similarity index 100% rename from src/core/SQL/SQLite/13/insert_nick.sql rename to src/core/SQL/SQLite/14/insert_nick.sql diff --git a/src/core/SQL/SQLite/13/insert_quasseluser.sql b/src/core/SQL/SQLite/14/insert_quasseluser.sql similarity index 100% rename from src/core/SQL/SQLite/13/insert_quasseluser.sql rename to src/core/SQL/SQLite/14/insert_quasseluser.sql diff --git a/src/core/SQL/SQLite/13/insert_sender.sql b/src/core/SQL/SQLite/14/insert_sender.sql similarity index 100% rename from src/core/SQL/SQLite/13/insert_sender.sql rename to src/core/SQL/SQLite/14/insert_sender.sql diff --git a/src/core/SQL/SQLite/13/insert_server.sql b/src/core/SQL/SQLite/14/insert_server.sql similarity index 100% rename from src/core/SQL/SQLite/13/insert_server.sql rename to src/core/SQL/SQLite/14/insert_server.sql diff --git a/src/core/SQL/SQLite/13/insert_user_setting.sql b/src/core/SQL/SQLite/14/insert_user_setting.sql similarity index 100% rename from src/core/SQL/SQLite/13/insert_user_setting.sql rename to src/core/SQL/SQLite/14/insert_user_setting.sql diff --git a/src/core/SQL/SQLite/13/select_authuser.sql b/src/core/SQL/SQLite/14/select_authuser.sql similarity index 100% rename from src/core/SQL/SQLite/13/select_authuser.sql rename to src/core/SQL/SQLite/14/select_authuser.sql diff --git a/src/core/SQL/SQLite/13/select_bufferByName.sql b/src/core/SQL/SQLite/14/select_bufferByName.sql similarity index 100% rename from src/core/SQL/SQLite/13/select_bufferByName.sql rename to src/core/SQL/SQLite/14/select_bufferByName.sql diff --git a/src/core/SQL/SQLite/13/select_bufferExists.sql b/src/core/SQL/SQLite/14/select_bufferExists.sql similarity index 100% rename from src/core/SQL/SQLite/13/select_bufferExists.sql rename to src/core/SQL/SQLite/14/select_bufferExists.sql diff --git a/src/core/SQL/SQLite/13/select_buffer_by_id.sql b/src/core/SQL/SQLite/14/select_buffer_by_id.sql similarity index 100% rename from src/core/SQL/SQLite/13/select_buffer_by_id.sql rename to src/core/SQL/SQLite/14/select_buffer_by_id.sql diff --git a/src/core/SQL/SQLite/13/select_buffer_lastseen_messages.sql b/src/core/SQL/SQLite/14/select_buffer_lastseen_messages.sql similarity index 100% rename from src/core/SQL/SQLite/13/select_buffer_lastseen_messages.sql rename to src/core/SQL/SQLite/14/select_buffer_lastseen_messages.sql diff --git a/src/core/SQL/SQLite/13/select_buffers.sql b/src/core/SQL/SQLite/14/select_buffers.sql similarity index 100% rename from src/core/SQL/SQLite/13/select_buffers.sql rename to src/core/SQL/SQLite/14/select_buffers.sql diff --git a/src/core/SQL/SQLite/13/select_buffers_for_network.sql b/src/core/SQL/SQLite/14/select_buffers_for_network.sql similarity index 100% rename from src/core/SQL/SQLite/13/select_buffers_for_network.sql rename to src/core/SQL/SQLite/14/select_buffers_for_network.sql diff --git a/src/core/SQL/SQLite/13/select_checkidentity.sql b/src/core/SQL/SQLite/14/select_checkidentity.sql similarity index 100% rename from src/core/SQL/SQLite/13/select_checkidentity.sql rename to src/core/SQL/SQLite/14/select_checkidentity.sql diff --git a/src/core/SQL/SQLite/13/select_connected_networks.sql b/src/core/SQL/SQLite/14/select_connected_networks.sql similarity index 100% rename from src/core/SQL/SQLite/13/select_connected_networks.sql rename to src/core/SQL/SQLite/14/select_connected_networks.sql diff --git a/src/core/SQL/SQLite/13/select_identities.sql b/src/core/SQL/SQLite/14/select_identities.sql similarity index 100% rename from src/core/SQL/SQLite/13/select_identities.sql rename to src/core/SQL/SQLite/14/select_identities.sql diff --git a/src/core/SQL/SQLite/13/select_internaluser.sql b/src/core/SQL/SQLite/14/select_internaluser.sql similarity index 100% rename from src/core/SQL/SQLite/13/select_internaluser.sql rename to src/core/SQL/SQLite/14/select_internaluser.sql diff --git a/src/core/SQL/SQLite/13/select_messages.sql b/src/core/SQL/SQLite/14/select_messages.sql similarity index 100% rename from src/core/SQL/SQLite/13/select_messages.sql rename to src/core/SQL/SQLite/14/select_messages.sql diff --git a/src/core/SQL/SQLite/13/select_messagesAll.sql b/src/core/SQL/SQLite/14/select_messagesAll.sql similarity index 100% rename from src/core/SQL/SQLite/13/select_messagesAll.sql rename to src/core/SQL/SQLite/14/select_messagesAll.sql diff --git a/src/core/SQL/SQLite/13/select_messagesAllNew.sql b/src/core/SQL/SQLite/14/select_messagesAllNew.sql similarity index 100% rename from src/core/SQL/SQLite/13/select_messagesAllNew.sql rename to src/core/SQL/SQLite/14/select_messagesAllNew.sql diff --git a/src/core/SQL/SQLite/13/select_messagesNewerThan.sql b/src/core/SQL/SQLite/14/select_messagesNewerThan.sql similarity index 100% rename from src/core/SQL/SQLite/13/select_messagesNewerThan.sql rename to src/core/SQL/SQLite/14/select_messagesNewerThan.sql diff --git a/src/core/SQL/SQLite/13/select_messagesNewestK.sql b/src/core/SQL/SQLite/14/select_messagesNewestK.sql similarity index 100% rename from src/core/SQL/SQLite/13/select_messagesNewestK.sql rename to src/core/SQL/SQLite/14/select_messagesNewestK.sql diff --git a/src/core/SQL/SQLite/13/select_networkExists.sql b/src/core/SQL/SQLite/14/select_networkExists.sql similarity index 100% rename from src/core/SQL/SQLite/13/select_networkExists.sql rename to src/core/SQL/SQLite/14/select_networkExists.sql diff --git a/src/core/SQL/SQLite/13/select_networks_for_user.sql b/src/core/SQL/SQLite/14/select_networks_for_user.sql similarity index 100% rename from src/core/SQL/SQLite/13/select_networks_for_user.sql rename to src/core/SQL/SQLite/14/select_networks_for_user.sql diff --git a/src/core/SQL/SQLite/13/select_nicks.sql b/src/core/SQL/SQLite/14/select_nicks.sql similarity index 100% rename from src/core/SQL/SQLite/13/select_nicks.sql rename to src/core/SQL/SQLite/14/select_nicks.sql diff --git a/src/core/SQL/SQLite/13/select_persistent_channels.sql b/src/core/SQL/SQLite/14/select_persistent_channels.sql similarity index 100% rename from src/core/SQL/SQLite/13/select_persistent_channels.sql rename to src/core/SQL/SQLite/14/select_persistent_channels.sql diff --git a/src/core/SQL/SQLite/13/select_servers_for_network.sql b/src/core/SQL/SQLite/14/select_servers_for_network.sql similarity index 100% rename from src/core/SQL/SQLite/13/select_servers_for_network.sql rename to src/core/SQL/SQLite/14/select_servers_for_network.sql diff --git a/src/core/SQL/SQLite/13/select_user_setting.sql b/src/core/SQL/SQLite/14/select_user_setting.sql similarity index 100% rename from src/core/SQL/SQLite/13/select_user_setting.sql rename to src/core/SQL/SQLite/14/select_user_setting.sql diff --git a/src/core/SQL/SQLite/13/select_userid.sql b/src/core/SQL/SQLite/14/select_userid.sql similarity index 100% rename from src/core/SQL/SQLite/13/select_userid.sql rename to src/core/SQL/SQLite/14/select_userid.sql diff --git a/src/core/SQL/SQLite/13/setup_000_quasseluser.sql b/src/core/SQL/SQLite/14/setup_000_quasseluser.sql similarity index 100% rename from src/core/SQL/SQLite/13/setup_000_quasseluser.sql rename to src/core/SQL/SQLite/14/setup_000_quasseluser.sql diff --git a/src/core/SQL/SQLite/13/setup_010_sender.sql b/src/core/SQL/SQLite/14/setup_010_sender.sql similarity index 100% rename from src/core/SQL/SQLite/13/setup_010_sender.sql rename to src/core/SQL/SQLite/14/setup_010_sender.sql diff --git a/src/core/SQL/SQLite/13/setup_020_network.sql b/src/core/SQL/SQLite/14/setup_020_network.sql similarity index 75% rename from src/core/SQL/SQLite/13/setup_020_network.sql rename to src/core/SQL/SQLite/14/setup_020_network.sql index eb99a48b..c4e864e1 100644 --- a/src/core/SQL/SQLite/13/setup_020_network.sql +++ b/src/core/SQL/SQLite/14/setup_020_network.sql @@ -16,6 +16,10 @@ CREATE TABLE network ( autoreconnectretries INTEGER NOT NULL DEFAULT 0, unlimitedconnectretries INTEGER NOT NULL DEFAULT 0, -- BOOL rejoinchannels INTEGER NOT NULL DEFAULT 0, -- BOOL - connected INTEGER NOT NULL DEFAULT 1, + connected INTEGER NOT NULL DEFAULT 0, -- BOOL + usermode TEXT, -- user mode to restore + awaymessage TEXT, -- away message to restore (empty if not away) + attachperform TEXT, -- perform list for on attach + detachperform TEXT, -- perform list for on detach UNIQUE (userid, networkname) ) diff --git a/src/core/SQL/SQLite/13/setup_030_buffer.sql b/src/core/SQL/SQLite/14/setup_030_buffer.sql similarity index 100% rename from src/core/SQL/SQLite/13/setup_030_buffer.sql rename to src/core/SQL/SQLite/14/setup_030_buffer.sql diff --git a/src/core/SQL/SQLite/13/setup_040_buffer_idx.sql b/src/core/SQL/SQLite/14/setup_040_buffer_idx.sql similarity index 100% rename from src/core/SQL/SQLite/13/setup_040_buffer_idx.sql rename to src/core/SQL/SQLite/14/setup_040_buffer_idx.sql diff --git a/src/core/SQL/SQLite/13/setup_050_buffer_cname_idx.sql b/src/core/SQL/SQLite/14/setup_050_buffer_cname_idx.sql similarity index 100% rename from src/core/SQL/SQLite/13/setup_050_buffer_cname_idx.sql rename to src/core/SQL/SQLite/14/setup_050_buffer_cname_idx.sql diff --git a/src/core/SQL/SQLite/13/setup_060_backlog.sql b/src/core/SQL/SQLite/14/setup_060_backlog.sql similarity index 100% rename from src/core/SQL/SQLite/13/setup_060_backlog.sql rename to src/core/SQL/SQLite/14/setup_060_backlog.sql diff --git a/src/core/SQL/SQLite/13/setup_070_coreinfo.sql b/src/core/SQL/SQLite/14/setup_070_coreinfo.sql similarity index 100% rename from src/core/SQL/SQLite/13/setup_070_coreinfo.sql rename to src/core/SQL/SQLite/14/setup_070_coreinfo.sql diff --git a/src/core/SQL/SQLite/13/setup_080_ircservers.sql b/src/core/SQL/SQLite/14/setup_080_ircservers.sql similarity index 100% rename from src/core/SQL/SQLite/13/setup_080_ircservers.sql rename to src/core/SQL/SQLite/14/setup_080_ircservers.sql diff --git a/src/core/SQL/SQLite/13/setup_090_backlog_idx.sql b/src/core/SQL/SQLite/14/setup_090_backlog_idx.sql similarity index 100% rename from src/core/SQL/SQLite/13/setup_090_backlog_idx.sql rename to src/core/SQL/SQLite/14/setup_090_backlog_idx.sql diff --git a/src/core/SQL/SQLite/13/setup_100_backlog_idx2.sql b/src/core/SQL/SQLite/14/setup_100_backlog_idx2.sql similarity index 100% rename from src/core/SQL/SQLite/13/setup_100_backlog_idx2.sql rename to src/core/SQL/SQLite/14/setup_100_backlog_idx2.sql diff --git a/src/core/SQL/SQLite/13/setup_110_buffer_user_idx.sql b/src/core/SQL/SQLite/14/setup_110_buffer_user_idx.sql similarity index 100% rename from src/core/SQL/SQLite/13/setup_110_buffer_user_idx.sql rename to src/core/SQL/SQLite/14/setup_110_buffer_user_idx.sql diff --git a/src/core/SQL/SQLite/13/setup_120_user_setting.sql b/src/core/SQL/SQLite/14/setup_120_user_setting.sql similarity index 100% rename from src/core/SQL/SQLite/13/setup_120_user_setting.sql rename to src/core/SQL/SQLite/14/setup_120_user_setting.sql diff --git a/src/core/SQL/SQLite/13/setup_130_identity.sql b/src/core/SQL/SQLite/14/setup_130_identity.sql similarity index 100% rename from src/core/SQL/SQLite/13/setup_130_identity.sql rename to src/core/SQL/SQLite/14/setup_130_identity.sql diff --git a/src/core/SQL/SQLite/13/setup_140_identity_nick.sql b/src/core/SQL/SQLite/14/setup_140_identity_nick.sql similarity index 100% rename from src/core/SQL/SQLite/13/setup_140_identity_nick.sql rename to src/core/SQL/SQLite/14/setup_140_identity_nick.sql diff --git a/src/core/SQL/SQLite/13/update_backlog_bufferid.sql b/src/core/SQL/SQLite/14/update_backlog_bufferid.sql similarity index 100% rename from src/core/SQL/SQLite/13/update_backlog_bufferid.sql rename to src/core/SQL/SQLite/14/update_backlog_bufferid.sql diff --git a/src/core/SQL/SQLite/13/update_buffer_lastseen.sql b/src/core/SQL/SQLite/14/update_buffer_lastseen.sql similarity index 100% rename from src/core/SQL/SQLite/13/update_buffer_lastseen.sql rename to src/core/SQL/SQLite/14/update_buffer_lastseen.sql diff --git a/src/core/SQL/SQLite/13/update_buffer_name.sql b/src/core/SQL/SQLite/14/update_buffer_name.sql similarity index 100% rename from src/core/SQL/SQLite/13/update_buffer_name.sql rename to src/core/SQL/SQLite/14/update_buffer_name.sql diff --git a/src/core/SQL/SQLite/13/update_buffer_persistent_channel.sql b/src/core/SQL/SQLite/14/update_buffer_persistent_channel.sql similarity index 100% rename from src/core/SQL/SQLite/13/update_buffer_persistent_channel.sql rename to src/core/SQL/SQLite/14/update_buffer_persistent_channel.sql diff --git a/src/core/SQL/SQLite/13/update_buffer_set_channel_key.sql b/src/core/SQL/SQLite/14/update_buffer_set_channel_key.sql similarity index 100% rename from src/core/SQL/SQLite/13/update_buffer_set_channel_key.sql rename to src/core/SQL/SQLite/14/update_buffer_set_channel_key.sql diff --git a/src/core/SQL/SQLite/13/update_identity.sql b/src/core/SQL/SQLite/14/update_identity.sql similarity index 100% rename from src/core/SQL/SQLite/13/update_identity.sql rename to src/core/SQL/SQLite/14/update_identity.sql diff --git a/src/core/SQL/SQLite/13/update_network.sql b/src/core/SQL/SQLite/14/update_network.sql similarity index 100% rename from src/core/SQL/SQLite/13/update_network.sql rename to src/core/SQL/SQLite/14/update_network.sql diff --git a/src/core/SQL/SQLite/13/update_network_connected.sql b/src/core/SQL/SQLite/14/update_network_connected.sql similarity index 100% rename from src/core/SQL/SQLite/13/update_network_connected.sql rename to src/core/SQL/SQLite/14/update_network_connected.sql diff --git a/src/core/SQL/SQLite/13/update_user_setting.sql b/src/core/SQL/SQLite/14/update_user_setting.sql similarity index 100% rename from src/core/SQL/SQLite/13/update_user_setting.sql rename to src/core/SQL/SQLite/14/update_user_setting.sql diff --git a/src/core/SQL/SQLite/13/update_username.sql b/src/core/SQL/SQLite/14/update_username.sql similarity index 100% rename from src/core/SQL/SQLite/13/update_username.sql rename to src/core/SQL/SQLite/14/update_username.sql diff --git a/src/core/SQL/SQLite/13/update_userpassword.sql b/src/core/SQL/SQLite/14/update_userpassword.sql similarity index 100% rename from src/core/SQL/SQLite/13/update_userpassword.sql rename to src/core/SQL/SQLite/14/update_userpassword.sql diff --git a/src/core/SQL/SQLite/14/upgrade_000_rename_networktable.sql b/src/core/SQL/SQLite/14/upgrade_000_rename_networktable.sql new file mode 100644 index 00000000..3063c868 --- /dev/null +++ b/src/core/SQL/SQLite/14/upgrade_000_rename_networktable.sql @@ -0,0 +1 @@ +ALTER TABLE network RENAME TO networkold \ No newline at end of file diff --git a/src/core/SQL/SQLite/14/upgrade_010_create_networktable.sql b/src/core/SQL/SQLite/14/upgrade_010_create_networktable.sql new file mode 100644 index 00000000..c4e864e1 --- /dev/null +++ b/src/core/SQL/SQLite/14/upgrade_010_create_networktable.sql @@ -0,0 +1,25 @@ +CREATE TABLE network ( + networkid INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + userid INTEGER NOT NULL, + networkname TEXT NOT NULL, + identityid INTEGER NOT NULL DEFAULT 1, + encodingcodec TEXT NOT NULL DEFAULT "ISO-8859-15", + decodingcodec TEXT NOT NULL DEFAULT "ISO-8859-15", + servercodec TEXT NOT NULL DEFAULT "", + userandomserver INTEGER NOT NULL DEFAULT 0, -- BOOL + perform TEXT, + useautoidentify INTEGER NOT NULL DEFAULT 0, -- BOOL + autoidentifyservice TEXT, + autoidentifypassword TEXT, + useautoreconnect INTEGER NOT NULL DEFAULT 0, -- BOOL + autoreconnectinterval INTEGER NOT NULL DEFAULT 0, + autoreconnectretries INTEGER NOT NULL DEFAULT 0, + unlimitedconnectretries INTEGER NOT NULL DEFAULT 0, -- BOOL + rejoinchannels INTEGER NOT NULL DEFAULT 0, -- BOOL + connected INTEGER NOT NULL DEFAULT 0, -- BOOL + usermode TEXT, -- user mode to restore + awaymessage TEXT, -- away message to restore (empty if not away) + attachperform TEXT, -- perform list for on attach + detachperform TEXT, -- perform list for on detach + UNIQUE (userid, networkname) +) diff --git a/src/core/SQL/SQLite/14/upgrade_030_copy_networktable.sql b/src/core/SQL/SQLite/14/upgrade_030_copy_networktable.sql new file mode 100644 index 00000000..adbfa189 --- /dev/null +++ b/src/core/SQL/SQLite/14/upgrade_030_copy_networktable.sql @@ -0,0 +1,2 @@ +INSERT INTO network (networkid, userid, networkname, identityid, encodingcodec, decodingcodec, servercodec, userandomserver, perform, useautoidentify, autoidentifyservice, autoidentifypassword, useautoreconnect, autoreconnectinterval, autoreconnectretries, unlimitedconnectretries, rejoinchannels, connected) +SELECT networkid, userid, networkname, identityid, encodingcodec, decodingcodec, servercodec, userandomserver, perform, useautoidentify, autoidentifyservice, autoidentifypassword, useautoreconnect, autoreconnectinterval, autoreconnectretries, unlimitedconnectretries, rejoinchannels, connected FROM networkold diff --git a/src/core/SQL/SQLite/14/upgrade_040_drop_networkold.sql b/src/core/SQL/SQLite/14/upgrade_040_drop_networkold.sql new file mode 100644 index 00000000..9073c436 --- /dev/null +++ b/src/core/SQL/SQLite/14/upgrade_040_drop_networkold.sql @@ -0,0 +1 @@ +DROP TABLE networkold diff --git a/src/core/sql.qrc b/src/core/sql.qrc index 4b1ef6f8..6e169afb 100644 --- a/src/core/sql.qrc +++ b/src/core/sql.qrc @@ -15,79 +15,83 @@ ./SQL/SQLite/12/upgrade_030_create_ircserver.sql ./SQL/SQLite/12/upgrade_040_copy_ircserver.sql ./SQL/SQLite/12/upgrade_050_drop_ircserverold.sql - ./SQL/SQLite/13/delete_backlog_by_uid.sql - ./SQL/SQLite/13/delete_backlog_for_buffer.sql - ./SQL/SQLite/13/delete_backlog_for_network.sql - ./SQL/SQLite/13/delete_buffer_for_bufferid.sql - ./SQL/SQLite/13/delete_buffers_by_uid.sql - ./SQL/SQLite/13/delete_buffers_for_network.sql - ./SQL/SQLite/13/delete_identity.sql - ./SQL/SQLite/13/delete_ircservers_for_network.sql - ./SQL/SQLite/13/delete_network.sql - ./SQL/SQLite/13/delete_networks_by_uid.sql - ./SQL/SQLite/13/delete_nicks.sql - ./SQL/SQLite/13/delete_quasseluser.sql - ./SQL/SQLite/13/insert_buffer.sql - ./SQL/SQLite/13/insert_identity.sql - ./SQL/SQLite/13/insert_message.sql - ./SQL/SQLite/13/insert_network.sql - ./SQL/SQLite/13/insert_nick.sql - ./SQL/SQLite/13/insert_quasseluser.sql - ./SQL/SQLite/13/insert_sender.sql - ./SQL/SQLite/13/insert_server.sql - ./SQL/SQLite/13/insert_user_setting.sql - ./SQL/SQLite/13/select_authuser.sql - ./SQL/SQLite/13/select_buffer_by_id.sql - ./SQL/SQLite/13/select_buffer_lastseen_messages.sql - ./SQL/SQLite/13/select_bufferByName.sql - ./SQL/SQLite/13/select_bufferExists.sql - ./SQL/SQLite/13/select_buffers.sql - ./SQL/SQLite/13/select_buffers_for_network.sql - ./SQL/SQLite/13/select_checkidentity.sql - ./SQL/SQLite/13/select_connected_networks.sql - ./SQL/SQLite/13/select_identities.sql - ./SQL/SQLite/13/select_internaluser.sql - ./SQL/SQLite/13/select_messages.sql - ./SQL/SQLite/13/select_messagesAll.sql - ./SQL/SQLite/13/select_messagesAllNew.sql - ./SQL/SQLite/13/select_messagesNewerThan.sql - ./SQL/SQLite/13/select_messagesNewestK.sql - ./SQL/SQLite/13/select_networkExists.sql - ./SQL/SQLite/13/select_networks_for_user.sql - ./SQL/SQLite/13/select_nicks.sql - ./SQL/SQLite/13/select_persistent_channels.sql - ./SQL/SQLite/13/select_servers_for_network.sql - ./SQL/SQLite/13/select_user_setting.sql - ./SQL/SQLite/13/select_userid.sql - ./SQL/SQLite/13/setup_000_quasseluser.sql - ./SQL/SQLite/13/setup_010_sender.sql - ./SQL/SQLite/13/setup_020_network.sql - ./SQL/SQLite/13/setup_030_buffer.sql - ./SQL/SQLite/13/setup_040_buffer_idx.sql - ./SQL/SQLite/13/setup_050_buffer_cname_idx.sql - ./SQL/SQLite/13/setup_060_backlog.sql - ./SQL/SQLite/13/setup_070_coreinfo.sql - ./SQL/SQLite/13/setup_080_ircservers.sql - ./SQL/SQLite/13/setup_090_backlog_idx.sql - ./SQL/SQLite/13/setup_100_backlog_idx2.sql - ./SQL/SQLite/13/setup_110_buffer_user_idx.sql - ./SQL/SQLite/13/setup_120_user_setting.sql - ./SQL/SQLite/13/setup_130_identity.sql - ./SQL/SQLite/13/setup_140_identity_nick.sql - ./SQL/SQLite/13/update_backlog_bufferid.sql - ./SQL/SQLite/13/update_buffer_lastseen.sql - ./SQL/SQLite/13/update_buffer_name.sql - ./SQL/SQLite/13/update_buffer_persistent_channel.sql - ./SQL/SQLite/13/update_buffer_set_channel_key.sql - ./SQL/SQLite/13/update_identity.sql - ./SQL/SQLite/13/update_network.sql - ./SQL/SQLite/13/update_network_connected.sql - ./SQL/SQLite/13/update_user_setting.sql - ./SQL/SQLite/13/update_username.sql - ./SQL/SQLite/13/update_userpassword.sql ./SQL/SQLite/13/upgrade_000_create_buffer_user_idx.sql ./SQL/SQLite/13/upgrade_010_create_buffer_cname_idx.sql ./SQL/SQLite/13/upgrade_020_create_buffer_cname_idx.sql + ./SQL/SQLite/14/delete_backlog_by_uid.sql + ./SQL/SQLite/14/delete_backlog_for_buffer.sql + ./SQL/SQLite/14/delete_backlog_for_network.sql + ./SQL/SQLite/14/delete_buffer_for_bufferid.sql + ./SQL/SQLite/14/delete_buffers_by_uid.sql + ./SQL/SQLite/14/delete_buffers_for_network.sql + ./SQL/SQLite/14/delete_identity.sql + ./SQL/SQLite/14/delete_ircservers_for_network.sql + ./SQL/SQLite/14/delete_network.sql + ./SQL/SQLite/14/delete_networks_by_uid.sql + ./SQL/SQLite/14/delete_nicks.sql + ./SQL/SQLite/14/delete_quasseluser.sql + ./SQL/SQLite/14/insert_buffer.sql + ./SQL/SQLite/14/insert_identity.sql + ./SQL/SQLite/14/insert_message.sql + ./SQL/SQLite/14/insert_network.sql + ./SQL/SQLite/14/insert_nick.sql + ./SQL/SQLite/14/insert_quasseluser.sql + ./SQL/SQLite/14/insert_sender.sql + ./SQL/SQLite/14/insert_server.sql + ./SQL/SQLite/14/insert_user_setting.sql + ./SQL/SQLite/14/select_authuser.sql + ./SQL/SQLite/14/select_buffer_by_id.sql + ./SQL/SQLite/14/select_buffer_lastseen_messages.sql + ./SQL/SQLite/14/select_bufferByName.sql + ./SQL/SQLite/14/select_bufferExists.sql + ./SQL/SQLite/14/select_buffers.sql + ./SQL/SQLite/14/select_buffers_for_network.sql + ./SQL/SQLite/14/select_checkidentity.sql + ./SQL/SQLite/14/select_connected_networks.sql + ./SQL/SQLite/14/select_identities.sql + ./SQL/SQLite/14/select_internaluser.sql + ./SQL/SQLite/14/select_messages.sql + ./SQL/SQLite/14/select_messagesAll.sql + ./SQL/SQLite/14/select_messagesAllNew.sql + ./SQL/SQLite/14/select_messagesNewerThan.sql + ./SQL/SQLite/14/select_messagesNewestK.sql + ./SQL/SQLite/14/select_networkExists.sql + ./SQL/SQLite/14/select_networks_for_user.sql + ./SQL/SQLite/14/select_nicks.sql + ./SQL/SQLite/14/select_persistent_channels.sql + ./SQL/SQLite/14/select_servers_for_network.sql + ./SQL/SQLite/14/select_user_setting.sql + ./SQL/SQLite/14/select_userid.sql + ./SQL/SQLite/14/setup_000_quasseluser.sql + ./SQL/SQLite/14/setup_010_sender.sql + ./SQL/SQLite/14/setup_020_network.sql + ./SQL/SQLite/14/setup_030_buffer.sql + ./SQL/SQLite/14/setup_040_buffer_idx.sql + ./SQL/SQLite/14/setup_050_buffer_cname_idx.sql + ./SQL/SQLite/14/setup_060_backlog.sql + ./SQL/SQLite/14/setup_070_coreinfo.sql + ./SQL/SQLite/14/setup_080_ircservers.sql + ./SQL/SQLite/14/setup_090_backlog_idx.sql + ./SQL/SQLite/14/setup_100_backlog_idx2.sql + ./SQL/SQLite/14/setup_110_buffer_user_idx.sql + ./SQL/SQLite/14/setup_120_user_setting.sql + ./SQL/SQLite/14/setup_130_identity.sql + ./SQL/SQLite/14/setup_140_identity_nick.sql + ./SQL/SQLite/14/update_backlog_bufferid.sql + ./SQL/SQLite/14/update_buffer_lastseen.sql + ./SQL/SQLite/14/update_buffer_name.sql + ./SQL/SQLite/14/update_buffer_persistent_channel.sql + ./SQL/SQLite/14/update_buffer_set_channel_key.sql + ./SQL/SQLite/14/update_identity.sql + ./SQL/SQLite/14/update_network.sql + ./SQL/SQLite/14/update_network_connected.sql + ./SQL/SQLite/14/update_user_setting.sql + ./SQL/SQLite/14/update_username.sql + ./SQL/SQLite/14/update_userpassword.sql + ./SQL/SQLite/14/upgrade_000_rename_networktable.sql + ./SQL/SQLite/14/upgrade_010_create_networktable.sql + ./SQL/SQLite/14/upgrade_030_copy_networktable.sql + ./SQL/SQLite/14/upgrade_040_drop_networkold.sql ./SQL/SQLite/2/upgrade_000_drop_buffergroup.sql ./SQL/SQLite/2/upgrade_010_update_schemaversion.sql ./SQL/SQLite/3/upgrade_000_update_backlog_flags.sql -- 2.20.1