diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2018-04-15 06:41:42 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2018-04-15 06:41:42 +0000 |
| commit | 6293b53c4434de66c4a728c68661d110de671bbe (patch) | |
| tree | 9078a32b991644bd7a2687c25b168655ae1e92d1 /databases/rubygem-dbd-pg/files/patch-database.rb | |
| parent | Update to 3.8.5. (diff) | |
- fix API for pg-1.0.0
Diffstat (limited to 'databases/rubygem-dbd-pg/files/patch-database.rb')
| -rw-r--r-- | databases/rubygem-dbd-pg/files/patch-database.rb | 62 |
1 files changed, 56 insertions, 6 deletions
diff --git a/databases/rubygem-dbd-pg/files/patch-database.rb b/databases/rubygem-dbd-pg/files/patch-database.rb index 00ff711b0d55..d1c958fa08a6 100644 --- a/databases/rubygem-dbd-pg/files/patch-database.rb +++ b/databases/rubygem-dbd-pg/files/patch-database.rb @@ -1,4 +1,4 @@ ---- lib/dbd/pg/database.rb.orig 2018-03-17 05:55:55 UTC +--- lib/dbd/pg/database.rb.orig 2018-04-15 06:18:20 UTC +++ lib/dbd/pg/database.rb @@ -48,7 +48,7 @@ class DBI::DBD::Pg::Database < DBI::Base hash['tty'] ||= '' @@ -18,7 +18,33 @@ raise DBI::OperationalError.new(err.message) end -@@ -443,7 +443,7 @@ class DBI::DBD::Pg::Database < DBI::Base +@@ -96,7 +96,7 @@ class DBI::DBD::Pg::Database < DBI::Base + else + return false + end +- rescue PGError ++ rescue PG::Error + return false + ensure + answer.clear if answer +@@ -426,7 +426,7 @@ class DBI::DBD::Pg::Database < DBI::Base + def __blob_import(file) + start_transaction unless @in_transaction + @connection.lo_import(file) +- rescue PGError => err ++ rescue PG::Error => err + raise DBI::DatabaseError.new(err.message) + end + +@@ -436,27 +436,27 @@ class DBI::DBD::Pg::Database < DBI::Base + def __blob_export(oid, file) + start_transaction unless @in_transaction + @connection.lo_export(oid.to_i, file) +- rescue PGError => err ++ rescue PG::Error => err + raise DBI::DatabaseError.new(err.message) + end + # # Create a BLOB. # @@ -26,8 +52,11 @@ + def __blob_create(mode=PG::Connection::INV_READ) start_transaction unless @in_transaction @connection.lo_creat(mode) - rescue PGError => err -@@ -453,7 +453,7 @@ class DBI::DBD::Pg::Database < DBI::Base +- rescue PGError => err ++ rescue PG::Error => err + raise DBI::DatabaseError.new(err.message) + end + # # Open a BLOB. # @@ -35,7 +64,20 @@ + def __blob_open(oid, mode=PG::Connection::INV_READ) start_transaction unless @in_transaction @connection.lo_open(oid.to_i, mode) - rescue PGError => err +- rescue PGError => err ++ rescue PG::Error => err + raise DBI::DatabaseError.new(err.message) + end + +@@ -466,7 +466,7 @@ class DBI::DBD::Pg::Database < DBI::Base + def __blob_unlink(oid) + start_transaction unless @in_transaction + @connection.lo_unlink(oid.to_i) +- rescue PGError => err ++ rescue PG::Error => err + raise DBI::DatabaseError.new(err.message) + end + @@ -474,7 +474,7 @@ class DBI::DBD::Pg::Database < DBI::Base # Read a BLOB and return the data. # @@ -54,7 +96,7 @@ raise DBI::DatabaseError.new(err.message) end -@@ -494,7 +494,7 @@ class DBI::DBD::Pg::Database < DBI::Base +@@ -494,14 +494,14 @@ class DBI::DBD::Pg::Database < DBI::Base # def __blob_write(oid, value) start_transaction unless @in_transaction @@ -63,6 +105,14 @@ res = @connection.lo_write(blob, value) # FIXME not sure why PG doesn't like to close here -- seems to be # working but we should make sure it's not eating file descriptors + # up before release. + # @connection.lo_close(blob) + return res +- rescue PGError => err ++ rescue PG::Error => err + raise DBI::DatabaseError.new(err.message) + end + @@ -510,7 +510,7 @@ class DBI::DBD::Pg::Database < DBI::Base # def __set_notice_processor(proc) |