From 50c1531083f450971fc814fd8fcb29b8b6d35050 Mon Sep 17 00:00:00 2001 From: Jbreso Date: Tue, 30 Jan 2024 10:31:29 +0100 Subject: [PATCH 1/6] feat: refs#Eliminar vistas vn2008 --- db/routines/vn2008/views/Equipos.sql | 8 -------- db/routines/vn2008/views/deliveryPoint.sql | 7 ------- db/routines/vn2008/views/device_user.sql | 6 ------ db/routines/vn2008/views/escritos.sql | 9 --------- 4 files changed, 30 deletions(-) delete mode 100644 db/routines/vn2008/views/Equipos.sql delete mode 100644 db/routines/vn2008/views/deliveryPoint.sql delete mode 100644 db/routines/vn2008/views/device_user.sql delete mode 100644 db/routines/vn2008/views/escritos.sql diff --git a/db/routines/vn2008/views/Equipos.sql b/db/routines/vn2008/views/Equipos.sql deleted file mode 100644 index fd1210237a..0000000000 --- a/db/routines/vn2008/views/Equipos.sql +++ /dev/null @@ -1,8 +0,0 @@ -CREATE OR REPLACE DEFINER=`root`@`localhost` - SQL SECURITY DEFINER - VIEW `vn2008`.`Equipos` -AS SELECT `h`.`code` AS `alias`, - `h`.`description` AS `descripcion`, - `h`.`workerFk` AS `trabajador_id`, - `h`.`windowsSerial` AS `windowsSerial` -FROM `vn`.`host` `h` diff --git a/db/routines/vn2008/views/deliveryPoint.sql b/db/routines/vn2008/views/deliveryPoint.sql deleted file mode 100644 index 7763bc9fa4..0000000000 --- a/db/routines/vn2008/views/deliveryPoint.sql +++ /dev/null @@ -1,7 +0,0 @@ -CREATE OR REPLACE DEFINER=`root`@`localhost` - SQL SECURITY DEFINER - VIEW `vn2008`.`deliveryPoint` -AS SELECT `dp`.`id` AS `id`, - `dp`.`name` AS `name`, - `dp`.`ubication` AS `ubication` -FROM `vn`.`deliveryPoint` `dp` diff --git a/db/routines/vn2008/views/device_user.sql b/db/routines/vn2008/views/device_user.sql deleted file mode 100644 index 52a2faafa7..0000000000 --- a/db/routines/vn2008/views/device_user.sql +++ /dev/null @@ -1,6 +0,0 @@ -CREATE OR REPLACE DEFINER=`root`@`localhost` - SQL SECURITY DEFINER - VIEW `vn2008`.`device_user` -AS SELECT `dpu`.`deviceProductionFk` AS `device_id`, - `dpu`.`userFk` AS `user_id` -FROM `vn`.`deviceProductionUser` `dpu` diff --git a/db/routines/vn2008/views/escritos.sql b/db/routines/vn2008/views/escritos.sql deleted file mode 100644 index b99bc13d76..0000000000 --- a/db/routines/vn2008/views/escritos.sql +++ /dev/null @@ -1,9 +0,0 @@ -CREATE OR REPLACE DEFINER=`root`@`localhost` - SQL SECURITY DEFINER - VIEW `vn2008`.`escritos` -AS SELECT `s`.`id` AS `id`, - `s`.`code` AS `abrev`, - `s`.`description` AS `descripcion`, - `s`.`isVisible` AS `visible`, - `s`.`hasCompany` AS `hasCompany` -FROM `vn`.`sample` `s` From 1ffbb30d77689ffc9dd9e7c219c5f335a3ada3f0 Mon Sep 17 00:00:00 2001 From: josepd Date: Fri, 2 Feb 2024 14:05:27 +0100 Subject: [PATCH 2/6] refs #6689 feat: delete view vn2008 --- db/routines/vn2008/views/Prioridades.sql | 6 ------ db/routines/vn2008/views/person_user.sql | 10 ---------- db/routines/vn2008/views/person_user_idtrabajador.sql | 9 --------- db/routines/vn2008/views/reference_min.sql | 7 ------- db/versions/10869-crimsonDracena/00-firstScript.sql | 1 + 5 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 db/routines/vn2008/views/Prioridades.sql delete mode 100644 db/routines/vn2008/views/person_user.sql delete mode 100644 db/routines/vn2008/views/person_user_idtrabajador.sql delete mode 100644 db/routines/vn2008/views/reference_min.sql create mode 100644 db/versions/10869-crimsonDracena/00-firstScript.sql diff --git a/db/routines/vn2008/views/Prioridades.sql b/db/routines/vn2008/views/Prioridades.sql deleted file mode 100644 index 7e89a538fa..0000000000 --- a/db/routines/vn2008/views/Prioridades.sql +++ /dev/null @@ -1,6 +0,0 @@ -CREATE OR REPLACE DEFINER=`root`@`localhost` - SQL SECURITY DEFINER - VIEW `vn2008`.`Prioridades` -AS SELECT `qp`.`id` AS `Id_Prioridad`, - `qp`.`priority` AS `Prioridad` -FROM `vn`.`queuePriority` `qp` diff --git a/db/routines/vn2008/views/person_user.sql b/db/routines/vn2008/views/person_user.sql deleted file mode 100644 index 1fb470c886..0000000000 --- a/db/routines/vn2008/views/person_user.sql +++ /dev/null @@ -1,10 +0,0 @@ -CREATE OR REPLACE DEFINER=`root`@`localhost` - SQL SECURITY DEFINER - VIEW `vn2008`.`person_user` -AS SELECT `u`.`id` AS `id`, - `u`.`role` AS `mysql_user_id`, - `u`.`name` AS `name`, - `u`.`password` AS `password`, - `u`.`active` AS `active`, - `u`.`lastPassChange` AS `last_pass_change` -FROM `account`.`user` `u` diff --git a/db/routines/vn2008/views/person_user_idtrabajador.sql b/db/routines/vn2008/views/person_user_idtrabajador.sql deleted file mode 100644 index 1eb45f4647..0000000000 --- a/db/routines/vn2008/views/person_user_idtrabajador.sql +++ /dev/null @@ -1,9 +0,0 @@ -CREATE OR REPLACE DEFINER=`root`@`localhost` - SQL SECURITY DEFINER - VIEW `vn2008`.`person_user_idtrabajador` -AS SELECT `t`.`Id_Trabajador` AS `Id_Trabajador` -FROM ( - `vn2008`.`person_user` `p` - JOIN `vn2008`.`Trabajadores` `t` ON(`p`.`id` = `t`.`user_id`) - ) -WHERE `t`.`user_id` = `account`.`myUser_getId`() diff --git a/db/routines/vn2008/views/reference_min.sql b/db/routines/vn2008/views/reference_min.sql deleted file mode 100644 index d40ae12a31..0000000000 --- a/db/routines/vn2008/views/reference_min.sql +++ /dev/null @@ -1,7 +0,0 @@ -CREATE OR REPLACE DEFINER=`root`@`localhost` - SQL SECURITY DEFINER - VIEW `vn2008`.`reference_min` -AS SELECT `rc`.`dated` AS `date`, - `rc`.`value` AS `rate`, - `rc`.`currencyFk` AS `moneda_id` -FROM `vn`.`referenceCurrent` `rc` diff --git a/db/versions/10869-crimsonDracena/00-firstScript.sql b/db/versions/10869-crimsonDracena/00-firstScript.sql new file mode 100644 index 0000000000..e5e3c3a4b5 --- /dev/null +++ b/db/versions/10869-crimsonDracena/00-firstScript.sql @@ -0,0 +1 @@ +REVOKE SELECT ON TABLE reference_min FROM logistic; From 518d057cf3cd4f7c5923da90eb907e8daf5d363a Mon Sep 17 00:00:00 2001 From: Jbreso Date: Fri, 2 Feb 2024 14:31:23 +0100 Subject: [PATCH 3/6] refs #6686 feat: Delete views vn2008 --- db/routines/vn2008/views/edi_feature.sql | 10 ---------- db/routines/vn2008/views/edi_genus.sql | 9 --------- db/routines/vn2008/views/edi_item_feature.sql | 11 ----------- db/routines/vn2008/views/edi_plant.sql | 10 ---------- db/routines/vn2008/views/edi_type.sql | 10 ---------- db/routines/vn2008/views/edi_value.sql | 10 ---------- 6 files changed, 60 deletions(-) delete mode 100644 db/routines/vn2008/views/edi_feature.sql delete mode 100644 db/routines/vn2008/views/edi_genus.sql delete mode 100644 db/routines/vn2008/views/edi_item_feature.sql delete mode 100644 db/routines/vn2008/views/edi_plant.sql delete mode 100644 db/routines/vn2008/views/edi_type.sql delete mode 100644 db/routines/vn2008/views/edi_value.sql diff --git a/db/routines/vn2008/views/edi_feature.sql b/db/routines/vn2008/views/edi_feature.sql deleted file mode 100644 index 7789eac060..0000000000 --- a/db/routines/vn2008/views/edi_feature.sql +++ /dev/null @@ -1,10 +0,0 @@ -CREATE OR REPLACE DEFINER=`root`@`localhost` - SQL SECURITY DEFINER - VIEW `vn2008`.`edi_feature` -AS SELECT `edi`.`feature`.`item_id` AS `item_id`, - `edi`.`feature`.`feature_type_id` AS `feature_type_id`, - `edi`.`feature`.`feature_value` AS `feature_value`, - `edi`.`feature`.`entry_date` AS `entry_date`, - `edi`.`feature`.`expiry_date` AS `expiry_date`, - `edi`.`feature`.`change_date_time` AS `change_date_time` -FROM `edi`.`feature` diff --git a/db/routines/vn2008/views/edi_genus.sql b/db/routines/vn2008/views/edi_genus.sql deleted file mode 100644 index c87ef2243a..0000000000 --- a/db/routines/vn2008/views/edi_genus.sql +++ /dev/null @@ -1,9 +0,0 @@ -CREATE OR REPLACE DEFINER=`root`@`localhost` - SQL SECURITY DEFINER - VIEW `vn2008`.`edi_genus` -AS SELECT `edi`.`genus`.`genus_id` AS `genus_id`, - `edi`.`genus`.`latin_genus_name` AS `latin_genus_name`, - `edi`.`genus`.`entry_date` AS `entry_date`, - `edi`.`genus`.`expiry_date` AS `expiry_date`, - `edi`.`genus`.`change_date_time` AS `change_date_time` -FROM `edi`.`genus` diff --git a/db/routines/vn2008/views/edi_item_feature.sql b/db/routines/vn2008/views/edi_item_feature.sql deleted file mode 100644 index 216bd7cf62..0000000000 --- a/db/routines/vn2008/views/edi_item_feature.sql +++ /dev/null @@ -1,11 +0,0 @@ -CREATE OR REPLACE DEFINER=`root`@`localhost` - SQL SECURITY DEFINER - VIEW `vn2008`.`edi_item_feature` -AS SELECT `edi`.`item_feature`.`item_id` AS `item_id`, - `edi`.`item_feature`.`presentation_order` AS `presentation_order`, - `edi`.`item_feature`.`feature` AS `feature`, - `edi`.`item_feature`.`regulation_type` AS `regulation_type`, - `edi`.`item_feature`.`entry_date` AS `entry_date`, - `edi`.`item_feature`.`expiry_date` AS `expiry_date`, - `edi`.`item_feature`.`change_date_time` AS `change_date_time` -FROM `edi`.`item_feature` diff --git a/db/routines/vn2008/views/edi_plant.sql b/db/routines/vn2008/views/edi_plant.sql deleted file mode 100644 index 3537998db8..0000000000 --- a/db/routines/vn2008/views/edi_plant.sql +++ /dev/null @@ -1,10 +0,0 @@ -CREATE OR REPLACE DEFINER=`root`@`localhost` - SQL SECURITY DEFINER - VIEW `vn2008`.`edi_plant` -AS SELECT `edi`.`plant`.`plant_id` AS `plant_id`, - `edi`.`plant`.`genus_id` AS `genus_id`, - `edi`.`plant`.`specie_id` AS `specie_id`, - `edi`.`plant`.`entry_date` AS `entry_date`, - `edi`.`plant`.`expiry_date` AS `expiry_date`, - `edi`.`plant`.`change_date_time` AS `change_date_time` -FROM `edi`.`plant` diff --git a/db/routines/vn2008/views/edi_type.sql b/db/routines/vn2008/views/edi_type.sql deleted file mode 100644 index 95d73a1ff5..0000000000 --- a/db/routines/vn2008/views/edi_type.sql +++ /dev/null @@ -1,10 +0,0 @@ -CREATE OR REPLACE DEFINER=`root`@`localhost` - SQL SECURITY DEFINER - VIEW `vn2008`.`edi_type` -AS SELECT `edi`.`type`.`type_id` AS `type_id`, - `edi`.`type`.`type_group_id` AS `type_group_id`, - `edi`.`type`.`description` AS `description`, - `edi`.`type`.`entry_date` AS `entry_date`, - `edi`.`type`.`expiry_date` AS `expiry_date`, - `edi`.`type`.`change_date_time` AS `change_date_time` -FROM `edi`.`type` diff --git a/db/routines/vn2008/views/edi_value.sql b/db/routines/vn2008/views/edi_value.sql deleted file mode 100644 index 27829aa9e2..0000000000 --- a/db/routines/vn2008/views/edi_value.sql +++ /dev/null @@ -1,10 +0,0 @@ -CREATE OR REPLACE DEFINER=`root`@`localhost` - SQL SECURITY DEFINER - VIEW `vn2008`.`edi_value` -AS SELECT `edi`.`value`.`type_id` AS `type_id`, - `edi`.`value`.`type_value` AS `type_value`, - `edi`.`value`.`type_description` AS `type_description`, - `edi`.`value`.`entry_date` AS `entry_date`, - `edi`.`value`.`expiry_date` AS `expiry_date`, - `edi`.`value`.`change_date_time` AS `change_date_time` -FROM `edi`.`value` From c3aeaf4da7b12eb4cd3096065f5ef75058e5bd22 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 2 Feb 2024 23:07:29 +0100 Subject: [PATCH 4/6] fix: refs #6371 Versions fixed --- db/versions/10835-brownCarnation/12-account_conciliacion.sql | 4 ++-- db/versions/10835-brownCarnation/25-awb_recibida.sql | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/db/versions/10835-brownCarnation/12-account_conciliacion.sql b/db/versions/10835-brownCarnation/12-account_conciliacion.sql index cf541e6c82..d8469e035c 100644 --- a/db/versions/10835-brownCarnation/12-account_conciliacion.sql +++ b/db/versions/10835-brownCarnation/12-account_conciliacion.sql @@ -1,4 +1,4 @@ -DROP TRIGGER IF EXISTS vn2008.account_conciliacion_beforeInsert; +DROP TRIGGER IF EXISTS vn2008.account_conciliacion_BEFORE_INSERT; ALTER TABLE IF EXISTS `vn2008`.`account_conciliacion` RENAME `vn`.`accountReconciliation`; @@ -11,4 +11,4 @@ CHANGE COLUMN IF EXISTS `importe` `amount` double NOT NULL, CHANGE COLUMN IF EXISTS `Concepto` `concept` varchar(255) DEFAULT NULL, CHANGE COLUMN IF EXISTS `DebeHaber` `debitCredit` smallint(6) NOT NULL, CHANGE COLUMN IF EXISTS `id_calculated` `calculatedCode` varchar(255) DEFAULT NULL, -CHANGE COLUMN IF EXISTS `odbc_date` `created` timestamp NULL DEFAULT current_timestamp(); \ No newline at end of file +CHANGE COLUMN IF EXISTS `odbc_date` `created` timestamp NULL DEFAULT current_timestamp(); diff --git a/db/versions/10835-brownCarnation/25-awb_recibida.sql b/db/versions/10835-brownCarnation/25-awb_recibida.sql index 8528b86e80..e403775c96 100644 --- a/db/versions/10835-brownCarnation/25-awb_recibida.sql +++ b/db/versions/10835-brownCarnation/25-awb_recibida.sql @@ -1,8 +1,8 @@ -DROP TRIGGER IF EXISTS vn2008.awb_recibida_afterDelete; +DROP TRIGGER IF EXISTS vn2008.awb_recibida_ad; ALTER TABLE IF EXISTS `vn2008`.`awb_recibida` RENAME `vn`.`awbInvoiceIn`; ALTER TABLE IF EXISTS `vn`.`awbInvoiceIn` CHANGE COLUMN IF EXISTS `awb_id` `awbFk` smallint(5) unsigned NOT NULL, CHANGE COLUMN IF EXISTS `recibida_id` `invoiceInFk` mediumint(8) unsigned NOT NULL, -CHANGE COLUMN IF EXISTS `dua` `sad` varchar(18) DEFAULT NULL; \ No newline at end of file +CHANGE COLUMN IF EXISTS `dua` `sad` varchar(18) DEFAULT NULL; From e704f2eaf7387f569fb5b56da9bd5c527b75e22a Mon Sep 17 00:00:00 2001 From: josepd Date: Mon, 5 Feb 2024 07:11:50 +0100 Subject: [PATCH 5/6] feat: refs #6689 Deleted view vn2008 --- db/versions/10869-crimsonDracena/00-firstScript.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/versions/10869-crimsonDracena/00-firstScript.sql b/db/versions/10869-crimsonDracena/00-firstScript.sql index e5e3c3a4b5..0042d24e30 100644 --- a/db/versions/10869-crimsonDracena/00-firstScript.sql +++ b/db/versions/10869-crimsonDracena/00-firstScript.sql @@ -1 +1 @@ -REVOKE SELECT ON TABLE reference_min FROM logistic; +REVOKE SELECT ON TABLE vn2008.reference_min FROM logistic; From d2fec7beee6fb3120eb806be6ba21aa041cafe95 Mon Sep 17 00:00:00 2001 From: davidd Date: Mon, 5 Feb 2024 07:30:04 +0100 Subject: [PATCH 6/6] refs #6642 --- db/routines/vn/views/ticketStateToday.sql | 13 ++++++------- db/routines/vn/views/zoneEstimatedDelivery.sql | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/db/routines/vn/views/ticketStateToday.sql b/db/routines/vn/views/ticketStateToday.sql index cf1f24539f..2ee65b7c28 100644 --- a/db/routines/vn/views/ticketStateToday.sql +++ b/db/routines/vn/views/ticketStateToday.sql @@ -1,16 +1,15 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `vn`.`ticketStateToday` -AS SELECT `ts`.`ticketFk` AS `ticket`, +AS SELECT + `ts`.`ticketFk` AS `ticketFk`, `ts`.`state` AS `state`, `ts`.`productionOrder` AS `productionOrder`, `ts`.`alertLevel` AS `alertLevel`, - `ts`.`userFk` AS `worker`, + `ts`.`userFk` AS `userFk`, `ts`.`code` AS `code`, `ts`.`updated` AS `updated`, `ts`.`isPicked` AS `isPicked` -FROM ( - `vn`.`ticketState` `ts` - JOIN `vn`.`ticket` `t` ON(`t`.`id` = `ts`.`ticketFk`) - ) -WHERE `t`.`shipped` BETWEEN `util`.`VN_CURDATE`() AND `MIDNIGHT`(`util`.`VN_CURDATE`()) +FROM `ticketState` `ts` + JOIN `ticket` `t` ON `t`.`id` = `ts`.`ticketFk` +WHERE `t`.`shipped` BETWEEN `util`.`VN_CURDATE`() AND `MIDNIGHT`(`util`.`VN_CURDATE`()); diff --git a/db/routines/vn/views/zoneEstimatedDelivery.sql b/db/routines/vn/views/zoneEstimatedDelivery.sql index e52d5487eb..621d1a8f00 100644 --- a/db/routines/vn/views/zoneEstimatedDelivery.sql +++ b/db/routines/vn/views/zoneEstimatedDelivery.sql @@ -9,7 +9,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` lhp.m3, dl.minSpeed FROM ticket t - JOIN ticketStateToday tst ON tst.ticket = t.id + JOIN ticketStateToday tst ON tst.ticketFk = t.id JOIN state s ON s.id = tst.state JOIN saleVolume sv ON sv.ticketFk = t.id LEFT JOIN lastHourProduction lhp ON lhp.warehouseFk = t.warehouseFk