rdbi-driver-postgresql 0.9.0 → 0.9.1

data/VERSION

@@ -1 +1 @@
-0.9.0
+0.9.1

data/lib/rdbi-driver-postgresql.rb

@@ -0,0 +1,2 @@
+require 'rdbi'
+require 'rdbi/driver/postgresql'

data/lib/rdbi/driver/postgresql.rb

@@ -1,7 +1,6 @@
 require 'rdbi'
 require 'epoxy'
 require 'methlab'
-gem 'pg', '= 0.9.0'
 require 'pg'
 
 class RDBI::Driver::PostgreSQL < RDBI::Driver
@@ -71,7 +70,7 @@ class RDBI::Driver::PostgreSQL < RDBI::Driver
         "SELECT table_type FROM information_schema.tables WHERE table_schema = ? AND table_name = ?",
         pg_schema,
         table_name
-      ).fetch( :all )[ 0 ]
+      ).fetch( :first ) rescue nil
       if info_row.nil?
         return nil
       end
@@ -201,13 +200,13 @@ class RDBI::Driver::PostgreSQL < RDBI::Driver
     def fetch_range(start, stop)
       # XXX when did PGresult get so stupid?
       ary = []
-      (start..stop).to_a.each do |i|
+      (start..stop).each do |i|
         row = []
         @handle.num_fields.times do |j|
           row[ j ] = @handle.getvalue( i, j )
         end
 
-        ary.push row
+        ary << row
       end
       # XXX end stupid rectifier.
       
@@ -215,27 +214,30 @@ class RDBI::Driver::PostgreSQL < RDBI::Driver
     end
 
     def fix_dates(values)
-      # probably a better way to do this, but at least it's happening on fetch.
-      retval = []
-      values.each_with_index do |val, x|
+      index = 0
+
+      values.collect! do |val|
         if val.kind_of?(Array)
-          newval = []
-          val.each_with_index do |col, i|
-            if !col.nil? and @schema.columns[i].type == 'timestamp without time zone'
+          index2 = 0
+          val.collect! do |col|
+            if !col.nil? and @schema.columns[index2].type == 'timestamp without time zone'
               col << @stub_datetime
             end
 
-            newval.push(col)
+            index2 += 1
+            col
           end
-          retval.push(newval)
         else
-          if !val.nil? and @schema.columns[x].type == 'timestamp without time zone'
+          if !val.nil? and @schema.columns[index].type == 'timestamp without time zone'
             val << @stub_datetime
           end
-          retval.push(val)
         end
+
+        index += 1
+        val
       end
-      return retval
+
+      return values
     end
   end
 
@@ -251,7 +253,7 @@ class RDBI::Driver::PostgreSQL < RDBI::Driver
 
       ep = Epoxy.new( query )
       @index_map = ep.indexed_binds
-      query = ep.quote(@index_map.compact.inject({}) { |x,y| x.merge({ y => nil }) }) do |x| 
+      query = ep.quote(Hash[@index_map.compact.zip([])]) do |x|
         case x
         when Integer
           "$#{x+1}" 
@@ -269,10 +271,11 @@ class RDBI::Driver::PostgreSQL < RDBI::Driver
       # @input_type_map initialized in superclass
       @output_type_map = RDBI::Type.create_type_hash( RDBI::Type::Out )
       @output_type_map[ :bigint ] = RDBI::Type.filterlist( RDBI::Type::Filters::STR_TO_INT )
+
+      prep_finalizer { @pg_result.clear }
     end
 
-    # Returns an Array of things used to fill out the parameters to RDBI::Result.new
-    def new_execution( *binds )
+    def new_modification(*binds)
       # FIXME move to RDBI::Util or something.
       hashes, binds = binds.partition { |x| x.kind_of?(Hash) }
       hash = hashes.inject({}) { |x, y| x.merge(y) }
@@ -283,21 +286,39 @@ class RDBI::Driver::PostgreSQL < RDBI::Driver
       end
 
       pg_result = @dbh.pg_conn.exec_prepared( @stmt_name, binds )
+      return pg_result.cmd_tuples
+    end
 
-      columns = []
-      stub_datetime = DateTime.now.strftime( " %z" )
-      (0...pg_result.num_fields).each do |i|
-        c = RDBI::Column.new
-        c.name = pg_result.fname( i ).to_sym
-        c.type = @dbh.pg_conn.exec(
-          "SELECT format_type( #{ pg_result.ftype(i) }, #{ pg_result.fmod(i) } )"
-        )[ 0 ].values[ 0 ]
-        if c.type.start_with? 'timestamp'
-          c.ruby_type = 'timestamp'.to_sym
-        else
-          c.ruby_type = c.type.to_sym
+    # Returns an Array of things used to fill out the parameters to RDBI::Result.new
+    def new_execution( *binds )
+      # FIXME move to RDBI::Util or something.
+      hashes, binds = binds.partition { |x| x.kind_of?(Hash) }
+      hash = hashes.inject({}, :merge)
+      hash.each do |key, value|
+        if index = @index_map.index(key)
+          binds.insert(index, value)
+        end
+      end
+
+      pg_result = @dbh.pg_conn.exec_prepared( @stmt_name, binds )
+
+      columns = [] 
+      column_query = (0...pg_result.num_fields).map do |x|
+        "format_type(#{ pg_result.ftype(x) }, #{ pg_result.fmod(x) }) as col#{x}"
+      end.join(", ")
+
+      unless column_query.empty?
+        @dbh.pg_conn.exec("select #{column_query}")[0].values.each_with_index do |type, i|
+          c = RDBI::Column.new
+          c.name = pg_result.fname( i ).to_sym
+          c.type = type
+          if c.type.start_with? 'timestamp'
+            c.ruby_type = 'timestamp'.to_sym
+          else
+            c.ruby_type = c.type.to_sym
+          end
+          columns << c
         end
-        columns << c
       end
 
       this_schema = RDBI::Schema.new
@@ -305,10 +326,5 @@ class RDBI::Driver::PostgreSQL < RDBI::Driver
 
       [ Cursor.new(pg_result, this_schema), this_schema, @output_type_map ]
     end
-
-    def finish
-      @pg_result.clear
-      super
-    end
   end
 end

data/rdbi-driver-postgresql.gemspec

@@ -1,40 +1,40 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{rdbi-driver-postgresql}
-  s.version = "0.9.0"
+  s.version = "0.9.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pistos", "Erik Hollensbe"]
-  s.date = %q{2010-08-21}
+  s.date = %q{2010-12-10}
   s.description = %q{PostgreSQL driver for RDBI}
   s.email = %q{rdbi@pistos.oib.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     "LICENCE",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/rdbi/driver/postgresql.rb",
-     "rdbi-driver-postgresql.gemspec",
-     "test/helper.rb",
-     "test/test_database.rb"
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/rdbi-driver-postgresql.rb",
+    "lib/rdbi/driver/postgresql.rb",
+    "rdbi-driver-postgresql.gemspec",
+    "test/helper.rb",
+    "test/test_database.rb"
   ]
   s.homepage = %q{http://github.com/Pistos/rdbi-dbd-postgresql}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{PostgreSQL driver for RDBI}
   s.test_files = [
     "test/helper.rb",
-     "test/test_database.rb"
+    "test/test_database.rb"
   ]
 
   if s.respond_to? :specification_version then

data/test/helper.rb

@@ -2,9 +2,7 @@ require 'rubygems'
 gem 'test-unit'
 require 'test/unit'
 require 'fileutils'
-
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+gem 'pg', '= 0.9.0'
 gem 'rdbi-dbrc'
 require 'rdbi-dbrc'
 require 'rdbi/driver/postgresql'
@@ -31,7 +29,7 @@ class Test::Unit::TestCase
 
   def init_database
     dbh = new_database
-    SQL.each { |query| dbh.execute(query) }
+    SQL.each { |query| dbh.execute_modification(query) }
     return dbh
   end
 

data/test/test_database.rb

@@ -39,10 +39,7 @@ class TestDatabase < Test::Unit::TestCase
 
   def test_03_execute
     self.dbh = init_database
-    res = dbh.execute( "insert into foo (bar) values (?)", 1 )
-    assert res
-    assert_kind_of( RDBI::Result, res )
-    assert_equal( 1, res.affected_count )
+    assert_equal(1, dbh.execute_modification( "insert into foo (bar) values (?)", 1 ))
 
     res = dbh.execute( "select * from foo" )
     assert res
@@ -84,10 +81,11 @@ class TestDatabase < Test::Unit::TestCase
     assert sth
     assert_kind_of( RDBI::Statement, sth )
     assert_respond_to( sth, :execute )
+    assert_respond_to( sth, :execute_modification )
 
     5.times do
-      res = sth.execute( 1 )
-      assert_equal( 1, res.affected_count )
+      res = sth.execute_modification( 1 )
+      assert_equal( 1, res )
     end
 
     assert_equal( dbh.last_statement.object_id, sth.object_id )
@@ -118,7 +116,7 @@ class TestDatabase < Test::Unit::TestCase
 
     dbh.transaction do
       assert dbh.in_transaction?
-      5.times { dbh.execute( "insert into foo (bar) values (?)", 1 ) }
+      5.times { dbh.execute_modification( "insert into foo (bar) values (?)", 1 ) }
       dbh.rollback
       assert ! dbh.in_transaction?
     end
@@ -129,7 +127,7 @@ class TestDatabase < Test::Unit::TestCase
 
     dbh.transaction do
       assert dbh.in_transaction?
-      5.times { dbh.execute("insert into foo (bar) values (?)", 1) }
+      5.times { dbh.execute_modification("insert into foo (bar) values (?)", 1) }
       assert_equal( [[1]] * 5, dbh.execute("select * from foo").fetch(:all) )
       dbh.commit
       assert ! dbh.in_transaction?
@@ -169,7 +167,7 @@ class TestDatabase < Test::Unit::TestCase
   def test_07_schema
     self.dbh = init_database
 
-    dbh.execute( "insert into bar (foo, bar) values (?, ?)", "foo", 1 )
+    dbh.execute_modification( "insert into bar (foo, bar) values (?, ?)", "foo", 1 )
     res = dbh.execute( "select * from bar" )
 
     assert res
@@ -183,7 +181,7 @@ class TestDatabase < Test::Unit::TestCase
     self.dbh = init_database
 
     dt = DateTime.now
-    dbh.execute( 'insert into time_test (my_date) values (?)', dt )
+    dbh.execute_modification( 'insert into time_test (my_date) values (?)', dt )
     dt2 = dbh.execute( 'select * from time_test limit 1' ).fetch(1)[0][0]
 
     assert_kind_of( DateTime, dt2 )

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rdbi-driver-postgresql
 version: !ruby/object:Gem::Version 
-  hash: 59
   prerelease: false
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Pistos
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-21 00:00:00 -04:00
+date: 2010-12-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,7 +26,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -41,7 +39,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -55,7 +52,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -69,7 +65,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -83,7 +78,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 59
         segments: 
         - 0
         - 9
@@ -99,7 +93,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -113,7 +106,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
         segments: 
         - 0
         - 3
@@ -136,6 +128,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- lib/rdbi-driver-postgresql.rb
 - lib/rdbi/driver/postgresql.rb
 - rdbi-driver-postgresql.gemspec
 - test/helper.rb
@@ -145,8 +138,8 @@ homepage: http://github.com/Pistos/rdbi-dbd-postgresql
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -154,7 +147,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -163,7 +155,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"