Mute notices from postgresql during setup

They are mostly warnings about tables that do not exists. This
is intentional and would only confuse the casual user.

diff --git a/lib/cmd.php b/lib/cmd.php
index 9efe5653b735ca45dd12a62da471d824436dc4ee..101868109c8f2cd9cca82810583e6a9962799820 100644 (file)
--- a/lib/cmd.php
+++ b/lib/cmd.php
@@ -185,6 +185,10 @@ function runSQLScript($sScript, $bfatal = true, $bVerbose = false, $bIgnoreError
         fail('unable to start pgsql');
     }
 
+    if (!$bVerbose) {
+        fwrite($ahPipes[0], "set client_min_messages to WARNING;");
+    }
+
     while (strlen($sScript)) {
         $iWritten = fwrite($ahPipes[0], $sScript);
         if ($iWritten <= 0) break;

diff --git a/utils/setup.php b/utils/setup.php
index d8cceba474a0ac11897ab0ad107da12995656574..b9c0166c5ad213aaff4e0d0fe20529c8794f5964 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -440,7 +440,6 @@ if ($aCMDResult['load-data'] || $aCMDResult['all']) {
             // PGSQL_EMPTY_QUERY, PGSQL_COMMAND_OK, PGSQL_TUPLES_OK,
             // PGSQL_COPY_OUT, PGSQL_COPY_IN, PGSQL_BAD_RESPONSE,
             // PGSQL_NONFATAL_ERROR and PGSQL_FATAL_ERROR
-            echo 'Query result ' . $i . ' is: ' . $resultStatus . "\n";
             if ($resultStatus != PGSQL_COMMAND_OK && $resultStatus != PGSQL_TUPLES_OK) {
                 $resultError = pg_result_error($hPGresult);
                 echo '-- error text ' . $i . ': ' . $resultError . "\n";