database/benchmark.sh in message-db-2.1.6 vs database/benchmark.sh in message-db-3.0.0

@@ -33,30 +33,34 @@
   database=$DATABASE_NAME
 fi
 echo "Database name is: $database"
 echo
 
+function run_psql {
+  psql $database -v ON_ERROR_STOP=1 "$@"
+}
+
 echo "Installing benchmark scripts"
 echo
 
-psql $database -q -f $base/benchmark_write.sql
-psql $database -q -f $base/benchmark_get.sql
+run_psql -q -f $base/benchmark_write.sql
+run_psql -q -f $base/benchmark_get.sql
 
 echo
 echo "Benchmarking write"
 echo "- - -"
 echo
 
-psql $database -U message_store -c "EXPLAIN ANALYZE SELECT benchmark_write('$stream_name'::varchar, $cycles::int);"
+run_psql -U message_store -c "EXPLAIN ANALYZE SELECT benchmark_write('$stream_name'::varchar, $cycles::int);"
 
 echo
 
 echo
 echo "Benchmarking get"
 echo "- - -"
 echo
 
-psql $database -U message_store -c "EXPLAIN ANALYZE SELECT benchmark_get('$stream_name'::varchar, $cycles::int);"
+run_psql -U message_store -c "EXPLAIN ANALYZE SELECT benchmark_get('$stream_name'::varchar, $cycles::int);"
 
 echo "= = ="
 echo "Done"
 echo