fix: unblock tenants and make migrations safer (#1839)

Author: leandrocp

compose.dbs.yml

@@ -1,7 +1,6 @@
 services:
   db:
     image: supabase/postgres:17.6.1.074
-    container_name: realtime-db
     ports:
       - "5432:5432"
     volumes:
@@ -18,7 +17,6 @@ services:
 
   tenant_db:
     image: supabase/postgres:17.6.1.074
-    container_name: tenant-db
     ports:
       - "5433:5432"
     command: postgres -c config_file=/etc/postgresql/postgresql.conf

lib/realtime/tenants/repo/migrations/20211116045059_create_realtime_check_filters_trigger.ex

@@ -57,6 +57,8 @@ defmodule Realtime.Tenants.Migrations.CreateRealtimeCheckFiltersTrigger do
     end;
     $$;")
 
+    execute("drop trigger if exists tr_check_filters on realtime.subscription")
+
     execute("create trigger tr_check_filters
     before insert or update on realtime.subscription
     for each row

lib/realtime/tenants/repo/migrations/20211210212804_enable_generic_subscription_claims.ex

@@ -7,9 +7,9 @@ defmodule Realtime.Tenants.Migrations.EnableGenericSubscriptionClaims do
     execute("truncate table realtime.subscription restart identity")
 
     execute("alter table realtime.subscription
-      drop constraint subscription_entity_user_id_filters_key cascade,
-      drop column email cascade,
-      drop column created_at cascade")
+      drop constraint if exists subscription_entity_user_id_filters_key cascade,
+      drop column if exists email cascade,
+      drop column if exists created_at cascade")
 
     execute("alter table realtime.subscription rename user_id to subscription_id")
 
@@ -87,7 +87,7 @@ defmodule Realtime.Tenants.Migrations.EnableGenericSubscriptionClaims do
 
     execute("alter type realtime.wal_rls rename attribute users to subscription_ids cascade;")
 
-    execute("drop function realtime.apply_rls(jsonb, integer);")
+    execute("drop function if exists realtime.apply_rls(jsonb, integer);")
     execute("create or replace function realtime.apply_rls(wal jsonb, max_record_bytes int = 1024 * 1024)
       returns setof realtime.wal_rls
       language plpgsql

lib/realtime/tenants/repo/migrations/20240523004032_redefine_authorization_tables.ex

@@ -4,9 +4,9 @@ defmodule Realtime.Tenants.Migrations.RedefineAuthorizationTables do
   use Ecto.Migration
 
   def change do
-    drop table(:broadcasts), mode: :cascade
-    drop table(:presences), mode: :cascade
-    drop table(:channels), mode: :cascade
+    drop_if_exists table(:broadcasts), mode: :cascade
+    drop_if_exists table(:presences), mode: :cascade
+    drop_if_exists table(:channels), mode: :cascade
 
     create_if_not_exists table(:messages) do
       add :topic, :text, null: false
@@ -31,7 +31,7 @@ defmodule Realtime.Tenants.Migrations.RedefineAuthorizationTables do
     execute("ALTER table realtime.messages OWNER to supabase_realtime_admin")
 
     execute("""
-    DROP function realtime.channel_name
+    DROP function IF EXISTS realtime.channel_name
     """)
 
     execute("""

lib/realtime/tenants/repo/migrations/20241108114728_messages_using_uuid.ex

@@ -10,6 +10,6 @@ defmodule Realtime.Tenants.Migrations.MessagesUsingUuid do
     end
 
     execute("ALTER TABLE realtime.messages ADD PRIMARY KEY (id, inserted_at)")
-    execute("DROP SEQUENCE realtime.messages_id_seq")
+    execute("DROP SEQUENCE IF EXISTS realtime.messages_id_seq")
   end
 end

lib/realtime/tenants/repo/migrations/20251120212548_add_action_to_subscriptions.ex

@@ -19,7 +19,7 @@ defmodule Realtime.Tenants.Migrations.AddActionToSubscriptions do
 
   def down do
     execute("""
-    ALTER TABLE realtime.subscription DROP COLUMN action_filter;
+    ALTER TABLE realtime.subscription DROP COLUMN IF EXISTS action_filter;
     """)
 
     execute("""

lib/realtime_web/dashboard/sql_inspector.ex

@@ -9,9 +9,11 @@ defmodule RealtimeWeb.Dashboard.SqlInspector do
   """
   use Phoenix.LiveDashboard.PageBuilder
 
+  require Logger
+
   alias Realtime.Repo.Replica
 
-  @query_timeout 10_000
+  @query_timeout 30_000
   @max_rows 1_000
 
   @sensitive_patterns ~w(password passwd secret token jwt key credential private salt hash)
@@ -52,6 +54,7 @@ defmodule RealtimeWeb.Dashboard.SqlInspector do
          )}
 
       {:error, msg} ->
+        Logger.warning("SqlInspector query error: #{msg}")
         {:noreply, assign(socket, error: msg, result: nil, sql: sql, display_rows: [], row_count: 0)}
     end
   end
@@ -74,7 +77,7 @@ defmodule RealtimeWeb.Dashboard.SqlInspector do
   @impl true
   def render(assigns) do
     ~H"""
-    <div style="background: #ffffff; border: 1px solid #dee2e6; border-radius: 8px; box-shadow: 0 1px 3px rgba(0,0,0,0.05); padding: 20px; margin-bottom: 16px;">
+    <div style="background: #ffffff; border: 1px solid #dee2e6; border-radius: 8px; box-shadow: 0 1px 3px rgba(0,0,0,0.05); padding: 20px; margin-bottom: 16px; min-width: 0;">
       <h5 style="margin: 0 0 4px 0; font-weight: 600;">SQL Inspector</h5>
       <p style="color: #6c757d; font-size: 0.85rem; margin-bottom: 16px;">
         Read-only SELECT queries only. Sensitive column values are masked. Results capped at <%= @max_rows %> rows.
@@ -161,15 +164,18 @@ defmodule RealtimeWeb.Dashboard.SqlInspector do
       limited_sql = "SELECT * FROM (#{stripped}) AS _q LIMIT #{@max_rows}"
       repo = Replica.replica()
 
-      repo.transaction(fn ->
-        Ecto.Adapters.SQL.query!(repo, "SET TRANSACTION READ ONLY", [])
-
-        case Ecto.Adapters.SQL.query(repo, limited_sql, [], timeout: @query_timeout) do
-          {:ok, result} -> repo.rollback({:ok, mask_sensitive_columns(result)})
-          {:error, %{postgres: %{message: message}}} -> repo.rollback({:error, message})
-          {:error, reason} -> repo.rollback({:error, inspect(reason)})
-        end
-      end)
+      repo.transaction(
+        fn ->
+          Ecto.Adapters.SQL.query!(repo, "SET TRANSACTION READ ONLY", [])
+
+          case Ecto.Adapters.SQL.query(repo, limited_sql, [], timeout: @query_timeout) do
+            {:ok, result} -> repo.rollback({:ok, mask_sensitive_columns(result)})
+            {:error, %{postgres: %{message: message}}} -> repo.rollback({:error, message})
+            {:error, reason} -> repo.rollback({:error, inspect(reason)})
+          end
+        end,
+        timeout: @query_timeout
+      )
       |> case do
         {:error, {:ok, result}} -> {:ok, result}
         {:error, {:error, message}} -> {:error, message}