From 3bb6fa1e59a189bb79ad176596a77692107c4431091500abfc8f42e0ddf469ab Mon Sep 17 00:00:00 2001
From: AidarKC <i@aidarkc.ru>
Date: Sat, 25 Jul 2026 03:29:58 +0400
Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B2=D0=B5=D1=80:=20=D0=BE?=
 =?UTF-8?q?=D1=82=D0=B2=D1=8F=D0=B7=D0=B0=D1=82=D1=8C=20PostgreSQL=20DM=20?=
 =?UTF-8?q?runtime=20=D0=BE=D1=82=20signed=5Fmessages=5Fv2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shine/db/dao/SignedMessagesV2DAO.java     |  6 +++---
 .../src/main/resources/postgres/schema_v1.sql | 21 -------------------
 VERSION.properties                            |  2 +-
 3 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/SHiNE-server/shine-server-db/src/main/java/shine/db/dao/SignedMessagesV2DAO.java b/SHiNE-server/shine-server-db/src/main/java/shine/db/dao/SignedMessagesV2DAO.java
index 6d8fc683..12339b63 100644
--- a/SHiNE-server/shine-server-db/src/main/java/shine/db/dao/SignedMessagesV2DAO.java
+++ b/SHiNE-server/shine-server-db/src/main/java/shine/db/dao/SignedMessagesV2DAO.java
@@ -248,9 +248,9 @@ public final class SignedMessagesV2DAO {
                     time_ms, nonce, message_type, revision_time_ms, reencrypted_at_ms,
                     raw_block, created_at_ms, source_api, origin_session_id,
                     receipt_ref_base_key, receipt_ref_type, read_at_ms
-                FROM signed_messages_v2
+                FROM %s
                 WHERE message_key = ?
-                """;
+                """.formatted(messagesTable());
             try (PreparedStatement ps = c.prepareStatement(sql)) {
                 ps.setString(1, messageKey);
                 try (ResultSet rs = ps.executeQuery()) {
@@ -571,7 +571,7 @@ public final class SignedMessagesV2DAO {
                 message_key, base_key, target_login, from_login, to_login,
                 time_ms, nonce, message_type, revision_time_ms, reencrypted_at_ms,
                 raw_block, created_at_ms, source_api, origin_session_id,
-                receipt_ref_base_key, receipt_ref_type
+                receipt_ref_base_key, receipt_ref_type, read_at_ms
             FROM %s
             WHERE message_type IN (7, 8)
               AND (
diff --git a/SHiNE-server/shine-server-db/src/main/resources/postgres/schema_v1.sql b/SHiNE-server/shine-server-db/src/main/resources/postgres/schema_v1.sql
index 7dceb287..1da3fe34 100644
--- a/SHiNE-server/shine-server-db/src/main/resources/postgres/schema_v1.sql
+++ b/SHiNE-server/shine-server-db/src/main/resources/postgres/schema_v1.sql
@@ -541,27 +541,6 @@ CREATE TABLE IF NOT EXISTS signed_message_session_delivery (
 CREATE INDEX IF NOT EXISTS idx_signed_message_delivery_session
     ON signed_message_session_delivery(session_id, delivered);
 
-CREATE OR REPLACE VIEW signed_messages_v2 AS
-SELECT
-    message_key,
-    base_key,
-    target_login,
-    from_login,
-    to_login,
-    time_ms,
-    nonce,
-    message_type,
-    revision_time_ms,
-    reencrypted_at_ms,
-    raw_block,
-    created_at_ms,
-    source_api,
-    origin_session_id,
-    receipt_ref_base_key,
-    receipt_ref_type,
-    read_at_ms
-FROM signed_messages;
-
 CREATE TABLE IF NOT EXISTS message_views_state (
     viewer_login       TEXT NOT NULL,
     to_bch_name        TEXT NOT NULL,
diff --git a/VERSION.properties b/VERSION.properties
index c6df679d..872e98e4 100644
--- a/VERSION.properties
+++ b/VERSION.properties
@@ -1,2 +1,2 @@
 client.version=1.2.354
-server.version=1.2.325
+server.version=1.2.326