X-Git-Url: http://mop.ddnsfree.com/gitweb/?p=brisk.git;a=blobdiff_plain;f=sql%2Fbuilder.sh;h=e71d26e21f95c88d2fee2d5f0226f0bdb5c6dd4c;hp=3d145a6b6ce1eacb9058e1369ea49e3c6ae9bd69;hb=af5d80281ca7394f3365bbbeaabbe5d471ebe310;hpb=bef452514e4c78f5f13ad096b6643cd6d7d081f5 diff --git a/sql/builder.sh b/sql/builder.sh index 3d145a6..e71d26e 100755 --- a/sql/builder.sh +++ b/sql/builder.sh @@ -3,6 +3,7 @@ # MATCH_DROP='^DROP.*([^-]...|.[^-]..|..[^M].|...[^F])$|^ALTER TABLE.* DROP .*([^-]...|.[^-]..|..[^M].|...[^F])$|^DELETE .*([^-]...|.[^-]..|..[^M].|...[^F])$|--MB$' +DATECUR="$(date +%s)" # functions usage () { @@ -37,9 +38,9 @@ sqlexe () { sht=$1 if [ "$SHORT" = "y" ]; then - sed "s/#PFX#/$PFX/g" | psql -a $pg_args 2>&1 | egrep 'ERROR|^-- MESG' + sed "s/#PFX#/$PFX/g;s/#NOW#/$DATECUR/g" | psql -a $pg_args 2>&1 | egrep 'ERROR|^-- MESG|^-- FILE ' else - sed "s/#PFX#/$PFX/g" | psql -a $pg_args + sed "s/#PFX#/$PFX/g;s/#NOW#/$DATECUR/g" | psql -a $pg_args fi return 0