m4dbi 0.6.2 → 0.7.0

data/spec/hash.rb

@@ -1,4 +1,4 @@
-require 'spec/helper'
+require_relative 'helper'
 
 describe 'Hash' do
   it 'is convertible to an SQL subclause and matching value Array' do
@@ -11,12 +11,12 @@ describe 'Hash' do
     }
     clause, values = h.to_clause( " AND " )
     where_clause, where_values = h.to_where_clause
-    
+
     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_key do |key|
       clause.should.match /#{key} = ?/
       if h[ key ].nil?
@@ -25,11 +25,11 @@ describe 'Hash' do
         where_clause.should.match /#{key} = ?/
       end
     end
-    
+
     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(

data/spec/helper.rb

@@ -12,21 +12,33 @@ $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" )
+  driver = ENV[ 'M4DBI_DRIVER' ] || "PostgreSQL"
+  # puts "\nUsing RDBI driver: '#{driver}'"
+  case driver.downcase
+  when 'postgresql', 'sqlite3', 'mysql'
+    require "rdbi/driver/#{driver.downcase}"
+  else
+    raise "Unrecognized RDBI driver: #{driver}"
+  end
+
+  M4DBI.connect(
+    driver,
+    :database => database,
+    :username => 'm4dbi',
+    :hostname => 'localhost',
+    :password => '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
+    if ! command.strip.empty?
+      dbh.execute command
     end
   end
 end

data/spec/model.rb

@@ -1,13 +1,18 @@
-require 'spec/helper'
+require_relative 'helper'
 
-describe 'DBI::Model' do
+describe 'M4DBI::Model' do
   it 'raises an exception when trying to define a model before connecting to a database' do
-    dbh = DBI::DatabaseHandle.last_handle
-    if dbh and dbh.respond_to? :disconnect
+    dbh = M4DBI.last_dbh
+    if dbh && dbh.respond_to?( :disconnect )
       dbh.disconnect
+      dbh.should.not.be.connected
     end
-    should.raise do
-      @m_author = Class.new( DBI::Model( :authors ) )
+    dbh = M4DBI.last_dbh
+    if dbh
+      dbh.should.not.be.connected
+    end
+    should.raise( M4DBI::Error ) do
+      @m_author = Class.new( M4DBI::Model( :authors ) )
     end
   end
 end
@@ -15,7 +20,7 @@ end
 $dbh = connect_to_spec_database
 reset_data
 
-class ManyCol < DBI::Model( :many_col_table )
+class ManyCol < M4DBI::Model( :many_col_table )
   def inc
     self.c1 = c1 + 10
   end
@@ -25,18 +30,18 @@ class ManyCol < DBI::Model( :many_col_table )
   end
 end
 
-describe 'A DBI::Model subclass' do
+describe 'A M4DBI::Model subclass' do
   before do
-    # Here we subclass DBI::Model.
+    # Here we subclass M4DBI::Model.
     # This is nearly equivalent to the typical "ChildClassName < ParentClassName"
     # syntax, but allows us to refer to the class in our specs.
-    @m_author = Class.new( DBI::Model( :authors ) )
-    @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_nipk = Class.new( DBI::Model( :non_id_pk, :pk => [ :str ] ) )
-    @m_mcpk = Class.new( DBI::Model( :mcpk, :pk => [ :kc1, :kc2 ] ) )
-    class Author < DBI::Model( :authors ); end
+    @m_author = Class.new( M4DBI::Model( :authors ) )
+    @m_post = Class.new( M4DBI::Model( :posts ) )
+    @m_empty = Class.new( M4DBI::Model( :empty_table ) )
+    @m_mc = Class.new( M4DBI::Model( :many_col_table ) )
+    @m_nipk = Class.new( M4DBI::Model( :non_id_pk, :pk => [ :str ] ) )
+    @m_mcpk = Class.new( M4DBI::Model( :mcpk, :pk => [ :kc1, :kc2 ] ) )
+    class Author < M4DBI::Model( :authors ); end
   end
 
   it 'can be defined' do
@@ -46,16 +51,16 @@ describe 'A DBI::Model subclass' do
 
   it 'maintains identity across different inheritances' do
     should.not.raise do
-      class Author < DBI::Model( :authors ); end
-      class Author < DBI::Model( :authors ); end
+      class Author < M4DBI::Model( :authors ); end
+      class Author < M4DBI::Model( :authors ); end
     end
   end
 
   it 'maintains member methods across redefinitions' do
-    class Author < DBI::Model( :authors )
+    class Author < M4DBI::Model( :authors )
       def method1; 1; end
     end
-    class Author < DBI::Model( :authors )
+    class Author < M4DBI::Model( :authors )
       def method2; 2; end
     end
     a = Author[ 3 ]
@@ -67,16 +72,29 @@ describe 'A DBI::Model subclass' do
     # If you try to subclass a class a second time with a different parent class,
     # Ruby raises an exception.
     should.not.raise do
-      original_handle = DBI::DatabaseHandle.last_handle
+      original_handle = M4DBI.last_dbh
 
-      class Author < DBI::Model( :authors ); end
+      class Author < M4DBI::Model( :authors ); end
 
       dbh = connect_to_spec_database
-      new_handle = DBI::DatabaseHandle.last_handle
+      new_handle = M4DBI.last_dbh
       new_handle.should.equal dbh
       new_handle.should.not.equal original_handle
 
-      class Author < DBI::Model( :authors ); end
+      class Author < M4DBI::Model( :authors ); end
+    end
+  end
+
+  it 'provides the database handle it is using' do
+    begin
+      @m_author.dbh.should.equal $dbh
+
+      dbh = connect_to_spec_database( ENV[ 'M4DBI_DATABASE2' ] || 'm4dbi2' )
+      @m_author2 = Class.new( M4DBI::Model( :authors ) )
+      @m_author2.dbh.should.equal dbh
+    ensure
+      # Clean up handles for later specs
+      connect_to_spec_database
     end
   end
 
@@ -89,8 +107,8 @@ describe 'A DBI::Model subclass' do
       dbh = connect_to_spec_database( ENV[ 'M4DBI_DATABASE2' ] || 'm4dbi2' )
       reset_data( dbh, "test-data2.sql" )
 
-      @m_author2 = Class.new( DBI::Model( :authors ) )
-      @m_author2.dbh.should.equal dbh
+      @m_author2 = Class.new( M4DBI::Model( :authors ) )
+      @m_author2.dbh.should.not.equal @m_author.dbh
 
       @m_author2[ 1 ].should.be.nil
       a11 = @m_author2[ 11 ]
@@ -111,15 +129,15 @@ describe 'A DBI::Model subclass' do
   it 'can use a specific database handle' do
     begin
       dbh1 = connect_to_spec_database
-      dbh1.should.equal DBI::DatabaseHandle.last_handle
+      dbh1.should.equal M4DBI.last_dbh
       dbh2 = connect_to_spec_database( ENV[ 'M4DBI_DATABASE2' ] || 'm4dbi2' )
-      dbh2.should.equal DBI::DatabaseHandle.last_handle
+      dbh2.should.equal M4DBI.last_dbh
       reset_data( dbh2, "test-data2.sql" )
 
       dbh1.should.not.equal dbh2
 
-      class Author1 < DBI::Model( :authors, :dbh => dbh1 ); end
-      class Author2 < DBI::Model( :authors, :dbh => dbh2 ); end
+      class Author1 < M4DBI::Model( :authors, :dbh => dbh1 ); end
+      class Author2 < M4DBI::Model( :authors, :dbh => dbh2 ); end
 
       a1 = Author1[ 1 ]
       a1.should.not.be.nil
@@ -135,13 +153,13 @@ describe 'A DBI::Model subclass' do
   end
 
   it 'raises an exception when creating with invalid arguments' do
-    should.raise( DBI::Error ) do
+    should.raise( M4DBI::Error ) do
       @m_author.new nil
     end
-    should.raise( DBI::Error ) do
+    should.raise( M4DBI::Error ) do
       @m_author.new 2
     end
-    should.raise( DBI::Error ) do
+    should.raise( M4DBI::Error ) do
       @m_author.new Object.new
     end
   end
@@ -184,7 +202,7 @@ describe 'A DBI::Model subclass' do
     o.class.should.equal @m_mcpk
     o.val.should.equal 'five six'
 
-    should.not.raise( DBI::Error ) do
+    should.not.raise( RDBI::Error ) do
       o = @m_author[ nil ]
       o.should.be.nil
     end
@@ -194,7 +212,7 @@ describe 'A DBI::Model subclass' do
     o = @m_author[ :name => 'author1' ]
     o.should.not.be.nil
     o.class.should.equal @m_author
-    o.id.should.equal 1
+    o[ 'id' ].should.equal 1
 
     o = @m_post[ :author_id => 1 ]
     o.should.not.be.nil
@@ -228,7 +246,7 @@ describe 'A DBI::Model subclass' do
     posts[ 0 ].class.should.equal @m_post
 
     sorted_posts = posts.sort { |p1,p2|
-      p1._id <=> p2._id
+      p1[ 'id' ] <=> p2[ 'id' ]
     }
     p = sorted_posts.first
     p.text.should.equal 'First post.'
@@ -260,7 +278,7 @@ describe 'A DBI::Model subclass' do
     posts[ 0 ].class.should.equal @m_post
 
     sorted_posts = posts.sort { |p1,p2|
-      p2._id <=> p1._id
+      p2[ 'id' ] <=> p1[ 'id' ]
     }
     p = sorted_posts.first
     p.text.should.equal 'Second post.'
@@ -274,7 +292,7 @@ describe 'A DBI::Model subclass' do
     posts[ 0 ].class.should.equal @m_post
 
     sorted_posts = posts.sort { |p1,p2|
-      p2._id <=> p1._id
+      p2[ 'id' ] <=> p1[ 'id' ]
     }
     p = sorted_posts.first
     p.text.should.equal 'Second post.'
@@ -305,14 +323,14 @@ describe 'A DBI::Model subclass' 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
+    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
+    post[ 'id' ].should.equal 3
   end
 
   it 'returns nil from #one_where when no record is found' do
@@ -329,10 +347,10 @@ describe 'A DBI::Model subclass' do
     rows.should.not.be.empty
     rows.size.should.equal 3
 
-    rows[ 0 ].id.should.equal 1
+    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 ][ 'id' ].should.equal 2
     rows[ 1 ].class.should.equal @m_author
     rows[ 1 ].name.should.equal 'author2'
   end
@@ -360,34 +378,48 @@ describe 'A DBI::Model subclass' do
   end
 
   it 'provides a means to create new records via #create( Hash )' do
+    num_authors = @m_author.count
+
     a = @m_author.create(
-      :id => 9,
-      :name => 'author9'
+      :id => 99,
+      :name => 'author99'
     )
     a.should.not.be.nil
     a.class.should.equal @m_author
-    a.id.should.equal 9
+    a[ 'id' ].should.equal 99
     a.should.respond_to :name
     a.should.not.respond_to :no_column_by_this_name
-    a.name.should.equal 'author9'
+    a.name.should.equal 'author99'
 
-    a_ = @m_author[ 9 ]
+    a_ = @m_author[ 99 ]
     a_.should.not.be.nil
     a_.should.equal a
-    a_.name.should.equal 'author9'
-
-    # No value given for auto-incrementing primary key
-    a = @m_author.create(
-      :name => 'author10'
-    )
+    a_.name.should.equal 'author99'
+
+    # Insert without auto-incrementing primary key specified
+    # Try at least as many times as there were records in the DB,
+    # because the sequence used for the IDs is independent of
+    # the actual ID values in the DB for some RDBMSes.
+    num_authors.times do
+      begin
+        a = @m_author.create(
+          :name => 'author10'
+        )
+        break  # Stop on success
+      rescue Exception => e
+        if e.message !~ /duplicate/
+          raise e
+        end
+      end
+    end
     a.should.not.be.nil
     a.class.should.equal @m_author
-    a.id.should.not.equal 9
+    a[ 'id' ].should.not.be.nil
     a.should.respond_to :name
     a.should.not.respond_to :no_column_by_this_name
     a.name.should.equal 'author10'
 
-    a_ = @m_author[ a.id ]
+    a_ = @m_author[ a[ 'id' ] ]
     a_.should.not.be.nil
     a_.should.equal a
     a_.name.should.equal 'author10'
@@ -403,12 +435,12 @@ describe 'A DBI::Model subclass' do
     end
 
     a = @m_author.create { |rec|
-      rec.id = 9
+      rec[ 'id' ] = 9
       rec.name = 'author9'
     }
     a.should.not.be.nil
     a.class.should.equal @m_author
-    a.id.should.equal 9
+    a[ 'id' ].should.equal 9
     a.name.should.equal 'author9'
 
     a_ = @m_author[ 9 ]
@@ -418,13 +450,13 @@ describe 'A DBI::Model subclass' do
     m = nil
     should.not.raise do
       m = @m_mc.create { |rec|
-        rec.id = 1
+        rec[ 'id' ] = 1
         rec.c2 = 7
         rec.c3 = 8
       }
     end
     m_ = @m_mc[ 1 ]
-    m_.id.should.equal 1
+    m_[ 'id' ].should.equal 1
     m_.c1.should.be.nil
     m_.c2.should.equal 7
     m_.c3.should.equal 8
@@ -442,7 +474,7 @@ describe 'A DBI::Model subclass' do
     )
     a.should.not.be.nil
     a.class.should.equal @m_author
-    a.id.should.equal 1
+    a[ 'id' ].should.equal 1
     a.should.respond_to :name
     a.should.not.respond_to :no_column_by_this_name
     a.name.should.equal 'author1'
@@ -465,7 +497,7 @@ describe 'A DBI::Model subclass' do
     )
     a.should.not.be.nil
     a.class.should.equal @m_author
-    a.id.should.equal 9
+    a[ 'id' ].should.equal 9
     a.should.respond_to :name
     a.should.not.respond_to :no_column_by_this_name
     a.name.should.equal 'author9'
@@ -497,10 +529,10 @@ describe 'A DBI::Model subclass' do
     posts.should.not.be.empty
     posts.size.should.equal 2
 
-    posts[ 0 ].id.should.equal 1
+    posts[ 0 ][ 'id' ].should.equal 1
     posts[ 0 ].text.should.equal 'First post.'
     posts[ 0 ].class.should.equal @m_post
-    posts[ 1 ].id.should.equal 3
+    posts[ 1 ][ 'id' ].should.equal 3
     posts[ 1 ].text.should.equal 'Third post.'
     posts[ 1 ].class.should.equal @m_post
 
@@ -529,7 +561,7 @@ describe 'A DBI::Model subclass' do
     post.should.not.be.nil
     post.class.should.equal @m_post
 
-    post.id.should.equal 3
+    post[ 'id' ].should.equal 3
     post.author_id.should.equal 1
     post.text.should.equal 'Third post.'
 
@@ -619,11 +651,12 @@ describe 'A DBI::Model subclass' do
   end
 end
 
-describe 'A created DBI::Model subclass instance' do
+describe 'A created M4DBI::Model subclass instance' do
   before do
-    @m_mc = Class.new( DBI::Model( :many_col_table ) )
-    @m_author = Class.new( DBI::Model( :authors ) )
-    @m_post = Class.new( DBI::Model( :posts ) )
+    @m_mc = Class.new( M4DBI::Model( :many_col_table ) )
+    @m_author = Class.new( M4DBI::Model( :authors ) )
+    @m_post = Class.new( M4DBI::Model( :posts ) )
+    @m_conflict = Class.new( M4DBI::Model( :conflicting_cols ) )
   end
 
   it 'provides read access to fields via identically-named readers' do
@@ -633,12 +666,12 @@ describe 'A created DBI::Model subclass instance' do
     )
     mc.should.not.be.nil
     should.not.raise do
-      mc.id
+      mc[ 'id' ]
       mc.c1
       mc.c2
       mc.c5
     end
-    mc.id.should.not.be.nil
+    mc[ 'id' ].should.not.be.nil
     mc.c3.should.equal 3
     mc.c4.should.equal 4
   end
@@ -655,26 +688,86 @@ describe 'A created DBI::Model subclass instance' do
     mc.c2.should.equal 20
     mc.c3.should.equal 30
     mc.c4.should.equal 40
-    id_ = mc.id
+    id_ = mc[ 'id' ]
     id_.should.not.be.nil
 
     mc_ = @m_mc[ id_ ]
-    mc_.id.should.equal id_
+    mc_[ 'id' ].should.equal id_
     mc_.c1.should.equal 10
     mc_.c2.should.equal 20
     mc_.c3.should.equal 30
     mc_.c4.should.equal 40
   end
 
+  it 'provides read access to fields via Hash-like syntax' do
+    mc = @m_mc.create(
+      :c3 => 3,
+      :c4 => 4
+    )
+    mc.should.not.be.nil
+    mc[ 'id' ].should.not.be.nil
+    mc[ 'c3' ].should.equal 3
+    mc[ 'c4' ].should.equal 4
+    mc[ :id ].should.not.be.nil
+    mc[ :c3 ].should.equal 3
+    mc[ :c4 ].should.equal 4
+  end
+
+  it 'provides write access to fields via Hash-like syntax' do
+    mc = @m_mc.create(
+      :c3 => 30,
+      :c4 => 40
+    )
+    mc.should.not.be.nil
+    mc[ 'c1' ] = 10
+    mc[ 'c2' ] = 20
+    mc[ 'c1' ].should.equal 10
+    mc[ 'c2' ].should.equal 20
+    mc[ 'c3' ].should.equal 30
+    mc[ 'c4' ].should.equal 40
+    id_ = mc[ 'id' ]
+    id_.should.not.be.nil
+
+    mc_ = @m_mc[ id_ ]
+    mc_[ 'id' ].should.equal id_
+    mc_[ 'c1' ].should.equal 10
+    mc_[ 'c2' ].should.equal 20
+    mc_[ 'c3' ].should.equal 30
+    mc_[ 'c4' ].should.equal 40
+  end
+
+  it 'provides alternative accessors for columns that collide with Object methods' do
+    mc = @m_conflict.create(
+      :c1 => 123,
+      :class => 'Mammalia',
+      :dup => false
+    )
+    mc.should.not.be.nil
+    should.not.raise do
+      mc[ 'id' ]
+      mc.class
+      mc.class_
+      mc.dup
+      mc.dup_
+    end
+    mc[ 'id' ].should.not.be.nil
+    mc.c1.should.equal 123
+    mc.class.should.equal @m_conflict
+    mc.class_.should.equal 'Mammalia'
+    mc.dup.should.equal mc
+  end
+
   it 'maintains Hash key equality across different fetches' do
     h = Hash.new
     a = @m_author[ 1 ]
     h[ a ] = 123
     a_ = @m_author[ 1 ]
     h[ a_].should.equal 123
+    a.should.equal a_
 
     a2 = @m_author[ 2 ]
     h[ a2 ].should.be.nil
+    a2.should.not.equal a
 
     h[ a2 ] = 456
     h[ a ].should.equal 123
@@ -682,6 +775,7 @@ describe 'A created DBI::Model subclass instance' do
 
     a2_ = @m_author[ 2 ]
     h[ a2_ ].should.equal 456
+    a2.should.equal a2_
   end
 
   it 'maintains Hash key distinction for different Model subclasses' do
@@ -697,13 +791,13 @@ describe 'A created DBI::Model subclass instance' do
   end
 end
 
-describe 'A found DBI::Model subclass instance' do
+describe 'A found M4DBI::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_nipk = Class.new( DBI::Model( :non_id_pk, :pk => [ :str ] ) )
-    @m_mcpk = Class.new( DBI::Model( :mcpk, :pk => [ :kc1, :kc2 ] ) )
+    @m_author = Class.new( M4DBI::Model( :authors ) )
+    @m_post = Class.new( M4DBI::Model( :posts ) )
+    @m_mc = Class.new( M4DBI::Model( :many_col_table ) )
+    @m_nipk = Class.new( M4DBI::Model( :non_id_pk, :pk => [ :str ] ) )
+    @m_mcpk = Class.new( M4DBI::Model( :mcpk, :pk => [ :kc1, :kc2 ] ) )
   end
 
   it 'provides access to primary key value' do
@@ -724,7 +818,7 @@ describe 'A found DBI::Model subclass instance' do
     p = @m_post[ 2 ]
 
     should.not.raise( NoMethodError ) do
-      p.id
+      p[ 'id' ]
       p.author_id
       p.text
     end
@@ -733,7 +827,7 @@ describe 'A found DBI::Model subclass instance' do
       p.foobar
     end
 
-    p.id.should.equal 2
+    p[ 'id' ].should.equal 2
     p.author_id.should.equal 2
     p.text.should.equal 'Second post.'
   end
@@ -831,38 +925,38 @@ describe 'A found DBI::Model subclass instance' do
 
 end
 
-describe 'DBI::Model (relationships)' do
+describe 'M4DBI::Model (relationships)' do
   before do
-    @m_author = Class.new( DBI::Model( :authors ) )
-    @m_post = Class.new( DBI::Model( :posts ) )
-    @m_fan = Class.new( DBI::Model( :fans ) )
+    @m_author = Class.new( M4DBI::Model( :authors ) )
+    @m_post = Class.new( M4DBI::Model( :posts ) )
+    @m_fan = Class.new( M4DBI::Model( :fans ) )
   end
 
   it 'facilitates relating one to many, providing read access' do
-    DBI::Model.one_to_many( @m_author, @m_post, :posts, :author, :author_id )
+    M4DBI::Model.one_to_many( @m_author, @m_post, :posts, :author, :author_id )
     a = @m_author[ 1 ]
     a.posts.should.not.be.empty
     p = @m_post[ 3 ]
     p.author.should.not.be.nil
-    p.author.id.should.equal 1
+    p.author[ 'id' ].should.equal 1
   end
 
   it 'facilitates relating one to many, allowing one of the many to set its one' do
-    DBI::Model.one_to_many(
+    M4DBI::Model.one_to_many(
       @m_author, @m_post, :posts, :author, :author_id
     )
     p = @m_post[ 3 ]
     p.author.should.not.be.nil
-    p.author.id.should.equal 1
+    p.author[ 'id' ].should.equal 1
     p.author = @m_author.create( :id => 4, :name => 'author4' )
     p_ = @m_post[ 3 ]
-    p_.author.id.should.equal 4
+    p_.author[ 'id' ].should.equal 4
 
     reset_data
   end
 
   it 'facilitates relating many to many, providing read access' do
-    DBI::Model.many_to_many(
+    M4DBI::Model.many_to_many(
       @m_author, @m_fan, :authors_liked, :fans, :authors_fans, :author_id, :fan_id
     )
     a1 = @m_author[ 1 ]
@@ -908,20 +1002,41 @@ describe 'DBI::Model (relationships)' do
   end
 end
 
-describe 'DBI::Collection' do
+describe 'M4DBI::Collection' do
   before do
-    @m_author = Class.new( DBI::Model( :authors ) )
-    @m_post = Class.new( DBI::Model( :posts ) )
+    @m_author = Class.new( M4DBI::Model( :authors ) )
+    @m_post = Class.new( M4DBI::Model( :posts ) )
 
-    DBI::Model.one_to_many(
+    M4DBI::Model.one_to_many(
       @m_author, @m_post, :posts, :author, :author_id
     )
   end
 
   it 'accepts additions' do
+    num_posts = @m_post.count
+
     a = @m_author[ 1 ]
     the_text = 'A new post.'
-    a.posts << { :text => the_text }
+
+    num_posts_of_author = a.posts.count
+
+    # Insert without auto-incrementing primary key specified
+    # Try at least as many times as there were records in the DB,
+    # because the sequence used for the IDs is independent of
+    # the actual ID values in the DB for some RDBMSes.
+    num_posts.times do
+      begin
+        a.posts << { :text => the_text }
+        break  # Stop on success
+      rescue Exception => e
+        if e.message !~ /duplicate/
+          raise e
+        end
+      end
+    end
+
+    a.posts.count.should.equal num_posts_of_author + 1
+
     p = a.posts.find { |p| p.text == the_text }
     p.should.not.be.nil
     p.author.should.equal a
@@ -965,4 +1080,4 @@ describe 'DBI::Collection' do
 
     reset_data
   end
-end
+end