From 173b3f5d9796cea4919b554119e34c18a028694a Mon Sep 17 00:00:00 2001
From: Nguyen Ngo <ngodanguyen@macbook-local>
Date: Wed, 24 Jun 2026 17:56:40 -0400
Subject: [PATCH] Jun 24 - Implement devices tracker - Phase32 migration script
 fix

---
 .../versions/phase32_device_token_columns.py  | 70 +++++++++++++------
 1 file changed, 48 insertions(+), 22 deletions(-)

diff --git a/migrations/versions/phase32_device_token_columns.py b/migrations/versions/phase32_device_token_columns.py
index af542ea..6a4f495 100644
--- a/migrations/versions/phase32_device_token_columns.py
+++ b/migrations/versions/phase32_device_token_columns.py
@@ -1,40 +1,66 @@
 """phase32 — add ios_version and last_seen_at to api_device_tokens
 
-phase31 recorded as applied but the ALTER statements never ran because
-the migration used op.get_bind() pattern that failed silently.
-This migration adds the two columns using raw SQL with IF NOT EXISTS
-(same pattern as all working migrations in this project).
+phase31 recorded as applied but ALTER statements never executed.
+Uses INFORMATION_SCHEMA column-existence checks — safe on MySQL 5.7+.
 Also drops the orphaned device_registrations table from phase30 if present.
 """
 
-from alembic import op
-
 revision      = 'phase32_device_token_columns'
 down_revision = 'phase31_device_registry'
 branch_labels = None
 depends_on    = None
 
+from alembic import op
+import sqlalchemy as sa
+
+
+def _column_exists(conn, table, column):
+    result = conn.execute(sa.text(
+        "SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS "
+        "WHERE TABLE_SCHEMA = DATABASE() "
+        "AND TABLE_NAME = :t AND COLUMN_NAME = :c"
+    ), {"t": table, "c": column})
+    return result.scalar() > 0
+
+
+def _table_exists(conn, table):
+    result = conn.execute(sa.text(
+        "SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES "
+        "WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = :t"
+    ), {"t": table})
+    return result.scalar() > 0
+
 
 def upgrade():
-    op.execute("""
-        ALTER TABLE api_device_tokens
-        ADD COLUMN IF NOT EXISTS ios_version VARCHAR(20) NULL
-    """)
+    bind = op.get_bind()
 
-    op.execute("""
-        ALTER TABLE api_device_tokens
-        ADD COLUMN IF NOT EXISTS last_seen_at DATETIME NULL
-    """)
+    if not _column_exists(bind, 'api_device_tokens', 'ios_version'):
+        op.execute(sa.text(
+            "ALTER TABLE api_device_tokens ADD COLUMN ios_version VARCHAR(20) NULL"
+        ))
 
-    op.execute("""
-        UPDATE api_device_tokens
-        SET last_seen_at = registered_at
-        WHERE last_seen_at IS NULL
-    """)
+    if not _column_exists(bind, 'api_device_tokens', 'last_seen_at'):
+        op.execute(sa.text(
+            "ALTER TABLE api_device_tokens ADD COLUMN last_seen_at DATETIME NULL"
+        ))
 
-    op.execute("DROP TABLE IF EXISTS device_registrations")
+    op.execute(sa.text(
+        "UPDATE api_device_tokens SET last_seen_at = registered_at WHERE last_seen_at IS NULL"
+    ))
+
+    if _table_exists(bind, 'device_registrations'):
+        op.execute(sa.text("DROP TABLE device_registrations"))
 
 
 def downgrade():
-    op.execute("ALTER TABLE api_device_tokens DROP COLUMN IF EXISTS ios_version")
-    op.execute("ALTER TABLE api_device_tokens DROP COLUMN IF EXISTS last_seen_at")
+    bind = op.get_bind()
+
+    if _column_exists(bind, 'api_device_tokens', 'ios_version'):
+        op.execute(sa.text(
+            "ALTER TABLE api_device_tokens DROP COLUMN ios_version"
+        ))
+
+    if _column_exists(bind, 'api_device_tokens', 'last_seen_at'):
+        op.execute(sa.text(
+            "ALTER TABLE api_device_tokens DROP COLUMN last_seen_at"
+        ))
\ No newline at end of file