m4dbi 0.5.0 → 0.6.0

data/CHANGELOG

@@ -1,3 +1,19 @@
+## 0.6.0
+
+- Compatibility with DBI 0.4.0 ensured.
+- Support for multi-column primary keys added.
+- MySQL support improved and spec'ed.
+- SQLite support improved and spec'ed.
+- MIT licence adopted.
+
+## 0.5.5
+
+- Improved and added numerous specs.
+- More precise NoMethodError? thrown on Model instances. (r2601)
+- DBI::Timestamp now behaves like Time. (r2602)
+- Model instance writers now properly modify object values (not just database).
+- nil values in condition clauses ([] and "where") no longer generate wrong SQL.
+
 ## 0.5.0
 
-First official public release.
+- First official public release.

data/HIM

@@ -21,17 +21,17 @@ M4DBI is a Ruby library that provides ORM modelling to the Ruby DBI package
   
 ==== Repository
 
-To use the repository version, you need Subversion (http://subversion.tigris.org).
-Chances are, there is a Subversion package for your Linux/UNIX flavour.
+To use the repository version, you need git ( http://git.or.cz ).
+Chances are, there is a git package for your Linux/UNIX flavour.
 
   cd /where/you/want/m4dbi
-  svn co http://rome.purepistos.net/svn/m4dbi
+  git clone git://github.com/Pistos/m4dbi.git
   
 Change the following to whatever the equivalent paths are for your system:
 
   cd /usr/lib/ruby/site_ruby/1.8
-  ln -s /path/to/checked/out/m4dbi/trunk/lib/m4dbi
-  ln -s /path/to/checked/out/m4dbi/trunk/lib/m4dbi.rb
+  ln -s /path/to/cloned/m4dbi/lib/m4dbi
+  ln -s /path/to/cloned/m4dbi/lib/m4dbi.rb
 
 === Usage
 
@@ -40,7 +40,7 @@ generated from the spec files under the spec/ dir.
 
 === Source Code
 
-Browse source at http://rome.purepistos.net/issues/m4dbi/browser/trunk .
+Browse source at http://github.com/Pistos/m4dbi/tree/master .
 See coverage at http://rome.purepistos.net/m4dbi/rcov .
 Very limited rdocs at http://rome.purepistos.net/m4dbi/rdoc .
 

data/LICENCE

@@ -0,0 +1,21 @@
+The MIT Licence
+
+Copyright (c) 2008-2009 Pistos
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/lib/m4dbi.rb

@@ -1,8 +1,14 @@
 require 'rubygems'
 
-require 'm4dbi/traits'
-require 'm4dbi/hash'
-require 'm4dbi/database-handle'
-require 'm4dbi/row'
-require 'm4dbi/model'
-require 'm4dbi/collection'
+M4DBI_VERSION = '0.6.0'
+
+__DIR__ = File.expand_path( File.dirname( __FILE__ ) )
+
+require "#{__DIR__}/m4dbi/traits"
+require "#{__DIR__}/m4dbi/hash"
+require "#{__DIR__}/m4dbi/array"
+require "#{__DIR__}/m4dbi/database-handle"
+require "#{__DIR__}/m4dbi/row"
+require "#{__DIR__}/m4dbi/timestamp"
+require "#{__DIR__}/m4dbi/model"
+require "#{__DIR__}/m4dbi/collection"

data/lib/m4dbi/array.rb

@@ -0,0 +1,5 @@
+class Array
+  def to_placeholders
+    map { '?' }.join( ', ' )
+  end
+end

data/lib/m4dbi/database-handle.rb

@@ -20,17 +20,40 @@ module DBI
     end
   end; end
   
+  module DBD; module Mysql
+    module DatabaseNameAccessor
+      def dbname
+        select_column( "SELECT DATABASE()" )
+      end
+    end
+  end; end
+  
+  module DBD; module SQLite3
+    module DatabaseNameAccessor
+      def dbname
+        select_one( "PRAGMA database_list" )[ 2 ]
+      end
+    end
+  end; end
+  
   class DatabaseHandle
+    attr_reader :transactions
+    
     alias old_initialize initialize
-    def initialize( handle )
+    def initialize( *args )
       DBI::DatabaseHandle.last_handle = self
-      handle = old_initialize( handle )
+      handle = old_initialize( *args )
       @mutex = Mutex.new
+      @transactions = Array.new
       
       # Hackery to expose dbname.
       if defined?( DBI::DBD::Pg::Database ) and ( DBI::DBD::Pg::Database === @handle )
         @handle.extend DBI::DBD::Pg::ConnectionDatabaseNameAccessor
         extend DBI::DBD::Pg::DatabaseNameAccessor
+      elsif defined?( DBI::DBD::Mysql::Database ) and ( DBI::DBD::Mysql::Database === @handle )
+        extend DBI::DBD::Mysql::DatabaseNameAccessor
+      elsif defined?( DBI::DBD::SQLite3::Database ) and ( DBI::DBD::SQLite3::Database === @handle )
+        extend DBI::DBD::SQLite3::DatabaseNameAccessor
       end
       # TODO: more DBDs
       
@@ -44,12 +67,18 @@ module DBI
     # database handle.
     def one_transaction
       @mutex.synchronize do
+        # Keep track of transactions for debugging purposes
+        transaction = { :time => ::Time.now, :stack => caller }
+        @transactions << transaction
+        
         auto_commit = self[ 'AutoCommit' ]
         self[ 'AutoCommit' ] = false
         result = transaction do
           yield self
         end
         self[ 'AutoCommit' ] = auto_commit
+        
+        @transactions.delete transaction
         result
       end
     end
@@ -58,6 +87,8 @@ module DBI
       row = select_one( statement, *bindvars )
       if row
         row[ 0 ]
+      else
+        raise DBI::DataError.new( "Query returned no rows." )
       end
     end
     

data/lib/m4dbi/hash.rb

@@ -1,21 +1,49 @@
 class Hash
-  def to_clause( join_string )
+  COMPACT_NILS = true
+  DONT_COMPACT_NILS = false
+  
+  # Takes an optional block to provide a single "field = ?" type subclause
+  # for each key-value pair.
+  def to_clause( join_string, compact_nils = DONT_COMPACT_NILS )
     # The clause items and the values have to be in the same order.
     keys_ = keys
-    clause = keys_.map { |field|
-      "#{field} = ?"
-    }.join( join_string )
+    if block_given?
+      mapping = keys_.map { |field| yield field }
+    else
+      mapping = keys_.map { |field| "#{field} = ?" }
+    end
+    clause = mapping.join( join_string )
     values_ = keys_.map { |key|
       self[ key ]
     }
+    if compact_nils
+      values_.compact!
+    end
     [ clause, values_ ]
   end
   
   def to_where_clause
-    to_clause( " AND " )
+    to_clause( " AND ", COMPACT_NILS ) { |field|
+      if self[ field ].nil?
+        "#{field} IS NULL"
+      else
+        "#{field} = ?"
+      end
+    }
   end
   
   def to_set_clause
     to_clause( ", " )
   end
+  
+  if method_defined? :slice
+    warn "Hash#slice already defined; redefining."
+  end
+  def slice( *desired_keys )
+    Hash[
+      select { |key,value|
+        desired_keys.include? key
+      }
+    ]
+  end
 end

data/lib/m4dbi/model.rb

@@ -11,26 +11,39 @@ module DBI
     
     extend Enumerable
     
-    def self.[]( hash_or_pk_value )
-      case hash_or_pk_value
-        when Hash
-          clause, values = hash_or_pk_value.to_where_clause
-          row = dbh.select_one(
-            "SELECT * FROM #{table} WHERE #{clause}",
-            *values
-          )
-        else
-          row = dbh.select_one(
-            "SELECT * FROM #{table} WHERE #{pk} = ?",
-            hash_or_pk_value
-          )
+    def self.[]( first_arg, *args )
+      if args.size == 0
+        case first_arg
+          when Hash
+            clause, values = first_arg.to_where_clause
+          when NilClass
+            clause = pk_clause
+            values = [ first_arg ]
+          else # single value
+            clause = pk_clause
+            values = Array( first_arg )
+        end
+      else
+        clause = pk_clause
+        values = [ first_arg ] + args
       end
       
+      row = dbh.select_one(
+        "SELECT * FROM #{table} WHERE #{clause}",
+        *values
+      )
+          
       if row
         self.new( row )
       end
     end
     
+    def self.pk_clause
+      pk.map { |col|
+        "#{col} = ?"
+      }.join( ' AND ' )
+    end
+    
     def self.from_rows( rows )
       rows.map { |r| self.new( r ) }
     end
@@ -85,7 +98,7 @@ module DBI
     end
     
     def self.count
-      dbh.select_column( "SELECT COUNT(*) FROM #{table}" )
+      dbh.select_column( "SELECT COUNT(*) FROM #{table}" ).to_i
     end
     
     def self.create( hash = {} )
@@ -115,9 +128,16 @@ module DBI
           *values
         )
         if num_inserted > 0
-          pk_value = hash[ self.pk.to_sym ] || hash[ self.pk.to_s ]
-          if pk_value
-            rec = self.one_where( self.pk => pk_value )
+          pk_hash = hash.slice( *(
+            self.pk.map { |pk_col| pk_col.to_sym }
+          ) )
+          if pk_hash.empty?
+            pk_hash = hash.slice( *(
+              self.pk.map { |pk_col| pk_col.to_s }
+            ) )
+          end
+          if not pk_hash.empty?
+            rec = self.one_where( pk_hash )
           else
             begin
               rec = last_record( dbh_ )
@@ -189,11 +209,12 @@ module DBI
       )
     end
     
-    def self.update_one( pk_value, set_hash )
-      set_clause, set_params = set_hash.to_set_clause
-      params = set_params + [ pk_value ]
+    def self.update_one( *args )
+      set_clause, set_params = args[ -1 ].to_set_clause
+      pk_values = args[ 0..-2 ]
+      params = set_params + pk_values
       dbh.do(
-        "UPDATE #{table} SET #{set_clause} WHERE #{pk} = ?",
+        "UPDATE #{table} SET #{set_clause} WHERE #{pk_clause}",
         *params
       )
     end
@@ -233,6 +254,7 @@ module DBI
               j.#{m1_fk} = ?
               AND m2.id = j.#{m2_fk}
           },
+          # TODO: m2.id?  Should be m2.pk or something
           pk
         )
       end
@@ -249,6 +271,7 @@ module DBI
               j.#{m2_fk} = ?
               AND m1.id = j.#{m1_fk}
           },
+          # TODO: Should be m1.pk not m1.id
           pk
         )
       end
@@ -267,17 +290,44 @@ module DBI
     end
     
     def method_missing( method, *args )
-      @row.send( method, *args )
+      begin
+        @row.send( method, *args )
+      rescue NoMethodError => e
+        raise NoMethodError.new(
+          "undefined method '#{method}' for #{self}",
+          method,
+          args
+        )
+      end
     end
     
+    # Returns a single value for single-column primary keys,
+    # returns an Array for multi-column primary keys.
     def pk
-      @row[ self.class.pk ]
+      if pk_columns.size == 1
+        @row[ pk_columns[ 0 ] ]
+      else
+        pk_values
+      end
     end
     
-    def pk_column
+    # Always returns an Array of values, even for single-column primary keys.
+    def pk_values
+      pk_columns.map { |col|
+        @row[ col ]
+      }
+    end
+    
+    def pk_columns
       self.class.pk
     end
     
+    def pk_clause
+      pk_columns.map { |col|
+        "#{col} = ?"
+      }.join( ' AND ' )
+    end
+    
     def ==( other )
       other and ( pk == other.pk )
     end
@@ -293,17 +343,23 @@ module DBI
     def set( hash )
       set_clause, set_params = hash.to_set_clause
       set_params << pk
-      dbh.do(
-        "UPDATE #{table} SET #{set_clause} WHERE #{pk_column} = ?",
+      num_updated = dbh.do(
+        "UPDATE #{table} SET #{set_clause} WHERE #{pk_clause}",
         *set_params
       )
+      if num_updated > 0
+        hash.each do |key,value|
+          @row[ key ] = value
+        end
+      end
+      num_updated
     end
     
     # Returns true iff the record and only the record was successfully deleted.
     def delete
       num_deleted = dbh.do(
-        "DELETE FROM #{table} WHERE #{pk_column} = ?",
-        pk
+        "DELETE FROM #{table} WHERE #{pk_clause}",
+        *pk_values
       )
       num_deleted == 1
     end
@@ -316,18 +372,21 @@ module DBI
   
   # Define a new DBI::Model like this:
   #   class Post < DBI::Model( :posts ); end
-  # You can specify the primary key column like so:
-  #   class Author < DBI::Model( :authors, 'id' ); end
-  def self.Model( table, pk_ = 'id' )
+  # You can specify the primary key column(s) using an array, like so:
+  #   class Author < DBI::Model( :authors, [ 'auth_num' ] ); end
+  def self.Model( table, pk_ = [ 'id' ] )
     h = DBI::DatabaseHandle.last_handle
     if h.nil? or not h.connected?
       raise DBI::Error.new( "Attempted to create a Model class without first connecting to a database." )
     end
+    if not pk_.respond_to? :each
+      raise DBI::Error.new( "Primary key must be enumerable (was given #{pk_.inspect})" )
+    end
     
     model_key =
-      if defined?( DBI::DBD::Pg::Database ) and DBI::DBD::Pg::Database === h.handle
+      # DBD-dependent.  Not all DBDs have dbname implemented by M4DBI.
+      if h.respond_to? :dbname
         "#{h.dbname}::#{table}"
-      # TODO: more DBDs
       else
         table
       end
@@ -342,24 +401,35 @@ module DBI
       } )
       
       if defined?( DBI::DBD::Pg::Database ) and DBI::DBD::Pg::Database === h.handle
+        # TODO: This is broken for non-SERIAL or multi-column primary keys
         meta_def( "last_record".to_sym ) do |dbh_|
           self.s1 "SELECT * FROM #{table} WHERE #{pk} = currval( '#{table}_#{pk}_seq' );" 
         end
+      elsif defined?( DBI::DBD::Mysql::Database ) and DBI::DBD::Mysql::Database === h.handle
+        meta_def( "last_record".to_sym ) do |dbh_|
+          self.s1 "SELECT * FROM #{table} WHERE #{pk} = LAST_INSERT_ID();" 
+        end
+      elsif defined?( DBI::DBD::SQLite3::Database ) and DBI::DBD::SQLite3::Database === h.handle
+        meta_def( "last_record".to_sym ) do |dbh_|
+          self.s1 "SELECT * FROM #{table} WHERE #{pk} = last_insert_rowid();" 
+        end
       # TODO: more DBDs
       end
       
       klass.trait[ :columns ].each do |col|
         colname = col[ 'name' ]
         
+        # Column readers
         class_def( colname.to_sym ) do
           @row[ colname ]
         end
         
+        # Column writers
         class_def( "#{colname}=".to_sym ) do |new_value|
           num_changed = dbh.do(
-            "UPDATE #{table} SET #{colname} = ? WHERE #{pk_column} = ?",
+            "UPDATE #{table} SET #{colname} = ? WHERE #{pk_clause}",
             new_value,
-            pk
+            *pk_values
           )
           if num_changed > 0
             @row[ colname ] = new_value

data/lib/m4dbi/timestamp.rb

@@ -0,0 +1,20 @@
+module DBI
+  class Timestamp
+    def method_missing( method, *args )
+      t = to_time
+      begin
+        t.send( method, *args )
+      rescue NoMethodError => e
+        raise NoMethodError.new(
+          "undefined method '#{method}' for #{self}",
+          method,
+          args
+        )
+      end
+    end
+    
+    def <=>( other )
+      to_time <=> other.to_time
+    end
+  end
+end

data/spec/dbi.rb

@@ -1,7 +1,7 @@
 require 'spec/helper'
 
-$dbh = DBI.connect( "DBI:Pg:m4dbi", "m4dbi", "m4dbi" )
-# See test-schema.sql and test-data.sql
+$dbh = connect_to_spec_database
+reset_data
 
 describe 'DBI::DatabaseHandle#select_column' do
   
@@ -11,6 +11,15 @@ describe 'DBI::DatabaseHandle#select_column' do
     )
     name.class.should.not.equal Array
     name.should.equal 'author1'
+    
+    null = $dbh.select_column(
+      "SELECT c4 FROM many_col_table WHERE c3 = 40"
+    )
+    null.should.be.nil
+    
+    should.raise( DBI::DataError ) do
+      $dbh.select_column( "SELECT name FROM authors WHERE 1+1 = 3" )
+    end
   end
   
   it 'selects one column of first row' do
@@ -26,7 +35,6 @@ describe 'DBI::DatabaseHandle#select_column' do
     )
     name.should.equal 'author3'
   end
-  
 end
 
 describe 'DBI::DatabaseHandle#one_transaction' do
@@ -87,6 +95,8 @@ describe 'DBI::DatabaseHandle#one_transaction' do
     
     value = $dbh.sc "SELECT c1 FROM many_col_table WHERE id = 1;"
     value.should.equal( 11 + 1 + 1 )
+    
+    reset_data
   end
   
 end

data/spec/hash.rb

@@ -5,23 +5,43 @@ describe 'Hash' do
     h = {
       :a => 2,
       :b => 'foo',
+      :the_nil => nil,
       :abc => Time.now,
       :xyz => 9.02,
     }
     clause, values = h.to_clause( " AND " )
     where_clause, where_values = h.to_where_clause
     
-    s = "a = ? AND b = ? AND abc = ? AND xyz = ?"
-    clause.length.should.equal s.length
-    where_clause.length.should.equal s.length
+    str = "a = ? AND b = ? AND the_nil = ? AND abc = ? AND xyz = ?"
+    where_str = "a = ? AND b = ? AND the_nil IS NULL AND abc = ? AND xyz = ?"
+    clause.length.should.equal str.length
+    where_clause.length.should.equal where_str.length
     
-    h.each do |key,value|
+    h.each_key do |key|
       clause.should.match /#{key} = ?/
-      where_clause.should.match /#{key} = ?/
-      values.find { |v| v == value }.should.not.be.nil
-      where_values.find { |v| v == value }.should.not.be.nil
+      if h[ key ].nil?
+        where_clause.should.match /#{key} IS NULL/
+      else
+        where_clause.should.match /#{key} = ?/
+      end
     end
-    values.size.should.equal h.keys.size
-    where_values.size.should.equal h.keys.size
+    
+    values.should.equal h.values
+    where_values.should.equal h.values.compact
+  end
+  
+  it 'offers a means to get subhashes via #slice' do
+    h = { :a => 1, :b => 2, :c => 3, :d => 4, :e => 5, :f => 6 }
+    h.slice( :b, :c ).should.equal(
+      { :b => 2, :c => 3 }
+    )
+    h.slice( :a, :b, :f ).should.equal(
+      { :a => 1, :b => 2, :f => 6 }
+    )
+    h.slice( :c, :e, :q ).should.equal(
+      { :c => 3, :e => 5 }
+    )
+    h.slice.should.equal Hash.new
+    h.slice( :g, :h ).should.equal Hash.new
   end
 end

data/spec/helper.rb

@@ -11,3 +11,22 @@ $LOAD_PATH.unshift(
 )
 
 require 'm4dbi'
+
+puts "DBI version: #{DBI::VERSION}"
+puts "M4DBI version: #{M4DBI_VERSION}"
+
+# See test-schema*.sql and test-data.sql
+def connect_to_spec_database( database = ( ENV[ 'M4DBI_DATABASE' ] || 'm4dbi' ) )
+  driver = ENV[ 'M4DBI_DRIVER' ] || "DBI:Pg"
+  puts "Using DBI driver: '#{driver}'"
+  DBI.connect( "#{driver}:#{database}", "m4dbi", "m4dbi" )
+end
+
+def reset_data( dbh = $dbh, datafile = "test-data.sql" )
+  dir = File.dirname( __FILE__ )
+  File.read( "#{dir}/#{datafile}" ).split( /;/ ).each do |command|
+    if not command.strip.empty?
+      dbh.do command
+    end
+  end
+end

data/spec/model.rb

@@ -1,14 +1,5 @@
 require 'spec/helper'
 
-# See test-schema.sql and test-data.sql
-
-def reset_data( dbh = $dbh, datafile = "test-data.sql" )
-  dir = File.dirname( __FILE__ )
-  File.read( "#{dir}/#{datafile}" ).split( /;/ ).each do |command|
-    dbh.do( command )
-  end
-end
-
 describe 'DBI::Model' do
   it 'raises an exception when trying to define a model before connecting to a database' do
     dbh = DBI::DatabaseHandle.last_handle
@@ -21,7 +12,7 @@ describe 'DBI::Model' do
   end
 end
 
-$dbh = DBI.connect( "DBI:Pg:m4dbi", "m4dbi", "m4dbi" )
+$dbh = connect_to_spec_database
 reset_data
 
 class ManyCol < DBI::Model( :many_col_table )
@@ -43,6 +34,7 @@ describe 'A DBI::Model subclass' do
     @m_post = Class.new( DBI::Model( :posts ) )
     @m_empty = Class.new( DBI::Model( :empty_table ) )
     @m_mc = Class.new( DBI::Model( :many_col_table ) )
+    @m_mcpk = Class.new( DBI::Model( :mcpk, [ :kc1, :kc2 ] ) )
     class Author < DBI::Model( :authors ); end
   end
   
@@ -78,7 +70,7 @@ describe 'A DBI::Model subclass' do
       
       class Author < DBI::Model( :authors ); end
         
-      dbh = DBI.connect( "DBI:Pg:m4dbi", "m4dbi", "m4dbi" )
+      dbh = connect_to_spec_database
       new_handle = DBI::DatabaseHandle.last_handle
       new_handle.should.equal dbh
       new_handle.should.not.equal original_handle
@@ -93,7 +85,7 @@ describe 'A DBI::Model subclass' do
       a1.should.not.be.nil
       a1.name.should.equal 'author1'
       
-      dbh = DBI.connect( "DBI:Pg:m4dbi2", "m4dbi", "m4dbi" )
+      dbh = connect_to_spec_database( 'm4dbi2' )
       reset_data( dbh, "test-data2.sql" )
       
       @m_author2 = Class.new( DBI::Model( :authors ) )
@@ -109,7 +101,7 @@ describe 'A DBI::Model subclass' do
     ensure
       # Clean up handles for later specs
       dbh.disconnect if dbh and dbh.connected?
-      DBI.connect( "DBI:Pg:m4dbi", "m4dbi", "m4dbi" )
+      connect_to_spec_database
     end
   end
   
@@ -135,6 +127,26 @@ describe 'A DBI::Model subclass' do
     o.should.not.be.nil
     o.class.should.equal @m_author
     o.name.should.equal 'author2'
+    
+    o = @m_mcpk[ [ 2, 2 ] ]
+    o.should.not.be.nil
+    o.class.should.equal @m_mcpk
+    o.val.should.equal 'two two'
+    
+    o = @m_mcpk[ 1, 1 ]
+    o.should.not.be.nil
+    o.class.should.equal @m_mcpk
+    o.val.should.equal 'one one'
+    
+    o = @m_mcpk[ { :kc1 => 5, :kc2 => 6 } ]
+    o.should.not.be.nil
+    o.class.should.equal @m_mcpk
+    o.val.should.equal 'five six'
+    
+    should.not.raise( DBI::Error ) do
+      o = @m_author[ nil ]
+      o.should.be.nil
+    end
   end
   
   it 'provides hash-like single-record access via #[ field_hash ]' do
@@ -147,6 +159,16 @@ describe 'A DBI::Model subclass' do
     o.should.not.be.nil
     o.class.should.equal @m_post
     o.text.should.equal 'First post.'
+    
+    o = @m_mc[ :c1 => 100, :c2 => 50 ]
+    o.should.not.be.nil
+    o.class.should.equal @m_mc
+    o.c3.should.equal 20
+    
+    o = @m_mc[ :c1 => 100, :c2 => nil ]
+    o.should.not.be.nil
+    o.class.should.equal @m_mc
+    o.c3.should.equal 40
   end
   
   it 'returns nil from #[] when no record is found' do
@@ -158,9 +180,7 @@ describe 'A DBI::Model subclass' do
   end
   
   it 'provides multi-record access via #where( Hash )' do
-    posts = @m_post.where(
-      :author_id => 1
-    )
+    posts = @m_post.where( :author_id => 1 )
     posts.should.not.be.nil
     posts.should.not.be.empty
     posts.size.should.equal 2
@@ -171,6 +191,24 @@ describe 'A DBI::Model subclass' do
     }
     p = sorted_posts.first
     p.text.should.equal 'First post.'
+    
+    rows = @m_mc.where( :c1 => 100, :c2 => 50 )
+    rows.should.not.be.nil
+    rows.should.not.be.empty
+    rows.size.should.equal 1
+    row = rows[ 0 ]
+    row.class.should.equal @m_mc
+    row.c1.should.equal 100
+    row.c3.should.equal 20
+    
+    rows = @m_mc.where( :c1 => 100, :c2 => nil )
+    rows.should.not.be.nil
+    rows.should.not.be.empty
+    rows.size.should.equal 1
+    row = rows[ 0 ]
+    row.class.should.equal @m_mc
+    row.c1.should.equal 100
+    row.c3.should.equal 40
   end    
     
   it 'provides multi-record access via #where( String )' do
@@ -187,6 +225,20 @@ describe 'A DBI::Model subclass' do
     p.text.should.equal 'Second post.'
   end
   
+  it 'provides multi-record access via #where( String, param, param... )' do
+    posts = @m_post.where( "id < ?", 3 )
+    posts.should.not.be.nil
+    posts.should.not.be.empty
+    posts.size.should.equal 2
+    posts[ 0 ].class.should.equal @m_post
+      
+    sorted_posts = posts.sort { |p1,p2|
+      p2._id <=> p1._id
+    }
+    p = sorted_posts.first
+    p.text.should.equal 'Second post.'
+  end
+  
   it 'returns an empty array from #where when no records are found' do
     a = @m_author.where( :id => 999 )
     a.should.be.empty
@@ -200,6 +252,12 @@ describe 'A DBI::Model subclass' do
     post.should.not.be.nil
     post.class.should.equal @m_post
     post.text.should.equal 'Second post.'
+    
+    row = @m_mc.one_where( :c1 => 100, :c2 => nil )
+    row.should.not.be.nil
+    row.class.should.equal @m_mc
+    row.c1.should.equal 100
+    row.c3.should.equal 40
   end
   
   it 'provides single-record access via #one_where( String )' do
@@ -209,6 +267,13 @@ describe 'A DBI::Model subclass' do
     post.id.should.equal 3
   end
   
+  it 'provides single-record access via #one_where( String, param, param... )' do
+    post = @m_post.one_where( "text LIKE ?", '%Third%' )
+    post.should.not.be.nil
+    post.class.should.equal @m_post
+    post.id.should.equal 3
+  end
+  
   it 'returns nil from #one_where when no record is found' do
     a = @m_author.one_where( :id => 999 )
     a.should.be.nil
@@ -217,7 +282,6 @@ describe 'A DBI::Model subclass' do
     p.should.be.nil
   end
   
-  
   it 'returns all table records via #all' do
     rows = @m_author.all
     rows.should.not.be.nil
@@ -225,8 +289,10 @@ describe 'A DBI::Model subclass' do
     rows.size.should.equal 3
     
     rows[ 0 ].id.should.equal 1
+    rows[ 0 ].class.should.equal @m_author
     rows[ 0 ].name.should.equal 'author1'
     rows[ 1 ].id.should.equal 2
+    rows[ 1 ].class.should.equal @m_author
     rows[ 1 ].name.should.equal 'author2'
   end
   
@@ -236,7 +302,7 @@ describe 'A DBI::Model subclass' do
     rows.should.be.empty
   end
   
-  it 'returns any single record from #one' do
+  it 'returns a random single record from #one' do
     one = @m_author.one
     one.should.not.be.nil
     one.class.should.equal @m_author
@@ -324,6 +390,14 @@ describe 'A DBI::Model subclass' do
     a.should.not.respond_to :no_column_by_this_name
     a.name.should.equal 'author1'
     @m_author.count.should.equal n
+    
+    n = @m_mc.count
+    row = @m_mc.find_or_create( :c1 => 100, :c2 => nil )
+    row.should.not.be.nil
+    row.class.should.equal @m_mc
+    row.c1.should.equal 100
+    row.c3.should.equal 40
+    @m_mc.count.should.equal n
   end
   
   it 'creates a record via #find_or_create( Hash )' do
@@ -373,7 +447,7 @@ describe 'A DBI::Model subclass' do
     posts[ 1 ].text.should.equal 'Third post.'
     posts[ 1 ].class.should.equal @m_post
     
-    no_posts = @m_post.s( "SELECT * FROM posts WHERE FALSE" )
+    no_posts = @m_post.s( "SELECT * FROM posts WHERE 1+1 = 3" )
     no_posts.should.not.be.nil
     no_posts.should.be.empty
   end
@@ -402,7 +476,7 @@ describe 'A DBI::Model subclass' do
     post.author_id.should.equal 1
     post.text.should.equal 'Third post.'
     
-    no_post = @m_post.s1( "SELECT * FROM posts WHERE FALSE" )
+    no_post = @m_post.s1( "SELECT * FROM posts WHERE 1+1 = 3" )
     no_post.should.be.nil
   end
   
@@ -426,16 +500,26 @@ describe 'A DBI::Model subclass' do
   end
   
   it 'provides a means to update records referred to by primary key value' do
-    new_text = 'This is some new text.'
+    new_text = 'Some new text.'
     
     p2 = @m_post[ 2 ]
     p2.text.should.not.equal new_text
-    
     @m_post.update_one( 2, { :text => new_text } )
-    
     p2_ = @m_post[ 2 ]
     p2_.text.should.equal new_text
     
+    row = @m_mcpk[ 1, 1 ]
+    row.val.should.not.equal new_text
+    @m_mcpk.update_one( 1, 1, { :val => new_text } )
+    row = @m_mcpk[ 1, 1 ]
+    row.val.should.equal new_text
+    
+    row = @m_mcpk[ 3, 4 ]
+    row.val.should.not.equal new_text
+    @m_mcpk.update_one( 3, 4, { :val => new_text } )
+    row = @m_mcpk[ 3, 4 ]
+    row.val.should.equal new_text
+    
     reset_data
   end
   
@@ -560,6 +644,8 @@ describe 'A found DBI::Model subclass instance' do
   before do
     @m_author = Class.new( DBI::Model( :authors ) )
     @m_post = Class.new( DBI::Model( :posts ) )
+    @m_mc = Class.new( DBI::Model( :many_col_table ) )
+    @m_mcpk = Class.new( DBI::Model( :mcpk, [ :kc1, :kc2 ] ) )
   end
   
   it 'provides access to primary key value' do
@@ -568,6 +654,12 @@ describe 'A found DBI::Model subclass instance' do
     
     p = @m_post[ 3 ]
     p.pk.should.equal 3
+    
+    r = @m_mcpk[ 1, 1 ]
+    r.pk.should.equal [ 1, 1 ]
+    
+    r = @m_mcpk[ { :kc1 => 3, :kc2 => 4 } ]
+    r.pk.should.equal [ 3, 4 ]
   end
   
   it 'provides read access to fields via identically-named readers' do
@@ -595,6 +687,7 @@ describe 'A found DBI::Model subclass instance' do
     
     p3 = @m_post[ 3 ]
     p3.text = the_new_text
+    p3.text.should.equal the_new_text
     
     p3_ = @m_post[ 3 ]
     p3_.text.should.equal the_new_text
@@ -603,6 +696,16 @@ describe 'A found DBI::Model subclass instance' do
     p2_ = @m_post[ 2 ]
     p2_.text.should.equal p2.text
     
+    mc1 = @m_mc.create(
+      :id => 1,
+      :c1 => 2
+    )
+    mc1.c1.should.equal 2
+    mc1.c1 = nil
+    mc1.c1.should.be.nil
+    mc1_ = @m_mc[ 1 ]
+    mc1_.c1.should.be.nil
+    
     reset_data
   end
   
@@ -620,11 +723,28 @@ describe 'A found DBI::Model subclass instance' do
       :author_id => 2,
       :text => the_new_text
     )
+    p.author_id.should.equal 2
+    p.text.should.equal the_new_text
     
     p_ = @m_post[ 1 ]
     p_.author_id.should.equal 2
     p_.text.should.equal the_new_text
     
+    mc1 = @m_mc.create(
+      :id => 1,
+      :c1 => 2,
+      :c2 => 3
+    )
+    mc1.set(
+      :c1 => nil,
+      :c2 => 4
+    )
+    mc1.c1.should.be.nil
+    mc1.c2.should.equal 4
+    mc1_ = @m_mc[ 1 ]
+    mc1_.c1.should.be.nil
+    mc1_.c2.should.equal 4
+    
     reset_data
   end
   
@@ -645,18 +765,6 @@ describe 'A found DBI::Model subclass instance' do
     end
   end
   
-  it 'allows a field to be incremented' do
-    mc = ManyCol.create( :c1 => 50 )
-    should.not.raise do
-      mc.inc
-    end
-  end
-  it 'allows a field to be decremented' do
-    mc = ManyCol.create( :c1 => 50 )
-    should.not.raise do
-      mc.dec
-    end
-  end
 end
 
 describe 'DBI::Model (relationships)' do
@@ -740,7 +848,6 @@ describe 'DBI::Collection' do
   before do
     @m_author = Class.new( DBI::Model( :authors ) )
     @m_post = Class.new( DBI::Model( :posts ) )
-    @m_fan = Class.new( DBI::Model( :fans ) )
     
     DBI::Model.one_to_many(
       @m_author, @m_post, :posts, :author, :author_id

metadata

@@ -1,19 +1,30 @@
 --- !ruby/object:Gem::Specification 
 name: m4dbi
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
-platform: ""
+  version: 0.6.0
+platform: ruby
 authors: 
 - Pistos
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-04-01 00:00:00 -04:00
+date: 2008-11-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: metaid
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: dbi
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -31,21 +42,25 @@ extra_rdoc_files:
 - HIM
 - READHIM
 - CHANGELOG
+- LICENCE
 files: 
 - HIM
 - READHIM
-- lib/m4dbi/database-handle.rb
+- CHANGELOG
+- LICENCE
+- lib/m4dbi/array.rb
+- lib/m4dbi/collection.rb
 - lib/m4dbi/row.rb
-- lib/m4dbi/model.rb
+- lib/m4dbi/timestamp.rb
 - lib/m4dbi/traits.rb
-- lib/m4dbi/collection.rb
+- lib/m4dbi/database-handle.rb
 - lib/m4dbi/hash.rb
+- lib/m4dbi/model.rb
 - lib/m4dbi.rb
-- spec/helper.rb
-- spec/dbi.rb
 - spec/model.rb
+- spec/dbi.rb
 - spec/hash.rb
-- CHANGELOG
+- spec/helper.rb
 has_rdoc: false
 homepage: http://purepistos.net/m4dbi
 post_install_message: 
@@ -66,15 +81,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
   version: 
 requirements: 
-- dbi
 - bacon (optional)
-rubyforge_project: 
-rubygems_version: 0.9.5
+rubyforge_project: m4dbi
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Models (and More) for DBI
 test_files: 
-- spec/helper.rb
-- spec/dbi.rb
 - spec/model.rb
+- spec/dbi.rb
 - spec/hash.rb
+- spec/helper.rb