Moving dupe checking to before new actor_id generation.

diff --git a/server/migrations/2020-07-18-234519_add_unique_community_user_actor_ids/up.sql b/server/migrations/2020-07-18-234519_add_unique_community_user_actor_ids/up.sql
index bbf6b18c6843b538715da32a4adab00b49f48e9f..e32ed5e089e012aab5a81655fb72e176caf74adb 100644 (file)
--- a/server/migrations/2020-07-18-234519_add_unique_community_user_actor_ids/up.sql
+++ b/server/migrations/2020-07-18-234519_add_unique_community_user_actor_ids/up.sql
@@ -8,16 +8,9 @@ as $$
   from generate_series(1, 20)
 $$;
 
-update community 
-set actor_id = generate_unique_changeme()
-where actor_id = 'http://fake.com';
-
-update user_ 
-set actor_id = generate_unique_changeme()
-where actor_id = 'http://fake.com';
-
 -- Need to delete the possible community and user dupes for ones that don't start with the fake one
--- TODO make sure this removes the later ids, not the first
+-- A few test inserts, to make sure this removes later dupes
+-- insert into community (name, title, category_id, creator_id) values ('testcom', 'another testcom', 1, 2);
 delete from community a using (
   select min(id) as id, actor_id
     from community 
@@ -34,6 +27,15 @@ delete from user_ a using (
 where a.actor_id = b.actor_id 
 and a.id <> b.id;
 
+-- Replacing the current default on the columns, to the unique one
+update community 
+set actor_id = generate_unique_changeme()
+where actor_id = 'http://fake.com';
+
+update user_ 
+set actor_id = generate_unique_changeme()
+where actor_id = 'http://fake.com';
+
 -- Add the unique indexes
 alter table community alter column actor_id set not null;
 alter table community alter column actor_id set default generate_unique_changeme();