Speakr is a personal, self-hosted web application designed for transcribing audio recordings
Python
Refactor database column handling for PostgreSQL compatibility
Szymon Sakowicz1ebd0e1163d6
diff --git a/src/init_db.py b/src/init_db.pyindex 34293989..3838cd00 100644--- a/src/init_db.py+++ b/src/init_db.py@@ -455,7 +455,10 @@ def initialize_database(app):existing_indexes = [idx['name'] for idx in inspector.get_indexes('user')]if 'ix_user_sso_subject' not in existing_indexes:with engine.connect() as conn:- conn.execute(text('CREATE UNIQUE INDEX IF NOT EXISTS ix_user_sso_subject ON user (sso_subject)'))+ if engine.name == 'mysql':+ conn.execute(text('CREATE UNIQUE INDEX IF NOT EXISTS ix_user_sso_subject ON `user` (sso_subject)'))+ else:+ conn.execute(text('CREATE UNIQUE INDEX IF NOT EXISTS ix_user_sso_subject ON "user" (sso_subject)'))conn.commit()app.logger.info("Created unique index ix_user_sso_subject on user.sso_subject")except Exception as e:diff --git a/src/utils/database.py b/src/utils/database.pyindex 7bb824b5..7c88c00b 100644--- a/src/utils/database.py+++ b/src/utils/database.py@@ -23,11 +23,19 @@ def add_column_if_not_exists(engine, table_name, column_name, column_type):if column_name not in columns:with engine.connect() as conn:+ # Quote identifiers to handle reserved keywords (e.g., "user" in PostgreSQL)+ # MySQL uses backticks, PostgreSQL/SQLite use double quotes# Handle special case where column_type includes the column nameif column_name in column_type:- conn.execute(text(f'ALTER TABLE {table_name} ADD COLUMN {column_type}'))+ if engine.name == 'mysql':+ conn.execute(text(f'ALTER TABLE `{table_name}` ADD COLUMN {column_type}'))+ else:+ conn.execute(text(f'ALTER TABLE "{table_name}" ADD COLUMN {column_type}'))else:- conn.execute(text(f'ALTER TABLE {table_name} ADD COLUMN {column_name} {column_type}'))+ if engine.name == 'mysql':+ conn.execute(text(f'ALTER TABLE `{table_name}` ADD COLUMN `{column_name}` {column_type}'))+ else:+ conn.execute(text(f'ALTER TABLE "{table_name}" ADD COLUMN "{column_name}" {column_type}'))conn.commit()return Truereturn False@@ -72,7 +80,7 @@ def migrate_column_type(engine, table_name, column_name, new_type, transform_sqlif temp_col in columns:try:# Try to drop it and start over- conn.execute(text(f'ALTER TABLE {table_name} DROP COLUMN {temp_col}'))+ conn.execute(text(f'ALTER TABLE "{table_name}" DROP COLUMN "{temp_col}"'))conn.commit()except Exception:# If we can't drop it, the migration may have partially completed@@ -80,7 +88,7 @@ def migrate_column_type(engine, table_name, column_name, new_type, transform_sqlif column_name not in columns:# Old column is gone, temp exists - just rename temp to complete migrationtry:- conn.execute(text(f'ALTER TABLE {table_name} RENAME COLUMN {temp_col} TO {column_name}'))+ conn.execute(text(f'ALTER TABLE "{table_name}" RENAME COLUMN "{temp_col}" TO "{column_name}"'))conn.commit()return Trueexcept Exception as e:@@ -90,25 +98,25 @@ def migrate_column_type(engine, table_name, column_name, new_type, transform_sqlreturn False# Add temporary column with new type- conn.execute(text(f'ALTER TABLE {table_name} ADD COLUMN {temp_col} {new_type}'))+ conn.execute(text(f'ALTER TABLE "{table_name}" ADD COLUMN "{temp_col}" {new_type}'))# Copy data with optional transformationif transform_sql:- conn.execute(text(f'UPDATE {table_name} SET {temp_col} = {transform_sql} WHERE {column_name} IS NOT NULL'))+ conn.execute(text(f'UPDATE "{table_name}" SET "{temp_col}" = {transform_sql} WHERE "{column_name}" IS NOT NULL'))else:- conn.execute(text(f'UPDATE {table_name} SET {temp_col} = {column_name}'))+ conn.execute(text(f'UPDATE "{table_name}" SET "{temp_col}" = "{column_name}"'))# Drop old column (SQLite 3.35.0+ only)try:- conn.execute(text(f'ALTER TABLE {table_name} DROP COLUMN {column_name}'))+ conn.execute(text(f'ALTER TABLE "{table_name}" DROP COLUMN "{column_name}"'))# Drop succeeded, now rename temp to original name- conn.execute(text(f'ALTER TABLE {table_name} RENAME COLUMN {temp_col} TO {column_name}'))+ conn.execute(text(f'ALTER TABLE "{table_name}" RENAME COLUMN "{temp_col}" TO "{column_name}"'))conn.commit()except Exception:# Older SQLite - can't drop columns# Rename temp column to original name (this will fail if original still exists)try:- conn.execute(text(f'ALTER TABLE {table_name} RENAME COLUMN {temp_col} TO {column_name}'))+ conn.execute(text(f'ALTER TABLE "{table_name}" RENAME COLUMN "{temp_col}" TO "{column_name}"'))conn.commit()except Exception:# Can't rename because old column exists - this is OK for SQLite@@ -123,18 +131,18 @@ def migrate_column_type(engine, table_name, column_name, new_type, transform_sqlelif engine_name == 'postgresql':# PostgreSQL can alter column type directlyif transform_sql:- conn.execute(text(f'ALTER TABLE {table_name} ALTER COLUMN {column_name} TYPE {new_type} USING {transform_sql}'))+ conn.execute(text(f'ALTER TABLE "{table_name}" ALTER COLUMN "{column_name}" TYPE {new_type} USING {transform_sql}'))else:- conn.execute(text(f'ALTER TABLE {table_name} ALTER COLUMN {column_name} TYPE {new_type}'))+ conn.execute(text(f'ALTER TABLE "{table_name}" ALTER COLUMN "{column_name}" TYPE {new_type}'))conn.commit()elif engine_name == 'mysql':# MySQL can modify column type- conn.execute(text(f'ALTER TABLE {table_name} MODIFY COLUMN {column_name} {new_type}'))+ conn.execute(text(f'ALTER TABLE `{table_name}` MODIFY COLUMN `{column_name}` {new_type}'))# Apply transformation if providedif transform_sql:- conn.execute(text(f'UPDATE {table_name} SET {column_name} = {transform_sql} WHERE {column_name} IS NOT NULL'))+ conn.execute(text(f'UPDATE `{table_name}` SET `{column_name}` = {transform_sql} WHERE `{column_name}` IS NOT NULL'))conn.commit()return True