diff --git a/db/versions/11441-limeCyca/00-firstScript.sql b/db/versions/11441-limeCyca/00-firstScript.sql new file mode 100644 index 0000000000..54024ec8d1 --- /dev/null +++ b/db/versions/11441-limeCyca/00-firstScript.sql @@ -0,0 +1,9 @@ +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 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 = ?;`;