hotel-manage-stack/kitchen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix migration transaction poisoning: ADD COLUMN IF NOT EXISTS

Browse source 
Migrations used try/except around ADD COLUMN inside a single engine.begin()
block. When a 'column already exists' error was caught, asyncpg left the
transaction in aborted state, causing all subsequent DDL in the block to fail
with InFailedSQLTransactionError. Replace with IF NOT EXISTS to prevent the
error entirely.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
jtricerolph 2026-07-12 19:53:26 +00:00
parent e7e1fda9f6
commit bc874ac9ff
25 changed files with 302 additions and 302 deletions
Download patch file Download diff file Expand all files Collapse all files

20
backend/migrations/add_newbook_tables.py
View file

@ -23,15 +23,15 @@ async def run_migration():
# Add Newbook columns to kitchen_settings table
settings_columns = [
"ALTER TABLE kitchen_settings ADD COLUMN newbook_api_username VARCHAR(255)",
"ALTER TABLE kitchen_settings ADD COLUMN newbook_api_password VARCHAR(500)",
"ALTER TABLE kitchen_settings ADD COLUMN newbook_api_key VARCHAR(500)",
"ALTER TABLE kitchen_settings ADD COLUMN newbook_api_region VARCHAR(10)",
"ALTER TABLE kitchen_settings ADD COLUMN newbook_instance_id VARCHAR(100)",
"ALTER TABLE kitchen_settings ADD COLUMN newbook_last_sync TIMESTAMP",
"ALTER TABLE kitchen_settings ADD COLUMN newbook_auto_sync_enabled BOOLEAN DEFAULT FALSE",
"ALTER TABLE kitchen_settings ADD COLUMN newbook_breakfast_gl_codes VARCHAR(500)",
"ALTER TABLE kitchen_settings ADD COLUMN newbook_dinner_gl_codes VARCHAR(500)",
"ALTER TABLE kitchen_settings ADD COLUMN IF NOT EXISTS newbook_api_username VARCHAR(255)",
"ALTER TABLE kitchen_settings ADD COLUMN IF NOT EXISTS newbook_api_password VARCHAR(500)",
"ALTER TABLE kitchen_settings ADD COLUMN IF NOT EXISTS newbook_api_key VARCHAR(500)",
"ALTER TABLE kitchen_settings ADD COLUMN IF NOT EXISTS newbook_api_region VARCHAR(10)",
"ALTER TABLE kitchen_settings ADD COLUMN IF NOT EXISTS newbook_instance_id VARCHAR(100)",
"ALTER TABLE kitchen_settings ADD COLUMN IF NOT EXISTS newbook_last_sync TIMESTAMP",
"ALTER TABLE kitchen_settings ADD COLUMN IF NOT EXISTS newbook_auto_sync_enabled BOOLEAN DEFAULT FALSE",
"ALTER TABLE kitchen_settings ADD COLUMN IF NOT EXISTS newbook_breakfast_gl_codes VARCHAR(500)",
"ALTER TABLE kitchen_settings ADD COLUMN IF NOT EXISTS newbook_dinner_gl_codes VARCHAR(500)",
]
for sql in settings_columns:
@ -163,7 +163,7 @@ async def run_migration():
# Add room_count column if it doesn't exist
try:
async with engine.begin() as conn:
await conn.execute(text("ALTER TABLE newbook_room_categories ADD COLUMN room_count INTEGER DEFAULT 0"))
await conn.execute(text("ALTER TABLE newbook_room_categories ADD COLUMN IF NOT EXISTS room_count INTEGER DEFAULT 0"))
logger.info("Added room_count column to newbook_room_categories")
except Exception as e:
if "already exists" in str(e).lower() or "duplicate column" in str(e).lower():