1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
|
--- 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'] ||= ''
hash['port'] = hash['port'].to_i unless hash['port'].nil?
- @connection = PGconn.new(hash['host'], hash['port'], hash['options'], hash['tty'],
+ @connection = PG::Connection.new(hash['host'], hash['port'], hash['options'], hash['tty'],
hash['dbname'] || hash['database'], user, auth)
@exec_method = :exec
@@ -78,7 +78,7 @@ class DBI::DBD::Pg::Database < DBI::Base
self['AutoCommit'] = true # Postgres starts in unchained mode (AutoCommit=on) by default
- rescue PGError => err
+ rescue PG::Error => err
raise DBI::OperationalError.new(err.message)
end
@@ -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.
#
- def __blob_create(mode=PGconn::INV_READ)
+ def __blob_create(mode=PG::Connection::INV_READ)
start_transaction unless @in_transaction
@connection.lo_creat(mode)
- rescue PGError => err
+ rescue PG::Error => err
raise DBI::DatabaseError.new(err.message)
end
#
# Open a BLOB.
#
- def __blob_open(oid, mode=PGconn::INV_READ)
+ 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 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.
#
def __blob_read(oid, length)
- blob = @connection.lo_open(oid.to_i, PGconn::INV_READ)
+ blob = @connection.lo_open(oid.to_i, PG::Connection::INV_READ)
if length.nil?
data = @connection.lo_read(blob)
@@ -485,7 +485,7 @@ class DBI::DBD::Pg::Database < DBI::Base
# FIXME it doesn't like to close here either.
# @connection.lo_close(blob)
data
- rescue PGError => err
+ rescue PG::Error => err
raise DBI::DatabaseError.new(err.message)
end
@@ -494,14 +494,14 @@ class DBI::DBD::Pg::Database < DBI::Base
#
def __blob_write(oid, value)
start_transaction unless @in_transaction
- blob = @connection.lo_open(oid.to_i, PGconn::INV_WRITE)
+ blob = @connection.lo_open(oid.to_i, PG::Connection::INV_WRITE)
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)
@connection.set_notice_processor proc
- rescue PGError => err
+ rescue PG::Error => err
raise DBI::DatabaseError.new(err.message)
end
end # Database
|
