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

refactor: refs #7690 unify workerTimeControlParams with workerTimeControlConfig #3191

Merged
ivanm merged 9 commits from 7690-renameConfigTables into dev 2024-11-21 09:13:53 +00:00
Conversation 1 Commits 9 Files Changed 10 +8 -10
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 830573e229 - Show all commits

14
db/routines/vn/events/printQueue_check.sql
View File

@ -33,10 +33,10 @@ DO BEGIN
FROM printQueue WHERE statusCode = 'queued'; FROM printQueue WHERE statusCode = 'queued';
SELECT isAlreadyNotified INTO vIsAlreadyNotified SELECT isAlreadyNotified INTO vIsAlreadyNotified
FROM printingQueueConfig; FROM printingQueueCheck;
IF (SELECT lastCount FROM printingQueueConfig) = vCurrentCount AND IF (SELECT lastCount FROM printingQueueCheck) = vCurrentCount AND
(SELECT lastCheckSum FROM printingQueueConfig) = vCheckSum AND (SELECT lastCheckSum FROM printingQueueCheck) = vCheckSum AND
vIsAlreadyNotified = FALSE AND vCurrentCount > 0 vIsAlreadyNotified = FALSE AND vCurrentCount > 0
THEN THEN
@ -67,16 +67,16 @@ DO BEGIN
CONCAT('Hay ', vCurrentCount, ' lineas bloqueadas', vTableQueue, '</table>') CONCAT('Hay ', vCurrentCount, ' lineas bloqueadas', vTableQueue, '</table>')
); );
UPDATE printingQueueConfig SET isAlreadyNotified = TRUE; UPDATE printingQueueCheck SET isAlreadyNotified = TRUE;
END IF; END IF;
IF (SELECT lastCount FROM printingQueueConfig) > vCurrentCount AND IF (SELECT lastCount FROM printingQueueCheck) > vCurrentCount AND
vIsAlreadyNotified = TRUE vIsAlreadyNotified = TRUE
THEN THEN
UPDATE printingQueueConfig SET isAlreadyNotified = FALSE; UPDATE printingQueueCheck SET isAlreadyNotified = FALSE;
END IF; END IF;
UPDATE printingQueueConfig UPDATE printingQueueCheck
SET lastCount = vCurrentCount, SET lastCount = vCurrentCount,
lastCheckSum = vCheckSum; lastCheckSum = vCheckSum;

4
db/versions/11354-aquaMastic/00-firstScript.sql
View File

@ -1,4 +1,2 @@
RENAME TABLE vn.workerTimeControlParams TO vn.workerTimeControlParams__; RENAME TABLE vn.workerTimeControlParams TO vn.workerTimeControlParams__;
ALTER TABLE vn.workerTimeControlParams__ COMMENT='@deprecated 2024-11-19'; ALTER TABLE vn.workerTimeControlParams__ COMMENT='@deprecated 2024-11-19';
RENAME TABLE vn.printingQueueCheck TO vn.printingQueueConfig;