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

Merge branch 'dev' into 7744-closeAllTest

This commit is contained in:
Javi Gallego 2024-10-16 09:09:41 +02:00
parent 4a88ba5078 5a2058865d
commit f78aad0874
5 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
back/methods/vn-user/specs/renew-token.spec.js
View File

@ -72,9 +72,9 @@ describe('Renew Token', () => {
}
expect(error).toBeDefined();
const query = 'SELECT * FROM util.debug WHERE variable = "renewToken"';
const debugLog = await models.Application.rawSql(query, null);
const query = 'SELECT * FROM util.debug WHERE variable = "renewToken"';
const debugLog = await models.Application.rawSql(query);
expect(debugLog.length).toEqual(1);
});

6
db/versions/11230-brownEucalyptus/00-addClientObservationType.sql
View File

@ -1,3 +1,3 @@
ALTER TABLE vn.clientObservation
ADD COLUMN observationTypeFk TINYINT(3) UNSIGNED NOT NULL,
ADD CONSTRAINT clientObservationTypeFk FOREIGN KEY (observationTypeFk) REFERENCES vn.observationType(id);
ALTER TABLE vn.clientObservation DROP COLUMN IF EXISTS observationTypeFk;
ALTER TABLE vn.clientObservation ADD COLUMN IF NOT EXISTS observationTypeFk TINYINT(3) UNSIGNED NULL;
ALTER TABLE vn.clientObservation ADD CONSTRAINT clientObservationTypeFk FOREIGN KEY IF NOT EXISTS (observationTypeFk) REFERENCES vn.observationType(id);

2
db/versions/11251-navyChrysanthemum/00-firstScript.sql
View File

@ -1,5 +1,3 @@
/*
UPDATE vn.sale
SET originalQuantity = quantity
WHERE originalQuantity IS NULL
*/

2
db/versions/11251-navyChrysanthemum/01-firstScript.sql
View File

@ -1 +1 @@
-- ALTER TABLE vn.sale MODIFY COLUMN originalQuantity decimal(10,2) DEFAULT 0.00 NOT NULL COMMENT 'Se utiliza para notificar a través de rocket los cambios de quantity';
ALTER TABLE vn.sale MODIFY COLUMN originalQuantity decimal(10,2) DEFAULT 0.00 NOT NULL COMMENT 'Se utiliza para notificar a través de rocket los cambios de quantity';

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "salix-back",
"version": "24.42.0",
"version": "24.44.0",
"author": "Verdnatura Levante SL",
"description": "Salix backend",
"license": "GPL-3.0",