From c199ecc41c77b0b2aa6d3ad5c98a772e973899be Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Mon, 16 Dec 2024 16:56:58 +0000
Subject: [PATCH] fix: enhance pgmq.meta table validation checks

- Verify pgmq.meta is a regular table
- Check for exact required columns
- Ensure no additional columns exist
- Only execute insert if all conditions are met

Co-Authored-By: oliver@supabase.io <oliver@supabase.io>
---
 .../20241215003910_backfill_pgmq_metadata.sql | 59 +++++++++++++------
 1 file changed, 42 insertions(+), 17 deletions(-)

diff --git a/migrations/db/migrations/20241215003910_backfill_pgmq_metadata.sql b/migrations/db/migrations/20241215003910_backfill_pgmq_metadata.sql
index 652be2a1d..d94f9e0a0 100644
--- a/migrations/db/migrations/20241215003910_backfill_pgmq_metadata.sql
+++ b/migrations/db/migrations/20241215003910_backfill_pgmq_metadata.sql
@@ -1,28 +1,53 @@
 -- migrate:up
 do $$
+declare
+    column_count integer;
+    expected_columns text[] := array['queue_name', 'is_partitioned', 'is_unlogged', 'created_at'];
 begin
-    -- Check if the pgmq.meta table exists
+    -- Check if pgmq.meta exists and is a regular table
     if exists (
         select 1
         from pg_catalog.pg_class c
         join pg_catalog.pg_namespace n on c.relnamespace = n.oid
-        where n.nspname = 'pgmq' and c.relname = 'meta'
+        where n.nspname = 'pgmq'
+        and c.relname = 'meta'
+        and c.relkind = 'r'  -- 'r' means regular table
     ) then
-        -- Insert data into pgmq.meta for all tables matching the naming pattern 'pgmq.q_<queue_name>'
-        insert into pgmq.meta (queue_name, is_partitioned, is_unlogged, created_at)
-        select
-            substring(c.relname from 3) as queue_name,
-            false as is_partitioned,
-            case when c.relpersistence = 'u' then true else false end as is_unlogged,
-            now() as created_at
-        from
-			pg_catalog.pg_class c
-        	join pg_catalog.pg_namespace n
-				on c.relnamespace = n.oid
-        where
-			n.nspname = 'pgmq'
-			and c.relname like 'q_%'
-	 		and c.relkind in ('r', 'p', 'u');
+        -- Check if all required columns exist and no additional columns exist
+        select count(*)
+        into column_count
+        from pg_catalog.pg_attribute a
+        join pg_catalog.pg_class c on a.attrelnum > 0 and a.attrelid = c.oid
+        join pg_catalog.pg_namespace n on c.relnamespace = n.oid
+        where n.nspname = 'pgmq'
+        and c.relname = 'meta'
+        and not a.attisdropped;  -- Exclude dropped columns
+
+        -- Only proceed if column count matches and all required columns exist
+        if column_count = array_length(expected_columns, 1)
+        and exists (
+            select 1
+            from pg_catalog.pg_attribute a
+            join pg_catalog.pg_class c on a.attrelnum > 0 and a.attrelid = c.oid
+            join pg_catalog.pg_namespace n on c.relnamespace = n.oid
+            where n.nspname = 'pgmq'
+            and c.relname = 'meta'
+            and a.attname = any(expected_columns)
+            having count(*) = array_length(expected_columns, 1)
+        ) then
+            -- Insert data into pgmq.meta for all tables matching the naming pattern 'pgmq.q_<queue_name>'
+            insert into pgmq.meta (queue_name, is_partitioned, is_unlogged, created_at)
+            select
+                substring(c.relname from 3) as queue_name,
+                false as is_partitioned,
+                case when c.relpersistence = 'u' then true else false end as is_unlogged,
+                now() as created_at
+            from pg_catalog.pg_class c
+            join pg_catalog.pg_namespace n on c.relnamespace = n.oid
+            where n.nspname = 'pgmq'
+            and c.relname like 'q_%'
+            and c.relkind in ('r', 'p', 'u');
+        end if;
     end if;
 end $$;