From 5404f895b26d7b4cf44100157df1d75fe75afb21 Mon Sep 17 00:00:00 2001 From: ivanm Date: Wed, 12 Feb 2025 17:08:45 +0100 Subject: [PATCH 1/2] refactor: refs #8573 add fk to expedition.hostFk --- db/versions/11441-limeCyca/00-firstScript.sql | 9 +++++++++ modules/ticket/back/methods/boxing/getVideo.js | 2 +- modules/ticket/back/methods/boxing/getVideoList.js | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 db/versions/11441-limeCyca/00-firstScript.sql diff --git a/db/versions/11441-limeCyca/00-firstScript.sql b/db/versions/11441-limeCyca/00-firstScript.sql new file mode 100644 index 0000000000..f417a2c8ef --- /dev/null +++ b/db/versions/11441-limeCyca/00-firstScript.sql @@ -0,0 +1,9 @@ +ALTER TABLE vn.expedition + MODIFY COLUMN hostFk VARCHAR(30) COLLATE utf8mb3_general_ci; + +ALTER TABLE vn.expedition + ADD CONSTRAINT fk_expedition_host_code + FOREIGN KEY (hostFk) + REFERENCES host(code) + ON UPDATE CASCADE + ON DELETE CASCADE; \ No newline at end of file diff --git a/modules/ticket/back/methods/boxing/getVideo.js b/modules/ticket/back/methods/boxing/getVideo.js index 6f471e837f..fe951a3705 100644 --- a/modules/ticket/back/methods/boxing/getVideo.js +++ b/modules/ticket/back/methods/boxing/getVideo.js @@ -49,7 +49,7 @@ module.exports = Self => { ps.monitorId, e.created FROM expedition e - JOIN host h ON Convert(h.code USING utf8mb3) COLLATE utf8mb3_unicode_ci = e.hostFk + JOIN host h ON h.code = e.hostFk JOIN packingSite ps ON ps.hostFk = h.id WHERE e.id = ?;`; const [expedition] = await models.Expedition.rawSql(query, [id]); diff --git a/modules/ticket/back/methods/boxing/getVideoList.js b/modules/ticket/back/methods/boxing/getVideoList.js index db68d05063..41930c7f7d 100644 --- a/modules/ticket/back/methods/boxing/getVideoList.js +++ b/modules/ticket/back/methods/boxing/getVideoList.js @@ -44,7 +44,7 @@ module.exports = Self => { ps.monitorId, e.created FROM expedition e - JOIN host h ON Convert(h.code USING utf8mb3) COLLATE utf8mb3_unicode_ci = e.hostFk + JOIN host h ON h.code = e.hostFk JOIN packingSite ps ON ps.hostFk = h.id WHERE e.id = ?;`; From caa921020d4debcd68344e97c02e0a7aee45e8a4 Mon Sep 17 00:00:00 2001 From: ivanm Date: Thu, 13 Feb 2025 16:41:29 +0100 Subject: [PATCH 2/2] refactor: refs #8573 update before alter table --- db/versions/11441-limeCyca/00-firstScript.sql | 18 +++++++++--------- db/versions/11441-limeCyca/01-firstScript.sql | 9 +++++++++ 2 files changed, 18 insertions(+), 9 deletions(-) create mode 100644 db/versions/11441-limeCyca/01-firstScript.sql diff --git a/db/versions/11441-limeCyca/00-firstScript.sql b/db/versions/11441-limeCyca/00-firstScript.sql index f417a2c8ef..54024ec8d1 100644 --- a/db/versions/11441-limeCyca/00-firstScript.sql +++ b/db/versions/11441-limeCyca/00-firstScript.sql @@ -1,9 +1,9 @@ -ALTER TABLE vn.expedition - MODIFY COLUMN hostFk VARCHAR(30) COLLATE utf8mb3_general_ci; - -ALTER TABLE vn.expedition - ADD CONSTRAINT fk_expedition_host_code - FOREIGN KEY (hostFk) - REFERENCES host(code) - ON UPDATE CASCADE - ON DELETE CASCADE; \ No newline at end of file +UPDATE vn.expedition e + JOIN ( + SELECT id + FROM vn.expedition + WHERE hostFk COLLATE utf8mb3_unicode_ci NOT IN + (SELECT code COLLATE utf8mb3_unicode_ci FROM host WHERE code IS NOT NULL) + ) s + ON e.id = s.id + SET e.hostFk = 'pc336'; \ No newline at end of file diff --git a/db/versions/11441-limeCyca/01-firstScript.sql b/db/versions/11441-limeCyca/01-firstScript.sql new file mode 100644 index 0000000000..f417a2c8ef --- /dev/null +++ b/db/versions/11441-limeCyca/01-firstScript.sql @@ -0,0 +1,9 @@ +ALTER TABLE vn.expedition + MODIFY COLUMN hostFk VARCHAR(30) COLLATE utf8mb3_general_ci; + +ALTER TABLE vn.expedition + ADD CONSTRAINT fk_expedition_host_code + FOREIGN KEY (hostFk) + REFERENCES host(code) + ON UPDATE CASCADE + ON DELETE CASCADE; \ No newline at end of file