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.

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 05da7a1..9c340df 100644 (file)
--- a/src/core/postgresqlstorage.cpp
+++ b/src/core/postgresqlstorage.cpp
@@ -1547,7 +1547,7 @@ QList<Message> 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 bbf41ac..0ac40d9 100644 (file)
--- a/src/core/sql.qrc
+++ b/src/core/sql.qrc
@@ -16,8 +16,8 @@
     <file>./SQL/PostgreSQL/20/delete_buffers_for_network.sql</file>
     <file>./SQL/PostgreSQL/20/delete_identity.sql</file>
     <file>./SQL/PostgreSQL/20/delete_ircservers_for_network.sql</file>
-    <file>./SQL/PostgreSQL/20/delete_network.sql</file>
     <file>./SQL/PostgreSQL/20/delete_networks_by_uid.sql</file>
+    <file>./SQL/PostgreSQL/20/delete_network.sql</file>
     <file>./SQL/PostgreSQL/20/delete_nicks.sql</file>
     <file>./SQL/PostgreSQL/20/delete_quasseluser.sql</file>
     <file>./SQL/PostgreSQL/20/insert_buffer.sql</file>
@@ -31,40 +31,40 @@
     <file>./SQL/PostgreSQL/20/insert_user_setting.sql</file>
     <file>./SQL/PostgreSQL/20/migrate_write_backlog.sql</file>
     <file>./SQL/PostgreSQL/20/migrate_write_buffer.sql</file>
-    <file>./SQL/PostgreSQL/20/migrate_write_identity.sql</file>
     <file>./SQL/PostgreSQL/20/migrate_write_identity_nick.sql</file>
+    <file>./SQL/PostgreSQL/20/migrate_write_identity.sql</file>
     <file>./SQL/PostgreSQL/20/migrate_write_ircserver.sql</file>
     <file>./SQL/PostgreSQL/20/migrate_write_network.sql</file>
     <file>./SQL/PostgreSQL/20/migrate_write_quasseluser.sql</file>
     <file>./SQL/PostgreSQL/20/migrate_write_sender.sql</file>
     <file>./SQL/PostgreSQL/20/migrate_write_usersetting.sql</file>
     <file>./SQL/PostgreSQL/20/select_authuser.sql</file>
+    <file>./SQL/PostgreSQL/20/select_buffer_by_id.sql</file>
     <file>./SQL/PostgreSQL/20/select_bufferByName.sql</file>
     <file>./SQL/PostgreSQL/20/select_bufferExists.sql</file>
-    <file>./SQL/PostgreSQL/20/select_buffer_by_id.sql</file>
     <file>./SQL/PostgreSQL/20/select_buffer_lastseen_messages.sql</file>
     <file>./SQL/PostgreSQL/20/select_buffer_markerlinemsgids.sql</file>
-    <file>./SQL/PostgreSQL/20/select_buffers.sql</file>
     <file>./SQL/PostgreSQL/20/select_buffers_for_network.sql</file>
+    <file>./SQL/PostgreSQL/20/select_buffers.sql</file>
     <file>./SQL/PostgreSQL/20/select_checkidentity.sql</file>
     <file>./SQL/PostgreSQL/20/select_connected_networks.sql</file>
     <file>./SQL/PostgreSQL/20/select_identities.sql</file>
     <file>./SQL/PostgreSQL/20/select_internaluser.sql</file>
-    <file>./SQL/PostgreSQL/20/select_messages.sql</file>
-    <file>./SQL/PostgreSQL/20/select_messagesAll.sql</file>
     <file>./SQL/PostgreSQL/20/select_messagesAllNew.sql</file>
+    <file>./SQL/PostgreSQL/20/select_messagesAll.sql</file>
     <file>./SQL/PostgreSQL/20/select_messagesNewerThan.sql</file>
+    <file>./SQL/PostgreSQL/20/select_messagesNewestK.sql</file>
     <file>./SQL/PostgreSQL/20/select_messagesRange.sql</file>
-    <file>./SQL/PostgreSQL/20/select_networkExists.sql</file>
     <file>./SQL/PostgreSQL/20/select_network_awaymsg.sql</file>
-    <file>./SQL/PostgreSQL/20/select_network_usermode.sql</file>
+    <file>./SQL/PostgreSQL/20/select_networkExists.sql</file>
     <file>./SQL/PostgreSQL/20/select_networks_for_user.sql</file>
+    <file>./SQL/PostgreSQL/20/select_network_usermode.sql</file>
     <file>./SQL/PostgreSQL/20/select_nicks.sql</file>
     <file>./SQL/PostgreSQL/20/select_persistent_channels.sql</file>
     <file>./SQL/PostgreSQL/20/select_senderid.sql</file>
     <file>./SQL/PostgreSQL/20/select_servers_for_network.sql</file>
-    <file>./SQL/PostgreSQL/20/select_user_setting.sql</file>
     <file>./SQL/PostgreSQL/20/select_userid.sql</file>
+    <file>./SQL/PostgreSQL/20/select_user_setting.sql</file>
     <file>./SQL/PostgreSQL/20/setup_000_quasseluser.sql</file>
     <file>./SQL/PostgreSQL/20/setup_010_sender.sql</file>
     <file>./SQL/PostgreSQL/20/setup_020_identity.sql</file>
@@ -81,60 +81,29 @@
     <file>./SQL/PostgreSQL/20/setup_130_function_lastmsgid.sql</file>
     <file>./SQL/PostgreSQL/20/update_backlog_bufferid.sql</file>
     <file>./SQL/PostgreSQL/20/update_buffer_lastmsgid.sql</file>
+    <file>./SQL/PostgreSQL/20/update_buffer_lastseen.sql</file>
     <file>./SQL/PostgreSQL/20/update_buffer_markerlinemsgid.sql</file>
     <file>./SQL/PostgreSQL/20/update_buffer_name.sql</file>
     <file>./SQL/PostgreSQL/20/update_buffer_persistent_channel.sql</file>
     <file>./SQL/PostgreSQL/20/update_buffer_set_channel_key.sql</file>
     <file>./SQL/PostgreSQL/20/update_identity.sql</file>
-    <file>./SQL/PostgreSQL/20/update_network.sql</file>
     <file>./SQL/PostgreSQL/20/update_network_connected.sql</file>
     <file>./SQL/PostgreSQL/20/update_network_set_awaymsg.sql</file>
     <file>./SQL/PostgreSQL/20/update_network_set_usermode.sql</file>
-    <file>./SQL/PostgreSQL/20/update_user_setting.sql</file>
+    <file>./SQL/PostgreSQL/20/update_network.sql</file>
     <file>./SQL/PostgreSQL/20/update_username.sql</file>
     <file>./SQL/PostgreSQL/20/update_userpassword.sql</file>
+    <file>./SQL/PostgreSQL/20/update_user_setting.sql</file>
     <file>./SQL/PostgreSQL/20/upgrade_000_alter_buffer_add_lastmsgid.sql</file>
     <file>./SQL/PostgreSQL/20/upgrade_001_add_function_populate_lastmsgid.sql</file>
     <file>./SQL/PostgreSQL/20/upgrade_002_run_function_populate_lastmsgid.sql</file>
     <file>./SQL/PostgreSQL/20/upgrade_003_correct_bad_lastseenmsgid.sql</file>
     <file>./SQL/PostgreSQL/20/upgrade_004_add_lastseenmsgid_constraint.sql</file>
-    <file>./SQL/PostgreSQL/20/update_buffer_lastseen.sql</file>
     <file>./SQL/SQLite/1/upgrade_000_drop_coreinfo.sql</file>
     <file>./SQL/SQLite/1/upgrade_010_create_coreinfo.sql</file>
     <file>./SQL/SQLite/1/upgrade_020_update_schemaversion.sql</file>
-    <file>./SQL/SQLite/10/upgrade_000_switch_to_msgid.sql</file>
-    <file>./SQL/SQLite/10/upgrade_010_rename_buffer_table.sql</file>
-    <file>./SQL/SQLite/10/upgrade_020_create_buffer_table.sql</file>
-    <file>./SQL/SQLite/10/upgrade_030_copy_buffer_table.sql</file>
-    <file>./SQL/SQLite/10/upgrade_040_drop_buffer_old_table.sql</file>
-    <file>./SQL/SQLite/11/upgrade_000_create_user_setting.sql</file>
-    <file>./SQL/SQLite/12/upgrade_000_create_identity.sql</file>
-    <file>./SQL/SQLite/12/upgrade_010_create_identity_nick.sql</file>
-    <file>./SQL/SQLite/12/upgrade_020_rename_servertable.sql</file>
-    <file>./SQL/SQLite/12/upgrade_030_create_ircserver.sql</file>
-    <file>./SQL/SQLite/12/upgrade_040_copy_ircserver.sql</file>
-    <file>./SQL/SQLite/12/upgrade_050_drop_ircserverold.sql</file>
-    <file>./SQL/SQLite/13/upgrade_000_create_buffer_user_idx.sql</file>
-    <file>./SQL/SQLite/13/upgrade_010_create_buffer_cname_idx.sql</file>
-    <file>./SQL/SQLite/13/upgrade_020_create_buffer_cname_idx.sql</file>
-    <file>./SQL/SQLite/14/upgrade_000_rename_networktable.sql</file>
-    <file>./SQL/SQLite/14/upgrade_010_create_networktable.sql</file>
-    <file>./SQL/SQLite/14/upgrade_030_copy_networktable.sql</file>
-    <file>./SQL/SQLite/14/upgrade_040_drop_networkold.sql</file>
-    <file>./SQL/SQLite/15/upgrade_000_fix_ircservers.sql</file>
-    <file>./SQL/SQLite/15/upgrade_000_fix_network.sql</file>
-    <file>./SQL/SQLite/16/upgrade_000_alter_buffer_add_markerlinemsgid.sql</file>
-    <file>./SQL/SQLite/17/upgrade_000_alter_network_add_sasl.sql</file>
-    <file>./SQL/SQLite/17/upgrade_001_alter_network_add_sasl.sql</file>
-    <file>./SQL/SQLite/17/upgrade_002_alter_network_add_sasl.sql</file>
-    <file>./SQL/SQLite/18/upgrade_000_alter_quasseluser_add_passwordversion.sql</file>
-    <file>./SQL/SQLite/19/upgrade_000_alter_ircserver_add_sslverify.sql</file>
     <file>./SQL/SQLite/2/upgrade_000_drop_buffergroup.sql</file>
     <file>./SQL/SQLite/2/upgrade_010_update_schemaversion.sql</file>
-    <file>./SQL/SQLite/20/upgrade_000_alter_network_add_ratelimit_usecustom.sql</file>
-    <file>./SQL/SQLite/20/upgrade_001_alter_network_add_ratelimit_burstsize.sql</file>
-    <file>./SQL/SQLite/20/upgrade_002_alter_network_add_ratelimit_delay.sql</file>
-    <file>./SQL/SQLite/20/upgrade_003_alter_network_add_ratelimit_unlimited.sql</file>
     <file>./SQL/SQLite/3/upgrade_000_update_backlog_flags.sql</file>
     <file>./SQL/SQLite/3/upgrade_010_update_schemaversion.sql</file>
     <file>./SQL/SQLite/4/upgrade_000_rename_buffertable.sql</file>
@@ -177,6 +146,37 @@
     <file>./SQL/SQLite/9/upgrade_000_create_backlog_idx.sql</file>
     <file>./SQL/SQLite/9/upgrade_010_create_backlog_idx2.sql</file>
     <file>./SQL/SQLite/9/upgrade_020_create_buffer_idx.sql</file>
+    <file>./SQL/SQLite/10/upgrade_000_switch_to_msgid.sql</file>
+    <file>./SQL/SQLite/10/upgrade_010_rename_buffer_table.sql</file>
+    <file>./SQL/SQLite/10/upgrade_020_create_buffer_table.sql</file>
+    <file>./SQL/SQLite/10/upgrade_030_copy_buffer_table.sql</file>
+    <file>./SQL/SQLite/10/upgrade_040_drop_buffer_old_table.sql</file>
+    <file>./SQL/SQLite/11/upgrade_000_create_user_setting.sql</file>
+    <file>./SQL/SQLite/12/upgrade_000_create_identity.sql</file>
+    <file>./SQL/SQLite/12/upgrade_010_create_identity_nick.sql</file>
+    <file>./SQL/SQLite/12/upgrade_020_rename_servertable.sql</file>
+    <file>./SQL/SQLite/12/upgrade_030_create_ircserver.sql</file>
+    <file>./SQL/SQLite/12/upgrade_040_copy_ircserver.sql</file>
+    <file>./SQL/SQLite/12/upgrade_050_drop_ircserverold.sql</file>
+    <file>./SQL/SQLite/13/upgrade_000_create_buffer_user_idx.sql</file>
+    <file>./SQL/SQLite/13/upgrade_010_create_buffer_cname_idx.sql</file>
+    <file>./SQL/SQLite/13/upgrade_020_create_buffer_cname_idx.sql</file>
+    <file>./SQL/SQLite/14/upgrade_000_rename_networktable.sql</file>
+    <file>./SQL/SQLite/14/upgrade_010_create_networktable.sql</file>
+    <file>./SQL/SQLite/14/upgrade_030_copy_networktable.sql</file>
+    <file>./SQL/SQLite/14/upgrade_040_drop_networkold.sql</file>
+    <file>./SQL/SQLite/15/upgrade_000_fix_ircservers.sql</file>
+    <file>./SQL/SQLite/15/upgrade_000_fix_network.sql</file>
+    <file>./SQL/SQLite/16/upgrade_000_alter_buffer_add_markerlinemsgid.sql</file>
+    <file>./SQL/SQLite/17/upgrade_000_alter_network_add_sasl.sql</file>
+    <file>./SQL/SQLite/17/upgrade_001_alter_network_add_sasl.sql</file>
+    <file>./SQL/SQLite/17/upgrade_002_alter_network_add_sasl.sql</file>
+    <file>./SQL/SQLite/18/upgrade_000_alter_quasseluser_add_passwordversion.sql</file>
+    <file>./SQL/SQLite/19/upgrade_000_alter_ircserver_add_sslverify.sql</file>
+    <file>./SQL/SQLite/20/upgrade_000_alter_network_add_ratelimit_usecustom.sql</file>
+    <file>./SQL/SQLite/20/upgrade_001_alter_network_add_ratelimit_burstsize.sql</file>
+    <file>./SQL/SQLite/20/upgrade_002_alter_network_add_ratelimit_delay.sql</file>
+    <file>./SQL/SQLite/20/upgrade_003_alter_network_add_ratelimit_unlimited.sql</file>
     <file>./SQL/SQLite/21/delete_backlog_by_uid.sql</file>
     <file>./SQL/SQLite/21/delete_backlog_for_buffer.sql</file>
     <file>./SQL/SQLite/21/delete_backlog_for_network.sql</file>
@@ -185,8 +185,8 @@
     <file>./SQL/SQLite/21/delete_buffers_for_network.sql</file>
     <file>./SQL/SQLite/21/delete_identity.sql</file>
     <file>./SQL/SQLite/21/delete_ircservers_for_network.sql</file>
-    <file>./SQL/SQLite/21/delete_network.sql</file>
     <file>./SQL/SQLite/21/delete_networks_by_uid.sql</file>
+    <file>./SQL/SQLite/21/delete_network.sql</file>
     <file>./SQL/SQLite/21/delete_nicks.sql</file>
     <file>./SQL/SQLite/21/delete_quasseluser.sql</file>
     <file>./SQL/SQLite/21/insert_buffer.sql</file>
@@ -200,40 +200,40 @@
     <file>./SQL/SQLite/21/insert_user_setting.sql</file>
     <file>./SQL/SQLite/21/migrate_read_backlog.sql</file>
     <file>./SQL/SQLite/21/migrate_read_buffer.sql</file>
-    <file>./SQL/SQLite/21/migrate_read_identity.sql</file>
     <file>./SQL/SQLite/21/migrate_read_identity_nick.sql</file>
+    <file>./SQL/SQLite/21/migrate_read_identity.sql</file>
     <file>./SQL/SQLite/21/migrate_read_ircserver.sql</file>
     <file>./SQL/SQLite/21/migrate_read_network.sql</file>
     <file>./SQL/SQLite/21/migrate_read_quasseluser.sql</file>
     <file>./SQL/SQLite/21/migrate_read_sender.sql</file>
     <file>./SQL/SQLite/21/migrate_read_usersetting.sql</file>
     <file>./SQL/SQLite/21/select_authuser.sql</file>
+    <file>./SQL/SQLite/21/select_buffer_by_id.sql</file>
     <file>./SQL/SQLite/21/select_bufferByName.sql</file>
     <file>./SQL/SQLite/21/select_bufferExists.sql</file>
-    <file>./SQL/SQLite/21/select_buffer_by_id.sql</file>
     <file>./SQL/SQLite/21/select_buffer_lastseen_messages.sql</file>
     <file>./SQL/SQLite/21/select_buffer_markerlinemsgids.sql</file>
-    <file>./SQL/SQLite/21/select_buffers.sql</file>
     <file>./SQL/SQLite/21/select_buffers_for_merge.sql</file>
     <file>./SQL/SQLite/21/select_buffers_for_network.sql</file>
+    <file>./SQL/SQLite/21/select_buffers.sql</file>
     <file>./SQL/SQLite/21/select_checkidentity.sql</file>
     <file>./SQL/SQLite/21/select_connected_networks.sql</file>
     <file>./SQL/SQLite/21/select_identities.sql</file>
     <file>./SQL/SQLite/21/select_internaluser.sql</file>
-    <file>./SQL/SQLite/21/select_messages.sql</file>
-    <file>./SQL/SQLite/21/select_messagesAll.sql</file>
     <file>./SQL/SQLite/21/select_messagesAllNew.sql</file>
+    <file>./SQL/SQLite/21/select_messagesAll.sql</file>
     <file>./SQL/SQLite/21/select_messagesNewerThan.sql</file>
     <file>./SQL/SQLite/21/select_messagesNewestK.sql</file>
-    <file>./SQL/SQLite/21/select_networkExists.sql</file>
+    <file>./SQL/SQLite/21/select_messagesRange.sql</file>
     <file>./SQL/SQLite/21/select_network_awaymsg.sql</file>
-    <file>./SQL/SQLite/21/select_network_usermode.sql</file>
+    <file>./SQL/SQLite/21/select_networkExists.sql</file>
     <file>./SQL/SQLite/21/select_networks_for_user.sql</file>
+    <file>./SQL/SQLite/21/select_network_usermode.sql</file>
     <file>./SQL/SQLite/21/select_nicks.sql</file>
     <file>./SQL/SQLite/21/select_persistent_channels.sql</file>
     <file>./SQL/SQLite/21/select_servers_for_network.sql</file>
-    <file>./SQL/SQLite/21/select_user_setting.sql</file>
     <file>./SQL/SQLite/21/select_userid.sql</file>
+    <file>./SQL/SQLite/21/select_user_setting.sql</file>
     <file>./SQL/SQLite/21/setup_000_quasseluser.sql</file>
     <file>./SQL/SQLite/21/setup_010_sender.sql</file>
     <file>./SQL/SQLite/21/setup_020_network.sql</file>
@@ -250,26 +250,26 @@
     <file>./SQL/SQLite/21/setup_130_identity.sql</file>
     <file>./SQL/SQLite/21/setup_140_identity_nick.sql</file>
     <file>./SQL/SQLite/21/update_backlog_bufferid.sql</file>
+    <file>./SQL/SQLite/21/update_buffer_lastmsgid.sql</file>
+    <file>./SQL/SQLite/21/update_buffer_lastseen.sql</file>
     <file>./SQL/SQLite/21/update_buffer_markerlinemsgid.sql</file>
     <file>./SQL/SQLite/21/update_buffer_name.sql</file>
     <file>./SQL/SQLite/21/update_buffer_persistent_channel.sql</file>
     <file>./SQL/SQLite/21/update_buffer_set_channel_key.sql</file>
     <file>./SQL/SQLite/21/update_identity.sql</file>
-    <file>./SQL/SQLite/21/update_network.sql</file>
     <file>./SQL/SQLite/21/update_network_connected.sql</file>
     <file>./SQL/SQLite/21/update_network_set_awaymsg.sql</file>
     <file>./SQL/SQLite/21/update_network_set_usermode.sql</file>
-    <file>./SQL/SQLite/21/update_user_setting.sql</file>
+    <file>./SQL/SQLite/21/update_network.sql</file>
     <file>./SQL/SQLite/21/update_username.sql</file>
     <file>./SQL/SQLite/21/update_userpassword.sql</file>
+    <file>./SQL/SQLite/21/update_user_setting.sql</file>
     <file>./SQL/SQLite/21/upgrade_000_alter_buffer_add_lastmsgid.sql</file>
     <file>./SQL/SQLite/21/upgrade_001_update_buffer_set_lastmsgid.sql</file>
     <file>./SQL/SQLite/21/upgrade_002_update_buffer_fix_lastseenmsgid_over_lastmsgid.sql</file>
     <file>./SQL/SQLite/21/upgrade_003_create_table_buffer_new.sql</file>
     <file>./SQL/SQLite/21/upgrade_004_insert_into_buffer_new_from_buffer.sql</file>
-    <file>./SQL/SQLite/21/upgrade_006_alter_table_buffer_new_rename_to_buffer.sql</file>
-    <file>./SQL/SQLite/21/update_buffer_lastmsgid.sql</file>
-    <file>./SQL/SQLite/21/update_buffer_lastseen.sql</file>
     <file>./SQL/SQLite/21/upgrade_005_drop_table_buffer.sql</file>
+    <file>./SQL/SQLite/21/upgrade_006_alter_table_buffer_new_rename_to_buffer.sql</file>
 </qresource>
 </RCC>

diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp
index 022db0e..99e97b5 100644 (file)
--- a/src/core/sqlitestorage.cpp
+++ b/src/core/sqlitestorage.cpp
@@ -1648,7 +1648,7 @@ QList<Message> 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());
         }