From fd50b407c466e29b38b86bb94816f151cce65ea9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sloup?= Date: Thu, 1 Sep 2022 17:16:42 +0200 Subject: [PATCH] Disable varDump postgresqlDataDir command as it was not found While running the script command varDump postgresqlDataDir; was executed, but it was no longer found. It is not needed for the script to work Tests for libecpg were commented, so our changes from the documentation are visible --- Sanity/libecpg/runtest.sh | 2 +- Sanity/libecpg/testecpg-decimal.pgc | 4 +++- Sanity/libecpg/testecpg-interval.pgc | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Sanity/libecpg/runtest.sh b/Sanity/libecpg/runtest.sh index b89d652..3877b00 100755 --- a/Sanity/libecpg/runtest.sh +++ b/Sanity/libecpg/runtest.sh @@ -47,7 +47,7 @@ rlJournalStart rlPhaseEnd rlPhaseStartSetup "Database setup" - varDump postgresqlDataDir; + # varDump postgresqlDataDir; [[ -d $postgresqlDataDir ]] && rlFileBackup $postgresqlDataDir; postgresqlCleanup; postgresqlInitDB; diff --git a/Sanity/libecpg/testecpg-decimal.pgc b/Sanity/libecpg/testecpg-decimal.pgc index d22a77c..7bc7151 100644 --- a/Sanity/libecpg/testecpg-decimal.pgc +++ b/Sanity/libecpg/testecpg-decimal.pgc @@ -1,4 +1,4 @@ -// Taken from https://www.postgresql.org/docs/13/ecpg-variables.html +// Taken from https://www.postgresql.org/docs/14/ecpg-variables.html #include #include @@ -15,7 +15,9 @@ EXEC SQL BEGIN DECLARE SECTION; decimal *dec; EXEC SQL END DECLARE SECTION; +// Add "USER postgres;" EXEC SQL CONNECT TO testdb USER postgres; +// EXEC SQL SELECT pg_catalog.set_config('search_path', '', false); EXEC SQL COMMIT; num = PGTYPESnumeric_new(); dec = PGTYPESdecimal_new(); diff --git a/Sanity/libecpg/testecpg-interval.pgc b/Sanity/libecpg/testecpg-interval.pgc index d065911..5fa5b75 100644 --- a/Sanity/libecpg/testecpg-interval.pgc +++ b/Sanity/libecpg/testecpg-interval.pgc @@ -1,4 +1,4 @@ -// Taken from https://www.postgresql.org/docs/13/ecpg-variables.html +// Taken from https://www.postgresql.org/docs/14/ecpg-variables.html #include #include @@ -11,7 +11,9 @@ EXEC SQL BEGIN DECLARE SECTION; interval *in; EXEC SQL END DECLARE SECTION; +// Add "USER postgres;" EXEC SQL CONNECT TO testdb USER postgres; +// EXEC SQL SELECT pg_catalog.set_config('search_path', '', false); EXEC SQL COMMIT; in = PGTYPESinterval_new(); EXEC SQL SELECT '1 min'::interval INTO :in;