Skip to content

Commit

Permalink
Ensure all arguments are passed to 'db connect' and add ability to pa…
Browse files Browse the repository at this point in the history
…ss arguments to 'db import'

Related to #22

Example usage:

$ warden db connect -e 'select * from theme' --skip-column-names -A

OR

$ warden db import -A --init-command="SET SESSION FOREIGN_KEY_CHECKS=0;"
  • Loading branch information
davidalger committed Jun 29, 2020
1 parent 3363e0a commit a556fd7
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions commands/db.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ eval "$(
case "${WARDEN_PARAMS[0]}" in
connect)
"${WARDEN_DIR}/bin/warden" env exec db \
mysql -u"${MYSQL_USER}" -p"${MYSQL_PASSWORD}" "${MYSQL_DATABASE}" "$@"
mysql -u"${MYSQL_USER}" -p"${MYSQL_PASSWORD}" "${MYSQL_DATABASE}" "${WARDEN_PARAMS[@]:1}" "$@"
;;
import)
LC_ALL=C sed -E 's/DEFINER[ ]*=[ ]*`[^`]+`@`[^`]+`/DEFINER=CURRENT_USER/g' \
| "${WARDEN_DIR}/bin/warden" env exec -T db \
mysql -u"${MYSQL_USER}" -p"${MYSQL_PASSWORD}" "${MYSQL_DATABASE}"
mysql -u"${MYSQL_USER}" -p"${MYSQL_PASSWORD}" "${MYSQL_DATABASE}" "${WARDEN_PARAMS[@]:1}" "$@"
;;
*)
fatal "The command \"${WARDEN_PARAMS[0]}\" does not exist. Please use --help for usage."
Expand Down

0 comments on commit a556fd7

Please sign in to comment.