sequel 3.34.0 → 3.35.0

data/spec/extensions/dirty_spec.rb

@@ -0,0 +1,155 @@
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+
+describe "Sequel::Plugins::Dirty" do
+  before do
+    @db = Sequel.mock(:fetch=>{:initial=>'i', :initial_changed=>'ic'}, :numrows=>1)
+    @c = Class.new(Sequel::Model(@db[:c]))
+    @c.plugin :dirty
+    @c.columns :initial, :initial_changed, :missing, :missing_changed
+  end
+
+  shared_examples_for "dirty plugin" do
+    it "initial_value should be the current value if value has not changed" do
+      @o.initial_value(:initial).should == 'i'
+      @o.initial_value(:missing).should == nil
+    end
+
+    it "initial_value should be the intial value if value has changed" do
+      @o.initial_value(:initial_changed).should == 'ic'
+      @o.initial_value(:missing_changed).should == nil
+    end
+
+    it "initial_value should handle case where initial value is reassigned later" do
+      @o.initial_changed = 'ic'
+      @o.initial_value(:initial_changed).should == 'ic'
+      @o.missing_changed = nil
+      @o.initial_value(:missing_changed).should == nil
+    end
+
+    it "changed_columns should handle case where initial value is reassigned later" do
+      @o.changed_columns.should == [:initial_changed, :missing_changed]
+      @o.initial_changed = 'ic'
+      @o.changed_columns.should == [:missing_changed]
+      @o.missing_changed = nil
+      @o.changed_columns.should == [:missing_changed]
+    end
+
+    it "column_change should give initial and current values if there has been a change made" do
+      @o.column_change(:initial_changed).should == ['ic', 'ic2']
+      @o.column_change(:missing_changed).should == [nil, 'mc2']
+    end
+
+    it "column_change should be nil if no change has been made" do
+      @o.column_change(:initial).should == nil
+      @o.column_change(:missing).should == nil
+    end
+
+    it "column_changed? should return whether the column has changed" do
+      @o.column_changed?(:initial).should == false
+      @o.column_changed?(:initial_changed).should == true
+      @o.column_changed?(:missing).should == false
+      @o.column_changed?(:missing_changed).should == true
+    end
+
+    it "column_changed? should handle case where initial value is reassigned later" do
+      @o.initial_changed = 'ic'
+      @o.column_changed?(:initial_changed).should == false
+      @o.missing_changed = nil
+      @o.column_changed?(:missing_changed).should == false
+    end
+
+    it "changed_columns should handle case where initial value is reassigned later" do
+      @o.changed_columns.should == [:initial_changed, :missing_changed]
+      @o.initial_changed = 'ic'
+      @o.changed_columns.should == [:missing_changed]
+      @o.missing_changed = nil
+      @o.changed_columns.should == [:missing_changed]
+    end
+
+    it "column_changes should give initial and current values" do
+      @o.column_changes.should == {:initial_changed=>['ic', 'ic2'], :missing_changed=>[nil, 'mc2']}
+    end
+
+    it "reset_column should reset the column to its initial value" do
+      @o.reset_column(:initial)
+      @o.initial.should == 'i'
+      @o.reset_column(:initial_changed)
+      @o.initial_changed.should == 'ic'
+      @o.reset_column(:missing)
+      @o.missing.should == nil
+      @o.reset_column(:missing_changed)
+      @o.missing_changed.should == nil
+    end
+
+    it "reset_column should remove missing values from the values" do
+      @o.reset_column(:missing)
+      @o.values.has_key?(:missing).should == false
+      @o.reset_column(:missing_changed)
+      @o.values.has_key?(:missing_changed).should == false
+    end
+    
+    it "refresh should clear the cached initial values" do
+      @o.refresh
+      @o.column_changes.should == {}
+    end
+    
+    it "will_change_column should be used to signal in-place modification to column" do
+      @o.will_change_column(:initial)
+      @o.initial << 'b'
+      @o.column_change(:initial).should == ['i', 'ib']
+      @o.will_change_column(:initial_changed)
+      @o.initial_changed << 'b'
+      @o.column_change(:initial_changed).should == ['ic', 'ic2b']
+      @o.will_change_column(:missing)
+      @o.values[:missing] = 'b'
+      @o.column_change(:missing).should == [nil, 'b']
+      @o.will_change_column(:missing_changed)
+      @o.missing_changed << 'b'
+      @o.column_change(:missing_changed).should == [nil, 'mc2b']
+    end
+
+    it "will_change_column should different types of existing objects" do
+      [nil, true, false, Class.new{undef_method :clone}.new, Class.new{def clone; raise TypeError; end}.new].each do |v|
+        o = @c.new(:initial=>v)
+        o.will_change_column(:initial)
+        o.initial = 'a'
+        o.column_change(:initial).should == [v, 'a']
+      end
+    end
+
+    it "save should clear the cached initial values" do
+      @o.save
+      @o.column_changes.should == {}
+    end
+
+    it "save_changes should clear the cached initial values" do
+      @o.save_changes
+      @o.column_changes.should == {}
+    end
+  end
+
+  describe "with new instance" do
+    before do
+      @o = @c.new(:initial=>'i', :initial_changed=>'ic')
+      @o.initial_changed = 'ic2'
+      @o.missing_changed = 'mc2'
+    end
+
+    it_should_behave_like "dirty plugin"
+  end
+
+  describe "with existing instance" do
+    before do
+      @o = @c[1]
+      @o.initial_changed = 'ic2'
+      @o.missing_changed = 'mc2'
+    end
+
+    it_should_behave_like "dirty plugin"
+
+    it "previous_changes should be the previous changes after saving" do
+      @o.save
+      @o.previous_changes.should == {:initial_changed=>['ic', 'ic2'], :missing_changed=>[nil, 'mc2']}
+    end
+  end
+end

data/spec/extensions/json_serializer_spec.rb

@@ -116,6 +116,19 @@ describe "Sequel::Plugins::JsonSerializer" do
     JSON.parse(ds.to_json).should == [@album.values.inject({}){|h, (k, v)| h[k.to_s] = v; h}]
   end
 
+  it "should have dataset to_json method respect :array option for the array to use" do
+    a = Album.load(:id=>1, :name=>'RF', :artist_id=>3)
+    JSON.parse(Album.to_json(:array=>[a])).should == [a]
+
+    a.associations[:artist] = artist = Artist.load(:id=>3, :name=>'YJM')
+    JSON.parse(Album.to_json(:array=>[a], :include=>:artist)).first.artist.should == artist
+
+    artist.associations[:albums] = [a]
+    x = JSON.parse(Artist.to_json(:array=>[artist], :include=>:albums))
+    x.should == [artist]
+    x.first.albums.should == [a]
+  end
+
   it "should propagate class default options to instance to_json output" do
     class ::Album2 < Sequel::Model
       attr_accessor :blah

data/spec/extensions/migration_spec.rb

@@ -320,23 +320,30 @@ describe "Sequel::IntegerMigrator" do
     proc{Sequel::IntegerMigrator.apply(@db, "spec/files/timestamped_migrations")}.should raise_error(Sequel::Migrator::Error)
   end
 
-  specify "should use transactions by default" do
-    Sequel::Migrator.apply(@db, "spec/files/transaction_migrations")
+  specify "should not use transactions by default" do
+    Sequel::Migrator.apply(@db, "spec/files/transaction_unspecified_migrations")
+    @db.sqls.should == ["CREATE TABLE schema_info (version integer DEFAULT 0 NOT NULL)", "SELECT 1 AS one FROM schema_info LIMIT 1", "INSERT INTO schema_info (version) VALUES (0)", "SELECT version FROM schema_info LIMIT 1", "CREATE TABLE sm11111 (smc1 integer)", "UPDATE schema_info SET version = 1", "CREATE TABLE sm (smc1 integer)", "UPDATE schema_info SET version = 2"]
+  end
+
+  specify "should use transactions by default if the database supports transactional ddl" do
+    @db.meta_def(:supports_transactional_ddl?){true}
+    Sequel::Migrator.apply(@db, "spec/files/transaction_unspecified_migrations")
     @db.sqls.should == ["CREATE TABLE schema_info (version integer DEFAULT 0 NOT NULL)", "SELECT 1 AS one FROM schema_info LIMIT 1", "INSERT INTO schema_info (version) VALUES (0)", "SELECT version FROM schema_info LIMIT 1", "BEGIN", "CREATE TABLE sm11111 (smc1 integer)", "UPDATE schema_info SET version = 1", "COMMIT", "BEGIN", "CREATE TABLE sm (smc1 integer)", "UPDATE schema_info SET version = 2", "COMMIT"]
   end
 
-  specify "should not use transactions for migrations that disable it" do
-    Sequel::Migrator.apply(@db, "spec/files/transactionless_migrations")
-    @db.sqls.should == ["CREATE TABLE schema_info (version integer DEFAULT 0 NOT NULL)", "SELECT 1 AS one FROM schema_info LIMIT 1", "INSERT INTO schema_info (version) VALUES (0)", "SELECT version FROM schema_info LIMIT 1", "CREATE TABLE sm11111 (smc1 integer)", "UPDATE schema_info SET version = 1", "CREATE TABLE sm (smc1 integer)", "UPDATE schema_info SET version = 2"]
+  specify "should respect transaction use on a per migration basis" do
+    @db.meta_def(:supports_transactional_ddl?){true}
+    Sequel::Migrator.apply(@db, "spec/files/transaction_specified_migrations")
+    @db.sqls.should == ["CREATE TABLE schema_info (version integer DEFAULT 0 NOT NULL)", "SELECT 1 AS one FROM schema_info LIMIT 1", "INSERT INTO schema_info (version) VALUES (0)", "SELECT version FROM schema_info LIMIT 1", "BEGIN", "CREATE TABLE sm11111 (smc1 integer)", "UPDATE schema_info SET version = 1", "COMMIT", "CREATE TABLE sm (smc1 integer)", "UPDATE schema_info SET version = 2"]
   end
 
   specify "should force transactions if enabled in the migrator" do
-    Sequel::Migrator.run(@db, "spec/files/transactionless_migrations", :use_transactions=>true)
+    Sequel::Migrator.run(@db, "spec/files/transaction_specified_migrations", :use_transactions=>true)
     @db.sqls.should == ["CREATE TABLE schema_info (version integer DEFAULT 0 NOT NULL)", "SELECT 1 AS one FROM schema_info LIMIT 1", "INSERT INTO schema_info (version) VALUES (0)", "SELECT version FROM schema_info LIMIT 1", "BEGIN", "CREATE TABLE sm11111 (smc1 integer)", "UPDATE schema_info SET version = 1", "COMMIT", "BEGIN", "CREATE TABLE sm (smc1 integer)", "UPDATE schema_info SET version = 2", "COMMIT"]
   end
 
   specify "should not use transactions if disabled in the migrator" do
-    Sequel::Migrator.run(@db, "spec/files/transaction_migrations", :use_transactions=>false)
+    Sequel::Migrator.run(@db, "spec/files/transaction_unspecified_migrations", :use_transactions=>false)
     @db.sqls.should == ["CREATE TABLE schema_info (version integer DEFAULT 0 NOT NULL)", "SELECT 1 AS one FROM schema_info LIMIT 1", "INSERT INTO schema_info (version) VALUES (0)", "SELECT version FROM schema_info LIMIT 1", "CREATE TABLE sm11111 (smc1 integer)", "UPDATE schema_info SET version = 1", "CREATE TABLE sm (smc1 integer)", "UPDATE schema_info SET version = 2"]
   end
 end
@@ -598,26 +605,32 @@ describe "Sequel::TimestampMigrator" do
 
   specify "should use TimestampMigrator if TimestampMigrator.apply is called even for integer migrations directory" do
     Sequel::TimestampMigrator.apply(@db, "spec/files/integer_migrations")
-    @db.sqls.should == ["SELECT NULL FROM schema_migrations LIMIT 1", "CREATE TABLE schema_migrations (filename varchar(255) PRIMARY KEY)", "SELECT NULL FROM schema_info LIMIT 1", "SELECT filename FROM schema_migrations ORDER BY filename", "BEGIN", "CREATE TABLE sm1111 (smc1 integer)", "INSERT INTO schema_migrations (filename) VALUES ('001_create_sessions.rb')", "COMMIT", "BEGIN", "CREATE TABLE sm2222 (smc2 integer)", "INSERT INTO schema_migrations (filename) VALUES ('002_create_nodes.rb')", "COMMIT", "BEGIN", "CREATE TABLE sm3333 (smc3 integer)", "INSERT INTO schema_migrations (filename) VALUES ('003_3_create_users.rb')", "COMMIT"]
+    @db.sqls.should == ["SELECT NULL FROM schema_migrations LIMIT 1", "CREATE TABLE schema_migrations (filename varchar(255) PRIMARY KEY)", "SELECT NULL FROM schema_info LIMIT 1", "SELECT filename FROM schema_migrations ORDER BY filename", "CREATE TABLE sm1111 (smc1 integer)", "INSERT INTO schema_migrations (filename) VALUES ('001_create_sessions.rb')", "CREATE TABLE sm2222 (smc2 integer)", "INSERT INTO schema_migrations (filename) VALUES ('002_create_nodes.rb')", "CREATE TABLE sm3333 (smc3 integer)", "INSERT INTO schema_migrations (filename) VALUES ('003_3_create_users.rb')"]
   end
 
-  specify "should use transactions by default" do
-    Sequel::TimestampMigrator.apply(@db, "spec/files/transaction_migrations")
+  specify "should not use transactions by default" do
+    Sequel::TimestampMigrator.apply(@db, "spec/files/transaction_unspecified_migrations")
+    @db.sqls.should == ["SELECT NULL FROM schema_migrations LIMIT 1", "CREATE TABLE schema_migrations (filename varchar(255) PRIMARY KEY)", "SELECT NULL FROM schema_info LIMIT 1", "SELECT filename FROM schema_migrations ORDER BY filename", "CREATE TABLE sm11111 (smc1 integer)", "INSERT INTO schema_migrations (filename) VALUES ('001_create_alt_basic.rb')", "CREATE TABLE sm (smc1 integer)", "INSERT INTO schema_migrations (filename) VALUES ('002_create_basic.rb')"]
+  end
+
+  specify "should use transactions by default if database supports transactional ddl" do
+    @db.meta_def(:supports_transactional_ddl?){true}
+    Sequel::TimestampMigrator.apply(@db, "spec/files/transaction_unspecified_migrations")
     @db.sqls.should == ["SELECT NULL FROM schema_migrations LIMIT 1", "CREATE TABLE schema_migrations (filename varchar(255) PRIMARY KEY)", "SELECT NULL FROM schema_info LIMIT 1", "SELECT filename FROM schema_migrations ORDER BY filename", "BEGIN", "CREATE TABLE sm11111 (smc1 integer)", "INSERT INTO schema_migrations (filename) VALUES ('001_create_alt_basic.rb')", "COMMIT", "BEGIN", "CREATE TABLE sm (smc1 integer)", "INSERT INTO schema_migrations (filename) VALUES ('002_create_basic.rb')", "COMMIT"]
   end
 
-  specify "should not use transactions for migrations that disable it" do
-    Sequel::TimestampMigrator.apply(@db, "spec/files/transactionless_migrations")
-    @db.sqls.should == ["SELECT NULL FROM schema_migrations LIMIT 1", "CREATE TABLE schema_migrations (filename varchar(255) PRIMARY KEY)", "SELECT NULL FROM schema_info LIMIT 1", "SELECT filename FROM schema_migrations ORDER BY filename", "CREATE TABLE sm11111 (smc1 integer)", "INSERT INTO schema_migrations (filename) VALUES ('001_create_alt_basic.rb')", "CREATE TABLE sm (smc1 integer)", "INSERT INTO schema_migrations (filename) VALUES ('002_create_basic.rb')"]
+  specify "should support transaction use on a per migration basis" do
+    Sequel::TimestampMigrator.apply(@db, "spec/files/transaction_specified_migrations")
+    @db.sqls.should == ["SELECT NULL FROM schema_migrations LIMIT 1", "CREATE TABLE schema_migrations (filename varchar(255) PRIMARY KEY)", "SELECT NULL FROM schema_info LIMIT 1", "SELECT filename FROM schema_migrations ORDER BY filename", "BEGIN", "CREATE TABLE sm11111 (smc1 integer)", "INSERT INTO schema_migrations (filename) VALUES ('001_create_alt_basic.rb')", "COMMIT", "CREATE TABLE sm (smc1 integer)", "INSERT INTO schema_migrations (filename) VALUES ('002_create_basic.rb')"]
   end
 
   specify "should force transactions if enabled by the migrator" do
-    Sequel::TimestampMigrator.run(@db, "spec/files/transactionless_migrations", :use_transactions=>true)
+    Sequel::TimestampMigrator.run(@db, "spec/files/transaction_specified_migrations", :use_transactions=>true)
     @db.sqls.should == ["SELECT NULL FROM schema_migrations LIMIT 1", "CREATE TABLE schema_migrations (filename varchar(255) PRIMARY KEY)", "SELECT NULL FROM schema_info LIMIT 1", "SELECT filename FROM schema_migrations ORDER BY filename", "BEGIN", "CREATE TABLE sm11111 (smc1 integer)", "INSERT INTO schema_migrations (filename) VALUES ('001_create_alt_basic.rb')", "COMMIT", "BEGIN", "CREATE TABLE sm (smc1 integer)", "INSERT INTO schema_migrations (filename) VALUES ('002_create_basic.rb')", "COMMIT"]
   end
 
   specify "should not use transactions if disabled in the migrator" do
-    Sequel::TimestampMigrator.run(@db, "spec/files/transaction_migrations", :use_transactions=>false)
+    Sequel::TimestampMigrator.run(@db, "spec/files/transaction_unspecified_migrations", :use_transactions=>false)
     @db.sqls.should == ["SELECT NULL FROM schema_migrations LIMIT 1", "CREATE TABLE schema_migrations (filename varchar(255) PRIMARY KEY)", "SELECT NULL FROM schema_info LIMIT 1", "SELECT filename FROM schema_migrations ORDER BY filename", "CREATE TABLE sm11111 (smc1 integer)", "INSERT INTO schema_migrations (filename) VALUES ('001_create_alt_basic.rb')", "CREATE TABLE sm (smc1 integer)", "INSERT INTO schema_migrations (filename) VALUES ('002_create_basic.rb')"]
   end
 end

data/spec/extensions/named_timezones_spec.rb

@@ -35,14 +35,12 @@ describe "Sequel named_timezones extension" do
     Sequel.database_timezone.should == @tz_out
   end
     
-  unless RUBY_VERSION == '1.8.6' && RUBY_PLATFORM =~ /win/
-    it "should convert datetimes going into the database to named database_timezone" do
-      ds = @db[:a]
-      def ds.supports_timestamp_timezones?; true; end
-      def ds.supports_timestamp_usecs?; false; end
-      ds.insert([@dt, DateTime.civil(2009,6,1,3,20,30,-7/24.0), DateTime.civil(2009,6,1,6,20,30,-1/6.0)])
-      @db.sqls.should == ["INSERT INTO a VALUES ('2009-06-01 06:20:30-0400', '2009-06-01 06:20:30-0400', '2009-06-01 06:20:30-0400')"]
-    end
+  it "should convert datetimes going into the database to named database_timezone" do
+    ds = @db[:a]
+    def ds.supports_timestamp_timezones?; true; end
+    def ds.supports_timestamp_usecs?; false; end
+    ds.insert([@dt, DateTime.civil(2009,6,1,3,20,30,-7/24.0), DateTime.civil(2009,6,1,6,20,30,-1/6.0)])
+    @db.sqls.should == ["INSERT INTO a VALUES ('2009-06-01 06:20:30-0400', '2009-06-01 06:20:30-0400', '2009-06-01 06:20:30-0400')"]
   end
   
   it "should convert datetimes coming out of the database from database_timezone to application_timezone" do

data/spec/extensions/pg_auto_parameterize_spec.rb

@@ -3,8 +3,9 @@ require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 describe "pg_auto_parameterize extension" do
   before do
     @db = Sequel.connect('mock://postgres', :quote_identifiers=>false)
-    @db.extend Sequel::Postgres::AutoParameterize::DatabaseMethods
     @db.synchronize{|c| def c.escape_bytea(v) v*2 end}
+    @db.extend_datasets{def use_cursor(*) clone end}
+    @db.extend Sequel::Postgres::AutoParameterize::DatabaseMethods
   end
 
   it "should automatically parameterize queries strings, blobs, numerics, dates, and times" do
@@ -44,10 +45,6 @@ describe "pg_auto_parameterize extension" do
 
     @db[:table].insert(:a=>1).should == 1
     @db.sqls.should == ['INSERT INTO table (a) VALUES ($1::int4) RETURNING id -- args: [1]']
-
-    @db.server_version = 80000
-    @db[:table].insert(:a=>1).should == 1
-    @db.sqls.should == ['INSERT INTO table (a) VALUES ($1::int4) -- args: [1]']
   end
 
   it "should not automatically paramiterize if no_auto_parameterize is used" do
@@ -61,4 +58,8 @@ describe "pg_auto_parameterize extension" do
   it "should show args with string when inspecting SQL " do
     @db[:table].filter(:a=>1).sql.inspect.should == '"SELECT * FROM table WHERE (a = $1::int4); [1]"'
   end
+
+  it "should not auto parameterize when using cursors" do
+    @db[:table].filter(:a=>1).use_cursor.opts[:no_auto_parameterize].should be_true
+  end
 end

data/spec/extensions/schema_dumper_spec.rb

@@ -508,7 +508,7 @@ END_MIG
       ["double precision", "timestamp with time zone", "timestamp without time zone",
        "time with time zone", "time without time zone", "character varying(20)"] +
       %w"nvarchar ntext smalldatetime smallmoney binary varbinary nchar" +
-      ["timestamp(6) without time zone", "timestamp(6) with time zone", "int(12) unsigned", 'bigint unsigned', 'tinyint(3) unsigned']
+      ["timestamp(6) without time zone", "timestamp(6) with time zone", "int(12) unsigned", 'bigint unsigned', 'tinyint(3) unsigned', 'identity', 'int identity']
     @d.meta_def(:schema) do |t, *o|
       i = 0
       types.map{|x| [:"c#{i+=1}", {:db_type=>x, :allow_null=>true}]}
@@ -581,6 +581,8 @@ create_table(:x) do
   Integer :c64
   Bignum :c65
   Integer :c66
+  Integer :c67
+  Integer :c68
 end
 END_MIG
   end

data/spec/extensions/single_table_inheritance_spec.rb

@@ -42,6 +42,11 @@ describe Sequel::Model, "#sti_key" do
     StiTest.all.collect{|x| x.class}.should == [StiTest, StiTestSub1, StiTestSub2]
   end 
 
+  it "should return rows with the correct class based on the polymorphic_key value when retreiving by primary key" do
+    @ds._fetch = [{:kind=>'StiTestSub1'}]
+    StiTest[1].class.should == StiTestSub1
+  end 
+
   it "should return rows with the correct class for subclasses based on the polymorphic_key value" do
     class ::StiTestSub1Sub < StiTestSub1; end 
     StiTestSub1.dataset._fetch = [{:kind=>'StiTestSub1'}, {:kind=>'StiTestSub1Sub'}]

data/spec/extensions/xml_serializer_spec.rb

@@ -157,6 +157,19 @@ describe "Sequel::Plugins::XmlSerializer" do
     Album.array_from_xml(Album.dataset.to_xml(:only=>:name)).should == [Album.load(:name=>@album.name)]
   end
 
+  it "should have to_xml dataset method respect an :array option" do
+    a = Album.load(:id=>1, :name=>'RF', :artist_id=>3)
+    Album.array_from_xml(Album.to_xml(:array=>[a])).should == [a]
+
+    a.associations[:artist] = artist = Artist.load(:id=>3, :name=>'YJM')
+    Album.array_from_xml(Album.to_xml(:array=>[a], :include=>:artist)).first.artist.should == artist
+
+    artist.associations[:albums] = [a]
+    x = Artist.array_from_xml(Artist.to_xml(:array=>[artist], :include=>:albums))
+    x.should == [artist]
+    x.first.albums.should == [a]
+  end
+
   it "should raise an error if the dataset does not have a row_proc" do
     proc{Album.dataset.naked.to_xml}.should raise_error(Sequel::Error)
   end

data/spec/files/{transactionless_migrations → transaction_specified_migrations}/001_create_alt_basic.rb

@@ -1,4 +1,4 @@
 Sequel.migration do
-  no_transaction
+  transaction
   change{create_table(:sm11111){Integer :smc1}}
 end

data/spec/integration/associations_test.rb

@@ -608,7 +608,7 @@ describe "Sequel::Model Simple Associations" do
       @els = {:eager_limit_strategy=>:correlated_subquery}
     end
     it_should_behave_like "eager limit strategies"
-  end unless Sequel.guarded?(:mysql, :db2, :oracle)
+  end unless Sequel.guarded?(:mysql, :db2, :oracle, :h2)
 
   specify "should handle many_to_one associations with same name as :key" do
     Album.def_column_alias(:artist_id_id, :artist_id)
@@ -693,12 +693,10 @@ describe "Sequel::Model Simple Associations" do
     @album.artist(proc{|ds| ds.exclude(:id=>@artist.id)}).should == nil
     @album.artist(proc{|ds| ds.filter(:id=>@artist.id)}).should == @artist
 
-    if RUBY_VERSION >= '1.8.7'
-      @artist.albums{|ds| ds.exclude(:id=>@album.id)}.should == []
-      @artist.albums{|ds| ds.filter(:id=>@album.id)}.should == [@album]
-      @album.artist{|ds| ds.exclude(:id=>@artist.id)}.should == nil
-      @album.artist{|ds| ds.filter(:id=>@artist.id)}.should == @artist
-    end
+    @artist.albums{|ds| ds.exclude(:id=>@album.id)}.should == []
+    @artist.albums{|ds| ds.filter(:id=>@album.id)}.should == [@album]
+    @album.artist{|ds| ds.exclude(:id=>@artist.id)}.should == nil
+    @album.artist{|ds| ds.filter(:id=>@artist.id)}.should == @artist
   end
   
   specify "should handle dynamic callbacks for eager loading via eager and eager_graph" do

data/spec/integration/dataset_test.rb

@@ -291,15 +291,26 @@ end
 
 describe Sequel::Database do
   specify "should correctly escape strings" do
-    INTEGRATION_DB.get("\\dingo".as(:a)) == "\\dingo"
-  end
-
-  specify "should correctly escape strings with quotes" do
-    INTEGRATION_DB.get("\\'dingo".as(:a)) == "\\'dingo"
+    ["\\\n",
+     "\\\\\n",
+     "\\\r\n",
+     "\\\\\r\n",
+     "\\\\\n\n", 
+     "\\\\\r\n\r\n",
+     "\\dingo",
+     "\\'dingo",
+     "\\\\''dingo",
+    ].each do |str|
+      INTEGRATION_DB.get(str.as(:a)).should == str
+      str = "1#{str}1"
+      INTEGRATION_DB.get(str.as(:a)).should == str
+      str = "#{str}#{str}"
+      INTEGRATION_DB.get(str.as(:a)).should == str
+    end
   end
 
-  specify "should properly escape binary data" do
-    INTEGRATION_DB.get("\1\2\3".to_sequel_blob.as(:a)) == "\1\2\3"
+  cspecify "should properly escape binary data", [:odbc], [:jdbc, :hsqldb], [:swift], :oracle do
+    INTEGRATION_DB.get("\1\2\3".to_sequel_blob.cast(File).as(:a)).should == "\1\2\3"
   end
 
   specify "should have a working table_exists?" do
@@ -1115,6 +1126,13 @@ describe "Sequel::Dataset DSL support" do
     @ds.get{a.sql_number ^ b ^ 1}.to_i.should == 7
   end
   
+  specify "should work with the modulus operator" do
+    @ds.insert(3, 5)
+    @ds.get{a.sql_number % 4}.to_i.should == 3
+    @ds.get{b.sql_number % 4}.to_i.should == 1
+    @ds.get{a.sql_number % 4 % 2}.to_i.should == 1
+  end
+  
   specify "should work with inequality operators" do
     @ds.insert(10, 11)
     @ds.insert(11, 11)

data/spec/integration/plugin_test.rb

@@ -914,7 +914,7 @@ if INTEGRATION_DB.dataset.supports_cte? and !Sequel.guarded?(:db2)
       nodes[0].associations.fetch(:parent, 1).should == nil
       nodes[1].associations[:parent].should == @aa
       nodes[1].associations[:parent].associations[:parent].should == @a
-      nodes[1].associations[:parent].associations[:parent].associations.fetch(:parent, 1) == nil
+      nodes[1].associations[:parent].associations[:parent].associations.fetch(:parent, 1).should == nil
       nodes[2].associations[:parent].should == @aaaa
       nodes[2].associations[:parent].associations[:parent].should == @aaa
       nodes[2].associations[:parent].associations[:parent].associations[:parent].should == @aa

data/spec/integration/schema_test.rb

@@ -239,7 +239,7 @@ describe "Database schema modifiers" do
     @ds = @db[:items]
   end
   after do
-    @db.drop_table?(:items)
+    @db.drop_table?(:items, :items2)
   end
 
   specify "should create tables correctly" do
@@ -250,6 +250,21 @@ describe "Database schema modifiers" do
     @ds.columns!.should == [:number]
   end
   
+  specify "should create tables from select statements correctly" do
+    @db.create_table!(:items){Integer :number}
+    @ds.insert([10])
+    @db.create_table(:items2, :as=>@db[:items])
+    @db.schema(:items2, :reload=>true).map{|x| x.first}.should == [:number]
+    @db[:items2].columns.should == [:number]
+    @db[:items2].all.should == [{:number=>10}]
+  end
+  
+  specify "should handle create table in a rolled back transaction" do
+    @db.drop_table?(:items)
+    @db.transaction(:rollback=>:always){@db.create_table(:items){Integer :number}}
+    @db.table_exists?(:items).should be_false
+  end if INTEGRATION_DB.supports_transactional_ddl?
+  
   describe "join tables" do
     after do
       @db.drop_join_table(:cat_id=>:cats, :dog_id=>:dogs) if @db.table_exists?(:cats_dogs)

data/spec/model/associations_spec.rb

@@ -382,7 +382,7 @@ describe Sequel::Model, "many_to_one" do
     MODEL_DB.sqls.should == ["SELECT * FROM nodes WHERE ((nodes.id = 234) AND (name > 'M')) LIMIT 1"]
   end
   
-  it "should use a block given to the association method as a callback on ruby 1.8.7+" do
+  it "should use a block given to the association method as a callback" do
     @c2.many_to_one :parent, :class => @c2
 
     d = @c2.create(:id => 1)
@@ -391,7 +391,7 @@ describe Sequel::Model, "many_to_one" do
     d.associations[:parent] = 42
     d.parent{|ds| ds.filter{name > 'M'}}.should_not == 42 
     MODEL_DB.sqls.should == ["SELECT * FROM nodes WHERE ((nodes.id = 234) AND (name > 'M')) LIMIT 1"]
-  end if RUBY_VERSION >= '1.8.7'
+  end
   
   it "should have the setter add to the reciprocal one_to_many cached association list if it exists" do
     @c2.many_to_one :parent, :class => @c2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 3.34.0
+  version: 3.35.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000 Z
+date: 2012-05-01 00:00:00.000000000 Z
 dependencies: []
 description: The Database Toolkit for Ruby
 email: code@jeremyevans.net
@@ -40,6 +40,7 @@ extra_rdoc_files:
 - doc/testing.rdoc
 - doc/schema_modification.rdoc
 - doc/transactions.rdoc
+- doc/thread_safety.rdoc
 - doc/release_notes/1.0.txt
 - doc/release_notes/1.1.txt
 - doc/release_notes/1.3.txt
@@ -93,6 +94,7 @@ extra_rdoc_files:
 - doc/release_notes/3.32.0.txt
 - doc/release_notes/3.33.0.txt
 - doc/release_notes/3.34.0.txt
+- doc/release_notes/3.35.0.txt
 files:
 - MIT-LICENSE
 - CHANGELOG
@@ -164,6 +166,7 @@ files:
 - doc/release_notes/3.32.0.txt
 - doc/release_notes/3.33.0.txt
 - doc/release_notes/3.34.0.txt
+- doc/release_notes/3.35.0.txt
 - doc/sharding.rdoc
 - doc/sql.rdoc
 - doc/validations.rdoc
@@ -172,6 +175,7 @@ files:
 - doc/testing.rdoc
 - doc/schema_modification.rdoc
 - doc/transactions.rdoc
+- doc/thread_safety.rdoc
 - spec/adapters/firebird_spec.rb
 - spec/adapters/informix_spec.rb
 - spec/adapters/mssql_spec.rb
@@ -185,9 +189,9 @@ files:
 - spec/core/dataset_spec.rb
 - spec/core/database_spec.rb
 - spec/core/expression_filters_spec.rb
+- spec/core/schema_spec.rb
 - spec/core/object_graph_spec.rb
 - spec/core/schema_generator_spec.rb
-- spec/core/schema_spec.rb
 - spec/core/spec_helper.rb
 - spec/core/version_spec.rb
 - spec/core/mock_adapter_spec.rb
@@ -264,6 +268,7 @@ files:
 - spec/extensions/select_remove_spec.rb
 - spec/extensions/static_cache_spec.rb
 - spec/extensions/query_literals_spec.rb
+- spec/extensions/dirty_spec.rb
 - spec/extensions/columns_introspection_spec.rb
 - spec/integration/associations_test.rb
 - spec/integration/database_test.rb
@@ -333,10 +338,10 @@ files:
 - spec/files/reversible_migrations/003_reversible.rb
 - spec/files/reversible_migrations/004_reversible.rb
 - spec/files/reversible_migrations/005_reversible.rb
-- spec/files/transaction_migrations/001_create_alt_basic.rb
-- spec/files/transaction_migrations/002_create_basic.rb
-- spec/files/transactionless_migrations/001_create_alt_basic.rb
-- spec/files/transactionless_migrations/002_create_basic.rb
+- spec/files/transaction_specified_migrations/001_create_alt_basic.rb
+- spec/files/transaction_specified_migrations/002_create_basic.rb
+- spec/files/transaction_unspecified_migrations/001_create_alt_basic.rb
+- spec/files/transaction_unspecified_migrations/002_create_basic.rb
 - lib/sequel.rb
 - lib/sequel/adapters/ado.rb
 - lib/sequel/adapters/ado/mssql.rb
@@ -368,7 +373,6 @@ files:
 - lib/sequel/adapters/mysql.rb
 - lib/sequel/adapters/odbc.rb
 - lib/sequel/adapters/odbc/mssql.rb
-- lib/sequel/adapters/odbc/db2.rb
 - lib/sequel/adapters/openbase.rb
 - lib/sequel/adapters/oracle.rb
 - lib/sequel/adapters/postgres.rb
@@ -503,6 +507,7 @@ files:
 - lib/sequel/plugins/prepared_statements_associations.rb
 - lib/sequel/plugins/dataset_associations.rb
 - lib/sequel/plugins/many_to_one_pk_lookup.rb
+- lib/sequel/plugins/dirty.rb
 - lib/sequel/timezones.rb
 - lib/sequel/version.rb
 - lib/sequel/ast_transformer.rb
@@ -527,7 +532,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.8.4
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/sequel/adapters/odbc/db2.rb

@@ -1,17 +0,0 @@
-Sequel.require 'adapters/shared/db2'
-
-module Sequel
-  module ODBC
-    # Database and Dataset instance methods for DB2 specific
-    # support via ODBC.
-    module DB2
-      module DatabaseMethods
-        include ::Sequel::DB2::DatabaseMethods
-      end
-      
-      class Dataset < ODBC::Dataset
-        include ::Sequel::DB2::DatasetMethods
-      end
-    end
-  end
-end