m4dbi 0.8.8 → 0.8.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d9b6b21860211863ed3ef697886bc4dd8d017743
+  data.tar.gz: 75fb2e328554c618b22c8919c05b3039d9a7f750
+SHA512:
+  metadata.gz: 333d1c3056960225ab40c2d1db68e397637b8dad22265c1e604ddc20130720a4afa757fb7f25ef3912228db18a8a78a2ddc848f952c8a62e304817af7c61fcc0
+  data.tar.gz: c971fd38a928c3a4bae6f63e633344728bb1208dc0f5a99d1e9ec0fd12ba5e05cfd421e3aa04982dc9d6fd4471c46e993a62f5d57929922181d0220922a0db80

data/lib/m4dbi/collection.rb

@@ -33,10 +33,12 @@ module M4DBI
                 AND #{@the_many_model.pk_clause}
             }
           )
-          stm.execute(
+          success = stm.execute(
             @the_one.pk,
             arg.pk
           ).affected_count > 0
+          stm.finish
+          success
         when Hash
           hash = arg
           keys = hash.keys
@@ -51,14 +53,16 @@ module M4DBI
                 AND #{where_subclause}
             }
           )
-          stm.execute(
+          num_deleted = stm.execute(
             @the_one.pk,
             *( keys.map { |k| hash[ k ] } )
           ).affected_count
+          stm.finish
+          num_deleted
       end
     end
 
-    # Returns the number of records deleted
+    # @return the number of records deleted
     def clear
       stm = @the_many_model.dbh.prepare(
         %{
@@ -66,7 +70,9 @@ module M4DBI
           WHERE #{@the_one_fk} = ?
         }
       )
-      stm.execute( @the_one.pk ).affected_count
+      num_deleted = stm.execute( @the_one.pk ).affected_count
+      stm.finish
+      num_deleted
     end
   end
 end

data/lib/m4dbi/database.rb

@@ -11,21 +11,34 @@ module M4DBI
     end
 
     def execute( *args )
-      @dbh.execute *args
+      result = @dbh.execute(*args)
+      if defined?( RDBI::Driver::PostgreSQL ) && RDBI::Driver::PostgreSQL === @dbh.driver
+        result.finish
+      end
+      result
     end
 
     def select( sql, *bindvars )
-      execute( sql, *bindvars ).fetch( :all, RDBI::Result::Driver::Struct )
+      result = @dbh.execute( sql, *bindvars )
+      rows = result.fetch( :all, RDBI::Result::Driver::Struct )
+      if defined?( RDBI::Driver::PostgreSQL ) && RDBI::Driver::PostgreSQL === @dbh.driver
+        result.finish
+      end
+      rows
     end
 
     def select_one( sql, *bindvars )
-      select( sql, *bindvars )[ 0 ]
+      select( sql, *bindvars )[0]
     end
 
     def select_column( sql, *bindvars )
-      rows = execute( sql, *bindvars ).fetch( 1, RDBI::Result::Driver::Array )
+      result = @dbh.execute( sql, *bindvars )
+      rows = result.fetch( 1, RDBI::Result::Driver::Array )
+      if defined?( RDBI::Driver::PostgreSQL ) && RDBI::Driver::PostgreSQL === @dbh.driver
+        result.finish
+      end
       if rows.any?
-        rows[ 0 ][ 0 ]
+        rows[0][0]
       else
         raise RDBI::Error.new( "Query returned no rows.  SQL: #{@dbh.last_query}" )
       end

data/lib/m4dbi/model.rb

@@ -2,14 +2,14 @@ module M4DBI
   class Model
     #attr_reader :row
     ancestral_trait_reader :dbh, :table
-    ancestral_trait_class_reader :dbh, :table, :pk, :columns, :st, :hooks
+    ancestral_trait_class_reader :dbh, :table, :pk, :columns, :hooks
 
     M4DBI_UNASSIGNED = '__m4dbi_unassigned__'
 
     extend Enumerable
 
     def self.prepare( sql )
-      st[sql] ||= dbh.prepare(sql)
+      dbh.prepare(sql)
     end
 
     def self.[]( first_arg, *args )
@@ -32,6 +32,7 @@ module M4DBI
       sql = "SELECT * FROM #{table} WHERE #{clause}"
       stm = prepare(sql)
       row = stm.select_one(*values)
+      stm.finish
 
       if row
         self.new( row )
@@ -72,9 +73,11 @@ module M4DBI
       end
 
       stm = prepare(sql)
-      self.from_rows(
+      rows = self.from_rows(
         stm.select_all(*params)
       )
+      stm.finish
+      rows
     end
 
     def self.one_where( conditions, *args )
@@ -89,6 +92,7 @@ module M4DBI
 
       stm = prepare(sql)
       row = stm.select_one( *params )
+      stm.finish
       if row
         self.new( row )
       end
@@ -96,7 +100,9 @@ module M4DBI
 
     def self.all
       stm = prepare("SELECT * FROM #{table}")
-      self.from_rows( stm.select_all )
+      records = self.from_rows( stm.select_all )
+      stm.finish
+      records
     end
 
     # TODO: Perhaps we'll use cursors for Model#each.
@@ -107,6 +113,7 @@ module M4DBI
     def self.one
       stm = prepare("SELECT * FROM #{table} LIMIT 1")
       row = stm.select_one
+      stm.finish
       if row
         self.new( row )
       end
@@ -114,7 +121,9 @@ module M4DBI
 
     def self.count
       stm = prepare("SELECT COUNT(*) FROM #{table}")
-      stm.select_column.to_i
+      retval = stm.select_column.to_i
+      stm.finish
+      retval
     end
 
     def self.create( hash = {} )
@@ -145,6 +154,7 @@ module M4DBI
         end
         stm = prepare(sql)
         num_inserted = stm.execute(*values).affected_count
+        stm.finish
         if num_inserted > 0
           pk_hash = hash.slice( *(
             self.pk.map { |pk_col| pk_col.to_sym }
@@ -199,14 +209,17 @@ module M4DBI
 
     def self.select_all( sql, *binds )
       stm = prepare(sql)
-      self.from_rows(
+      records = self.from_rows(
         stm.select_all( *binds )
       )
+      stm.finish
+      records
     end
 
     def self.select_one( sql, *binds )
       stm = prepare(sql)
       row = stm.select_one( *binds )
+      stm.finish
       if row
         self.new( row )
       end
@@ -232,7 +245,9 @@ module M4DBI
       set_clause, set_params = set_hash.to_set_clause
       params = set_params + where_params
       stm = prepare("UPDATE #{table} SET #{set_clause} WHERE #{where_clause}")
-      stm.execute( *params )
+      result = stm.execute( *params )
+      stm.finish
+      result
     end
 
     def self.update_one( *args )
@@ -240,7 +255,9 @@ module M4DBI
       pk_values = args[ 0..-2 ]
       params = set_params + pk_values
       stm = prepare("UPDATE #{table} SET #{set_clause} WHERE #{pk_clause}")
-      stm.execute( *params )
+      result = stm.execute( *params )
+      stm.finish
+      result
     end
 
     def self.after_create(&block)
@@ -343,11 +360,10 @@ module M4DBI
         # warn "Do not call M4DBI::Model#new directly; use M4DBI::Model#create instead."
       # end
       @row = row
-      @st = Hash.new
     end
 
     def prepare( sql )
-      @st[sql] ||= dbh.prepare(sql)
+      dbh.prepare(sql)
     end
 
     def method_missing( method, *args )
@@ -420,6 +436,7 @@ module M4DBI
       state_before = self.to_h
       st = prepare("UPDATE #{table} SET #{set_clause} WHERE #{pk_clause}")
       num_updated = st.execute( *set_params ).affected_count
+      st.finish  if defined?( RDBI::Driver::PostgreSQL ) && RDBI::Driver::PostgreSQL === dbh.driver
       if num_updated > 0
         hash.each do |key,value|
           @row[ key ] = value
@@ -447,6 +464,7 @@ module M4DBI
 
       st = prepare("DELETE FROM #{table} WHERE #{pk_clause}")
       num_deleted = st.execute( *pk_values ).affected_count
+      st.finish
       if num_deleted != 1
         false
       else
@@ -507,7 +525,6 @@ module M4DBI
         :table     => table,
         :pk        => pk_,
         :columns   => h.table_schema( table.to_sym ).columns,
-        :st        => Hash.new,  # prepared statements for all queries
         :hooks => {
           after_create: [],
           after_update: [],
@@ -563,6 +580,9 @@ module M4DBI
             new_value,
             *pk_values
           ).affected_count
+          if defined?( RDBI::Driver::PostgreSQL ) && RDBI::Driver::PostgreSQL === h.driver
+            stm.finish
+          end
           if num_changed > 0
             @row[ colname ] = new_value
           end

data/lib/m4dbi/statement.rb

@@ -8,6 +8,10 @@ module M4DBI
       @st.execute *args
     end
 
+    def finish
+      @st.finish
+    end
+
     def select( *bindvars )
       @st.execute( *bindvars ).fetch( :all, RDBI::Result::Driver::Struct )
     end

data/lib/m4dbi/version.rb

@@ -1,3 +1,3 @@
 module M4DBI
-  VERSION = '0.8.8'
+  VERSION = '0.8.9'
 end

metadata

@@ -1,61 +1,53 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: m4dbi
-version: !ruby/object:Gem::Version 
-  hash: 47
-  prerelease: 
-  segments: 
-  - 0
-  - 8
-  - 8
-  version: 0.8.8
+version: !ruby/object:Gem::Version
+  version: 0.8.9
 platform: ruby
-authors: 
+authors:
 - Pistos
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-05-13 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-06-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: metaid
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rdbi
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdbi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-description: M4DBI provides models, associations and some convenient extensions to RDBI.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: M4DBI provides models, associations and some convenient extensions to
+  RDBI.
 email: m4dbi dot pistos at purepistos dot net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - CHANGELOG
 - LICENCE
-files: 
+files:
 - README.rdoc
 - CHANGELOG
 - LICENCE
@@ -76,38 +68,29 @@ files:
 - spec/hash.rb
 homepage: https://github.com/Pistos/m4dbi
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
 - bacon (optional)
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Models (and More) for RDBI
-test_files: 
+test_files:
 - spec/database.rb
 - spec/model.rb
 - spec/helper.rb