From 8a5208e9b3e0698bc1df93ab91ec4a32d03fad03 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 1 Dec 2011 12:40:01 +0200
Subject: Make sure PostgreSQL psql driver stops at first error and exits with
 error code

---
 build/pgsql/pgsql | 2 +-
 m4/pgsql.m4       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/pgsql/pgsql b/build/pgsql/pgsql
index 0f92871..356079a 100755
--- a/build/pgsql/pgsql
+++ b/build/pgsql/pgsql
@@ -49,7 +49,7 @@ opt="--quiet $opt"
 export PGOPTIONS=--client-min-messages=warning
 
 if [ -n "$1" ]; then
-  exec $driver $opt <$1
+  exec $driver $opt --set ON_ERROR_STOP=1 -f $1
 else
   exec $driver $opt
 fi
diff --git a/m4/pgsql.m4 b/m4/pgsql.m4
index f894891..e4f6d71 100644
--- a/m4/pgsql.m4
+++ b/m4/pgsql.m4
@@ -180,7 +180,7 @@ AC_CONFIG_COMMANDS([pgsql.options],
    echo 'export PGOPTIONS' >>db-driver
 
    echo 'if test x$[]1 != x; then' >>db-driver
-   echo "  exec $pgsql_client "'$opt <$[]1' >>db-driver
+   echo "  exec $pgsql_client "'$opt --set ON_ERROR_STOP=1 -f $[]1' >>db-driver
    echo "else" >>db-driver
    echo "  exec $pgsql_client "'$opt' >>db-driver
    echo "fi" >>db-driver
-- 
cgit v1.1