Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/pg/files/
Date: Thu, 15 Apr 2021 18:05:55
Message-Id: 1618509925.827af756901a72b81c8ba0f076711e6d94124089.conikost@gentoo
1 commit: 827af756901a72b81c8ba0f076711e6d94124089
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Sun Apr 11 08:23:07 2021 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 15 18:05:25 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=827af756
7
8 dev-ruby/pg: remove unused patch(es)
9
10 Closes: https://github.com/gentoo/gentoo/pull/20331
11 Package-Manager: Portage-3.0.18, Repoman-3.0.3
12 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
13 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
14
15 dev-ruby/pg/files/postgresql10-tests.patch | 49 ------------------------------
16 1 file changed, 49 deletions(-)
17
18 diff --git a/dev-ruby/pg/files/postgresql10-tests.patch b/dev-ruby/pg/files/postgresql10-tests.patch
19 deleted file mode 100644
20 index f9b7c1579a9..00000000000
21 --- a/dev-ruby/pg/files/postgresql10-tests.patch
22 +++ /dev/null
23 @@ -1,49 +0,0 @@
24 -# HG changeset patch
25 -# User Lars Kanis <kanis@×××××××.de>
26 -# Date 1508756565 -7200
27 -# Node ID fe63160e8a9803e257231d879fab2841ba44c37a
28 -# Parent d6d5533dfca85b618232fe3e9e56e59dbee99de6
29 -Adjust tests for PostgreSQL-10
30 -
31 -diff --git a/spec/helpers.rb b/spec/helpers.rb
32 ---- a/spec/helpers.rb
33 -+++ b/spec/helpers.rb
34 -@@ -251,7 +251,7 @@
35 -
36 - def check_for_lingering_connections( conn )
37 - conn.exec( "SELECT * FROM pg_stat_activity" ) do |res|
38 -- conns = res.find_all {|row| row['pid'].to_i != conn.backend_pid }
39 -+ conns = res.find_all {|row| row['pid'].to_i != conn.backend_pid && ["client backend", nil].include?(row["backend_type"]) }
40 - unless conns.empty?
41 - puts "Lingering connections remain:"
42 - conns.each do |row|
43 -diff --git a/spec/pg/connection_spec.rb b/spec/pg/connection_spec.rb
44 ---- a/spec/pg/connection_spec.rb
45 -+++ b/spec/pg/connection_spec.rb
46 -@@ -232,7 +232,7 @@
47 - described_class.connect(@conninfo).finish
48 - sleep 0.5
49 - res = @conn.exec(%[SELECT COUNT(*) AS n FROM pg_stat_activity
50 -- WHERE usename IS NOT NULL])
51 -+ WHERE usename IS NOT NULL AND application_name != ''])
52 - # there's still the global @conn, but should be no more
53 - expect( res[0]['n'] ).to eq( '1' )
54 - end
55 -@@ -1537,9 +1537,14 @@
56 - end
57 -
58 - it "shouldn't type map params unless requested" do
59 -- expect{
60 -- @conn.exec_params( "SELECT $1", [5] )
61 -- }.to raise_error(PG::IndeterminateDatatype)
62 -+ if @conn.server_version < 100000
63 -+ expect{
64 -+ @conn.exec_params( "SELECT $1", [5] )
65 -+ }.to raise_error(PG::IndeterminateDatatype)
66 -+ else
67 -+ # PostgreSQL-10 maps to TEXT type (OID 25)
68 -+ expect( @conn.exec_params( "SELECT $1", [5] ).ftype(0)).to eq(25)
69 -+ end
70 - end
71 -
72 - it "should raise an error on invalid encoder to put_copy_data" do