From 33705cac168ec977c7bd246d9f1f0ee520fe7c7b Mon Sep 17 00:00:00 2001 From: Marcus Eggenberger Date: Wed, 11 Mar 2009 16:05:10 +0100 Subject: [PATCH] Fixing issues with SQLite backend not properly storing some boolean values. Affected network settings are: useautoidentify, useautoreconnect, unlimitedconnectretries, rejoinchannels, wasconnected Affected irc server settings are: usessl, useproxy --- .../{14 => 15}/delete_backlog_by_uid.sql | 0 .../{14 => 15}/delete_backlog_for_buffer.sql | 0 .../{14 => 15}/delete_backlog_for_network.sql | 0 .../{14 => 15}/delete_buffer_for_bufferid.sql | 0 .../{14 => 15}/delete_buffers_by_uid.sql | 0 .../{14 => 15}/delete_buffers_for_network.sql | 0 .../SQL/SQLite/{14 => 15}/delete_identity.sql | 0 .../delete_ircservers_for_network.sql | 0 .../SQL/SQLite/{14 => 15}/delete_network.sql | 0 .../{14 => 15}/delete_networks_by_uid.sql | 0 .../SQL/SQLite/{14 => 15}/delete_nicks.sql | 0 .../SQLite/{14 => 15}/delete_quasseluser.sql | 0 .../SQL/SQLite/{14 => 15}/insert_buffer.sql | 0 .../SQL/SQLite/{14 => 15}/insert_identity.sql | 0 .../SQL/SQLite/{14 => 15}/insert_message.sql | 0 .../SQL/SQLite/{14 => 15}/insert_network.sql | 0 .../SQL/SQLite/{14 => 15}/insert_nick.sql | 0 .../SQLite/{14 => 15}/insert_quasseluser.sql | 0 .../SQL/SQLite/{14 => 15}/insert_sender.sql | 0 .../SQL/SQLite/{14 => 15}/insert_server.sql | 0 .../SQLite/{14 => 15}/insert_user_setting.sql | 0 .../{14 => 15}/migrate_read_backlog.sql | 0 .../SQLite/{14 => 15}/migrate_read_buffer.sql | 0 .../{14 => 15}/migrate_read_identity.sql | 0 .../{14 => 15}/migrate_read_identity_nick.sql | 0 .../{14 => 15}/migrate_read_ircserver.sql | 0 .../{14 => 15}/migrate_read_network.sql | 0 .../{14 => 15}/migrate_read_quasseluser.sql | 0 .../SQLite/{14 => 15}/migrate_read_sender.sql | 0 .../{14 => 15}/migrate_read_usersetting.sql | 0 .../SQL/SQLite/{14 => 15}/select_authuser.sql | 0 .../SQLite/{14 => 15}/select_bufferByName.sql | 0 .../SQLite/{14 => 15}/select_bufferExists.sql | 0 .../SQLite/{14 => 15}/select_buffer_by_id.sql | 0 .../select_buffer_lastseen_messages.sql | 0 .../SQL/SQLite/{14 => 15}/select_buffers.sql | 0 .../{14 => 15}/select_buffers_for_merge.sql | 0 .../{14 => 15}/select_buffers_for_network.sql | 0 .../{14 => 15}/select_checkidentity.sql | 0 .../{14 => 15}/select_connected_networks.sql | 0 .../SQLite/{14 => 15}/select_identities.sql | 0 .../SQLite/{14 => 15}/select_internaluser.sql | 0 .../SQL/SQLite/{14 => 15}/select_messages.sql | 0 .../SQLite/{14 => 15}/select_messagesAll.sql | 0 .../{14 => 15}/select_messagesAllNew.sql | 0 .../{14 => 15}/select_messagesNewerThan.sql | 0 .../{14 => 15}/select_messagesNewestK.sql | 0 .../{14 => 15}/select_networkExists.sql | 0 .../{14 => 15}/select_network_awaymsg.sql | 0 .../{14 => 15}/select_network_usermode.sql | 0 .../{14 => 15}/select_networks_for_user.sql | 0 .../SQL/SQLite/{14 => 15}/select_nicks.sql | 0 .../{14 => 15}/select_persistent_channels.sql | 0 .../{14 => 15}/select_servers_for_network.sql | 0 .../SQLite/{14 => 15}/select_user_setting.sql | 0 .../SQL/SQLite/{14 => 15}/select_userid.sql | 0 .../{14 => 15}/setup_000_quasseluser.sql | 0 .../SQLite/{14 => 15}/setup_010_sender.sql | 0 .../SQLite/{14 => 15}/setup_020_network.sql | 0 .../SQLite/{14 => 15}/setup_030_buffer.sql | 0 .../{14 => 15}/setup_040_buffer_idx.sql | 0 .../{14 => 15}/setup_050_buffer_cname_idx.sql | 0 .../SQLite/{14 => 15}/setup_060_backlog.sql | 0 .../SQLite/{14 => 15}/setup_070_coreinfo.sql | 0 .../{14 => 15}/setup_080_ircservers.sql | 0 .../{14 => 15}/setup_090_backlog_idx.sql | 0 .../{14 => 15}/setup_100_backlog_idx2.sql | 0 .../{14 => 15}/setup_110_buffer_user_idx.sql | 0 .../{14 => 15}/setup_120_user_setting.sql | 0 .../SQLite/{14 => 15}/setup_130_identity.sql | 0 .../{14 => 15}/setup_140_identity_nick.sql | 0 .../{14 => 15}/update_backlog_bufferid.sql | 0 .../{14 => 15}/update_buffer_lastseen.sql | 0 .../SQLite/{14 => 15}/update_buffer_name.sql | 0 .../update_buffer_persistent_channel.sql | 0 .../update_buffer_set_channel_key.sql | 0 .../SQL/SQLite/{14 => 15}/update_identity.sql | 0 .../SQL/SQLite/{14 => 15}/update_network.sql | 0 .../{14 => 15}/update_network_connected.sql | 0 .../{14 => 15}/update_network_set_awaymsg.sql | 0 .../update_network_set_usermode.sql | 0 .../SQLite/{14 => 15}/update_user_setting.sql | 0 .../SQL/SQLite/{14 => 15}/update_username.sql | 0 .../SQLite/{14 => 15}/update_userpassword.sql | 0 .../SQLite/15/upgrade_000_fix_ircservers.sql | 3 + .../SQL/SQLite/15/upgrade_000_fix_network.sql | 7 + src/core/sql.qrc | 170 +++++++++--------- src/core/sqlitestorage.cpp | 14 +- 88 files changed, 103 insertions(+), 91 deletions(-) rename src/core/SQL/SQLite/{14 => 15}/delete_backlog_by_uid.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/delete_backlog_for_buffer.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/delete_backlog_for_network.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/delete_buffer_for_bufferid.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/delete_buffers_by_uid.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/delete_buffers_for_network.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/delete_identity.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/delete_ircservers_for_network.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/delete_network.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/delete_networks_by_uid.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/delete_nicks.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/delete_quasseluser.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/insert_buffer.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/insert_identity.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/insert_message.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/insert_network.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/insert_nick.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/insert_quasseluser.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/insert_sender.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/insert_server.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/insert_user_setting.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/migrate_read_backlog.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/migrate_read_buffer.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/migrate_read_identity.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/migrate_read_identity_nick.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/migrate_read_ircserver.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/migrate_read_network.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/migrate_read_quasseluser.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/migrate_read_sender.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/migrate_read_usersetting.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/select_authuser.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/select_bufferByName.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/select_bufferExists.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/select_buffer_by_id.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/select_buffer_lastseen_messages.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/select_buffers.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/select_buffers_for_merge.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/select_buffers_for_network.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/select_checkidentity.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/select_connected_networks.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/select_identities.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/select_internaluser.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/select_messages.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/select_messagesAll.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/select_messagesAllNew.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/select_messagesNewerThan.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/select_messagesNewestK.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/select_networkExists.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/select_network_awaymsg.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/select_network_usermode.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/select_networks_for_user.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/select_nicks.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/select_persistent_channels.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/select_servers_for_network.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/select_user_setting.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/select_userid.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/setup_000_quasseluser.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/setup_010_sender.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/setup_020_network.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/setup_030_buffer.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/setup_040_buffer_idx.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/setup_050_buffer_cname_idx.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/setup_060_backlog.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/setup_070_coreinfo.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/setup_080_ircservers.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/setup_090_backlog_idx.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/setup_100_backlog_idx2.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/setup_110_buffer_user_idx.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/setup_120_user_setting.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/setup_130_identity.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/setup_140_identity_nick.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/update_backlog_bufferid.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/update_buffer_lastseen.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/update_buffer_name.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/update_buffer_persistent_channel.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/update_buffer_set_channel_key.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/update_identity.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/update_network.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/update_network_connected.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/update_network_set_awaymsg.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/update_network_set_usermode.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/update_user_setting.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/update_username.sql (100%) rename src/core/SQL/SQLite/{14 => 15}/update_userpassword.sql (100%) create mode 100644 src/core/SQL/SQLite/15/upgrade_000_fix_ircservers.sql create mode 100644 src/core/SQL/SQLite/15/upgrade_000_fix_network.sql diff --git a/src/core/SQL/SQLite/14/delete_backlog_by_uid.sql b/src/core/SQL/SQLite/15/delete_backlog_by_uid.sql similarity index 100% rename from src/core/SQL/SQLite/14/delete_backlog_by_uid.sql rename to src/core/SQL/SQLite/15/delete_backlog_by_uid.sql diff --git a/src/core/SQL/SQLite/14/delete_backlog_for_buffer.sql b/src/core/SQL/SQLite/15/delete_backlog_for_buffer.sql similarity index 100% rename from src/core/SQL/SQLite/14/delete_backlog_for_buffer.sql rename to src/core/SQL/SQLite/15/delete_backlog_for_buffer.sql diff --git a/src/core/SQL/SQLite/14/delete_backlog_for_network.sql b/src/core/SQL/SQLite/15/delete_backlog_for_network.sql similarity index 100% rename from src/core/SQL/SQLite/14/delete_backlog_for_network.sql rename to src/core/SQL/SQLite/15/delete_backlog_for_network.sql diff --git a/src/core/SQL/SQLite/14/delete_buffer_for_bufferid.sql b/src/core/SQL/SQLite/15/delete_buffer_for_bufferid.sql similarity index 100% rename from src/core/SQL/SQLite/14/delete_buffer_for_bufferid.sql rename to src/core/SQL/SQLite/15/delete_buffer_for_bufferid.sql diff --git a/src/core/SQL/SQLite/14/delete_buffers_by_uid.sql b/src/core/SQL/SQLite/15/delete_buffers_by_uid.sql similarity index 100% rename from src/core/SQL/SQLite/14/delete_buffers_by_uid.sql rename to src/core/SQL/SQLite/15/delete_buffers_by_uid.sql diff --git a/src/core/SQL/SQLite/14/delete_buffers_for_network.sql b/src/core/SQL/SQLite/15/delete_buffers_for_network.sql similarity index 100% rename from src/core/SQL/SQLite/14/delete_buffers_for_network.sql rename to src/core/SQL/SQLite/15/delete_buffers_for_network.sql diff --git a/src/core/SQL/SQLite/14/delete_identity.sql b/src/core/SQL/SQLite/15/delete_identity.sql similarity index 100% rename from src/core/SQL/SQLite/14/delete_identity.sql rename to src/core/SQL/SQLite/15/delete_identity.sql diff --git a/src/core/SQL/SQLite/14/delete_ircservers_for_network.sql b/src/core/SQL/SQLite/15/delete_ircservers_for_network.sql similarity index 100% rename from src/core/SQL/SQLite/14/delete_ircservers_for_network.sql rename to src/core/SQL/SQLite/15/delete_ircservers_for_network.sql diff --git a/src/core/SQL/SQLite/14/delete_network.sql b/src/core/SQL/SQLite/15/delete_network.sql similarity index 100% rename from src/core/SQL/SQLite/14/delete_network.sql rename to src/core/SQL/SQLite/15/delete_network.sql diff --git a/src/core/SQL/SQLite/14/delete_networks_by_uid.sql b/src/core/SQL/SQLite/15/delete_networks_by_uid.sql similarity index 100% rename from src/core/SQL/SQLite/14/delete_networks_by_uid.sql rename to src/core/SQL/SQLite/15/delete_networks_by_uid.sql diff --git a/src/core/SQL/SQLite/14/delete_nicks.sql b/src/core/SQL/SQLite/15/delete_nicks.sql similarity index 100% rename from src/core/SQL/SQLite/14/delete_nicks.sql rename to src/core/SQL/SQLite/15/delete_nicks.sql diff --git a/src/core/SQL/SQLite/14/delete_quasseluser.sql b/src/core/SQL/SQLite/15/delete_quasseluser.sql similarity index 100% rename from src/core/SQL/SQLite/14/delete_quasseluser.sql rename to src/core/SQL/SQLite/15/delete_quasseluser.sql diff --git a/src/core/SQL/SQLite/14/insert_buffer.sql b/src/core/SQL/SQLite/15/insert_buffer.sql similarity index 100% rename from src/core/SQL/SQLite/14/insert_buffer.sql rename to src/core/SQL/SQLite/15/insert_buffer.sql diff --git a/src/core/SQL/SQLite/14/insert_identity.sql b/src/core/SQL/SQLite/15/insert_identity.sql similarity index 100% rename from src/core/SQL/SQLite/14/insert_identity.sql rename to src/core/SQL/SQLite/15/insert_identity.sql diff --git a/src/core/SQL/SQLite/14/insert_message.sql b/src/core/SQL/SQLite/15/insert_message.sql similarity index 100% rename from src/core/SQL/SQLite/14/insert_message.sql rename to src/core/SQL/SQLite/15/insert_message.sql diff --git a/src/core/SQL/SQLite/14/insert_network.sql b/src/core/SQL/SQLite/15/insert_network.sql similarity index 100% rename from src/core/SQL/SQLite/14/insert_network.sql rename to src/core/SQL/SQLite/15/insert_network.sql diff --git a/src/core/SQL/SQLite/14/insert_nick.sql b/src/core/SQL/SQLite/15/insert_nick.sql similarity index 100% rename from src/core/SQL/SQLite/14/insert_nick.sql rename to src/core/SQL/SQLite/15/insert_nick.sql diff --git a/src/core/SQL/SQLite/14/insert_quasseluser.sql b/src/core/SQL/SQLite/15/insert_quasseluser.sql similarity index 100% rename from src/core/SQL/SQLite/14/insert_quasseluser.sql rename to src/core/SQL/SQLite/15/insert_quasseluser.sql diff --git a/src/core/SQL/SQLite/14/insert_sender.sql b/src/core/SQL/SQLite/15/insert_sender.sql similarity index 100% rename from src/core/SQL/SQLite/14/insert_sender.sql rename to src/core/SQL/SQLite/15/insert_sender.sql diff --git a/src/core/SQL/SQLite/14/insert_server.sql b/src/core/SQL/SQLite/15/insert_server.sql similarity index 100% rename from src/core/SQL/SQLite/14/insert_server.sql rename to src/core/SQL/SQLite/15/insert_server.sql diff --git a/src/core/SQL/SQLite/14/insert_user_setting.sql b/src/core/SQL/SQLite/15/insert_user_setting.sql similarity index 100% rename from src/core/SQL/SQLite/14/insert_user_setting.sql rename to src/core/SQL/SQLite/15/insert_user_setting.sql diff --git a/src/core/SQL/SQLite/14/migrate_read_backlog.sql b/src/core/SQL/SQLite/15/migrate_read_backlog.sql similarity index 100% rename from src/core/SQL/SQLite/14/migrate_read_backlog.sql rename to src/core/SQL/SQLite/15/migrate_read_backlog.sql diff --git a/src/core/SQL/SQLite/14/migrate_read_buffer.sql b/src/core/SQL/SQLite/15/migrate_read_buffer.sql similarity index 100% rename from src/core/SQL/SQLite/14/migrate_read_buffer.sql rename to src/core/SQL/SQLite/15/migrate_read_buffer.sql diff --git a/src/core/SQL/SQLite/14/migrate_read_identity.sql b/src/core/SQL/SQLite/15/migrate_read_identity.sql similarity index 100% rename from src/core/SQL/SQLite/14/migrate_read_identity.sql rename to src/core/SQL/SQLite/15/migrate_read_identity.sql diff --git a/src/core/SQL/SQLite/14/migrate_read_identity_nick.sql b/src/core/SQL/SQLite/15/migrate_read_identity_nick.sql similarity index 100% rename from src/core/SQL/SQLite/14/migrate_read_identity_nick.sql rename to src/core/SQL/SQLite/15/migrate_read_identity_nick.sql diff --git a/src/core/SQL/SQLite/14/migrate_read_ircserver.sql b/src/core/SQL/SQLite/15/migrate_read_ircserver.sql similarity index 100% rename from src/core/SQL/SQLite/14/migrate_read_ircserver.sql rename to src/core/SQL/SQLite/15/migrate_read_ircserver.sql diff --git a/src/core/SQL/SQLite/14/migrate_read_network.sql b/src/core/SQL/SQLite/15/migrate_read_network.sql similarity index 100% rename from src/core/SQL/SQLite/14/migrate_read_network.sql rename to src/core/SQL/SQLite/15/migrate_read_network.sql diff --git a/src/core/SQL/SQLite/14/migrate_read_quasseluser.sql b/src/core/SQL/SQLite/15/migrate_read_quasseluser.sql similarity index 100% rename from src/core/SQL/SQLite/14/migrate_read_quasseluser.sql rename to src/core/SQL/SQLite/15/migrate_read_quasseluser.sql diff --git a/src/core/SQL/SQLite/14/migrate_read_sender.sql b/src/core/SQL/SQLite/15/migrate_read_sender.sql similarity index 100% rename from src/core/SQL/SQLite/14/migrate_read_sender.sql rename to src/core/SQL/SQLite/15/migrate_read_sender.sql diff --git a/src/core/SQL/SQLite/14/migrate_read_usersetting.sql b/src/core/SQL/SQLite/15/migrate_read_usersetting.sql similarity index 100% rename from src/core/SQL/SQLite/14/migrate_read_usersetting.sql rename to src/core/SQL/SQLite/15/migrate_read_usersetting.sql diff --git a/src/core/SQL/SQLite/14/select_authuser.sql b/src/core/SQL/SQLite/15/select_authuser.sql similarity index 100% rename from src/core/SQL/SQLite/14/select_authuser.sql rename to src/core/SQL/SQLite/15/select_authuser.sql diff --git a/src/core/SQL/SQLite/14/select_bufferByName.sql b/src/core/SQL/SQLite/15/select_bufferByName.sql similarity index 100% rename from src/core/SQL/SQLite/14/select_bufferByName.sql rename to src/core/SQL/SQLite/15/select_bufferByName.sql diff --git a/src/core/SQL/SQLite/14/select_bufferExists.sql b/src/core/SQL/SQLite/15/select_bufferExists.sql similarity index 100% rename from src/core/SQL/SQLite/14/select_bufferExists.sql rename to src/core/SQL/SQLite/15/select_bufferExists.sql diff --git a/src/core/SQL/SQLite/14/select_buffer_by_id.sql b/src/core/SQL/SQLite/15/select_buffer_by_id.sql similarity index 100% rename from src/core/SQL/SQLite/14/select_buffer_by_id.sql rename to src/core/SQL/SQLite/15/select_buffer_by_id.sql diff --git a/src/core/SQL/SQLite/14/select_buffer_lastseen_messages.sql b/src/core/SQL/SQLite/15/select_buffer_lastseen_messages.sql similarity index 100% rename from src/core/SQL/SQLite/14/select_buffer_lastseen_messages.sql rename to src/core/SQL/SQLite/15/select_buffer_lastseen_messages.sql diff --git a/src/core/SQL/SQLite/14/select_buffers.sql b/src/core/SQL/SQLite/15/select_buffers.sql similarity index 100% rename from src/core/SQL/SQLite/14/select_buffers.sql rename to src/core/SQL/SQLite/15/select_buffers.sql diff --git a/src/core/SQL/SQLite/14/select_buffers_for_merge.sql b/src/core/SQL/SQLite/15/select_buffers_for_merge.sql similarity index 100% rename from src/core/SQL/SQLite/14/select_buffers_for_merge.sql rename to src/core/SQL/SQLite/15/select_buffers_for_merge.sql diff --git a/src/core/SQL/SQLite/14/select_buffers_for_network.sql b/src/core/SQL/SQLite/15/select_buffers_for_network.sql similarity index 100% rename from src/core/SQL/SQLite/14/select_buffers_for_network.sql rename to src/core/SQL/SQLite/15/select_buffers_for_network.sql diff --git a/src/core/SQL/SQLite/14/select_checkidentity.sql b/src/core/SQL/SQLite/15/select_checkidentity.sql similarity index 100% rename from src/core/SQL/SQLite/14/select_checkidentity.sql rename to src/core/SQL/SQLite/15/select_checkidentity.sql diff --git a/src/core/SQL/SQLite/14/select_connected_networks.sql b/src/core/SQL/SQLite/15/select_connected_networks.sql similarity index 100% rename from src/core/SQL/SQLite/14/select_connected_networks.sql rename to src/core/SQL/SQLite/15/select_connected_networks.sql diff --git a/src/core/SQL/SQLite/14/select_identities.sql b/src/core/SQL/SQLite/15/select_identities.sql similarity index 100% rename from src/core/SQL/SQLite/14/select_identities.sql rename to src/core/SQL/SQLite/15/select_identities.sql diff --git a/src/core/SQL/SQLite/14/select_internaluser.sql b/src/core/SQL/SQLite/15/select_internaluser.sql similarity index 100% rename from src/core/SQL/SQLite/14/select_internaluser.sql rename to src/core/SQL/SQLite/15/select_internaluser.sql diff --git a/src/core/SQL/SQLite/14/select_messages.sql b/src/core/SQL/SQLite/15/select_messages.sql similarity index 100% rename from src/core/SQL/SQLite/14/select_messages.sql rename to src/core/SQL/SQLite/15/select_messages.sql diff --git a/src/core/SQL/SQLite/14/select_messagesAll.sql b/src/core/SQL/SQLite/15/select_messagesAll.sql similarity index 100% rename from src/core/SQL/SQLite/14/select_messagesAll.sql rename to src/core/SQL/SQLite/15/select_messagesAll.sql diff --git a/src/core/SQL/SQLite/14/select_messagesAllNew.sql b/src/core/SQL/SQLite/15/select_messagesAllNew.sql similarity index 100% rename from src/core/SQL/SQLite/14/select_messagesAllNew.sql rename to src/core/SQL/SQLite/15/select_messagesAllNew.sql diff --git a/src/core/SQL/SQLite/14/select_messagesNewerThan.sql b/src/core/SQL/SQLite/15/select_messagesNewerThan.sql similarity index 100% rename from src/core/SQL/SQLite/14/select_messagesNewerThan.sql rename to src/core/SQL/SQLite/15/select_messagesNewerThan.sql diff --git a/src/core/SQL/SQLite/14/select_messagesNewestK.sql b/src/core/SQL/SQLite/15/select_messagesNewestK.sql similarity index 100% rename from src/core/SQL/SQLite/14/select_messagesNewestK.sql rename to src/core/SQL/SQLite/15/select_messagesNewestK.sql diff --git a/src/core/SQL/SQLite/14/select_networkExists.sql b/src/core/SQL/SQLite/15/select_networkExists.sql similarity index 100% rename from src/core/SQL/SQLite/14/select_networkExists.sql rename to src/core/SQL/SQLite/15/select_networkExists.sql diff --git a/src/core/SQL/SQLite/14/select_network_awaymsg.sql b/src/core/SQL/SQLite/15/select_network_awaymsg.sql similarity index 100% rename from src/core/SQL/SQLite/14/select_network_awaymsg.sql rename to src/core/SQL/SQLite/15/select_network_awaymsg.sql diff --git a/src/core/SQL/SQLite/14/select_network_usermode.sql b/src/core/SQL/SQLite/15/select_network_usermode.sql similarity index 100% rename from src/core/SQL/SQLite/14/select_network_usermode.sql rename to src/core/SQL/SQLite/15/select_network_usermode.sql diff --git a/src/core/SQL/SQLite/14/select_networks_for_user.sql b/src/core/SQL/SQLite/15/select_networks_for_user.sql similarity index 100% rename from src/core/SQL/SQLite/14/select_networks_for_user.sql rename to src/core/SQL/SQLite/15/select_networks_for_user.sql diff --git a/src/core/SQL/SQLite/14/select_nicks.sql b/src/core/SQL/SQLite/15/select_nicks.sql similarity index 100% rename from src/core/SQL/SQLite/14/select_nicks.sql rename to src/core/SQL/SQLite/15/select_nicks.sql diff --git a/src/core/SQL/SQLite/14/select_persistent_channels.sql b/src/core/SQL/SQLite/15/select_persistent_channels.sql similarity index 100% rename from src/core/SQL/SQLite/14/select_persistent_channels.sql rename to src/core/SQL/SQLite/15/select_persistent_channels.sql diff --git a/src/core/SQL/SQLite/14/select_servers_for_network.sql b/src/core/SQL/SQLite/15/select_servers_for_network.sql similarity index 100% rename from src/core/SQL/SQLite/14/select_servers_for_network.sql rename to src/core/SQL/SQLite/15/select_servers_for_network.sql diff --git a/src/core/SQL/SQLite/14/select_user_setting.sql b/src/core/SQL/SQLite/15/select_user_setting.sql similarity index 100% rename from src/core/SQL/SQLite/14/select_user_setting.sql rename to src/core/SQL/SQLite/15/select_user_setting.sql diff --git a/src/core/SQL/SQLite/14/select_userid.sql b/src/core/SQL/SQLite/15/select_userid.sql similarity index 100% rename from src/core/SQL/SQLite/14/select_userid.sql rename to src/core/SQL/SQLite/15/select_userid.sql diff --git a/src/core/SQL/SQLite/14/setup_000_quasseluser.sql b/src/core/SQL/SQLite/15/setup_000_quasseluser.sql similarity index 100% rename from src/core/SQL/SQLite/14/setup_000_quasseluser.sql rename to src/core/SQL/SQLite/15/setup_000_quasseluser.sql diff --git a/src/core/SQL/SQLite/14/setup_010_sender.sql b/src/core/SQL/SQLite/15/setup_010_sender.sql similarity index 100% rename from src/core/SQL/SQLite/14/setup_010_sender.sql rename to src/core/SQL/SQLite/15/setup_010_sender.sql diff --git a/src/core/SQL/SQLite/14/setup_020_network.sql b/src/core/SQL/SQLite/15/setup_020_network.sql similarity index 100% rename from src/core/SQL/SQLite/14/setup_020_network.sql rename to src/core/SQL/SQLite/15/setup_020_network.sql diff --git a/src/core/SQL/SQLite/14/setup_030_buffer.sql b/src/core/SQL/SQLite/15/setup_030_buffer.sql similarity index 100% rename from src/core/SQL/SQLite/14/setup_030_buffer.sql rename to src/core/SQL/SQLite/15/setup_030_buffer.sql diff --git a/src/core/SQL/SQLite/14/setup_040_buffer_idx.sql b/src/core/SQL/SQLite/15/setup_040_buffer_idx.sql similarity index 100% rename from src/core/SQL/SQLite/14/setup_040_buffer_idx.sql rename to src/core/SQL/SQLite/15/setup_040_buffer_idx.sql diff --git a/src/core/SQL/SQLite/14/setup_050_buffer_cname_idx.sql b/src/core/SQL/SQLite/15/setup_050_buffer_cname_idx.sql similarity index 100% rename from src/core/SQL/SQLite/14/setup_050_buffer_cname_idx.sql rename to src/core/SQL/SQLite/15/setup_050_buffer_cname_idx.sql diff --git a/src/core/SQL/SQLite/14/setup_060_backlog.sql b/src/core/SQL/SQLite/15/setup_060_backlog.sql similarity index 100% rename from src/core/SQL/SQLite/14/setup_060_backlog.sql rename to src/core/SQL/SQLite/15/setup_060_backlog.sql diff --git a/src/core/SQL/SQLite/14/setup_070_coreinfo.sql b/src/core/SQL/SQLite/15/setup_070_coreinfo.sql similarity index 100% rename from src/core/SQL/SQLite/14/setup_070_coreinfo.sql rename to src/core/SQL/SQLite/15/setup_070_coreinfo.sql diff --git a/src/core/SQL/SQLite/14/setup_080_ircservers.sql b/src/core/SQL/SQLite/15/setup_080_ircservers.sql similarity index 100% rename from src/core/SQL/SQLite/14/setup_080_ircservers.sql rename to src/core/SQL/SQLite/15/setup_080_ircservers.sql diff --git a/src/core/SQL/SQLite/14/setup_090_backlog_idx.sql b/src/core/SQL/SQLite/15/setup_090_backlog_idx.sql similarity index 100% rename from src/core/SQL/SQLite/14/setup_090_backlog_idx.sql rename to src/core/SQL/SQLite/15/setup_090_backlog_idx.sql diff --git a/src/core/SQL/SQLite/14/setup_100_backlog_idx2.sql b/src/core/SQL/SQLite/15/setup_100_backlog_idx2.sql similarity index 100% rename from src/core/SQL/SQLite/14/setup_100_backlog_idx2.sql rename to src/core/SQL/SQLite/15/setup_100_backlog_idx2.sql diff --git a/src/core/SQL/SQLite/14/setup_110_buffer_user_idx.sql b/src/core/SQL/SQLite/15/setup_110_buffer_user_idx.sql similarity index 100% rename from src/core/SQL/SQLite/14/setup_110_buffer_user_idx.sql rename to src/core/SQL/SQLite/15/setup_110_buffer_user_idx.sql diff --git a/src/core/SQL/SQLite/14/setup_120_user_setting.sql b/src/core/SQL/SQLite/15/setup_120_user_setting.sql similarity index 100% rename from src/core/SQL/SQLite/14/setup_120_user_setting.sql rename to src/core/SQL/SQLite/15/setup_120_user_setting.sql diff --git a/src/core/SQL/SQLite/14/setup_130_identity.sql b/src/core/SQL/SQLite/15/setup_130_identity.sql similarity index 100% rename from src/core/SQL/SQLite/14/setup_130_identity.sql rename to src/core/SQL/SQLite/15/setup_130_identity.sql diff --git a/src/core/SQL/SQLite/14/setup_140_identity_nick.sql b/src/core/SQL/SQLite/15/setup_140_identity_nick.sql similarity index 100% rename from src/core/SQL/SQLite/14/setup_140_identity_nick.sql rename to src/core/SQL/SQLite/15/setup_140_identity_nick.sql diff --git a/src/core/SQL/SQLite/14/update_backlog_bufferid.sql b/src/core/SQL/SQLite/15/update_backlog_bufferid.sql similarity index 100% rename from src/core/SQL/SQLite/14/update_backlog_bufferid.sql rename to src/core/SQL/SQLite/15/update_backlog_bufferid.sql diff --git a/src/core/SQL/SQLite/14/update_buffer_lastseen.sql b/src/core/SQL/SQLite/15/update_buffer_lastseen.sql similarity index 100% rename from src/core/SQL/SQLite/14/update_buffer_lastseen.sql rename to src/core/SQL/SQLite/15/update_buffer_lastseen.sql diff --git a/src/core/SQL/SQLite/14/update_buffer_name.sql b/src/core/SQL/SQLite/15/update_buffer_name.sql similarity index 100% rename from src/core/SQL/SQLite/14/update_buffer_name.sql rename to src/core/SQL/SQLite/15/update_buffer_name.sql diff --git a/src/core/SQL/SQLite/14/update_buffer_persistent_channel.sql b/src/core/SQL/SQLite/15/update_buffer_persistent_channel.sql similarity index 100% rename from src/core/SQL/SQLite/14/update_buffer_persistent_channel.sql rename to src/core/SQL/SQLite/15/update_buffer_persistent_channel.sql diff --git a/src/core/SQL/SQLite/14/update_buffer_set_channel_key.sql b/src/core/SQL/SQLite/15/update_buffer_set_channel_key.sql similarity index 100% rename from src/core/SQL/SQLite/14/update_buffer_set_channel_key.sql rename to src/core/SQL/SQLite/15/update_buffer_set_channel_key.sql diff --git a/src/core/SQL/SQLite/14/update_identity.sql b/src/core/SQL/SQLite/15/update_identity.sql similarity index 100% rename from src/core/SQL/SQLite/14/update_identity.sql rename to src/core/SQL/SQLite/15/update_identity.sql diff --git a/src/core/SQL/SQLite/14/update_network.sql b/src/core/SQL/SQLite/15/update_network.sql similarity index 100% rename from src/core/SQL/SQLite/14/update_network.sql rename to src/core/SQL/SQLite/15/update_network.sql diff --git a/src/core/SQL/SQLite/14/update_network_connected.sql b/src/core/SQL/SQLite/15/update_network_connected.sql similarity index 100% rename from src/core/SQL/SQLite/14/update_network_connected.sql rename to src/core/SQL/SQLite/15/update_network_connected.sql diff --git a/src/core/SQL/SQLite/14/update_network_set_awaymsg.sql b/src/core/SQL/SQLite/15/update_network_set_awaymsg.sql similarity index 100% rename from src/core/SQL/SQLite/14/update_network_set_awaymsg.sql rename to src/core/SQL/SQLite/15/update_network_set_awaymsg.sql diff --git a/src/core/SQL/SQLite/14/update_network_set_usermode.sql b/src/core/SQL/SQLite/15/update_network_set_usermode.sql similarity index 100% rename from src/core/SQL/SQLite/14/update_network_set_usermode.sql rename to src/core/SQL/SQLite/15/update_network_set_usermode.sql diff --git a/src/core/SQL/SQLite/14/update_user_setting.sql b/src/core/SQL/SQLite/15/update_user_setting.sql similarity index 100% rename from src/core/SQL/SQLite/14/update_user_setting.sql rename to src/core/SQL/SQLite/15/update_user_setting.sql diff --git a/src/core/SQL/SQLite/14/update_username.sql b/src/core/SQL/SQLite/15/update_username.sql similarity index 100% rename from src/core/SQL/SQLite/14/update_username.sql rename to src/core/SQL/SQLite/15/update_username.sql diff --git a/src/core/SQL/SQLite/14/update_userpassword.sql b/src/core/SQL/SQLite/15/update_userpassword.sql similarity index 100% rename from src/core/SQL/SQLite/14/update_userpassword.sql rename to src/core/SQL/SQLite/15/update_userpassword.sql diff --git a/src/core/SQL/SQLite/15/upgrade_000_fix_ircservers.sql b/src/core/SQL/SQLite/15/upgrade_000_fix_ircservers.sql new file mode 100644 index 00000000..ef456a3d --- /dev/null +++ b/src/core/SQL/SQLite/15/upgrade_000_fix_ircservers.sql @@ -0,0 +1,3 @@ +UPDATE ircserver +SET ssl = length(replace(replace(replace(ssl,'true','1'), 'false', '0'), '0', '')), + useproxy = length(replace(replace(replace(useproxy,'true','1'), 'false', '0'), '0', '')) diff --git a/src/core/SQL/SQLite/15/upgrade_000_fix_network.sql b/src/core/SQL/SQLite/15/upgrade_000_fix_network.sql new file mode 100644 index 00000000..1831e732 --- /dev/null +++ b/src/core/SQL/SQLite/15/upgrade_000_fix_network.sql @@ -0,0 +1,7 @@ +UPDATE network +SET userandomserver = length(replace(replace(replace(userandomserver,'true','1'), 'false', '0'), '0', '')), + useautoidentify = length(replace(replace(replace(useautoidentify,'true','1'), 'false', '0'), '0', '')), + useautoreconnect = length(replace(replace(replace(useautoreconnect,'true','1'), 'false', '0'), '0', '')), + unlimitedconnectretries = length(replace(replace(replace(unlimitedconnectretries,'true','1'), 'false', '0'), '0', '')), + rejoinchannels = length(replace(replace(replace(rejoinchannels,'true','1'), 'false', '0'), '0', '')), + connected = length(replace(replace(replace(connected,'true','1'), 'false', '0'), '0', '')) diff --git a/src/core/sql.qrc b/src/core/sql.qrc index aab3c1a3..3e041df0 100644 --- a/src/core/sql.qrc +++ b/src/core/sql.qrc @@ -99,94 +99,96 @@ ./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/migrate_read_backlog.sql - ./SQL/SQLite/14/migrate_read_buffer.sql - ./SQL/SQLite/14/migrate_read_identity.sql - ./SQL/SQLite/14/migrate_read_identity_nick.sql - ./SQL/SQLite/14/migrate_read_ircserver.sql - ./SQL/SQLite/14/migrate_read_network.sql - ./SQL/SQLite/14/migrate_read_quasseluser.sql - ./SQL/SQLite/14/migrate_read_sender.sql - ./SQL/SQLite/14/migrate_read_usersetting.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_merge.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_network_awaymsg.sql - ./SQL/SQLite/14/select_network_usermode.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_network_set_awaymsg.sql - ./SQL/SQLite/14/update_network_set_usermode.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/15/delete_backlog_by_uid.sql + ./SQL/SQLite/15/delete_backlog_for_buffer.sql + ./SQL/SQLite/15/delete_backlog_for_network.sql + ./SQL/SQLite/15/delete_buffer_for_bufferid.sql + ./SQL/SQLite/15/delete_buffers_by_uid.sql + ./SQL/SQLite/15/delete_buffers_for_network.sql + ./SQL/SQLite/15/delete_identity.sql + ./SQL/SQLite/15/delete_ircservers_for_network.sql + ./SQL/SQLite/15/delete_network.sql + ./SQL/SQLite/15/delete_networks_by_uid.sql + ./SQL/SQLite/15/delete_nicks.sql + ./SQL/SQLite/15/delete_quasseluser.sql + ./SQL/SQLite/15/insert_buffer.sql + ./SQL/SQLite/15/insert_identity.sql + ./SQL/SQLite/15/insert_message.sql + ./SQL/SQLite/15/insert_network.sql + ./SQL/SQLite/15/insert_nick.sql + ./SQL/SQLite/15/insert_quasseluser.sql + ./SQL/SQLite/15/insert_sender.sql + ./SQL/SQLite/15/insert_server.sql + ./SQL/SQLite/15/insert_user_setting.sql + ./SQL/SQLite/15/migrate_read_backlog.sql + ./SQL/SQLite/15/migrate_read_buffer.sql + ./SQL/SQLite/15/migrate_read_identity.sql + ./SQL/SQLite/15/migrate_read_identity_nick.sql + ./SQL/SQLite/15/migrate_read_ircserver.sql + ./SQL/SQLite/15/migrate_read_network.sql + ./SQL/SQLite/15/migrate_read_quasseluser.sql + ./SQL/SQLite/15/migrate_read_sender.sql + ./SQL/SQLite/15/migrate_read_usersetting.sql + ./SQL/SQLite/15/select_authuser.sql + ./SQL/SQLite/15/select_buffer_by_id.sql + ./SQL/SQLite/15/select_buffer_lastseen_messages.sql + ./SQL/SQLite/15/select_bufferByName.sql + ./SQL/SQLite/15/select_bufferExists.sql + ./SQL/SQLite/15/select_buffers.sql + ./SQL/SQLite/15/select_buffers_for_merge.sql + ./SQL/SQLite/15/select_buffers_for_network.sql + ./SQL/SQLite/15/select_checkidentity.sql + ./SQL/SQLite/15/select_connected_networks.sql + ./SQL/SQLite/15/select_identities.sql + ./SQL/SQLite/15/select_internaluser.sql + ./SQL/SQLite/15/select_messages.sql + ./SQL/SQLite/15/select_messagesAll.sql + ./SQL/SQLite/15/select_messagesAllNew.sql + ./SQL/SQLite/15/select_messagesNewerThan.sql + ./SQL/SQLite/15/select_messagesNewestK.sql + ./SQL/SQLite/15/select_network_awaymsg.sql + ./SQL/SQLite/15/select_network_usermode.sql + ./SQL/SQLite/15/select_networkExists.sql + ./SQL/SQLite/15/select_networks_for_user.sql + ./SQL/SQLite/15/select_nicks.sql + ./SQL/SQLite/15/select_persistent_channels.sql + ./SQL/SQLite/15/select_servers_for_network.sql + ./SQL/SQLite/15/select_user_setting.sql + ./SQL/SQLite/15/select_userid.sql + ./SQL/SQLite/15/setup_000_quasseluser.sql + ./SQL/SQLite/15/setup_010_sender.sql + ./SQL/SQLite/15/setup_020_network.sql + ./SQL/SQLite/15/setup_030_buffer.sql + ./SQL/SQLite/15/setup_040_buffer_idx.sql + ./SQL/SQLite/15/setup_050_buffer_cname_idx.sql + ./SQL/SQLite/15/setup_060_backlog.sql + ./SQL/SQLite/15/setup_070_coreinfo.sql + ./SQL/SQLite/15/setup_080_ircservers.sql + ./SQL/SQLite/15/setup_090_backlog_idx.sql + ./SQL/SQLite/15/setup_100_backlog_idx2.sql + ./SQL/SQLite/15/setup_110_buffer_user_idx.sql + ./SQL/SQLite/15/setup_120_user_setting.sql + ./SQL/SQLite/15/setup_130_identity.sql + ./SQL/SQLite/15/setup_140_identity_nick.sql + ./SQL/SQLite/15/update_backlog_bufferid.sql + ./SQL/SQLite/15/update_buffer_lastseen.sql + ./SQL/SQLite/15/update_buffer_name.sql + ./SQL/SQLite/15/update_buffer_persistent_channel.sql + ./SQL/SQLite/15/update_buffer_set_channel_key.sql + ./SQL/SQLite/15/update_identity.sql + ./SQL/SQLite/15/update_network.sql + ./SQL/SQLite/15/update_network_connected.sql + ./SQL/SQLite/15/update_network_set_awaymsg.sql + ./SQL/SQLite/15/update_network_set_usermode.sql + ./SQL/SQLite/15/update_user_setting.sql + ./SQL/SQLite/15/update_username.sql + ./SQL/SQLite/15/update_userpassword.sql + ./SQL/SQLite/15/upgrade_000_fix_ircservers.sql + ./SQL/SQLite/15/upgrade_000_fix_network.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 diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp index 056cddd0..19710edf 100644 --- a/src/core/sqlitestorage.cpp +++ b/src/core/sqlitestorage.cpp @@ -519,16 +519,16 @@ void SqliteStorage::bindNetworkInfo(QSqlQuery &query, const NetworkInfo &info) { query.bindValue(":encodingcodec", QString(info.codecForEncoding)); query.bindValue(":decodingcodec", QString(info.codecForDecoding)); query.bindValue(":servercodec", QString(info.codecForServer)); - query.bindValue(":userandomserver", info.useRandomServer); + query.bindValue(":userandomserver", info.useRandomServer ? 1 : 0); query.bindValue(":perform", info.perform.join("\n")); - query.bindValue(":useautoidentify", info.useAutoIdentify); + query.bindValue(":useautoidentify", info.useAutoIdentify ? 1 : 0); query.bindValue(":autoidentifyservice", info.autoIdentifyService); query.bindValue(":autoidentifypassword", info.autoIdentifyPassword); - query.bindValue(":useautoreconnect", info.useAutoReconnect); + query.bindValue(":useautoreconnect", info.useAutoReconnect ? 1 : 0); query.bindValue(":autoreconnectinterval", info.autoReconnectInterval); query.bindValue(":autoreconnectretries", info.autoReconnectRetries); - query.bindValue(":unlimitedconnectretries", info.unlimitedReconnectRetries); - query.bindValue(":rejoinchannels", info.rejoinChannels); + query.bindValue(":unlimitedconnectretries", info.unlimitedReconnectRetries ? 1 : 0); + query.bindValue(":rejoinchannels", info.rejoinChannels ? 1 : 0); if(info.networkId.isValid()) query.bindValue(":networkid", info.networkId.toInt()); } @@ -537,9 +537,9 @@ void SqliteStorage::bindServerInfo(QSqlQuery &query, const Network::Server &serv query.bindValue(":hostname", server.host); query.bindValue(":port", server.port); query.bindValue(":password", server.password); - query.bindValue(":ssl", server.useSsl); + query.bindValue(":ssl", server.useSsl ? 1 : 0); query.bindValue(":sslversion", server.sslVersion); - query.bindValue(":useproxy", server.useProxy); + query.bindValue(":useproxy", server.useProxy ? 1 : 0); query.bindValue(":proxytype", server.proxyType); query.bindValue(":proxyhost", server.proxyHost); query.bindValue(":proxyport", server.proxyPort); -- 2.20.1