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

feat: #6392 solveConflicts
gitea/salix/pipeline/pr-dev There was a failure building this commit Details

This commit is contained in:
Javi Gallego 2024-02-09 11:35:47 +01:00
parent 3e8fbce34d
commit 463b3fb6f3
8 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
db/versions/10862-navyHydrangea/02-updateExpense.sql
View File

@ -25,7 +25,6 @@ SET id = CASE id
WHEN 7001080000 THEN 7000108000 WHEN 7001080000 THEN 7000108000
WHEN 7002080000 THEN 7001208000 WHEN 7002080000 THEN 7001208000
WHEN 7000090000 THEN 7001009000 WHEN 7000090000 THEN 7001009000
WHEN 7000100000 THEN 7001010000
WHEN 7002090000 THEN 7001209000 WHEN 7002090000 THEN 7001209000
WHEN 7002100000 THEN 7001210000 WHEN 7002100000 THEN 7001210000
WHEN 7001090000 THEN 7001109000 WHEN 7001090000 THEN 7001109000
@ -42,5 +41,5 @@ WHERE id IN (7000010000, 7000020000, 7000030000, 7000040000, 7000050000,
7002040000, 7002050000, 7002020000, 7002010000, 7001060000, 7002040000, 7002050000, 7002020000, 7002010000, 7001060000,
7001070000, 7001030000, 7001040000, 7001050000, 7001020000, 7001070000, 7001030000, 7001040000, 7001050000, 7001020000,
7001010000, 7000080000, 7001080000, 7002080000, 7000090000, 7001010000, 7000080000, 7001080000, 7002080000, 7000090000,
7000100000, 7002090000, 7002100000, 7001090000, 7001100000, 7002090000, 7002100000, 7001090000, 7001100000,
7000120000, 7002120000, 7000130000, 7000140000, 7000008000); 7000120000, 7002120000, 7000130000, 7000140000, 7000008000);

6
db/versions/10862-navyHydrangea/03-updateExpenseConflict.sql Normal file
View File

@ -0,0 +1,6 @@
UPDATE vn.expense
SET id = CASE id
WHEN 7000100000 THEN 7001010000
ELSE id
END
WHERE id IN (7000100000);

3
db/versions/10862-navyHydrangea/03-balanceNestTree.sql → db/versions/10862-navyHydrangea/04-balanceNestTree.sql
View File

@ -26,7 +26,6 @@ UPDATE vn.balanceNestTree
WHEN 7001080000 THEN 7001108000 WHEN 7001080000 THEN 7001108000
WHEN 7002080000 THEN 7001208000 WHEN 7002080000 THEN 7001208000
WHEN 7000090000 THEN 7001009000 WHEN 7000090000 THEN 7001009000
WHEN 7000100000 THEN 7001010000
WHEN 7002090000 THEN 7001209000 WHEN 7002090000 THEN 7001209000
WHEN 7002100000 THEN 7001210000 WHEN 7002100000 THEN 7001210000
WHEN 7001090000 THEN 7001109000 WHEN 7001090000 THEN 7001109000
@ -43,5 +42,5 @@ UPDATE vn.balanceNestTree
7002040000, 7002050000, 7002020000, 7002010000, 7001060000, 7002040000, 7002050000, 7002020000, 7002010000, 7001060000,
7001070000, 7001030000, 7001040000, 7001050000, 7001020000, 7001070000, 7001030000, 7001040000, 7001050000, 7001020000,
7001010000, 7000080000, 7001080000, 7002080000, 7000090000, 7001010000, 7000080000, 7001080000, 7002080000, 7000090000,
7000100000, 7002090000, 7002100000, 7001090000, 7001100000, 7002090000, 7002100000, 7001090000, 7001100000,
7000120000, 7002120000, 7000130000, 7000140000, 7000008000); 7000120000, 7002120000, 7000130000, 7000140000, 7000008000);

6
db/versions/10862-navyHydrangea/05-balanceNestTreeConflict.sql Normal file
View File

@ -0,0 +1,6 @@
UPDATE vn.balanceNestTree
SET expenseFk = CASE expenseFk
WHEN 7000100000 THEN 7001010000
ELSE expenseFk
END
WHERE expenseFk IN (7000100000);

0
db/versions/10862-navyHydrangea/04-updateItem.sql → db/versions/10862-navyHydrangea/06-updateItem.sql
View File

28
db/versions/10862-navyHydrangea/05-updateGastosResumen copy.sql → db/versions/10862-navyHydrangea/07-updateGastosResumen.sql
View File

@ -23,18 +23,18 @@ SET Id_Gasto = CASE Id_Gastos
WHEN 7001020000 THEN 7001102000 WHEN 7001020000 THEN 7001102000
WHEN 7001010000 THEN 7001101000 WHEN 7001010000 THEN 7001101000
WHEN 7000080000 THEN 7000008000 WHEN 7000080000 THEN 7000008000
WHEN 7001080000 THEN 7000108000 WHEN 7001080000 THEN 7001108000
WHEN 7002080000 THEN 7000208000 WHEN 7002080000 THEN 7001208000
WHEN 7000090000 THEN 7000009000 WHEN 7000090000 THEN 7001009000
WHEN 7000100000 THEN 7000010000 WHEN 7002090000 THEN 7001209000
WHEN 7002090000 THEN 7000209000 WHEN 7002100000 THEN 7001210000
WHEN 7002100000 THEN 7000210000 WHEN 7001090000 THEN 7001109000
WHEN 7001090000 THEN 7000109000 WHEN 7001100000 THEN 7001110000
WHEN 7001100000 THEN 7000110000 WHEN 7000120000 THEN 7001012000
WHEN 7000120000 THEN 7000012000 WHEN 7002120000 THEN 7001212000
WHEN 7002120000 THEN 7000212000 WHEN 7000130000 THEN 7001013000
WHEN 7000130000 THEN 7000013000 WHEN 7000140000 THEN 7001014000
WHEN 7000140000 THEN 7000014000 WHEN 7000008000 THEN 7040008000
ELSE Id_Gastos ELSE Id_Gastos
END END
WHERE Id_Gastos IN (7000010000, 7000020000, 7000030000, 7000040000, 7000050000, WHERE Id_Gastos IN (7000010000, 7000020000, 7000030000, 7000040000, 7000050000,
@ -42,6 +42,6 @@ WHERE Id_Gastos IN (7000010000, 7000020000, 7000030000, 7000040000, 7000050000,
7002040000, 7002050000, 7002020000, 7002010000, 7001060000, 7002040000, 7002050000, 7002020000, 7002010000, 7001060000,
7001070000, 7001030000, 7001040000, 7001050000, 7001020000, 7001070000, 7001030000, 7001040000, 7001050000, 7001020000,
7001010000, 7000080000, 7001080000, 7002080000, 7000090000, 7001010000, 7000080000, 7001080000, 7002080000, 7000090000,
7000100000, 7002090000, 7002100000, 7001090000, 7001100000, 7002090000, 7002100000, 7001090000, 7001100000,
7000120000, 7002120000, 7000130000, 7000140000); 7000120000, 7002120000, 7000130000, 7000140000, 7000008000);

8
db/versions/10862-navyHydrangea/08-updateGastosResumenConflict.sql Normal file
View File

@ -0,0 +1,8 @@
-- en el futuro expenseSummary
UPDATE vn2008.gastos_resumen
SET Id_Gasto = CASE Id_Gastos
WHEN 7000100000 THEN 7000010000
ELSE Id_Gastos
END
WHERE Id_Gastos IN (7000100000);

0
db/versions/10862-navyHydrangea/06-updateVentasContables.sql → db/versions/10862-navyHydrangea/09-updateVentasContables.sql
View File