Skip to content

Commit 3fa566e

Browse files
committed
Removed debugging print statements from mysql.sh.
Added exclusions for xataface views in mysqldump.sh
1 parent 6918c96 commit 3fa566e

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

scaffold_template/bin/mysql.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ scaffolddir="$SCRIPTPATH/..";
55
ACMD="$1"
66
case $ACMD in
77
init)
8-
echo "Doing mysql init"
8+
#echo "Doing mysql init"
99
mysql --socket="$scaffolddir"/tmp/mysql.sock
1010
ERROR=$?
1111
;;
1212
*)
13-
echo "Doing regular mysql"
14-
mysql --socket="$scaffolddir"/tmp/mysql.sock -u `php $SCRIPTPATH/print_config_var.php _database.user` `php $SCRIPTPATH/print_config_var.php _database.name`
13+
#echo "Doing regular mysql"
14+
mysql --socket="$scaffolddir"/tmp/mysql.sock -u `php $SCRIPTPATH/print_config_var.php _database.user` `php $SCRIPTPATH/print_config_var.php _database.name` "$@"
1515
ERROR=$?
1616
;;
1717
esac

scaffold_template/bin/mysqldump.sh

+8-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,13 @@ if [[ $status == *"ERROR!"* ]]; then
1111
fi
1212
scaffolddir="$SCRIPTPATH/..";
1313
ACMD="$1"
14-
mysqldump --socket="$scaffolddir"/tmp/mysql.sock -u `php $SCRIPTPATH/print_config_var.php _database.user` `php $SCRIPTPATH/print_config_var.php _database.name`
14+
DATABASE=`php $SCRIPTPATH/print_config_var.php _database.name`
15+
IGNORE_TABLES=""
16+
for table in $(sh bin/mysql.sh -e "show tables like 'dataface__view_%'")
17+
do
18+
IGNORE_TABLES+="--ignore-table $DATABASE.$table "
19+
done
20+
21+
mysqldump $IGNORE_TABLES --socket="$scaffolddir"/tmp/mysql.sock -u `php $SCRIPTPATH/print_config_var.php _database.user` $DATABASE
1522
ERROR=$?
1623
exit $ERROR

0 commit comments

Comments
 (0)