7336_devToTest #2414

Merged
alexm merged 220 commits from 7336_devToTest into test 2024-05-07 06:26:53 +00:00
2 changed files with 8 additions and 7 deletions
Showing only changes of commit 1534402640 - Show all commits

View File

@ -206,7 +206,8 @@ BEGIN
SUM(b2.', vTwoYearsAgo,') twoYearsAgo SUM(b2.', vTwoYearsAgo,') twoYearsAgo
FROM tmp.nest b1 FROM tmp.nest b1
JOIN tmp.balance_aux b2 on b2.lft BETWEEN b1.lft and b1.rgt JOIN tmp.balance_aux b2 on b2.lft BETWEEN b1.lft and b1.rgt
GROUP BY b1.id)sub ON sub.id = b.id GROUP BY b1.id
)sub ON sub.id = b.id
SET b.', vYear, ' = thisYear, SET b.', vYear, ' = thisYear,
b.', vOneYearAgo, ' = oneYearAgo, b.', vOneYearAgo, ' = oneYearAgo,
b.', vTwoYearsAgo, ' = twoYearsAgo'); b.', vTwoYearsAgo, ' = twoYearsAgo');