From f7930ad66410b7fff40945aa87a7052877801124 Mon Sep 17 00:00:00 2001 From: Bernat Date: Wed, 6 Jun 2018 14:49:31 +0200 Subject: [PATCH] update structure and fixtures --- services/db/install/changes/1.0.6/buy.sql | 5 +++-- services/db/install/changes/1.0.6/ekt.sql | 7 ++++--- services/db/install/dump/fixtures.sql | 10 +++++----- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/services/db/install/changes/1.0.6/buy.sql b/services/db/install/changes/1.0.6/buy.sql index 242cc744e..a46700342 100644 --- a/services/db/install/changes/1.0.6/buy.sql +++ b/services/db/install/changes/1.0.6/buy.sql @@ -1,5 +1,6 @@ +USE `vn`; CREATE - ALGORITHM = UNDEFINED + OR REPLACE ALGORITHM = UNDEFINED DEFINER = `root`@`%` SQL SECURITY DEFINER VIEW `buy` AS @@ -28,4 +29,4 @@ VIEW `buy` AS `c`.`buy_edi_id` AS `ektFk`, `c`.`Novincular` AS `isIgnored` FROM - `vn2008`.`Compres` `c` \ No newline at end of file + `vn2008`.`Compres` `c`; diff --git a/services/db/install/changes/1.0.6/ekt.sql b/services/db/install/changes/1.0.6/ekt.sql index 513e51387..04679d689 100644 --- a/services/db/install/changes/1.0.6/ekt.sql +++ b/services/db/install/changes/1.0.6/ekt.sql @@ -1,5 +1,6 @@ +USE `edi`; CREATE - ALGORITHM = UNDEFINED + OR REPLACE ALGORITHM = UNDEFINED DEFINER = `root`@`%` SQL SECURITY DEFINER VIEW `edi`.`ekt` AS @@ -38,7 +39,7 @@ VIEW `edi`.`ekt` AS `vn2008`.`buy_edi`.`s5` AS `s5`, `vn2008`.`buy_edi`.`s6` AS `s6`, `vn2008`.`buy_edi`.`ok` AS `ok`, - `vn2008`.`buy_edi`.`trolley_id` AS `trolley_id`, + `vn2008`.`buy_edi`.`trolley_id` AS `trolley_id`, `vn2008`.`buy_edi`.`scanned` AS `scanned` FROM - `vn2008`.`buy_edi` \ No newline at end of file + `vn2008`.`buy_edi`; diff --git a/services/db/install/dump/fixtures.sql b/services/db/install/dump/fixtures.sql index c2dc7c9de..ccdf72114 100644 --- a/services/db/install/dump/fixtures.sql +++ b/services/db/install/dump/fixtures.sql @@ -631,12 +631,12 @@ INSERT INTO `vn`.`ticketWeekly`(`ticketFk`, `weekDay`) ( 4, 4), ( 5, 6); -INSERT INTO `vn`.`travel`(`id`, `landed`, `warehouseInFk`, `warehouseOutFk`, `agencyFk`, `m3`, `kg`) +INSERT INTO `vn`.`travel`(`id`,`shipped`, `landed`, `warehouseInFk`, `warehouseOutFk`, `agencyFk`, `m3`, `kg`) VALUES - ( 1, CURDATE(), 1, 2, 1, 100.00, 1000), - ( 2, CURDATE(), 1, 2, 1, 150, 2000), - ( 3, CURDATE(), 1, 2, 1, 0.00, 0.00), - ( 4, CURDATE(), 1, 2, 1, 50.00, 500); + ( 1, CURDATE(), CURDATE(), 1, 2, 1, 100.00, 1000), + ( 2, CURDATE(), CURDATE(), 1, 2, 1, 150, 2000), + ( 3, CURDATE(), CURDATE(), 1, 2, 1, 0.00, 0.00), + ( 4, CURDATE(), CURDATE(), 1, 2, 1, 50.00, 500); INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `companyFk`) VALUES