From 31c1e758654388b080ce1dee7065afa053efc1b8 Mon Sep 17 00:00:00 2001 From: Shane Synan Date: Sat, 4 Mar 2017 22:58:00 -0600 Subject: [PATCH] Unify SQL filenames, sort sql.qrc Unify SQL filenames, renaming PostgreSQL 'select_messages' to 'select_messagesNewestK', and renaming SQLite 'select_messages' to 'select_messagesRange'. Sort sql.qrc alphabetically. This makes it easier to see which functionality is related, e.g. when making future schema changes. Sorting improves 'git diff' output. --- ...essages.sql => select_messagesNewestK.sql} | 0 ..._messages.sql => select_messagesRange.sql} | 0 src/core/postgresqlstorage.cpp | 2 +- src/core/sql.qrc | 114 +++++++++--------- src/core/sqlitestorage.cpp | 2 +- 5 files changed, 59 insertions(+), 59 deletions(-) rename src/core/SQL/PostgreSQL/20/{select_messages.sql => select_messagesNewestK.sql} (100%) rename src/core/SQL/SQLite/21/{select_messages.sql => select_messagesRange.sql} (100%) diff --git a/src/core/SQL/PostgreSQL/20/select_messages.sql b/src/core/SQL/PostgreSQL/20/select_messagesNewestK.sql similarity index 100% rename from src/core/SQL/PostgreSQL/20/select_messages.sql rename to src/core/SQL/PostgreSQL/20/select_messagesNewestK.sql diff --git a/src/core/SQL/SQLite/21/select_messages.sql b/src/core/SQL/SQLite/21/select_messagesRange.sql similarity index 100% rename from src/core/SQL/SQLite/21/select_messages.sql rename to src/core/SQL/SQLite/21/select_messagesRange.sql diff --git a/src/core/postgresqlstorage.cpp b/src/core/postgresqlstorage.cpp index 05da7a12..9c340df6 100644 --- a/src/core/postgresqlstorage.cpp +++ b/src/core/postgresqlstorage.cpp @@ -1547,7 +1547,7 @@ QList PostgreSqlStorage::requestMsgs(UserId user, BufferId bufferId, Ms QString queryName; QVariantList params; if (last == -1 && first == -1) { - queryName = "select_messages"; + queryName = "select_messagesNewestK"; } else if (last == -1) { queryName = "select_messagesNewerThan"; diff --git a/src/core/sql.qrc b/src/core/sql.qrc index bbf41acb..0ac40d9e 100644 --- a/src/core/sql.qrc +++ b/src/core/sql.qrc @@ -16,8 +16,8 @@ ./SQL/PostgreSQL/20/delete_buffers_for_network.sql ./SQL/PostgreSQL/20/delete_identity.sql ./SQL/PostgreSQL/20/delete_ircservers_for_network.sql - ./SQL/PostgreSQL/20/delete_network.sql ./SQL/PostgreSQL/20/delete_networks_by_uid.sql + ./SQL/PostgreSQL/20/delete_network.sql ./SQL/PostgreSQL/20/delete_nicks.sql ./SQL/PostgreSQL/20/delete_quasseluser.sql ./SQL/PostgreSQL/20/insert_buffer.sql @@ -31,40 +31,40 @@ ./SQL/PostgreSQL/20/insert_user_setting.sql ./SQL/PostgreSQL/20/migrate_write_backlog.sql ./SQL/PostgreSQL/20/migrate_write_buffer.sql - ./SQL/PostgreSQL/20/migrate_write_identity.sql ./SQL/PostgreSQL/20/migrate_write_identity_nick.sql + ./SQL/PostgreSQL/20/migrate_write_identity.sql ./SQL/PostgreSQL/20/migrate_write_ircserver.sql ./SQL/PostgreSQL/20/migrate_write_network.sql ./SQL/PostgreSQL/20/migrate_write_quasseluser.sql ./SQL/PostgreSQL/20/migrate_write_sender.sql ./SQL/PostgreSQL/20/migrate_write_usersetting.sql ./SQL/PostgreSQL/20/select_authuser.sql + ./SQL/PostgreSQL/20/select_buffer_by_id.sql ./SQL/PostgreSQL/20/select_bufferByName.sql ./SQL/PostgreSQL/20/select_bufferExists.sql - ./SQL/PostgreSQL/20/select_buffer_by_id.sql ./SQL/PostgreSQL/20/select_buffer_lastseen_messages.sql ./SQL/PostgreSQL/20/select_buffer_markerlinemsgids.sql - ./SQL/PostgreSQL/20/select_buffers.sql ./SQL/PostgreSQL/20/select_buffers_for_network.sql + ./SQL/PostgreSQL/20/select_buffers.sql ./SQL/PostgreSQL/20/select_checkidentity.sql ./SQL/PostgreSQL/20/select_connected_networks.sql ./SQL/PostgreSQL/20/select_identities.sql ./SQL/PostgreSQL/20/select_internaluser.sql - ./SQL/PostgreSQL/20/select_messages.sql - ./SQL/PostgreSQL/20/select_messagesAll.sql ./SQL/PostgreSQL/20/select_messagesAllNew.sql + ./SQL/PostgreSQL/20/select_messagesAll.sql ./SQL/PostgreSQL/20/select_messagesNewerThan.sql + ./SQL/PostgreSQL/20/select_messagesNewestK.sql ./SQL/PostgreSQL/20/select_messagesRange.sql - ./SQL/PostgreSQL/20/select_networkExists.sql ./SQL/PostgreSQL/20/select_network_awaymsg.sql - ./SQL/PostgreSQL/20/select_network_usermode.sql + ./SQL/PostgreSQL/20/select_networkExists.sql ./SQL/PostgreSQL/20/select_networks_for_user.sql + ./SQL/PostgreSQL/20/select_network_usermode.sql ./SQL/PostgreSQL/20/select_nicks.sql ./SQL/PostgreSQL/20/select_persistent_channels.sql ./SQL/PostgreSQL/20/select_senderid.sql ./SQL/PostgreSQL/20/select_servers_for_network.sql - ./SQL/PostgreSQL/20/select_user_setting.sql ./SQL/PostgreSQL/20/select_userid.sql + ./SQL/PostgreSQL/20/select_user_setting.sql ./SQL/PostgreSQL/20/setup_000_quasseluser.sql ./SQL/PostgreSQL/20/setup_010_sender.sql ./SQL/PostgreSQL/20/setup_020_identity.sql @@ -81,60 +81,29 @@ ./SQL/PostgreSQL/20/setup_130_function_lastmsgid.sql ./SQL/PostgreSQL/20/update_backlog_bufferid.sql ./SQL/PostgreSQL/20/update_buffer_lastmsgid.sql + ./SQL/PostgreSQL/20/update_buffer_lastseen.sql ./SQL/PostgreSQL/20/update_buffer_markerlinemsgid.sql ./SQL/PostgreSQL/20/update_buffer_name.sql ./SQL/PostgreSQL/20/update_buffer_persistent_channel.sql ./SQL/PostgreSQL/20/update_buffer_set_channel_key.sql ./SQL/PostgreSQL/20/update_identity.sql - ./SQL/PostgreSQL/20/update_network.sql ./SQL/PostgreSQL/20/update_network_connected.sql ./SQL/PostgreSQL/20/update_network_set_awaymsg.sql ./SQL/PostgreSQL/20/update_network_set_usermode.sql - ./SQL/PostgreSQL/20/update_user_setting.sql + ./SQL/PostgreSQL/20/update_network.sql ./SQL/PostgreSQL/20/update_username.sql ./SQL/PostgreSQL/20/update_userpassword.sql + ./SQL/PostgreSQL/20/update_user_setting.sql ./SQL/PostgreSQL/20/upgrade_000_alter_buffer_add_lastmsgid.sql ./SQL/PostgreSQL/20/upgrade_001_add_function_populate_lastmsgid.sql ./SQL/PostgreSQL/20/upgrade_002_run_function_populate_lastmsgid.sql ./SQL/PostgreSQL/20/upgrade_003_correct_bad_lastseenmsgid.sql ./SQL/PostgreSQL/20/upgrade_004_add_lastseenmsgid_constraint.sql - ./SQL/PostgreSQL/20/update_buffer_lastseen.sql ./SQL/SQLite/1/upgrade_000_drop_coreinfo.sql ./SQL/SQLite/1/upgrade_010_create_coreinfo.sql ./SQL/SQLite/1/upgrade_020_update_schemaversion.sql - ./SQL/SQLite/10/upgrade_000_switch_to_msgid.sql - ./SQL/SQLite/10/upgrade_010_rename_buffer_table.sql - ./SQL/SQLite/10/upgrade_020_create_buffer_table.sql - ./SQL/SQLite/10/upgrade_030_copy_buffer_table.sql - ./SQL/SQLite/10/upgrade_040_drop_buffer_old_table.sql - ./SQL/SQLite/11/upgrade_000_create_user_setting.sql - ./SQL/SQLite/12/upgrade_000_create_identity.sql - ./SQL/SQLite/12/upgrade_010_create_identity_nick.sql - ./SQL/SQLite/12/upgrade_020_rename_servertable.sql - ./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/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/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/upgrade_000_fix_ircservers.sql - ./SQL/SQLite/15/upgrade_000_fix_network.sql - ./SQL/SQLite/16/upgrade_000_alter_buffer_add_markerlinemsgid.sql - ./SQL/SQLite/17/upgrade_000_alter_network_add_sasl.sql - ./SQL/SQLite/17/upgrade_001_alter_network_add_sasl.sql - ./SQL/SQLite/17/upgrade_002_alter_network_add_sasl.sql - ./SQL/SQLite/18/upgrade_000_alter_quasseluser_add_passwordversion.sql - ./SQL/SQLite/19/upgrade_000_alter_ircserver_add_sslverify.sql ./SQL/SQLite/2/upgrade_000_drop_buffergroup.sql ./SQL/SQLite/2/upgrade_010_update_schemaversion.sql - ./SQL/SQLite/20/upgrade_000_alter_network_add_ratelimit_usecustom.sql - ./SQL/SQLite/20/upgrade_001_alter_network_add_ratelimit_burstsize.sql - ./SQL/SQLite/20/upgrade_002_alter_network_add_ratelimit_delay.sql - ./SQL/SQLite/20/upgrade_003_alter_network_add_ratelimit_unlimited.sql ./SQL/SQLite/3/upgrade_000_update_backlog_flags.sql ./SQL/SQLite/3/upgrade_010_update_schemaversion.sql ./SQL/SQLite/4/upgrade_000_rename_buffertable.sql @@ -177,6 +146,37 @@ ./SQL/SQLite/9/upgrade_000_create_backlog_idx.sql ./SQL/SQLite/9/upgrade_010_create_backlog_idx2.sql ./SQL/SQLite/9/upgrade_020_create_buffer_idx.sql + ./SQL/SQLite/10/upgrade_000_switch_to_msgid.sql + ./SQL/SQLite/10/upgrade_010_rename_buffer_table.sql + ./SQL/SQLite/10/upgrade_020_create_buffer_table.sql + ./SQL/SQLite/10/upgrade_030_copy_buffer_table.sql + ./SQL/SQLite/10/upgrade_040_drop_buffer_old_table.sql + ./SQL/SQLite/11/upgrade_000_create_user_setting.sql + ./SQL/SQLite/12/upgrade_000_create_identity.sql + ./SQL/SQLite/12/upgrade_010_create_identity_nick.sql + ./SQL/SQLite/12/upgrade_020_rename_servertable.sql + ./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/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/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/upgrade_000_fix_ircservers.sql + ./SQL/SQLite/15/upgrade_000_fix_network.sql + ./SQL/SQLite/16/upgrade_000_alter_buffer_add_markerlinemsgid.sql + ./SQL/SQLite/17/upgrade_000_alter_network_add_sasl.sql + ./SQL/SQLite/17/upgrade_001_alter_network_add_sasl.sql + ./SQL/SQLite/17/upgrade_002_alter_network_add_sasl.sql + ./SQL/SQLite/18/upgrade_000_alter_quasseluser_add_passwordversion.sql + ./SQL/SQLite/19/upgrade_000_alter_ircserver_add_sslverify.sql + ./SQL/SQLite/20/upgrade_000_alter_network_add_ratelimit_usecustom.sql + ./SQL/SQLite/20/upgrade_001_alter_network_add_ratelimit_burstsize.sql + ./SQL/SQLite/20/upgrade_002_alter_network_add_ratelimit_delay.sql + ./SQL/SQLite/20/upgrade_003_alter_network_add_ratelimit_unlimited.sql ./SQL/SQLite/21/delete_backlog_by_uid.sql ./SQL/SQLite/21/delete_backlog_for_buffer.sql ./SQL/SQLite/21/delete_backlog_for_network.sql @@ -185,8 +185,8 @@ ./SQL/SQLite/21/delete_buffers_for_network.sql ./SQL/SQLite/21/delete_identity.sql ./SQL/SQLite/21/delete_ircservers_for_network.sql - ./SQL/SQLite/21/delete_network.sql ./SQL/SQLite/21/delete_networks_by_uid.sql + ./SQL/SQLite/21/delete_network.sql ./SQL/SQLite/21/delete_nicks.sql ./SQL/SQLite/21/delete_quasseluser.sql ./SQL/SQLite/21/insert_buffer.sql @@ -200,40 +200,40 @@ ./SQL/SQLite/21/insert_user_setting.sql ./SQL/SQLite/21/migrate_read_backlog.sql ./SQL/SQLite/21/migrate_read_buffer.sql - ./SQL/SQLite/21/migrate_read_identity.sql ./SQL/SQLite/21/migrate_read_identity_nick.sql + ./SQL/SQLite/21/migrate_read_identity.sql ./SQL/SQLite/21/migrate_read_ircserver.sql ./SQL/SQLite/21/migrate_read_network.sql ./SQL/SQLite/21/migrate_read_quasseluser.sql ./SQL/SQLite/21/migrate_read_sender.sql ./SQL/SQLite/21/migrate_read_usersetting.sql ./SQL/SQLite/21/select_authuser.sql + ./SQL/SQLite/21/select_buffer_by_id.sql ./SQL/SQLite/21/select_bufferByName.sql ./SQL/SQLite/21/select_bufferExists.sql - ./SQL/SQLite/21/select_buffer_by_id.sql ./SQL/SQLite/21/select_buffer_lastseen_messages.sql ./SQL/SQLite/21/select_buffer_markerlinemsgids.sql - ./SQL/SQLite/21/select_buffers.sql ./SQL/SQLite/21/select_buffers_for_merge.sql ./SQL/SQLite/21/select_buffers_for_network.sql + ./SQL/SQLite/21/select_buffers.sql ./SQL/SQLite/21/select_checkidentity.sql ./SQL/SQLite/21/select_connected_networks.sql ./SQL/SQLite/21/select_identities.sql ./SQL/SQLite/21/select_internaluser.sql - ./SQL/SQLite/21/select_messages.sql - ./SQL/SQLite/21/select_messagesAll.sql ./SQL/SQLite/21/select_messagesAllNew.sql + ./SQL/SQLite/21/select_messagesAll.sql ./SQL/SQLite/21/select_messagesNewerThan.sql ./SQL/SQLite/21/select_messagesNewestK.sql - ./SQL/SQLite/21/select_networkExists.sql + ./SQL/SQLite/21/select_messagesRange.sql ./SQL/SQLite/21/select_network_awaymsg.sql - ./SQL/SQLite/21/select_network_usermode.sql + ./SQL/SQLite/21/select_networkExists.sql ./SQL/SQLite/21/select_networks_for_user.sql + ./SQL/SQLite/21/select_network_usermode.sql ./SQL/SQLite/21/select_nicks.sql ./SQL/SQLite/21/select_persistent_channels.sql ./SQL/SQLite/21/select_servers_for_network.sql - ./SQL/SQLite/21/select_user_setting.sql ./SQL/SQLite/21/select_userid.sql + ./SQL/SQLite/21/select_user_setting.sql ./SQL/SQLite/21/setup_000_quasseluser.sql ./SQL/SQLite/21/setup_010_sender.sql ./SQL/SQLite/21/setup_020_network.sql @@ -250,26 +250,26 @@ ./SQL/SQLite/21/setup_130_identity.sql ./SQL/SQLite/21/setup_140_identity_nick.sql ./SQL/SQLite/21/update_backlog_bufferid.sql + ./SQL/SQLite/21/update_buffer_lastmsgid.sql + ./SQL/SQLite/21/update_buffer_lastseen.sql ./SQL/SQLite/21/update_buffer_markerlinemsgid.sql ./SQL/SQLite/21/update_buffer_name.sql ./SQL/SQLite/21/update_buffer_persistent_channel.sql ./SQL/SQLite/21/update_buffer_set_channel_key.sql ./SQL/SQLite/21/update_identity.sql - ./SQL/SQLite/21/update_network.sql ./SQL/SQLite/21/update_network_connected.sql ./SQL/SQLite/21/update_network_set_awaymsg.sql ./SQL/SQLite/21/update_network_set_usermode.sql - ./SQL/SQLite/21/update_user_setting.sql + ./SQL/SQLite/21/update_network.sql ./SQL/SQLite/21/update_username.sql ./SQL/SQLite/21/update_userpassword.sql + ./SQL/SQLite/21/update_user_setting.sql ./SQL/SQLite/21/upgrade_000_alter_buffer_add_lastmsgid.sql ./SQL/SQLite/21/upgrade_001_update_buffer_set_lastmsgid.sql ./SQL/SQLite/21/upgrade_002_update_buffer_fix_lastseenmsgid_over_lastmsgid.sql ./SQL/SQLite/21/upgrade_003_create_table_buffer_new.sql ./SQL/SQLite/21/upgrade_004_insert_into_buffer_new_from_buffer.sql - ./SQL/SQLite/21/upgrade_006_alter_table_buffer_new_rename_to_buffer.sql - ./SQL/SQLite/21/update_buffer_lastmsgid.sql - ./SQL/SQLite/21/update_buffer_lastseen.sql ./SQL/SQLite/21/upgrade_005_drop_table_buffer.sql + ./SQL/SQLite/21/upgrade_006_alter_table_buffer_new_rename_to_buffer.sql diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp index 022db0e8..99e97b54 100644 --- a/src/core/sqlitestorage.cpp +++ b/src/core/sqlitestorage.cpp @@ -1648,7 +1648,7 @@ QList SqliteStorage::requestMsgs(UserId user, BufferId bufferId, MsgId query.bindValue(":firstmsg", first.toInt()); } else { - query.prepare(queryString("select_messages")); + query.prepare(queryString("select_messagesRange")); query.bindValue(":lastmsg", last.toInt()); query.bindValue(":firstmsg", first.toInt()); } -- 2.20.1