!2 update to 3.14.2

From: @dillon_chen 
Reviewed-by: @shinwell_hu 
Signed-off-by: @shinwell_hu
This commit is contained in:
openeuler-ci-bot 2022-11-22 12:21:28 +00:00 committed by Gitee
commit 23d765ead1
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 5 additions and 53 deletions

BIN
DBD-Pg-3.14.2.tar.gz Normal file

Binary file not shown.

View File

@ -1,50 +0,0 @@
From 2b60151aea6f03ac7e846aae0d21e7f335cad99c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dagfinn=20Ilmari=20Manns=C3=A5ker?= <ilmari@ilmari.org>
Date: Wed, 9 Jan 2019 21:24:09 +0000
Subject: [PATCH] Fix client_min_messages=FATAL test on upcoming PostgreSQL
releases
The upcoming minor releases of PostgreSQL cap client_min_messages to
ERROR to avoid the case this test was testing for. Skip the test if
client_min_messages doesn't come back as 'fatal' after we set it.
---
t/02attribs.t | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/t/02attribs.t b/t/02attribs.t
index b9ecd90..75e8f48 100644
--- a/t/02attribs.t
+++ b/t/02attribs.t
@@ -1204,15 +1204,20 @@ $sth->execute();
is ($warning, undef, $t);
## Special case in which errors are not sent to the client!
-$t = q{When client_min_messages is FATAL, we do our best to alert the caller it's a Bad Idea};
-$dbh->do(q{SET client_min_messages = 'FATAL'});
-$dbh->{RaiseError} = 0;
-$dbh->{AutoCommit} = 1;
-eval {
- $dbh->do('SELECT 1 FROM nonesuh');
-};
-my $errorstring = $dbh->errstr;
-like ( $errorstring, qr/Perhaps client_min_messages/, $t);
+SKIP: {
+ $t = q{When client_min_messages is FATAL, we do our best to alert the caller it's a Bad Idea};
+ $dbh->do(q{SET client_min_messages = 'FATAL'});
+ skip "This version of PostgreSQL caps client_min_messages to ERROR", 1
+ unless $dbh->selectrow_array('SHOW client_min_messages') eq 'fatal';
+
+ $dbh->{RaiseError} = 0;
+ $dbh->{AutoCommit} = 1;
+ eval {
+ $dbh->do('SELECT 1 FROM nonesuh');
+ };
+ my $errorstring = $dbh->errstr;
+ like ( $errorstring, qr/Perhaps client_min_messages/, $t);
+}
$dbh->rollback();
$dbh->do(q{SET client_min_message = 'NOTICE'});
$dbh->{RaiseError} = 1;
--
2.20.1

Binary file not shown.

View File

@ -1,11 +1,10 @@
Name: perl-DBD-Pg Name: perl-DBD-Pg
Version: 3.7.4 Version: 3.14.2
Release: 6 Release: 1
Summary: DBD::Pg-PostgreSQL database driver for the DBI module Summary: DBD::Pg-PostgreSQL database driver for the DBI module
License: GPLv2+ or Artistic License: GPLv2+ or Artistic
Source0: https://cpan.metacpan.org/authors/id/T/TU/TURNSTEP/DBD-Pg-%{version}.tar.gz Source0: https://cpan.metacpan.org/authors/id/T/TU/TURNSTEP/DBD-Pg-%{version}.tar.gz
URL: https://metacpan.org/release/DBD-Pg URL: https://metacpan.org/release/DBD-Pg
Patch0000: DBD-Pg-3.7.4-Fix-client_min_messages-FATAL-test-on-upcoming-Postg.patch
BuildRequires: findutils gcc make perl-devel perl-generators perl-interpreter perl(Carp) perl(Config) BuildRequires: findutils gcc make perl-devel perl-generators perl-interpreter perl(Carp) perl(Config)
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76 perl(File::Spec) perl(lib) perl(strict) perl(vars) BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76 perl(File::Spec) perl(lib) perl(strict) perl(vars)
@ -49,5 +48,8 @@ make test
%{_mandir}/man3/*.3* %{_mandir}/man3/*.3*
%changelog %changelog
* Thu Nov 17 2022 dillon chen <dillon.chen@gmail.com> - 3.14.2-1
- update to 3.14.2
* Fri Apr 24 2020 songzhenyu<songzhenyu@huawei.com> - 3.7.4-6 * Fri Apr 24 2020 songzhenyu<songzhenyu@huawei.com> - 3.7.4-6
- Package init - Package init