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

28
backend/migrations/add_resos_integration.py
View file

@ -23,16 +23,16 @@ async def run_migration():
# Add Resos columns to kitchen_settings table
settings_columns = [
"ALTER TABLE kitchen_settings ADD COLUMN resos_api_key VARCHAR(500)",
"ALTER TABLE kitchen_settings ADD COLUMN resos_last_sync TIMESTAMP",
"ALTER TABLE kitchen_settings ADD COLUMN resos_auto_sync_enabled BOOLEAN DEFAULT FALSE",
"ALTER TABLE kitchen_settings ADD COLUMN resos_large_group_threshold INTEGER DEFAULT 8",
"ALTER TABLE kitchen_settings ADD COLUMN resos_note_keywords TEXT",
"ALTER TABLE kitchen_settings ADD COLUMN resos_allergy_keywords TEXT",
"ALTER TABLE kitchen_settings ADD COLUMN resos_custom_field_mapping JSONB",
"ALTER TABLE kitchen_settings ADD COLUMN resos_opening_hours_mapping JSONB",
"ALTER TABLE kitchen_settings ADD COLUMN resos_restaurant_table_entities TEXT",
"ALTER TABLE kitchen_settings ADD COLUMN resos_flag_icon_mapping JSONB",
"ALTER TABLE kitchen_settings ADD COLUMN IF NOT EXISTS resos_api_key VARCHAR(500)",
"ALTER TABLE kitchen_settings ADD COLUMN IF NOT EXISTS resos_last_sync TIMESTAMP",
"ALTER TABLE kitchen_settings ADD COLUMN IF NOT EXISTS resos_auto_sync_enabled BOOLEAN DEFAULT FALSE",
"ALTER TABLE kitchen_settings ADD COLUMN IF NOT EXISTS resos_large_group_threshold INTEGER DEFAULT 8",
"ALTER TABLE kitchen_settings ADD COLUMN IF NOT EXISTS resos_note_keywords TEXT",
"ALTER TABLE kitchen_settings ADD COLUMN IF NOT EXISTS resos_allergy_keywords TEXT",
"ALTER TABLE kitchen_settings ADD COLUMN IF NOT EXISTS resos_custom_field_mapping JSONB",
"ALTER TABLE kitchen_settings ADD COLUMN IF NOT EXISTS resos_opening_hours_mapping JSONB",
"ALTER TABLE kitchen_settings ADD COLUMN IF NOT EXISTS resos_restaurant_table_entities TEXT",
"ALTER TABLE kitchen_settings ADD COLUMN IF NOT EXISTS resos_flag_icon_mapping JSONB",
]
for sql in settings_columns:
@ -154,7 +154,7 @@ async def run_migration():
# Add unique_flag_types column to resos_daily_stats if it doesn't exist
try:
async with engine.begin() as conn:
await conn.execute(text("ALTER TABLE resos_daily_stats ADD COLUMN unique_flag_types JSONB"))
await conn.execute(text("ALTER TABLE resos_daily_stats ADD COLUMN IF NOT EXISTS unique_flag_types JSONB"))
logger.info("Added unique_flag_types column to resos_daily_stats")
except Exception as e:
if "already exists" in str(e).lower() or "duplicate column" in str(e).lower():
@ -165,7 +165,7 @@ async def run_migration():
# Add table_name column to resos_bookings (Phase 8.1)
try:
async with engine.begin() as conn:
await conn.execute(text("ALTER TABLE resos_bookings ADD COLUMN table_name VARCHAR(100)"))
await conn.execute(text("ALTER TABLE resos_bookings ADD COLUMN IF NOT EXISTS table_name VARCHAR(100)"))
logger.info("Added table_name column to resos_bookings")
except Exception as e:
if "already exists" in str(e).lower() or "duplicate column" in str(e).lower():
@ -176,7 +176,7 @@ async def run_migration():
# Add GL code columns for food/beverage split (Phase 8.1)
try:
async with engine.begin() as conn:
await conn.execute(text("ALTER TABLE kitchen_settings ADD COLUMN sambapos_food_gl_codes TEXT"))
await conn.execute(text("ALTER TABLE kitchen_settings ADD COLUMN IF NOT EXISTS sambapos_food_gl_codes TEXT"))
logger.info("Added sambapos_food_gl_codes column to kitchen_settings")
except Exception as e:
if "already exists" in str(e).lower() or "duplicate column" in str(e).lower():
@ -186,7 +186,7 @@ async def run_migration():
try:
async with engine.begin() as conn:
await conn.execute(text("ALTER TABLE kitchen_settings ADD COLUMN sambapos_beverage_gl_codes TEXT"))
await conn.execute(text("ALTER TABLE kitchen_settings ADD COLUMN IF NOT EXISTS sambapos_beverage_gl_codes TEXT"))
logger.info("Added sambapos_beverage_gl_codes column to kitchen_settings")
except Exception as e:
if "already exists" in str(e).lower() or "duplicate column" in str(e).lower():