Skip to content

Update functions.sh #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 24, 2023
Merged

Update functions.sh #224

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,10 @@ function do_dump() {
fi
if [ -n "$DB_DUMP_BY_SCHEMA" -a "$DB_DUMP_BY_SCHEMA" = "true" ]; then
if [[ -z "$DB_NAMES" ]]; then
DB_NAMES=$(mysql -h $DB_SERVER -P $DB_PORT $DBUSER $DBPASS -N -e 'show databases')
DB_LIST=$(mysql -h $DB_SERVER -P $DB_PORT $DBUSER $DBPASS -N -e 'show databases')
[ $? -ne 0 ] && return 1
else
DB_LIST="$DB_NAMES"
fi
if [ -z "$DB_NAMES_EXCLUDE" ]; then
DB_NAMES_EXCLUDE="information_schema performance_schema mysql sys"
Expand All @@ -135,7 +137,7 @@ function do_dump() {
for i in $DB_NAMES_EXCLUDE; do
exclude_list[$i]="true"
done
for onedb in $DB_NAMES; do
for onedb in $DB_LIST; do
if [ -v exclude_list[$onedb] ]; then
# skip db if it is in the exclude list
continue
Expand Down Expand Up @@ -468,7 +470,7 @@ function next_cron_expression() {
else
# if it is not a step function, just add the tmpvalid to the allvalid
allvalid="$allvalid $tmpvalid"
fi
fi
done

# sort for deduplication and ordering
Expand Down