From d07cbdaab3e467d1a8875249d17db04af8e79864 Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Sat, 2 May 2020 13:45:38 +0300 Subject: [PATCH] Fix #17975: Fix deleting unused messages with console command if message tables were created manually (auerswald, cebe) Co-authored-by: AA Co-authored-by: Carsten Brandt --- framework/CHANGELOG.md | 1 + framework/i18n/migrations/schema-mssql.sql | 4 ++-- framework/i18n/migrations/schema-mysql.sql | 2 +- framework/i18n/migrations/schema-pgsql.sql | 4 ++-- framework/i18n/migrations/schema-sqlite.sql | 4 ++-- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index 166d689da0..12fbcdc4c9 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -4,6 +4,7 @@ Yii Framework 2 Change Log 2.0.35 under development ------------------------ +- Bug #17975: Fix deleting unused messages with console command if message tables were created manually (auerswald, cebe) - Bug #17961: Fix pagination `pageSizeLimit` ignore if set as array with more then 2 elements (tsvetiligo) - Bug #18011: Added attribute labels support for `DynamicModel`, fixed `EachValidator` to pass the attribute label to the underlying `DynamicModel` (storch) - Enh #18019: Allow jQuery 3.5.0 to be installed (wouter90) diff --git a/framework/i18n/migrations/schema-mssql.sql b/framework/i18n/migrations/schema-mssql.sql index 479c0587ff..261f807cf7 100644 --- a/framework/i18n/migrations/schema-mssql.sql +++ b/framework/i18n/migrations/schema-mssql.sql @@ -29,7 +29,7 @@ CREATE TABLE [message] ); ALTER TABLE [message] ADD CONSTRAINT [pk_message_id_language] PRIMARY KEY ([id], [language]); -ALTER TABLE [message] ADD CONSTRAINT [fk_message_source_message] FOREIGN KEY ([id]) REFERENCES [source_message] ([id]) ON UPDATE CASCADE ON DELETE NO ACTION; +ALTER TABLE [message] ADD CONSTRAINT [fk_message_source_message] FOREIGN KEY ([id]) REFERENCES [source_message] ([id]) ON UPDATE NO ACTION ON DELETE CASCADE; CREATE INDEX [idx_message_language] on [message] ([language]); -CREATE INDEX [idx_source_message_category] on [source_message] ([category]); \ No newline at end of file +CREATE INDEX [idx_source_message_category] on [source_message] ([category]); diff --git a/framework/i18n/migrations/schema-mysql.sql b/framework/i18n/migrations/schema-mysql.sql index dbbbd93514..dec180c7f0 100644 --- a/framework/i18n/migrations/schema-mysql.sql +++ b/framework/i18n/migrations/schema-mysql.sql @@ -27,7 +27,7 @@ CREATE TABLE `message` ); ALTER TABLE `message` ADD CONSTRAINT `pk_message_id_language` PRIMARY KEY (`id`, `language`); -ALTER TABLE `message` ADD CONSTRAINT `fk_message_source_message` FOREIGN KEY (`id`) REFERENCES `source_message` (`id`) ON UPDATE CASCADE ON DELETE RESTRICT; +ALTER TABLE `message` ADD CONSTRAINT `fk_message_source_message` FOREIGN KEY (`id`) REFERENCES `source_message` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE; CREATE INDEX idx_message_language ON message (language); CREATE INDEX idx_source_message_category ON source_message (category); diff --git a/framework/i18n/migrations/schema-pgsql.sql b/framework/i18n/migrations/schema-pgsql.sql index 651ee7b8bf..4e447d31c5 100644 --- a/framework/i18n/migrations/schema-pgsql.sql +++ b/framework/i18n/migrations/schema-pgsql.sql @@ -29,10 +29,10 @@ CREATE TABLE "message" ); ALTER TABLE "message" ADD CONSTRAINT "pk_message_id_language" PRIMARY KEY ("id", "language"); -ALTER TABLE "message" ADD CONSTRAINT "fk_message_source_message" FOREIGN KEY ("id") REFERENCES "source_message" ("id") ON UPDATE CASCADE ON DELETE RESTRICT; +ALTER TABLE "message" ADD CONSTRAINT "fk_message_source_message" FOREIGN KEY ("id") REFERENCES "source_message" ("id") ON UPDATE RESTRICT ON DELETE CASCADE; CREATE INDEX "idx_message_language" ON "message" USING btree (language); ALTER TABLE "message" CLUSTER ON "idx_message_language"; CREATE INDEX "idx_source_message_category" ON "source_message" USING btree (category); -ALTER TABLE "source_message" CLUSTER ON "idx_source_message_category"; \ No newline at end of file +ALTER TABLE "source_message" CLUSTER ON "idx_source_message_category"; diff --git a/framework/i18n/migrations/schema-sqlite.sql b/framework/i18n/migrations/schema-sqlite.sql index 338bf623f3..24db67acab 100644 --- a/framework/i18n/migrations/schema-sqlite.sql +++ b/framework/i18n/migrations/schema-sqlite.sql @@ -20,11 +20,11 @@ CREATE TABLE `source_message` CREATE TABLE `message` ( - `id` integer NOT NULL REFERENCES `source_message` (`id`) ON UPDATE CASCADE ON DELETE NO ACTION, + `id` integer NOT NULL REFERENCES `source_message` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE, `language` varchar(16) NOT NULL, `translation` text, PRIMARY KEY (`id`, `language`) ); CREATE INDEX idx_message_language ON message (language); -CREATE INDEX idx_source_message_category ON source_message (category); \ No newline at end of file +CREATE INDEX idx_source_message_category ON source_message (category);