From 9c95750c56a1712d5baca404baea13bc06bbd192 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Wed, 24 Sep 2014 09:48:25 +0200 Subject: [PATCH] Testing schemata auto-update to repo --- BuildFiles/Packaging/repackage-build | 2 +- BuildFiles/Packaging/repackage-one | 2 +- Database/Schemata/upgrade-0002.sql | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BuildFiles/Packaging/repackage-build b/BuildFiles/Packaging/repackage-build index 8bb39af6..24059906 100755 --- a/BuildFiles/Packaging/repackage-build +++ b/BuildFiles/Packaging/repackage-build @@ -47,7 +47,7 @@ echo "Notifying developers that new build has packaged for test/deployment..." if [ "$DROPFOLDER" == "internal" ]; then echo "$(cat ../lastbuild/swarmops/internal/CommitMessage.txt)" > deploymsg.txt echo "" >> deploymsg.txt - echo "The packages (swarmops-frontend-internal, swarmops-backend-internal) are available from repositories now, and can be tested at http://dev.swarmops.com/ as usual. Last 3 commits on 'master':" >> deploymsg.txt + echo "The packages (swarmops-frontend-internal, swarmops-backend-internal) are available from repositories now, and can be tested at http://dev.swarmops.com/ as usual. Last 3 commits listed above." >> deploymsg.txt else echo "NOTE: this is a $DROPFOLDER package bundle. It will deploy automatically to live systems via apt-get upgrade. Yay, we made another sprint!" > deploymsg.txt fi diff --git a/BuildFiles/Packaging/repackage-one b/BuildFiles/Packaging/repackage-one index 0c67f218..64b408f0 100755 --- a/BuildFiles/Packaging/repackage-one +++ b/BuildFiles/Packaging/repackage-one @@ -158,7 +158,7 @@ scripts/update-repos swarmops-$PACKAGENAME-latest.deb if [ "$2" == "" ]; then echo "Installing INTERNAL BUILD on swarmops-dev for testing..." - sudo dpkg -i swarmops-$PACKAGENAME-latest.deb + sudo dpkg -i --force-confdef swarmops-$PACKAGENAME-latest.deb fi echo "Cleaning up..." diff --git a/Database/Schemata/upgrade-0002.sql b/Database/Schemata/upgrade-0002.sql index 86f6986e..b20694e2 100644 --- a/Database/Schemata/upgrade-0002.sql +++ b/Database/Schemata/upgrade-0002.sql @@ -89,7 +89,7 @@ END CREATE PROCEDURE `SetFinancialAccountParent`( IN financialAccountId INTEGER, - IN parentFinancialAccount INTEGER + IN parentFinancialAccountId INTEGER ) BEGIN @@ -102,7 +102,7 @@ END # -CREATE PROCEDURE `MoveTransactionRowRangeToNewFinancialAccount`( +CREATE PROCEDURE `MoveFinancialTransactionRowRangeToNewAccount`( IN oldFinancialAccountId INTEGER, IN newFinancialAccountId INTEGER, IN startDate DATETIME,