From 7ae7efb5232e3de7369871a99d5b3638bab382e3 Mon Sep 17 00:00:00 2001
From: Charles Bochet <charles@twenty.com>
Date: Mon, 24 Apr 2023 17:00:14 +0200
Subject: [PATCH] Fix

---
 .../down.sql                                  |  1 -
 .../up.sql                                    |  1 -
 .../down.sql                                  |  4 --
 .../up.sql                                    |  2 -
 .../down.sql                                  | 21 -------
 .../up.sql                                    | 19 -------
 .../down.sql                                  | 21 -------
 .../up.sql                                    | 19 -------
 .../down.sql                                  |  4 --
 .../up.sql                                    |  2 -
 .../up.sql                                    |  1 -
 .../down.sql                                  |  1 -
 .../up.sql                                    |  1 -
 .../down.sql                                  |  4 --
 .../up.sql                                    |  2 -
 .../down.sql                                  |  7 +++
 .../default/1682338781740_squashed/up.sql     | 55 +++++++++++++++++++
 17 files changed, 62 insertions(+), 103 deletions(-)
 delete mode 100644 hasura/migrations/default/1682141330851_create_table_public_workspace_members/down.sql
 delete mode 100644 hasura/migrations/default/1682141330851_create_table_public_workspace_members/up.sql
 delete mode 100644 hasura/migrations/default/1682141433503_alter_table_public_workspace_members_add_column_created_at/down.sql
 delete mode 100644 hasura/migrations/default/1682141433503_alter_table_public_workspace_members_add_column_created_at/up.sql
 delete mode 100644 hasura/migrations/default/1682141443863_alter_table_public_workspace_members_add_column_updated_at/down.sql
 delete mode 100644 hasura/migrations/default/1682141443863_alter_table_public_workspace_members_add_column_updated_at/up.sql
 delete mode 100644 hasura/migrations/default/1682141457260_alter_table_public_workspace_members_add_column_deleted_at/down.sql
 delete mode 100644 hasura/migrations/default/1682141457260_alter_table_public_workspace_members_add_column_deleted_at/up.sql
 delete mode 100644 hasura/migrations/default/1682337427850_alter_table_public_workspaces_add_column_domain_name/down.sql
 delete mode 100644 hasura/migrations/default/1682337427850_alter_table_public_workspaces_add_column_domain_name/up.sql
 delete mode 100644 hasura/migrations/default/1682337605938_alter_table_public_workspaces_drop_column_domain_name/up.sql
 delete mode 100644 hasura/migrations/default/1682337614489_alter_table_public_workspaces_alter_column_name/down.sql
 delete mode 100644 hasura/migrations/default/1682337614489_alter_table_public_workspaces_alter_column_name/up.sql
 delete mode 100644 hasura/migrations/default/1682338781740_alter_table_public_workspaces_add_column_deleted_at/down.sql
 delete mode 100644 hasura/migrations/default/1682338781740_alter_table_public_workspaces_add_column_deleted_at/up.sql
 rename hasura/migrations/default/{1682337605938_alter_table_public_workspaces_drop_column_domain_name => 1682338781740_squashed}/down.sql (66%)
 create mode 100644 hasura/migrations/default/1682338781740_squashed/up.sql

diff --git a/hasura/migrations/default/1682141330851_create_table_public_workspace_members/down.sql b/hasura/migrations/default/1682141330851_create_table_public_workspace_members/down.sql
deleted file mode 100644
index 17131d84e..000000000
--- a/hasura/migrations/default/1682141330851_create_table_public_workspace_members/down.sql
+++ /dev/null
@@ -1 +0,0 @@
-DROP TABLE "public"."workspace_members";
diff --git a/hasura/migrations/default/1682141330851_create_table_public_workspace_members/up.sql b/hasura/migrations/default/1682141330851_create_table_public_workspace_members/up.sql
deleted file mode 100644
index 835f01b2d..000000000
--- a/hasura/migrations/default/1682141330851_create_table_public_workspace_members/up.sql
+++ /dev/null
@@ -1 +0,0 @@
-CREATE TABLE "public"."workspace_members" ("id" serial NOT NULL, "user_id" uuid NOT NULL, "workspace_id" integer NOT NULL, PRIMARY KEY ("id") , FOREIGN KEY ("user_id") REFERENCES "auth"."users"("id") ON UPDATE restrict ON DELETE restrict, FOREIGN KEY ("workspace_id") REFERENCES "public"."workspaces"("id") ON UPDATE restrict ON DELETE restrict, UNIQUE ("id"), UNIQUE ("user_id"));
diff --git a/hasura/migrations/default/1682141433503_alter_table_public_workspace_members_add_column_created_at/down.sql b/hasura/migrations/default/1682141433503_alter_table_public_workspace_members_add_column_created_at/down.sql
deleted file mode 100644
index 43fcc7a4e..000000000
--- a/hasura/migrations/default/1682141433503_alter_table_public_workspace_members_add_column_created_at/down.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- Could not auto-generate a down migration.
--- Please write an appropriate down migration for the SQL below:
--- alter table "public"."workspace_members" add column "created_at" timestamptz
---  not null default now();
diff --git a/hasura/migrations/default/1682141433503_alter_table_public_workspace_members_add_column_created_at/up.sql b/hasura/migrations/default/1682141433503_alter_table_public_workspace_members_add_column_created_at/up.sql
deleted file mode 100644
index 6e48494ea..000000000
--- a/hasura/migrations/default/1682141433503_alter_table_public_workspace_members_add_column_created_at/up.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-alter table "public"."workspace_members" add column "created_at" timestamptz
- not null default now();
diff --git a/hasura/migrations/default/1682141443863_alter_table_public_workspace_members_add_column_updated_at/down.sql b/hasura/migrations/default/1682141443863_alter_table_public_workspace_members_add_column_updated_at/down.sql
deleted file mode 100644
index 47993769d..000000000
--- a/hasura/migrations/default/1682141443863_alter_table_public_workspace_members_add_column_updated_at/down.sql
+++ /dev/null
@@ -1,21 +0,0 @@
--- Could not auto-generate a down migration.
--- Please write an appropriate down migration for the SQL below:
--- alter table "public"."workspace_members" add column "updated_at" timestamptz
---  not null default now();
---
--- CREATE OR REPLACE FUNCTION "public"."set_current_timestamp_updated_at"()
--- RETURNS TRIGGER AS $$
--- DECLARE
---   _new record;
--- BEGIN
---   _new := NEW;
---   _new."updated_at" = NOW();
---   RETURN _new;
--- END;
--- $$ LANGUAGE plpgsql;
--- CREATE TRIGGER "set_public_workspace_members_updated_at"
--- BEFORE UPDATE ON "public"."workspace_members"
--- FOR EACH ROW
--- EXECUTE PROCEDURE "public"."set_current_timestamp_updated_at"();
--- COMMENT ON TRIGGER "set_public_workspace_members_updated_at" ON "public"."workspace_members"
--- IS 'trigger to set value of column "updated_at" to current timestamp on row update';
diff --git a/hasura/migrations/default/1682141443863_alter_table_public_workspace_members_add_column_updated_at/up.sql b/hasura/migrations/default/1682141443863_alter_table_public_workspace_members_add_column_updated_at/up.sql
deleted file mode 100644
index 2eb2da7f7..000000000
--- a/hasura/migrations/default/1682141443863_alter_table_public_workspace_members_add_column_updated_at/up.sql
+++ /dev/null
@@ -1,19 +0,0 @@
-alter table "public"."workspace_members" add column "updated_at" timestamptz
- not null default now();
-
-CREATE OR REPLACE FUNCTION "public"."set_current_timestamp_updated_at"()
-RETURNS TRIGGER AS $$
-DECLARE
-  _new record;
-BEGIN
-  _new := NEW;
-  _new."updated_at" = NOW();
-  RETURN _new;
-END;
-$$ LANGUAGE plpgsql;
-CREATE TRIGGER "set_public_workspace_members_updated_at"
-BEFORE UPDATE ON "public"."workspace_members"
-FOR EACH ROW
-EXECUTE PROCEDURE "public"."set_current_timestamp_updated_at"();
-COMMENT ON TRIGGER "set_public_workspace_members_updated_at" ON "public"."workspace_members"
-IS 'trigger to set value of column "updated_at" to current timestamp on row update';
diff --git a/hasura/migrations/default/1682141457260_alter_table_public_workspace_members_add_column_deleted_at/down.sql b/hasura/migrations/default/1682141457260_alter_table_public_workspace_members_add_column_deleted_at/down.sql
deleted file mode 100644
index 34346f439..000000000
--- a/hasura/migrations/default/1682141457260_alter_table_public_workspace_members_add_column_deleted_at/down.sql
+++ /dev/null
@@ -1,21 +0,0 @@
--- Could not auto-generate a down migration.
--- Please write an appropriate down migration for the SQL below:
--- alter table "public"."workspace_members" add column "deleted_at" timestamptz
---  null;
---
--- CREATE OR REPLACE FUNCTION "public"."set_current_timestamp_deleted_at"()
--- RETURNS TRIGGER AS $$
--- DECLARE
---   _new record;
--- BEGIN
---   _new := NEW;
---   _new."deleted_at" = NOW();
---   RETURN _new;
--- END;
--- $$ LANGUAGE plpgsql;
--- CREATE TRIGGER "set_public_workspace_members_deleted_at"
--- BEFORE UPDATE ON "public"."workspace_members"
--- FOR EACH ROW
--- EXECUTE PROCEDURE "public"."set_current_timestamp_deleted_at"();
--- COMMENT ON TRIGGER "set_public_workspace_members_deleted_at" ON "public"."workspace_members"
--- IS 'trigger to set value of column "deleted_at" to current timestamp on row update';
diff --git a/hasura/migrations/default/1682141457260_alter_table_public_workspace_members_add_column_deleted_at/up.sql b/hasura/migrations/default/1682141457260_alter_table_public_workspace_members_add_column_deleted_at/up.sql
deleted file mode 100644
index 64b2222a0..000000000
--- a/hasura/migrations/default/1682141457260_alter_table_public_workspace_members_add_column_deleted_at/up.sql
+++ /dev/null
@@ -1,19 +0,0 @@
-alter table "public"."workspace_members" add column "deleted_at" timestamptz
- null;
-
-CREATE OR REPLACE FUNCTION "public"."set_current_timestamp_deleted_at"()
-RETURNS TRIGGER AS $$
-DECLARE
-  _new record;
-BEGIN
-  _new := NEW;
-  _new."deleted_at" = NOW();
-  RETURN _new;
-END;
-$$ LANGUAGE plpgsql;
-CREATE TRIGGER "set_public_workspace_members_deleted_at"
-BEFORE UPDATE ON "public"."workspace_members"
-FOR EACH ROW
-EXECUTE PROCEDURE "public"."set_current_timestamp_deleted_at"();
-COMMENT ON TRIGGER "set_public_workspace_members_deleted_at" ON "public"."workspace_members"
-IS 'trigger to set value of column "deleted_at" to current timestamp on row update';
diff --git a/hasura/migrations/default/1682337427850_alter_table_public_workspaces_add_column_domain_name/down.sql b/hasura/migrations/default/1682337427850_alter_table_public_workspaces_add_column_domain_name/down.sql
deleted file mode 100644
index 965641ba8..000000000
--- a/hasura/migrations/default/1682337427850_alter_table_public_workspaces_add_column_domain_name/down.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- Could not auto-generate a down migration.
--- Please write an appropriate down migration for the SQL below:
--- alter table "public"."workspaces" add column "domain_name" text
---  null unique;
diff --git a/hasura/migrations/default/1682337427850_alter_table_public_workspaces_add_column_domain_name/up.sql b/hasura/migrations/default/1682337427850_alter_table_public_workspaces_add_column_domain_name/up.sql
deleted file mode 100644
index ff09f675f..000000000
--- a/hasura/migrations/default/1682337427850_alter_table_public_workspaces_add_column_domain_name/up.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-alter table "public"."workspaces" add column "domain_name" text
- null unique;
diff --git a/hasura/migrations/default/1682337605938_alter_table_public_workspaces_drop_column_domain_name/up.sql b/hasura/migrations/default/1682337605938_alter_table_public_workspaces_drop_column_domain_name/up.sql
deleted file mode 100644
index 75bb197fe..000000000
--- a/hasura/migrations/default/1682337605938_alter_table_public_workspaces_drop_column_domain_name/up.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table "public"."workspaces" drop column "domain_name" cascade;
diff --git a/hasura/migrations/default/1682337614489_alter_table_public_workspaces_alter_column_name/down.sql b/hasura/migrations/default/1682337614489_alter_table_public_workspaces_alter_column_name/down.sql
deleted file mode 100644
index fc016a35d..000000000
--- a/hasura/migrations/default/1682337614489_alter_table_public_workspaces_alter_column_name/down.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table "public"."workspaces" rename column "domain_name" to "name";
diff --git a/hasura/migrations/default/1682337614489_alter_table_public_workspaces_alter_column_name/up.sql b/hasura/migrations/default/1682337614489_alter_table_public_workspaces_alter_column_name/up.sql
deleted file mode 100644
index 256e5ffa1..000000000
--- a/hasura/migrations/default/1682337614489_alter_table_public_workspaces_alter_column_name/up.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table "public"."workspaces" rename column "name" to "domain_name";
diff --git a/hasura/migrations/default/1682338781740_alter_table_public_workspaces_add_column_deleted_at/down.sql b/hasura/migrations/default/1682338781740_alter_table_public_workspaces_add_column_deleted_at/down.sql
deleted file mode 100644
index 7fd42c852..000000000
--- a/hasura/migrations/default/1682338781740_alter_table_public_workspaces_add_column_deleted_at/down.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- Could not auto-generate a down migration.
--- Please write an appropriate down migration for the SQL below:
--- alter table "public"."workspaces" add column "deleted_at" Timestamp
---  null;
diff --git a/hasura/migrations/default/1682338781740_alter_table_public_workspaces_add_column_deleted_at/up.sql b/hasura/migrations/default/1682338781740_alter_table_public_workspaces_add_column_deleted_at/up.sql
deleted file mode 100644
index a72ce728e..000000000
--- a/hasura/migrations/default/1682338781740_alter_table_public_workspaces_add_column_deleted_at/up.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-alter table "public"."workspaces" add column "deleted_at" Timestamp
- null;
diff --git a/hasura/migrations/default/1682337605938_alter_table_public_workspaces_drop_column_domain_name/down.sql b/hasura/migrations/default/1682338781740_squashed/down.sql
similarity index 66%
rename from hasura/migrations/default/1682337605938_alter_table_public_workspaces_drop_column_domain_name/down.sql
rename to hasura/migrations/default/1682338781740_squashed/down.sql
index 92f9c9d61..cf8f11d73 100644
--- a/hasura/migrations/default/1682337605938_alter_table_public_workspaces_drop_column_domain_name/down.sql
+++ b/hasura/migrations/default/1682338781740_squashed/down.sql
@@ -1,3 +1,10 @@
+
+alter table "public"."workspaces" rename column "domain_name" to "name";
+
 alter table "public"."workspaces" add constraint "workspaces_domain_name_key" unique (domain_name);
 alter table "public"."workspaces" alter column "domain_name" drop not null;
 alter table "public"."workspaces" add column "domain_name" text;
+
+
+
+DROP TABLE "public"."workspace_members";
diff --git a/hasura/migrations/default/1682338781740_squashed/up.sql b/hasura/migrations/default/1682338781740_squashed/up.sql
new file mode 100644
index 000000000..0c8477294
--- /dev/null
+++ b/hasura/migrations/default/1682338781740_squashed/up.sql
@@ -0,0 +1,55 @@
+
+CREATE TABLE "public"."workspace_members" ("id" serial NOT NULL, "user_id" uuid NOT NULL, "workspace_id" integer NOT NULL, PRIMARY KEY ("id") , FOREIGN KEY ("user_id") REFERENCES "auth"."users"("id") ON UPDATE restrict ON DELETE restrict, FOREIGN KEY ("workspace_id") REFERENCES "public"."workspaces"("id") ON UPDATE restrict ON DELETE restrict, UNIQUE ("id"), UNIQUE ("user_id"));
+
+alter table "public"."workspace_members" add column "created_at" timestamptz
+ not null default now();
+
+alter table "public"."workspace_members" add column "updated_at" timestamptz
+ not null default now();
+
+CREATE OR REPLACE FUNCTION "public"."set_current_timestamp_updated_at"()
+RETURNS TRIGGER AS $$
+DECLARE
+  _new record;
+BEGIN
+  _new := NEW;
+  _new."updated_at" = NOW();
+  RETURN _new;
+END;
+$$ LANGUAGE plpgsql;
+CREATE TRIGGER "set_public_workspace_members_updated_at"
+BEFORE UPDATE ON "public"."workspace_members"
+FOR EACH ROW
+EXECUTE PROCEDURE "public"."set_current_timestamp_updated_at"();
+COMMENT ON TRIGGER "set_public_workspace_members_updated_at" ON "public"."workspace_members"
+IS 'trigger to set value of column "updated_at" to current timestamp on row update';
+
+alter table "public"."workspace_members" add column "deleted_at" timestamptz
+ null;
+
+CREATE OR REPLACE FUNCTION "public"."set_current_timestamp_deleted_at"()
+RETURNS TRIGGER AS $$
+DECLARE
+  _new record;
+BEGIN
+  _new := NEW;
+  _new."deleted_at" = NOW();
+  RETURN _new;
+END;
+$$ LANGUAGE plpgsql;
+CREATE TRIGGER "set_public_workspace_members_deleted_at"
+BEFORE UPDATE ON "public"."workspace_members"
+FOR EACH ROW
+EXECUTE PROCEDURE "public"."set_current_timestamp_deleted_at"();
+COMMENT ON TRIGGER "set_public_workspace_members_deleted_at" ON "public"."workspace_members"
+IS 'trigger to set value of column "deleted_at" to current timestamp on row update';
+
+alter table "public"."workspaces" add column "domain_name" text
+ null unique;
+
+alter table "public"."workspaces" drop column "domain_name" cascade;
+
+alter table "public"."workspaces" rename column "name" to "domain_name";
+
+alter table "public"."workspaces" add column "deleted_at" Timestamp
+ null;