From 15f8c398c6e61ca69de8729c85ea17a845d34ace Mon Sep 17 00:00:00 2001 From: Karl Hepworth Date: Fri, 26 Jul 2024 15:55:53 +1000 Subject: [PATCH 1/5] Add database dump script Signed-off-by: Karl Hepworth --- mysql/scripts/database-dump | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 mysql/scripts/database-dump diff --git a/mysql/scripts/database-dump b/mysql/scripts/database-dump new file mode 100644 index 0000000..9cff01f --- /dev/null +++ b/mysql/scripts/database-dump @@ -0,0 +1,6 @@ +#!/bin/bash + +DATABASE=$1 +DUMP_DIR=$2 + +mtk dump ${DATABASE} > ${DUMP_DIR}/${DATABASE}.sql From 7e5dbb1472e775214b8d949fd1fd1e6c868f9449 Mon Sep 17 00:00:00 2001 From: Karl Hepworth Date: Sat, 27 Jul 2024 13:11:59 +1000 Subject: [PATCH 2/5] import individual database file Signed-off-by: Karl Hepworth --- mysql/scripts/database-import-file | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 mysql/scripts/database-import-file diff --git a/mysql/scripts/database-import-file b/mysql/scripts/database-import-file new file mode 100644 index 0000000..eb07740 --- /dev/null +++ b/mysql/scripts/database-import-file @@ -0,0 +1,13 @@ +#!/bin/bash + +DATABASE=$1 +DUMP_DIR=$2 +DUMP_FILE=$3 + +mysql-drop-tables ${MYSQL_USERNAME} ${MYSQL_PASSWORD} ${MYSQL_HOSTNAME} ${DATABASE} + +echo "Starting to import: ${DUMP_DIR}/${DUMP_FILE}" +start=$(date +%s) +MYSQL_PWD="${MYSQL_PASSWORD}" mysql --user=${MYSQL_USERNAME} --host=${MYSQL_HOSTNAME} ${DATABASE} < ${DUMP_DIR}/${DUMP_FILE} +end=$(date +%s) +echo "Finished importing $i in: $(($end-$start)) seconds" \ No newline at end of file From 014ad8459efc8dc5ec995735991fbca90f79d933 Mon Sep 17 00:00:00 2001 From: Karl Hepworth Date: Tue, 30 Jul 2024 13:06:37 +1000 Subject: [PATCH 3/5] Add tests; Add stdout for dump start Signed-off-by: Karl Hepworth --- mysql/scripts/database-dump | 3 ++- mysql/tests.yml | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/mysql/scripts/database-dump b/mysql/scripts/database-dump index 9cff01f..b1db4a5 100644 --- a/mysql/scripts/database-dump +++ b/mysql/scripts/database-dump @@ -3,4 +3,5 @@ DATABASE=$1 DUMP_DIR=$2 -mtk dump ${DATABASE} > ${DUMP_DIR}/${DATABASE}.sql +echo "Starting dump to ${DUMP_DIR}/${DATABASE}.sql" +mtk dump ${DATABASE} > "${DUMP_DIR}/${DATABASE}.sql" diff --git a/mysql/tests.yml b/mysql/tests.yml index e8fb63e..93d64f7 100644 --- a/mysql/tests.yml +++ b/mysql/tests.yml @@ -20,11 +20,26 @@ fileExistenceTests: shouldExist: true permissions: '-rwxr-xr-x' + - name: 'Database: Dump' + path: '/usr/local/bin/database-dump' + shouldExist: true + permissions: '-rwxr-xr-x' + + - name: 'Database: Dump Tables' + path: '/usr/local/bin/database-dump-tables' + shouldExist: true + permissions: '-rwxr-xr-x' + - name: 'Database: Import' path: '/usr/local/bin/database-import' shouldExist: true permissions: '-rwxr-xr-x' + - name: 'Database: Import File' + path: '/usr/local/bin/database-import-file' + shouldExist: true + permissions: '-rwxr-xr-x' + - name: 'Database: Restore' path: '/usr/local/bin/database-restore' shouldExist: true From 11cd0300cb43dd04c5c2949a93c560ecf9a49a5b Mon Sep 17 00:00:00 2001 From: Karl Hepworth Date: Tue, 30 Jul 2024 14:14:48 +1000 Subject: [PATCH 4/5] Update in progress message for db file importing Signed-off-by: Karl Hepworth --- mysql/scripts/database-import-file | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql/scripts/database-import-file b/mysql/scripts/database-import-file index eb07740..496e0d5 100644 --- a/mysql/scripts/database-import-file +++ b/mysql/scripts/database-import-file @@ -6,7 +6,7 @@ DUMP_FILE=$3 mysql-drop-tables ${MYSQL_USERNAME} ${MYSQL_PASSWORD} ${MYSQL_HOSTNAME} ${DATABASE} -echo "Starting to import: ${DUMP_DIR}/${DUMP_FILE}" +echo "Importing ${DUMP_DIR}/${DUMP_FILE} ..." start=$(date +%s) MYSQL_PWD="${MYSQL_PASSWORD}" mysql --user=${MYSQL_USERNAME} --host=${MYSQL_HOSTNAME} ${DATABASE} < ${DUMP_DIR}/${DUMP_FILE} end=$(date +%s) From acec50666e0b2ce7f6ed14624cde548540ecd0ac Mon Sep 17 00:00:00 2001 From: Karl Hepworth Date: Wed, 31 Jul 2024 13:45:33 +1000 Subject: [PATCH 5/5] Final changes Signed-off-by: Karl Hepworth --- mysql/scripts/database-dump | 4 ++-- mysql/scripts/database-import-file | 13 ------------- mysql/tests.yml | 5 ----- 3 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 mysql/scripts/database-import-file diff --git a/mysql/scripts/database-dump b/mysql/scripts/database-dump index b1db4a5..23f2501 100644 --- a/mysql/scripts/database-dump +++ b/mysql/scripts/database-dump @@ -3,5 +3,5 @@ DATABASE=$1 DUMP_DIR=$2 -echo "Starting dump to ${DUMP_DIR}/${DATABASE}.sql" -mtk dump ${DATABASE} > "${DUMP_DIR}/${DATABASE}.sql" +echo "Dumping ${DATABASE} to ${DUMP_DIR}/${DATABASE}.sql ..." +mtk dump ${DATABASE} > "${DUMP_DIR}/${DATABASE}.sql" \ No newline at end of file diff --git a/mysql/scripts/database-import-file b/mysql/scripts/database-import-file deleted file mode 100644 index 496e0d5..0000000 --- a/mysql/scripts/database-import-file +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -DATABASE=$1 -DUMP_DIR=$2 -DUMP_FILE=$3 - -mysql-drop-tables ${MYSQL_USERNAME} ${MYSQL_PASSWORD} ${MYSQL_HOSTNAME} ${DATABASE} - -echo "Importing ${DUMP_DIR}/${DUMP_FILE} ..." -start=$(date +%s) -MYSQL_PWD="${MYSQL_PASSWORD}" mysql --user=${MYSQL_USERNAME} --host=${MYSQL_HOSTNAME} ${DATABASE} < ${DUMP_DIR}/${DUMP_FILE} -end=$(date +%s) -echo "Finished importing $i in: $(($end-$start)) seconds" \ No newline at end of file diff --git a/mysql/tests.yml b/mysql/tests.yml index 93d64f7..9fd3b03 100644 --- a/mysql/tests.yml +++ b/mysql/tests.yml @@ -35,11 +35,6 @@ fileExistenceTests: shouldExist: true permissions: '-rwxr-xr-x' - - name: 'Database: Import File' - path: '/usr/local/bin/database-import-file' - shouldExist: true - permissions: '-rwxr-xr-x' - - name: 'Database: Restore' path: '/usr/local/bin/database-restore' shouldExist: true