verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

refs #5970 fix sql
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Alex Moreno 2023-07-06 11:51:04 +02:00
parent ea71e980cc
commit a665b6c060
4 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
db/changes/232801/00-client_create.sql
View File

@ -1,11 +1,11 @@
DROP PROCEDURE IF EXISTS vn.clientCreate; DROP PROCEDURE IF EXISTS `vn`.`clientCreate`;
DELIMITER $$ DELIMITER $$
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`client_create`( CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`client_create`(
vFirstname VARCHAR(50), vFirstname VARCHAR(50),
vSurnames VARCHAR(50), vSurnames VARCHAR(50),
vFi VARCHAR(9), vFi VARCHAR(9),
vAddress TEXT, vAddress TEXT,
vPostcode CHAR(5), vPostcode CHAR(5),
vCity VARCHAR(25), vCity VARCHAR(25),
vProvinceFk SMALLINT(5), vProvinceFk SMALLINT(5),
@ -61,7 +61,7 @@ BEGIN
provinceFk = vProvinceFk, provinceFk = vProvinceFk,
city = vCity, city = vCity,
postcode = vPostcode, postcode = vPostcode,
socialName = CONCAT(vSurnames, ' ', vFirstname), socialName = CONCAT(vSurnames, ' ', vFirstname),
payMethodFk = vPayMethodFk, payMethodFk = vPayMethodFk,
dueDay = vDueDay, dueDay = vDueDay,
credit = vDefaultCredit, credit = vDefaultCredit,
@ -75,14 +75,14 @@ BEGIN
isTaxDataChecked = vIsTaxDataChecked, isTaxDataChecked = vIsTaxDataChecked,
hasCoreVnl = vHasCoreVnl, hasCoreVnl = vHasCoreVnl,
isActive = TRUE; isActive = TRUE;
INSERT INTO mandate (clientFk, companyFk, mandateTypeFk) INSERT INTO mandate (clientFk, companyFk, mandateTypeFk)
SELECT vUserFk, vCompanyFk, vMandateTypeFk SELECT vUserFk, vCompanyFk, vMandateTypeFk
WHERE NOT EXISTS ( WHERE NOT EXISTS (
SELECT id SELECT id
FROM mandate FROM mandate
WHERE clientFk = vUserFk WHERE clientFk = vUserFk
AND companyFk = vCompanyFk AND companyFk = vCompanyFk
AND mandateTypeFk = vMandateTypeFk AND mandateTypeFk = vMandateTypeFk
); );
END$$ END$$

20
db/changes/232801/00-client_create2.sql
View File

@ -1,17 +1,17 @@
ALTER TABLE vn.clientConfig ADD defaultPayMethodFk tinyint(3) unsigned NULL; ALTER TABLE `vn`.`clientConfig` ADD defaultPayMethodFk tinyint(3) unsigned NULL;
ALTER TABLE vn.clientConfig ADD defaultDueDay int unsigned NULL; ALTER TABLE `vn`.`clientConfig` ADD defaultDueDay int unsigned NULL;
ALTER TABLE vn.clientConfig ADD defaultCredit decimal(10, 2) NULL; ALTER TABLE `vn`.`clientConfig` ADD defaultCredit decimal(10, 2) NULL;
ALTER TABLE vn.clientConfig ADD defaultIsTaxDataChecked tinyint(1) NULL; ALTER TABLE `vn`.`clientConfig` ADD defaultIsTaxDataChecked tinyint(1) NULL;
ALTER TABLE vn.clientConfig ADD defaultHasCoreVnl boolean NULL; ALTER TABLE `vn`.`clientConfig` ADD defaultHasCoreVnl boolean NULL;
ALTER TABLE vn.clientConfig ADD defaultMandateTypeFk smallint(5) NULL; ALTER TABLE `vn`.`clientConfig` ADD defaultMandateTypeFk smallint(5) NULL;
ALTER TABLE vn.clientConfig ADD CONSTRAINT clientNewConfigPayMethod_FK FOREIGN KEY (dafaultPayMethodFk) REFERENCES vn.payMethod(id); ALTER TABLE `vn`.`clientConfig` ADD CONSTRAINT clientNewConfigPayMethod_FK FOREIGN KEY (defaultPayMethodFk) REFERENCES vn.payMethod(id);
ALTER TABLE vn.clientConfig ADD CONSTRAINT clientNewConfigMandateType_FK FOREIGN KEY (defaultMandateTypeFk) REFERENCES vn.mandateType(id); ALTER TABLE `vn`.`clientConfig` ADD CONSTRAINT clientNewConfigMandateType_FK FOREIGN KEY (defaultMandateTypeFk) REFERENCES vn.mandateType(id);
UPDATE vn.clientConfig UPDATE `vn`.`clientConfig`
SET defaultPayMethodFk = 4, SET defaultPayMethodFk = 4,
defaultDueDay = 5, defaultDueDay = 5,
defaultCredit = 300.0, defaultCredit = 300.0,
defaultIsTaxDataChecked = 1, defaultIsTaxDataChecked = 1,
defaultHasCoreVnl = 1, defaultHasCoreVnl = 1,
defaultMandateTypeFk = 2 defaultMandateTypeFk = 2
WHERE id = 1; WHERE id = 1;

2
db/changes/232801/00-department.sql
View File

@ -5,7 +5,7 @@ drop trigger `vn`.`department_afterUpdate`;
DELIMITER $$ DELIMITER $$
$$ $$
create definer = root@localhost trigger department_afterUpdate create definer = root@localhost trigger `vn`.`department_afterUpdate`
after update after update
on department on department
for each row for each row

14
db/dump/fixtures.sql
View File

@ -385,6 +385,12 @@ INSERT INTO `vn`.`clientManaCache`(`clientFk`, `mana`, `dated`)
(1103, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)), (1103, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
(1104, -30, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)); (1104, -30, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH));
INSERT INTO `vn`.`mandateType`(`id`, `name`)
VALUES
(1, 'B2B'),
(2, 'CORE'),
(3, 'LCR');
INSERT INTO `vn`.`clientConfig`(`id`, `riskTolerance`, `maxCreditRows`, `maxPriceIncreasingRatio`, `riskScope`, `defaultPayMethodFk`, `defaultDueDay`, `defaultCredit`, `defaultIsTaxDataChecked`, `defaultHasCoreVnl`, `defaultMandateTypeFk`) INSERT INTO `vn`.`clientConfig`(`id`, `riskTolerance`, `maxCreditRows`, `maxPriceIncreasingRatio`, `riskScope`, `defaultPayMethodFk`, `defaultDueDay`, `defaultCredit`, `defaultIsTaxDataChecked`, `defaultHasCoreVnl`, `defaultMandateTypeFk`)
VALUES VALUES
(1, 200, 10, 0.25, 2, 4, 5, 300.00, 1, 1, 2); (1, 200, 10, 0.25, 2, 4, 5, 300.00, 1, 1, 2);
@ -828,12 +834,6 @@ INSERT INTO `vn`.`greuge`(`id`, `clientFk`, `description`, `amount`, `shipped`,
(11, 1101, 'some heritage charges', -15.99, DATE_ADD(util.VN_CURDATE(), INTERVAL 1 MONTH), util.VN_CURDATE(), 5, 1), (11, 1101, 'some heritage charges', -15.99, DATE_ADD(util.VN_CURDATE(), INTERVAL 1 MONTH), util.VN_CURDATE(), 5, 1),
(12, 1101, 'some miscellaneous charges', 58.00, DATE_ADD(util.VN_CURDATE(), INTERVAL 1 MONTH), util.VN_CURDATE(), 6, 1); (12, 1101, 'some miscellaneous charges', 58.00, DATE_ADD(util.VN_CURDATE(), INTERVAL 1 MONTH), util.VN_CURDATE(), 6, 1);
INSERT INTO `vn`.`mandateType`(`id`, `name`)
VALUES
(1, 'B2B'),
(2, 'CORE'),
(3, 'LCR');
INSERT INTO `vn`.`mandate`(`id`, `clientFk`, `companyFk`, `code`, `created`, `mandateTypeFk`) INSERT INTO `vn`.`mandate`(`id`, `clientFk`, `companyFk`, `code`, `created`, `mandateTypeFk`)
VALUES VALUES
(1, 1102, 442, '1-1', util.VN_CURDATE(), 2); (1, 1102, 442, '1-1', util.VN_CURDATE(), 2);
@ -2597,7 +2597,7 @@ UPDATE `vn`.`ticket`
UPDATE `vn`.`ticket` UPDATE `vn`.`ticket`
SET refFk = 'A1111111' SET refFk = 'A1111111'
WHERE id = 6; WHERE id = 6;
INSERT INTO `vn`.`zoneAgencyMode`(`id`, `agencyModeFk`, `zoneFk`) INSERT INTO `vn`.`zoneAgencyMode`(`id`, `agencyModeFk`, `zoneFk`)
VALUES VALUES