From 131b8d3505393da5a80548301e9b34f75c67d9f9 Mon Sep 17 00:00:00 2001 From: Arjan H Date: Sat, 18 Jan 2025 19:49:20 +0100 Subject: [PATCH] Fix new(ish) db migration and add check --- dev/versions | 20 ++++++++++++++++++++ patch.sh | 1 + patches/db_migrations5.patch | 13 +++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 patches/db_migrations5.patch diff --git a/dev/versions b/dev/versions index e0e29df..762907a 100755 --- a/dev/versions +++ b/dev/versions @@ -77,6 +77,20 @@ colorGoVersion2() { echo "* $fileName:$res" } +colorEqual() { + local first="$1" + local second="$2" + + if [ "$first" = "$second" ]; then + res=$(echo $first | sed -e "s/$first/${COL_LIGHT_GREEN}$first${COL_NC}/") + echo " $res" + else + res=$(echo $first | sed -e "s/$first/${COL_LIGHT_RED}$first${COL_NC}/") + echo " $res, but have $second" + fi + +} + echo cd ../boulder @@ -112,3 +126,9 @@ grep GO_VERSION ../boulder/docker-compose.yml | sed -e "s/\s*GO_VERSION:/ /" colorGoVersion2 build/docker-compose.yml $goversion echo +db_migrs=$(ls -1 ../boulder/sa/db/boulder_sa/ | wc -l) +db_patches=$(ls -1 ../labca/patches/db_migrations* | wc -l) +echo -n "Database migrations " +colorEqual $db_migrs $db_patches +echo + diff --git a/patch.sh b/patch.sh index 3823585..7f34b34 100755 --- a/patch.sh +++ b/patch.sh @@ -33,6 +33,7 @@ $SUDO patch -p1 < $cloneDir/patches/db_migrations.patch $SUDO patch -p1 < $cloneDir/patches/db_migrations2.patch $SUDO patch -p1 < $cloneDir/patches/db_migrations3.patch $SUDO patch -p1 < $cloneDir/patches/db_migrations4.patch +$SUDO patch -p1 < $cloneDir/patches/db_migrations5.patch $SUDO patch -p1 < $cloneDir/patches/errors_errors.patch $SUDO patch -p1 < $cloneDir/patches/expiration-mailer_main.patch $SUDO patch -p1 < $cloneDir/patches/issuance_crl.patch diff --git a/patches/db_migrations5.patch b/patches/db_migrations5.patch new file mode 100644 index 0000000..e60bf8c --- /dev/null +++ b/patches/db_migrations5.patch @@ -0,0 +1,13 @@ +diff --git a/sa/db/boulder_sa/20240514000000_Paused.sql b/sa/db/boulder_sa/20240514000000_Paused.sql +index 9f5890cad..1707916ba 100644 +--- a/sa/db/boulder_sa/20240514000000_Paused.sql ++++ b/sa/db/boulder_sa/20240514000000_Paused.sql +@@ -5,7 +5,7 @@ + -- partition it. This table expected to be < 800K rows initially and grow at a + -- rate of ~18% per year. + +-CREATE TABLE `paused` ( ++CREATE TABLE IF NOT EXISTS `paused` ( + `registrationID` bigint(20) UNSIGNED NOT NULL, + `identifierType` tinyint(4) NOT NULL, + `identifierValue` varchar(255) NOT NULL,