beenull/crowdsec
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix --column-statistics handling in mysql tests (#1680)

Browse source
This commit is contained in:
mmetc 2022-07-25 16:25:57 +02:00 committed by GitHub
parent e1954adc32
commit e13867f7c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
tests/lib/db/instance-mysql
View file

@ -51,19 +51,14 @@ setup() {
dump() { dump() {
backup_file="${1?Missing file to backup database to}" backup_file="${1?Missing file to backup database to}"
COLUMN_STATISTICS=
if mysqldump --column-statistics 2>&1 | grep -q -v 'unknown option'; then
COLUMN_STATISTICS='--column-statistics=0'
fi
silence_password_warning \ args=(mysqldump)
mysqldump \ if mysqldump --column-statistics 2>&1 | grep -q -v 'unknown option'; then
"${COLUMN_STATISTICS}" \ args+=("--column-statistics=0")
"--host=${MYSQL_HOST}" \ fi
"--port=${MYSQL_PORT}" \ args+=("--host=${MYSQL_HOST}" "--port=${MYSQL_PORT}" "--user=${MYSQL_USER}" "--password=${MYSQL_PASSWORD}" --databases crowdsec_test)
"--user=${MYSQL_USER}" \
"--password=${MYSQL_PASSWORD}" \ silence_password_warning "${args[@]}" > "${backup_file}"
--databases crowdsec_test > "${backup_file}"
} }
restore() { restore() {