Skip to content

A platform for community discussion. Free, open, simple.

MT: Keep the real created_at for category moderation groups

Gerhard Schlager4c96dc29e421
diff --git a/migrations/converters/lib/migrations/converters/discourse/steps/category_moderation_groups.rb b/migrations/converters/lib/migrations/converters/discourse/steps/category_moderation_groups.rb
index d5c35cc08f6..37542f56bef 100644
--- a/migrations/converters/lib/migrations/converters/discourse/steps/category_moderation_groups.rb
+++ b/migrations/converters/lib/migrations/converters/discourse/steps/category_moderation_groups.rb
@@ -11,6 +11,7 @@ module Migrations
IntermediateDB::CategoryModerationGroup.create(
category_id: item[:category_id],
group_id: item[:group_id],
+ created_at: item[:created_at],
)
end
end
diff --git a/migrations/core/db/intermediate_db_schema/100-base-schema.sql b/migrations/core/db/intermediate_db_schema/100-base-schema.sql
index 0924f3842ce..3977fc9df40 100644
--- a/migrations/core/db/intermediate_db_schema/100-base-schema.sql
+++ b/migrations/core/db/intermediate_db_schema/100-base-schema.sql
@@ -100,8 +100,9 @@ CREATE TABLE category_custom_fields
CREATE TABLE category_moderation_groups
(
- category_id NUMERIC NOT NULL,
- group_id NUMERIC NOT NULL,
+ category_id NUMERIC NOT NULL,
+ group_id NUMERIC NOT NULL,
+ created_at DATETIME,
PRIMARY KEY (category_id, group_id)
);
diff --git a/migrations/core/lib/migrations/database/intermediate_db/category_moderation_group.rb b/migrations/core/lib/migrations/database/intermediate_db/category_moderation_group.rb
index a75ad8e9134..9ce6297a0aa 100644
--- a/migrations/core/lib/migrations/database/intermediate_db/category_moderation_group.rb
+++ b/migrations/core/lib/migrations/database/intermediate_db/category_moderation_group.rb
@@ -11,10 +11,11 @@ module Migrations
SQL = <<~SQL
INSERT INTO category_moderation_groups (
category_id,
- group_id
+ group_id,
+ created_at
)
VALUES (
- ?, ?
+ ?, ?, ?
)
SQL
private_constant :SQL
@@ -23,10 +24,16 @@ module Migrations
#
# @param category_id [Integer, String]
# @param group_id [Integer, String]
+ # @param created_at [Time, nil]
#
# @return [void]
- def self.create(category_id:, group_id:)
- Migrations::Database::IntermediateDB.insert(SQL, category_id, group_id)
+ def self.create(category_id:, group_id:, created_at: nil)
+ Migrations::Database::IntermediateDB.insert(
+ SQL,
+ category_id,
+ group_id,
+ Migrations::Database.format_datetime(created_at),
+ )
end
end
end
diff --git a/migrations/importer/lib/migrations/importer/steps/categories/category_moderation_groups.rb b/migrations/importer/lib/migrations/importer/steps/categories/category_moderation_groups.rb
index 77b0a34bd53..90f9e8fa624 100644
--- a/migrations/importer/lib/migrations/importer/steps/categories/category_moderation_groups.rb
+++ b/migrations/importer/lib/migrations/importer/steps/categories/category_moderation_groups.rb
@@ -6,7 +6,7 @@ module Migrations
class CategoryModerationGroups < CopyStep
depends_on :categories, :groups
- column_names %i[category_id group_id]
+ column_names %i[category_id group_id created_at updated_at]
requires_set :existing_category_moderation_groups,
"SELECT category_id, group_id FROM category_moderation_groups WHERE group_id > 0"
diff --git a/migrations/tooling/config/schema/intermediate_db/tables/category_moderation_groups.rb b/migrations/tooling/config/schema/intermediate_db/tables/category_moderation_groups.rb
index 08c0be1e552..886680869fa 100644
--- a/migrations/tooling/config/schema/intermediate_db/tables/category_moderation_groups.rb
+++ b/migrations/tooling/config/schema/intermediate_db/tables/category_moderation_groups.rb
@@ -3,5 +3,5 @@
Migrations::Tooling::Schema.table :category_moderation_groups do
primary_key :category_id, :group_id
- ignore :created_at, :id
+ ignore :id
end