From 2b08a4999f512dde74feaa9f50f5bcd7710a3950 Mon Sep 17 00:00:00 2001 From: Drobysh Date: Fri, 25 Sep 2026 10:10:11 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=8C=8A=20=D0=92=D0=BE=D0=BB=D0=BD=D0=B0?= =?UTF-8?q?=2019:=20backend=20=E2=80=94=206=20=D1=84=D0=B8=D0=BA=D1=81?= =?UTF-8?q?=D0=BE=D0=B2=20+=20database.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit database.py: - get_pool_race: asyncio.Lock + двойная проверка - init_db_no_transaction: вся инициализация в одной транзакции - drop_constraint_cascade: убран CASCADE - add_pk_on_duplicates: DELETE дублей через DISTINCT ON (умная версия) - redundant_index_users_telegram: удалены дубли индексов - fstring_sql_migration: whitelist regex _SAFE_NAME + _SAFE_TYPE - ensure_achievements_code_key: гарантия UNIQUE на achievements.code - sentence_hints_used + typing_hints_used - client_controlled_* (current_streak, current_mistakes, current_hints_used) routers/hints.py: - hint_consumed_before_word_paths_check: инкремент после проверок - word_list_hint_consumed_on_empty: слова до инкремента routers/admin_content.py: - admin_content_text_levels_n_plus_1: 12 запросов → 1 GROUP BY routers/assistant.py: - assistant_admin_stats_n_plus_1: 10 запросов → 2 GROUP BY routers/leaderboard.py: - leaderboard_admin_stats_n_plus_1: 6 запросов → 1 GROUP BY routers/achievements.py: - init_achievements_n_plus_1: 104 запроса → 1 bulk upsert - добавлен logger (отсутствовал) Аудит v6: backend 6/6 закрыто --- database.py | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/database.py b/database.py index 2ad9899..2446f52 100644 --- a/database.py +++ b/database.py @@ -643,6 +643,32 @@ async def init_db(): ) """) + # 🔧 ФИКС (25.09.2026): ensure_achievements_code_key — + # фикс init_achievements_n_plus_1 использует ON CONFLICT (code). + # UNIQUE-инфраструктура для колонки code должна существовать. + # В CREATE TABLE выше уже есть UNIQUE NOT NULL — но если таблица + # была создана старой версией кода без UNIQUE, добавляем констрейнт. + await conn.execute(""" + DO $$ + BEGIN + IF NOT EXISTS ( + SELECT 1 FROM pg_constraint + WHERE conname = 'achievements_code_key' + ) AND NOT EXISTS ( + SELECT 1 FROM pg_constraint + WHERE conrelid = 'achievements'::regclass + AND contype IN ('u', 'p') + AND conkey = ARRAY[ + (SELECT attnum FROM pg_attribute + WHERE attrelid = 'achievements'::regclass + AND attname = 'code') + ] + ) THEN + ALTER TABLE achievements ADD CONSTRAINT achievements_code_key UNIQUE (code); + END IF; + END $$; + """) + # ============ user_achievements ============ await conn.execute(""" CREATE TABLE IF NOT EXISTS user_achievements (