ydbd-pg 0.5.3 → 0.5.8

data/lib/dbd/Pg.rb

@@ -49,7 +49,7 @@ module DBI
         # Only things that extend DBI's results are documented.
         #
         module Pg
-            VERSION          = "0.5.3"
+            VERSION          = DBI::VERSION
             DESCRIPTION      = "PostgreSQL DBI DBD"
 
             #

data/lib/dbd/pg/database.rb

@@ -46,9 +46,10 @@ class DBI::DBD::Pg::Database < DBI::BaseDatabase
 
         hash['options'] ||= nil
         hash['tty'] ||= ''
+        hash['host'] ||= 'localhost'
         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 +79,7 @@ class DBI::DBD::Pg::Database < DBI::BaseDatabase
 
         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 +97,7 @@ class DBI::DBD::Pg::Database < DBI::BaseDatabase
         else
             return false
         end
-    rescue PGError
+    rescue PG::Error
         return false
     ensure
         answer.clear if answer
@@ -320,19 +321,6 @@ class DBI::DBD::Pg::Database < DBI::BaseDatabase
 
     private 
 
-    # special quoting if value is element of an array 
-    def quote_array_elements( value )
-        # XXX is this method still being used?
-        case value
-        when Array
-                        '{'+ value.collect{|v| quote_array_elements(v) }.join(',') + '}'
-        when String
-                        '"' + value.gsub(/\\/){ '\\\\' }.gsub(/"/){ '\\"' } + '"'
-        else
-            quote( value ).sub(/^'/,'').sub(/'$/,'') 
-        end
-    end 
-
     def parse_type_name(type_name)
         case type_name
         when 'bool'                      then DBI::Type::Boolean
@@ -397,7 +385,7 @@ class DBI::DBD::Pg::Database < DBI::BaseDatabase
                     # punt
                     @type_map[key] = DBI::DBD::Pg::Type::Array.new(DBI::Type::Varchar)
                 end
-            end
+            end unless key.is_a?(Integer)
         end
     end
 
@@ -426,7 +414,7 @@ class DBI::DBD::Pg::Database < DBI::BaseDatabase
     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 +424,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)
-    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 +454,7 @@ class DBI::DBD::Pg::Database < DBI::BaseDatabase
     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 +462,7 @@ class DBI::DBD::Pg::Database < DBI::BaseDatabase
     # 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 +473,7 @@ class DBI::DBD::Pg::Database < DBI::BaseDatabase
         # 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 +482,14 @@ class DBI::DBD::Pg::Database < DBI::BaseDatabase
     #
     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 +498,7 @@ class DBI::DBD::Pg::Database < DBI::BaseDatabase
     #
     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

data/lib/dbd/pg/statement.rb

@@ -18,7 +18,7 @@ class DBI::DBD::Pg::Statement < DBI::BaseStatement
         @result = nil
         @bindvars = []
         @prepared = false
-    rescue PGError => err
+    rescue PG::Error => err
         raise DBI::ProgrammingError.new(err.message)
     end
 
@@ -36,7 +36,7 @@ class DBI::DBD::Pg::Statement < DBI::BaseStatement
         # replace DBI::Binary object by oid returned by lo_import
         @bindvars.collect! do |var|
             if var.is_a? DBI::Binary then
-                oid = @db.__blob_create(PGconn::INV_WRITE)
+                oid = @db.__blob_create(PG::Connection::INV_WRITE)
                 @db.__blob_write(oid, var.to_s)
                 oid
             else
@@ -58,7 +58,7 @@ class DBI::DBD::Pg::Statement < DBI::BaseStatement
         end
 
         @result = DBI::DBD::Pg::Tuples.new(@db, pg_result)
-    rescue PGError, RuntimeError => err
+    rescue PG::Error, RuntimeError => err
         raise DBI::ProgrammingError.new(err.message)
     end
 

data/lib/dbd/pg/type.rb

@@ -32,7 +32,7 @@ module DBI::DBD::Pg::Type
         # Escapes the supplied data. Has no effect on the object.
         #
         def escape_bytea(str)
-            PGconn.escape_bytea(str)
+            PG::Connection.escape_bytea(str)
         end
 
         #
@@ -62,7 +62,7 @@ module DBI::DBD::Pg::Type
             #
             # Fix this for now, but beware that we'll have to unfix this as
             # soon as they fix their end.
-            ret = PGconn.unescape_bytea(obj)
+            ret = PG::Connection.unescape_bytea(obj)
 
             # XXX 
             # String#split does not properly create a full array if the the

data/readme.md

@@ -1,3 +1,10 @@
+# Release a new ydbi gem
+
+* bundle exec rake test test_dbd test_dbi
+* rake ydbd-pg:clobber_package; rake ydbd-pg:clobber_package; rake ydbi:gem ydbd-pg:gem
+* bundle exec gem push pkg/ydbd-*.gem
+* bundle exec gem push pkg/ydbi-*.gem
+
 # Description
     The DBI package is a vendor independent interface for accessing databases.
     It is similar, but not identical to, Perl's DBI module.
@@ -75,6 +82,15 @@
     gem install dbd-sqlite3
     gem install dbd-sqlite
 
+If you have a non standard path of postgres use something like
+
+    gem install pg -- --with-pg-config=/usr/local/pgsql-10.1/bin/pg_config
+
+Or if you are using bundler
+
+    bundle config build.pg --with-pg-config=/usr/local/pgsql-10.1/bin/pg_config
+    bundle install
+
 ## Without rubygems:
 
     ruby setup.rb config

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ydbd-pg
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.8
 platform: ruby
 authors:
 - Erik Hollensbe
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-01 00:00:00.000000000 Z
+date: 2021-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ydbi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.8
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -74,7 +74,8 @@ files:
 - test/dbd/postgresql/up.sql
 - test/ts_dbd.rb
 homepage: https://github.com/zdavatz/ydbi
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -91,10 +92,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: ydbi
-rubygems_version: 2.4.5
+rubygems_version: 3.2.4
 signing_key: 
 specification_version: 4
-summary: PostgreSQL DBI DBD
+summary: PostgreSQL DBI DBD ywesee fork
 test_files:
 - test/ts_dbd.rb