Merge pull request #64 from gamesgamesgamesgamesgames/feat/prefix-db-tables

chore: prefix db tables

Author: trezy

migrations/postgres/20260626000000_prefix_table_names.sql

@@ -0,0 +1,47 @@
+ALTER TABLE IF EXISTS account_delegates RENAME TO happyview_account_delegates;
+ALTER TABLE IF EXISTS admin_api_keys RENAME TO happyview_admin_api_keys;
+ALTER TABLE IF EXISTS admins RENAME TO happyview_admins;
+ALTER TABLE IF EXISTS api_keys RENAME TO happyview_api_keys;
+ALTER TABLE IF EXISTS users RENAME TO happyview_users;
+ALTER TABLE IF EXISTS api_clients RENAME TO happyview_api_clients;
+ALTER TABLE IF EXISTS auth_login_redirects RENAME TO happyview_auth_login_redirects;
+ALTER TABLE IF EXISTS backfill_jobs RENAME TO happyview_backfill_jobs;
+ALTER TABLE IF EXISTS backfill_repos RENAME TO happyview_backfill_repos;
+ALTER TABLE IF EXISTS dead_letter_hooks RENAME TO happyview_dead_letter_hooks;
+ALTER TABLE IF EXISTS dead_letter_scripts RENAME TO happyview_dead_letter_scripts;
+ALTER TABLE IF EXISTS delegated_accounts RENAME TO happyview_delegated_accounts;
+ALTER TABLE IF EXISTS domains RENAME TO happyview_domains;
+ALTER TABLE IF EXISTS dpop_keys RENAME TO happyview_dpop_keys;
+ALTER TABLE IF EXISTS dpop_sessions RENAME TO happyview_dpop_sessions;
+ALTER TABLE IF EXISTS event_logs RENAME TO happyview_event_logs;
+ALTER TABLE IF EXISTS external_account_tokens RENAME TO happyview_external_account_tokens;
+ALTER TABLE IF EXISTS external_auth_state RENAME TO happyview_external_auth_state;
+ALTER TABLE IF EXISTS instance_settings RENAME TO happyview_instance_settings;
+ALTER TABLE IF EXISTS labeler_subscriptions RENAME TO happyview_labeler_subscriptions;
+ALTER TABLE IF EXISTS labels RENAME TO happyview_labels;
+ALTER TABLE IF EXISTS lexicons RENAME TO happyview_lexicons;
+ALTER TABLE IF EXISTS network_lexicons RENAME TO happyview_network_lexicons;
+ALTER TABLE IF EXISTS oauth_sessions RENAME TO happyview_oauth_sessions;
+ALTER TABLE IF EXISTS oauth_state RENAME TO happyview_oauth_state;
+ALTER TABLE IF EXISTS plugin_configs RENAME TO happyview_plugin_configs;
+ALTER TABLE IF EXISTS plugin_dedup_keys RENAME TO happyview_plugin_dedup_keys;
+ALTER TABLE IF EXISTS plugin_kv RENAME TO happyview_plugin_kv;
+ALTER TABLE IF EXISTS plugins RENAME TO happyview_plugins;
+ALTER TABLE IF EXISTS rate_limit_allowlist RENAME TO happyview_rate_limit_allowlist;
+ALTER TABLE IF EXISTS rate_limit_settings RENAME TO happyview_rate_limit_settings;
+ALTER TABLE IF EXISTS rate_limits RENAME TO happyview_rate_limits;
+ALTER TABLE IF EXISTS record_refs RENAME TO happyview_record_refs;
+ALTER TABLE IF EXISTS records RENAME TO happyview_records;
+ALTER TABLE IF EXISTS script_variables RENAME TO happyview_script_variables;
+ALTER TABLE IF EXISTS scripts RENAME TO happyview_scripts;
+ALTER TABLE IF EXISTS service_entries RENAME TO happyview_service_entries;
+ALTER TABLE IF EXISTS service_entry_xrpcs RENAME TO happyview_service_entry_xrpcs;
+ALTER TABLE IF EXISTS service_identity RENAME TO happyview_service_identity;
+ALTER TABLE IF EXISTS space_credentials RENAME TO happyview_space_credentials;
+ALTER TABLE IF EXISTS space_dids RENAME TO happyview_space_dids;
+ALTER TABLE IF EXISTS space_invites RENAME TO happyview_space_invites;
+ALTER TABLE IF EXISTS space_members RENAME TO happyview_space_members;
+ALTER TABLE IF EXISTS space_records RENAME TO happyview_space_records;
+ALTER TABLE IF EXISTS space_sync_state RENAME TO happyview_space_sync_state;
+ALTER TABLE IF EXISTS spaces RENAME TO happyview_spaces;
+ALTER TABLE IF EXISTS user_permissions RENAME TO happyview_user_permissions;

migrations/sqlite/20260626000000_prefix_table_names.sql

@@ -0,0 +1,47 @@
+ALTER TABLE account_delegates RENAME TO happyview_account_delegates;
+ALTER TABLE admin_api_keys RENAME TO happyview_admin_api_keys;
+ALTER TABLE admins RENAME TO happyview_admins;
+ALTER TABLE api_keys RENAME TO happyview_api_keys;
+ALTER TABLE users RENAME TO happyview_users;
+ALTER TABLE api_clients RENAME TO happyview_api_clients;
+ALTER TABLE auth_login_redirects RENAME TO happyview_auth_login_redirects;
+ALTER TABLE backfill_jobs RENAME TO happyview_backfill_jobs;
+ALTER TABLE backfill_repos RENAME TO happyview_backfill_repos;
+ALTER TABLE dead_letter_hooks RENAME TO happyview_dead_letter_hooks;
+ALTER TABLE dead_letter_scripts RENAME TO happyview_dead_letter_scripts;
+ALTER TABLE delegated_accounts RENAME TO happyview_delegated_accounts;
+ALTER TABLE domains RENAME TO happyview_domains;
+ALTER TABLE dpop_keys RENAME TO happyview_dpop_keys;
+ALTER TABLE dpop_sessions RENAME TO happyview_dpop_sessions;
+ALTER TABLE event_logs RENAME TO happyview_event_logs;
+ALTER TABLE external_account_tokens RENAME TO happyview_external_account_tokens;
+ALTER TABLE external_auth_state RENAME TO happyview_external_auth_state;
+ALTER TABLE instance_settings RENAME TO happyview_instance_settings;
+ALTER TABLE labeler_subscriptions RENAME TO happyview_labeler_subscriptions;
+ALTER TABLE labels RENAME TO happyview_labels;
+ALTER TABLE lexicons RENAME TO happyview_lexicons;
+ALTER TABLE network_lexicons RENAME TO happyview_network_lexicons;
+ALTER TABLE oauth_sessions RENAME TO happyview_oauth_sessions;
+ALTER TABLE oauth_state RENAME TO happyview_oauth_state;
+ALTER TABLE plugin_configs RENAME TO happyview_plugin_configs;
+ALTER TABLE plugin_dedup_keys RENAME TO happyview_plugin_dedup_keys;
+ALTER TABLE plugin_kv RENAME TO happyview_plugin_kv;
+ALTER TABLE plugins RENAME TO happyview_plugins;
+ALTER TABLE rate_limit_allowlist RENAME TO happyview_rate_limit_allowlist;
+ALTER TABLE rate_limit_settings RENAME TO happyview_rate_limit_settings;
+ALTER TABLE rate_limits RENAME TO happyview_rate_limits;
+ALTER TABLE record_refs RENAME TO happyview_record_refs;
+ALTER TABLE records RENAME TO happyview_records;
+ALTER TABLE script_variables RENAME TO happyview_script_variables;
+ALTER TABLE scripts RENAME TO happyview_scripts;
+ALTER TABLE service_entries RENAME TO happyview_service_entries;
+ALTER TABLE service_entry_xrpcs RENAME TO happyview_service_entry_xrpcs;
+ALTER TABLE service_identity RENAME TO happyview_service_identity;
+ALTER TABLE space_credentials RENAME TO happyview_space_credentials;
+ALTER TABLE space_dids RENAME TO happyview_space_dids;
+ALTER TABLE space_invites RENAME TO happyview_space_invites;
+ALTER TABLE space_members RENAME TO happyview_space_members;
+ALTER TABLE space_records RENAME TO happyview_space_records;
+ALTER TABLE space_sync_state RENAME TO happyview_space_sync_state;
+ALTER TABLE spaces RENAME TO happyview_spaces;
+ALTER TABLE user_permissions RENAME TO happyview_user_permissions;

src/admin/api_clients.rs

@@ -66,7 +66,7 @@ pub(super) async fn create_api_client(
         .map(|origins| serde_json::to_string(origins).unwrap_or_else(|_| "[]".to_string()));
 
     let insert_sql = adapt_sql(
-        "INSERT INTO api_clients (id, client_key, client_secret_hash, name, client_id_url, client_uri, redirect_uris, scopes, rate_limit_capacity, rate_limit_refill_rate, client_type, allowed_origins, is_active, created_by, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1, ?, ?, ?)",
+        "INSERT INTO happyview_api_clients (id, client_key, client_secret_hash, name, client_id_url, client_uri, redirect_uris, scopes, rate_limit_capacity, rate_limit_refill_rate, client_type, allowed_origins, is_active, created_by, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1, ?, ?, ?)",
         state.db_backend,
     );
 
@@ -173,15 +173,15 @@ pub(super) async fn list_api_clients(
     let (select_sql, parent_filter) = if let Some(ref parent_id) = query.parent_id {
         (
             adapt_sql(
-                "SELECT id, client_key, name, client_id_url, client_uri, redirect_uris, scopes, client_type, allowed_origins, rate_limit_capacity, rate_limit_refill_rate, is_active, created_by, created_at, updated_at, parent_client_id, owner_did FROM api_clients WHERE parent_client_id = ? ORDER BY created_at DESC",
+                "SELECT id, client_key, name, client_id_url, client_uri, redirect_uris, scopes, client_type, allowed_origins, rate_limit_capacity, rate_limit_refill_rate, is_active, created_by, created_at, updated_at, parent_client_id, owner_did FROM happyview_api_clients WHERE parent_client_id = ? ORDER BY created_at DESC",
                 state.db_backend,
             ),
             Some(parent_id.clone()),
         )
     } else {
         (
             adapt_sql(
-                "SELECT id, client_key, name, client_id_url, client_uri, redirect_uris, scopes, client_type, allowed_origins, rate_limit_capacity, rate_limit_refill_rate, is_active, created_by, created_at, updated_at, parent_client_id, owner_did FROM api_clients ORDER BY created_at DESC",
+                "SELECT id, client_key, name, client_id_url, client_uri, redirect_uris, scopes, client_type, allowed_origins, rate_limit_capacity, rate_limit_refill_rate, is_active, created_by, created_at, updated_at, parent_client_id, owner_did FROM happyview_api_clients ORDER BY created_at DESC",
                 state.db_backend,
             ),
             None,
@@ -245,7 +245,7 @@ pub(super) async fn get_api_client(
     auth.require(Permission::ApiClientsView).await?;
 
     let select_sql = adapt_sql(
-        "SELECT id, client_key, name, client_id_url, client_uri, redirect_uris, scopes, client_type, allowed_origins, rate_limit_capacity, rate_limit_refill_rate, is_active, created_by, created_at, updated_at, parent_client_id, owner_did FROM api_clients WHERE id = ?",
+        "SELECT id, client_key, name, client_id_url, client_uri, redirect_uris, scopes, client_type, allowed_origins, rate_limit_capacity, rate_limit_refill_rate, is_active, created_by, created_at, updated_at, parent_client_id, owner_did FROM happyview_api_clients WHERE id = ?",
         state.db_backend,
     );
 
@@ -299,7 +299,7 @@ pub(super) async fn update_api_client(
 
     // Read current values
     let select_sql = adapt_sql(
-        "SELECT client_key, client_secret_hash, name, client_id_url, client_uri, redirect_uris, scopes, allowed_origins, rate_limit_capacity, rate_limit_refill_rate, is_active FROM api_clients WHERE id = ?",
+        "SELECT client_key, client_secret_hash, name, client_id_url, client_uri, redirect_uris, scopes, allowed_origins, rate_limit_capacity, rate_limit_refill_rate, is_active FROM happyview_api_clients WHERE id = ?",
         state.db_backend,
     );
 
@@ -362,7 +362,7 @@ pub(super) async fn update_api_client(
     let now = now_rfc3339();
 
     let update_sql = adapt_sql(
-        "UPDATE api_clients SET name = ?, client_uri = ?, redirect_uris = ?, scopes = ?, allowed_origins = ?, rate_limit_capacity = ?, rate_limit_refill_rate = ?, is_active = ?, updated_at = ? WHERE id = ?",
+        "UPDATE happyview_api_clients SET name = ?, client_uri = ?, redirect_uris = ?, scopes = ?, allowed_origins = ?, rate_limit_capacity = ?, rate_limit_refill_rate = ?, is_active = ?, updated_at = ? WHERE id = ?",
         state.db_backend,
     );
 
@@ -435,7 +435,7 @@ pub(super) async fn update_api_client(
 
         // Cascade deactivation to child clients.
         let deactivate_children_sql = adapt_sql(
-            "UPDATE api_clients SET is_active = 0, updated_at = ? WHERE parent_client_id = ? AND is_active = 1",
+            "UPDATE happyview_api_clients SET is_active = 0, updated_at = ? WHERE parent_client_id = ? AND is_active = 1",
             state.db_backend,
         );
         let _ = sqlx::query(&deactivate_children_sql)
@@ -445,7 +445,7 @@ pub(super) async fn update_api_client(
             .await;
 
         let children_sql = adapt_sql(
-            "SELECT client_id_url, client_key FROM api_clients WHERE parent_client_id = ?",
+            "SELECT client_id_url, client_key FROM happyview_api_clients WHERE parent_client_id = ?",
             state.db_backend,
         );
         if let Ok(children) = sqlx::query_as::<_, (String, String)>(&children_sql)
@@ -487,7 +487,7 @@ pub(super) async fn delete_api_client(
 
     // Look up client_id_url and client_key before deleting so we can remove from registries.
     let lookup_sql = adapt_sql(
-        "SELECT client_id_url, client_key FROM api_clients WHERE id = ?",
+        "SELECT client_id_url, client_key FROM happyview_api_clients WHERE id = ?",
         state.db_backend,
     );
     let client_info: Option<(String, String)> = sqlx::query_as(&lookup_sql)
@@ -498,7 +498,7 @@ pub(super) async fn delete_api_client(
 
     // Look up child clients before deleting (ON DELETE CASCADE will remove DB rows).
     let children_sql = adapt_sql(
-        "SELECT client_id_url, client_key FROM api_clients WHERE parent_client_id = ?",
+        "SELECT client_id_url, client_key FROM happyview_api_clients WHERE parent_client_id = ?",
         state.db_backend,
     );
     let children: Vec<(String, String)> = sqlx::query_as(&children_sql)
@@ -507,7 +507,10 @@ pub(super) async fn delete_api_client(
         .await
         .unwrap_or_default();
 
-    let delete_sql = adapt_sql("DELETE FROM api_clients WHERE id = ?", state.db_backend);
+    let delete_sql = adapt_sql(
+        "DELETE FROM happyview_api_clients WHERE id = ?",
+        state.db_backend,
+    );
 
     let result = sqlx::query(&delete_sql)
         .bind(&id)

src/admin/api_keys.rs

@@ -56,7 +56,7 @@ pub(super) async fn create_api_key(
         serde_json::to_string(&body.permissions).unwrap_or_else(|_| "[]".to_string());
 
     let insert_sql = adapt_sql(
-        "INSERT INTO api_keys (id, user_id, name, key_hash, key_prefix, permissions, created_at) VALUES (?, ?, ?, ?, ?, ?, ?)",
+        "INSERT INTO happyview_api_keys (id, user_id, name, key_hash, key_prefix, permissions, created_at) VALUES (?, ?, ?, ?, ?, ?, ?)",
         state.db_backend,
     );
 
@@ -105,7 +105,7 @@ pub(super) async fn list_api_keys(
     auth.require(Permission::ApiKeysRead).await?;
 
     let select_sql = adapt_sql(
-        "SELECT k.id, k.name, k.key_prefix, k.permissions, k.created_at, k.last_used_at, k.revoked_at FROM api_keys k JOIN users u ON u.id = k.user_id WHERE u.did = ? ORDER BY k.created_at DESC",
+        "SELECT k.id, k.name, k.key_prefix, k.permissions, k.created_at, k.last_used_at, k.revoked_at FROM happyview_api_keys k JOIN happyview_users u ON u.id = k.user_id WHERE u.did = ? ORDER BY k.created_at DESC",
         state.db_backend,
     );
 
@@ -156,7 +156,7 @@ pub(super) async fn revoke_api_key(
 
     let now = now_rfc3339();
     let update_sql = adapt_sql(
-        "UPDATE api_keys SET revoked_at = ? WHERE id = ? AND user_id = (SELECT id FROM users WHERE did = ?) AND revoked_at IS NULL",
+        "UPDATE happyview_api_keys SET revoked_at = ? WHERE id = ? AND user_id = (SELECT id FROM happyview_users WHERE did = ?) AND revoked_at IS NULL",
         state.db_backend,
     );
 

src/admin/auth.rs

@@ -54,7 +54,7 @@ impl UserAuth {
         backend: DatabaseBackend,
     ) -> Result<HashSet<Permission>, AppError> {
         let sql = adapt_sql(
-            "SELECT permission FROM user_permissions WHERE user_id = ?",
+            "SELECT permission FROM happyview_user_permissions WHERE user_id = ?",
             backend,
         );
         let rows: Vec<(String,)> = sqlx::query_as(&sql)
@@ -110,7 +110,7 @@ impl FromRequestParts<AppState> for UserAuth {
         let did = claims.did().to_string();
         let backend = state.db_backend;
 
-        let count: (i64,) = sqlx::query_as("SELECT COUNT(*) FROM users")
+        let count: (i64,) = sqlx::query_as("SELECT COUNT(*) FROM happyview_users")
             .fetch_one(&state.db)
             .await
             .map_err(|e| AppError::Internal(format!("user count query failed: {e}")))?;
@@ -121,7 +121,7 @@ impl FromRequestParts<AppState> for UserAuth {
             let now = now_rfc3339();
 
             let insert_sql = adapt_sql(
-                "INSERT INTO users (id, did, is_super, created_at) VALUES (?, ?, ?, ?)",
+                "INSERT INTO happyview_users (id, did, is_super, created_at) VALUES (?, ?, ?, ?)",
                 backend,
             );
 
@@ -135,7 +135,7 @@ impl FromRequestParts<AppState> for UserAuth {
 
             if result.is_ok() {
                 let perm_sql = adapt_sql(
-                    "INSERT INTO user_permissions (user_id, permission, granted_at) VALUES (?, ?, ?)",
+                    "INSERT INTO happyview_user_permissions (user_id, permission, granted_at) VALUES (?, ?, ?)",
                     backend,
                 );
                 for perm in Permission::all() {
@@ -164,7 +164,10 @@ impl FromRequestParts<AppState> for UserAuth {
             }
         }
 
-        let select_sql = adapt_sql("SELECT id, is_super FROM users WHERE did = ?", backend);
+        let select_sql = adapt_sql(
+            "SELECT id, is_super FROM happyview_users WHERE did = ?",
+            backend,
+        );
         let found: Option<(String, i32)> = sqlx::query_as(&select_sql)
             .bind(&did)
             .fetch_optional(&state.db)
@@ -185,7 +188,10 @@ impl FromRequestParts<AppState> for UserAuth {
         let db = state.db.clone();
         let uid = user_id.clone();
         let now = now_rfc3339();
-        let update_sql = adapt_sql("UPDATE users SET last_used_at = ? WHERE id = ?", backend);
+        let update_sql = adapt_sql(
+            "UPDATE happyview_users SET last_used_at = ? WHERE id = ?",
+            backend,
+        );
         tokio::spawn(async move {
             let _ = sqlx::query(&update_sql)
                 .bind(&now)
@@ -229,7 +235,7 @@ impl UserAuth {
         let backend = state.db_backend;
 
         let select_sql = adapt_sql(
-            "SELECT k.id, u.id, u.did, u.is_super, k.permissions FROM api_keys k JOIN users u ON u.id = k.user_id WHERE k.key_hash = ? AND k.revoked_at IS NULL",
+            "SELECT k.id, u.id, u.did, u.is_super, k.permissions FROM happyview_api_keys k JOIN happyview_users u ON u.id = k.user_id WHERE k.key_hash = ? AND k.revoked_at IS NULL",
             backend,
         );
 
@@ -256,7 +262,10 @@ impl UserAuth {
 
         let db = state.db.clone();
         let now = now_rfc3339();
-        let update_sql = adapt_sql("UPDATE api_keys SET last_used_at = ? WHERE id = ?", backend);
+        let update_sql = adapt_sql(
+            "UPDATE happyview_api_keys SET last_used_at = ? WHERE id = ?",
+            backend,
+        );
         tokio::spawn(async move {
             let _ = sqlx::query(&update_sql)
                 .bind(&now)