Merge branch '6371-restoreSeries' of https://gitea.verdnatura.es/verdnatura/salix into 6371-restoreSeries
This commit is contained in:
commit
53a48735e8
|
|
@ -19,7 +19,7 @@
|
|||
-- Current Database: `account`
|
||||
--
|
||||
|
||||
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `account` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci */;
|
||||
CREATE DATABASE /*!32312 */ `account` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci */;
|
||||
|
||||
USE `account`;
|
||||
|
||||
|
|
@ -2230,7 +2230,7 @@ DELIMITER ;
|
|||
-- Current Database: `bi`
|
||||
--
|
||||
|
||||
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `bi` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci */;
|
||||
CREATE DATABASE /*!32312 */ `bi` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci */;
|
||||
|
||||
USE `bi`;
|
||||
|
||||
|
|
@ -4000,7 +4000,7 @@ DELIMITER ;
|
|||
-- Current Database: `bs`
|
||||
--
|
||||
|
||||
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `bs` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci */;
|
||||
CREATE DATABASE /*!32312 */ `bs` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci */;
|
||||
|
||||
USE `bs`;
|
||||
|
||||
|
|
@ -6967,7 +6967,7 @@ DELIMITER ;
|
|||
-- Current Database: `cache`
|
||||
--
|
||||
|
||||
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `cache` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci */;
|
||||
CREATE DATABASE /*!32312 */ `cache` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci */;
|
||||
|
||||
USE `cache`;
|
||||
|
||||
|
|
@ -8087,7 +8087,7 @@ DELIMITER ;
|
|||
-- Current Database: `dipole`
|
||||
--
|
||||
|
||||
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `dipole` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci */;
|
||||
CREATE DATABASE /*!32312 */ `dipole` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci */;
|
||||
|
||||
USE `dipole`;
|
||||
|
||||
|
|
@ -8316,7 +8316,7 @@ DELIMITER ;
|
|||
-- Current Database: `edi`
|
||||
--
|
||||
|
||||
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `edi` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci */;
|
||||
CREATE DATABASE /*!32312 */ `edi` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci */;
|
||||
|
||||
USE `edi`;
|
||||
|
||||
|
|
@ -11054,7 +11054,7 @@ DELIMITER ;
|
|||
-- Current Database: `floranet`
|
||||
--
|
||||
|
||||
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `floranet` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci */;
|
||||
CREATE DATABASE /*!32312 */ `floranet` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci */;
|
||||
|
||||
USE `floranet`;
|
||||
|
||||
|
|
@ -11638,7 +11638,7 @@ DELIMITER ;
|
|||
-- Current Database: `hedera`
|
||||
--
|
||||
|
||||
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `hedera` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci */;
|
||||
CREATE DATABASE /*!32312 */ `hedera` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci */;
|
||||
|
||||
USE `hedera`;
|
||||
|
||||
|
|
@ -15833,7 +15833,7 @@ DELIMITER ;
|
|||
-- Current Database: `pbx`
|
||||
--
|
||||
|
||||
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `pbx` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci */;
|
||||
CREATE DATABASE /*!32312 */ `pbx` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci */;
|
||||
|
||||
USE `pbx`;
|
||||
|
||||
|
|
@ -16499,7 +16499,7 @@ DELIMITER ;
|
|||
-- Current Database: `psico`
|
||||
--
|
||||
|
||||
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `psico` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci */;
|
||||
CREATE DATABASE /*!32312 */ `psico` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci */;
|
||||
|
||||
USE `psico`;
|
||||
|
||||
|
|
@ -16834,7 +16834,7 @@ DELIMITER ;
|
|||
-- Current Database: `sage`
|
||||
--
|
||||
|
||||
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `sage` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci */;
|
||||
CREATE DATABASE /*!32312 */ `sage` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci */;
|
||||
|
||||
USE `sage`;
|
||||
|
||||
|
|
@ -19146,7 +19146,7 @@ DELIMITER ;
|
|||
-- Current Database: `salix`
|
||||
--
|
||||
|
||||
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `salix` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci */;
|
||||
CREATE DATABASE /*!32312 */ `salix` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci */;
|
||||
|
||||
USE `salix`;
|
||||
|
||||
|
|
@ -19440,7 +19440,7 @@ DELIMITER ;
|
|||
-- Current Database: `srt`
|
||||
--
|
||||
|
||||
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `srt` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci */;
|
||||
CREATE DATABASE /*!32312 */ `srt` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci */;
|
||||
|
||||
USE `srt`;
|
||||
|
||||
|
|
@ -22991,7 +22991,7 @@ DELIMITER ;
|
|||
-- Current Database: `stock`
|
||||
--
|
||||
|
||||
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `stock` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci */;
|
||||
CREATE DATABASE /*!32312 */ `stock` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci */;
|
||||
|
||||
USE `stock`;
|
||||
|
||||
|
|
@ -24069,7 +24069,7 @@ DELIMITER ;
|
|||
-- Current Database: `tmp`
|
||||
--
|
||||
|
||||
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `tmp` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci */;
|
||||
CREATE DATABASE /*!32312 */ `tmp` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci */;
|
||||
|
||||
USE `tmp`;
|
||||
|
||||
|
|
@ -24147,7 +24147,7 @@ DELIMITER ;
|
|||
-- Current Database: `util`
|
||||
--
|
||||
|
||||
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `util` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci */;
|
||||
CREATE DATABASE /*!32312 */ `util` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci */;
|
||||
|
||||
USE `util`;
|
||||
|
||||
|
|
@ -26252,7 +26252,7 @@ DELIMITER ;
|
|||
-- Current Database: `vn`
|
||||
--
|
||||
|
||||
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `vn` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci */;
|
||||
CREATE DATABASE /*!32312 */ `vn` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci */;
|
||||
|
||||
USE `vn`;
|
||||
|
||||
|
|
@ -63220,7 +63220,7 @@ BEGIN
|
|||
* @param vDate -> Date of the purchase operation.
|
||||
* @param vWarehouseFk -> Identifier of the warehouse (warehouseId).
|
||||
*/
|
||||
ALTER TABLE tmp.itemInventory ADD IF NOT EXISTS buy_id INT;
|
||||
ALTER TABLE tmp.itemInventory ADD buy_id INT;
|
||||
|
||||
CALL buyUltimate(vWarehouseFk, vDate);
|
||||
|
||||
|
|
@ -68883,7 +68883,7 @@ proc: BEGIN
|
|||
|
||||
CALL zone_getLanded(vShipped, vAddressFk, vAgencyModeFk, vWarehouseFk, TRUE);
|
||||
|
||||
IF NOT EXISTS (SELECT TRUE FROM tmp.zoneGetLanded LIMIT 1) THEN
|
||||
(SELECT TRUE FROM tmp.zoneGetLanded LIMIT 1) THEN
|
||||
CALL util.throw(CONCAT('There is no zone for these parameters ', vTicketFk));
|
||||
END IF;
|
||||
|
||||
|
|
@ -77852,11 +77852,11 @@ BEGIN
|
|||
|
||||
IF vWorkerFk THEN
|
||||
CALL timeControl_calculateByUser(vWorkerFk, vDatedFrom , vDatedTimeTo);
|
||||
CREATE TEMPORARY TABLE IF NOT EXISTS tmp.`user`
|
||||
CREATE TEMPORARY TABLE tmp.`user`
|
||||
SELECT vWorkerFk userFk;
|
||||
ELSE
|
||||
CALL timeControl_calculateAll(vDatedFrom, vDatedTimeTo);
|
||||
CREATE TEMPORARY TABLE IF NOT EXISTS tmp.`user`
|
||||
CREATE TEMPORARY TABLE tmp.`user`
|
||||
SELECT id userFk
|
||||
FROM worker w;
|
||||
END IF;
|
||||
|
|
@ -81544,7 +81544,7 @@ DELIMITER ;
|
|||
-- Current Database: `vn2008`
|
||||
--
|
||||
|
||||
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `vn2008` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci */;
|
||||
CREATE DATABASE /*!32312 */ `vn2008` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci */;
|
||||
|
||||
USE `vn2008`;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue