From owner-svn-ports-head@freebsd.org Fri Jan 3 12:45:48 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 392221F1268; Fri, 3 Jan 2020 12:45:48 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47q4Q40blbz3KHD; Fri, 3 Jan 2020 12:45:48 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0FBA12C378; Fri, 3 Jan 2020 12:45:48 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 003CjlB6026485; Fri, 3 Jan 2020 12:45:47 GMT (envelope-from dinoex@FreeBSD.org) Received: (from dinoex@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 003Cjlee026483; Fri, 3 Jan 2020 12:45:47 GMT (envelope-from dinoex@FreeBSD.org) Message-Id: <202001031245.003Cjlee026483@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dinoex set sender to dinoex@FreeBSD.org using -f From: Dirk Meyer Date: Fri, 3 Jan 2020 12:45:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r521934 - in head/databases/rubygem-dbd-pg: . files X-SVN-Group: ports-head X-SVN-Commit-Author: dinoex X-SVN-Commit-Paths: in head/databases/rubygem-dbd-pg: . files X-SVN-Commit-Revision: 521934 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jan 2020 12:45:48 -0000 Author: dinoex Date: Fri Jan 3 12:45:47 2020 New Revision: 521934 URL: https://svnweb.freebsd.org/changeset/ports/521934 Log: - fix regression with postgres11 undefined method `[]' for DBI::Type::Varchar:Class (NoMethodError) Modified: head/databases/rubygem-dbd-pg/Makefile head/databases/rubygem-dbd-pg/files/patch-database.rb Modified: head/databases/rubygem-dbd-pg/Makefile ============================================================================== --- head/databases/rubygem-dbd-pg/Makefile Fri Jan 3 12:22:56 2020 (r521933) +++ head/databases/rubygem-dbd-pg/Makefile Fri Jan 3 12:45:47 2020 (r521934) @@ -2,7 +2,7 @@ PORTNAME= dbd-pg PORTVERSION= 0.3.9 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= databases rubygems MASTER_SITES= RG Modified: head/databases/rubygem-dbd-pg/files/patch-database.rb ============================================================================== --- head/databases/rubygem-dbd-pg/files/patch-database.rb Fri Jan 3 12:22:56 2020 (r521933) +++ head/databases/rubygem-dbd-pg/files/patch-database.rb Fri Jan 3 12:45:47 2020 (r521934) @@ -1,6 +1,6 @@ ---- lib/dbd/pg/database.rb.orig 2018-04-15 06:18:20 UTC +--- lib/dbd/pg/database.rb.orig 2020-01-03 12:38:44 UTC +++ lib/dbd/pg/database.rb -@@ -48,7 +48,7 @@ class DBI::DBD::Pg::Database < DBI::Base +@@ -48,7 +48,7 @@ class DBI::DBD::Pg::Database < DBI::BaseDatabase hash['tty'] ||= '' hash['port'] = hash['port'].to_i unless hash['port'].nil? @@ -9,7 +9,7 @@ hash['dbname'] || hash['database'], user, auth) @exec_method = :exec -@@ -78,7 +78,7 @@ class DBI::DBD::Pg::Database < DBI::Base +@@ -78,7 +78,7 @@ class DBI::DBD::Pg::Database < DBI::BaseDatabase self['AutoCommit'] = true # Postgres starts in unchained mode (AutoCommit=on) by default @@ -18,7 +18,7 @@ raise DBI::OperationalError.new(err.message) end -@@ -96,7 +96,7 @@ class DBI::DBD::Pg::Database < DBI::Base +@@ -96,7 +96,7 @@ class DBI::DBD::Pg::Database < DBI::BaseDatabase else return false end @@ -27,7 +27,28 @@ return false ensure answer.clear if answer -@@ -426,7 +426,7 @@ class DBI::DBD::Pg::Database < DBI::Base +@@ -383,9 +383,6 @@ class DBI::DBD::Pg::Database < DBI::BaseDatabase + end + } + end +- # additional conversions +- @type_map[705] ||= DBI::Type::Varchar # select 'hallo' +- @type_map[1114] ||= DBI::Type::Timestamp # TIMESTAMP WITHOUT TIME ZONE + + # remap array subtypes + @type_map.each_key do |key| +@@ -399,6 +396,10 @@ class DBI::DBD::Pg::Database < DBI::BaseDatabase + end + end + end ++ ++ # additional conversions ++ @type_map[1114] ||= DBI::Type::Timestamp # TIMESTAMP WITHOUT TIME ZONE ++ @type_map[705] ||= DBI::Type::Varchar # select 'hallo' + end + + public +@@ -426,7 +427,7 @@ class DBI::DBD::Pg::Database < DBI::BaseDatabase def __blob_import(file) start_transaction unless @in_transaction @connection.lo_import(file) @@ -36,7 +57,7 @@ raise DBI::DatabaseError.new(err.message) end -@@ -436,27 +436,27 @@ class DBI::DBD::Pg::Database < DBI::Base +@@ -436,27 +437,27 @@ class DBI::DBD::Pg::Database < DBI::BaseDatabase def __blob_export(oid, file) start_transaction unless @in_transaction @connection.lo_export(oid.to_i, file) @@ -69,7 +90,7 @@ raise DBI::DatabaseError.new(err.message) end -@@ -466,7 +466,7 @@ class DBI::DBD::Pg::Database < DBI::Base +@@ -466,7 +467,7 @@ class DBI::DBD::Pg::Database < DBI::BaseDatabase def __blob_unlink(oid) start_transaction unless @in_transaction @connection.lo_unlink(oid.to_i) @@ -78,7 +99,7 @@ raise DBI::DatabaseError.new(err.message) end -@@ -474,7 +474,7 @@ class DBI::DBD::Pg::Database < DBI::Base +@@ -474,7 +475,7 @@ class DBI::DBD::Pg::Database < DBI::BaseDatabase # Read a BLOB and return the data. # def __blob_read(oid, length) @@ -87,7 +108,7 @@ if length.nil? data = @connection.lo_read(blob) -@@ -485,7 +485,7 @@ class DBI::DBD::Pg::Database < DBI::Base +@@ -485,7 +486,7 @@ class DBI::DBD::Pg::Database < DBI::BaseDatabase # FIXME it doesn't like to close here either. # @connection.lo_close(blob) data @@ -96,7 +117,7 @@ raise DBI::DatabaseError.new(err.message) end -@@ -494,14 +494,14 @@ class DBI::DBD::Pg::Database < DBI::Base +@@ -494,14 +495,14 @@ class DBI::DBD::Pg::Database < DBI::BaseDatabase # def __blob_write(oid, value) start_transaction unless @in_transaction @@ -113,7 +134,7 @@ raise DBI::DatabaseError.new(err.message) end -@@ -510,7 +510,7 @@ class DBI::DBD::Pg::Database < DBI::Base +@@ -510,7 +511,7 @@ class DBI::DBD::Pg::Database < DBI::BaseDatabase # def __set_notice_processor(proc) @connection.set_notice_processor proc