sequel 3.20.0 → 3.21.0

data/spec/integration/plugin_test.rb

@@ -414,7 +414,7 @@ describe "Touch plugin" do
   specify "should update the timestamp column when touching the record" do
     @album.updated_at.should == nil
     @album.touch
-    @album.updated_at.to_i.should be_close(Time.now.to_i, 2)
+    @album.updated_at.to_i.should be_within(2).of(Time.now.to_i)
   end
   
   cspecify "should update the timestamp column for associated records when the record is updated or destroyed", [:do, :sqlite], [:jdbc, :sqlite] do
@@ -422,16 +422,16 @@ describe "Touch plugin" do
     @album.update(:name=>'B')
     ua = @artist.reload.updated_at
     if ua.is_a?(Time)
-      ua.to_i.should be_close(Time.now.to_i, 2)
+      ua.to_i.should be_within(2).of(Time.now.to_i)
     else
-      (DateTime.now - ua).should be_close(0, 2.0/86400)
+      (DateTime.now - ua).should be_within(2.0/86400).of(0)
     end
     @artist.update(:updated_at=>nil)
     @album.destroy
     if ua.is_a?(Time)
-      ua.to_i.should be_close(Time.now.to_i, 2)
+      ua.to_i.should be_within(2).of(Time.now.to_i)
     else
-      (DateTime.now - ua).should be_close(0, 2.0/86400)
+      (DateTime.now - ua).should be_within(2.0/86400).of(0)
     end
   end
 end

data/spec/integration/prepared_statement_test.rb

@@ -242,7 +242,7 @@ describe "Bound Argument Types" do
     @ds.filter(:d=>@ds.ba(:$x, :date)).prepare(:first, :ps_date).call(:x=>@vs[:d])[:d].should == @vs[:d]
   end
 
-  cspecify "should handle datetime type", [:do], [:mysql2], [:swift], [:jdbc, :sqlite] do
+  cspecify "should handle datetime type", [:do], [:mysql2], [:swift], [:jdbc, :sqlite], [:tinytds] do
     Sequel.datetime_class = DateTime
     @ds.filter(:dt=>@ds.ba(:$x, :timestamp)).prepare(:first, :ps_datetime).call(:x=>@vs[:dt])[:dt].should == @vs[:dt]
   end

data/spec/integration/schema_test.rb

@@ -193,6 +193,13 @@ describe "Database schema modifiers" do
     @ds.columns!.should == [:number]
   end
 
+  specify "should handle combination of default, unique, and not null" do
+    @db.create_table!(:items){Integer :number, :default=>0, :null=>false, :unique=>true}
+    @db.table_exists?(:items).should == true
+    @db.schema(:items, :reload=>true).map{|x| x.last}.first.values_at(:ruby_default, :allow_null).should == [0, false]
+    @ds.insert([10])
+  end
+
   specify "should handle foreign keys correctly when creating tables" do
     @db.create_table!(:items) do 
       primary_key :id

data/spec/integration/spec_helper.rb

@@ -16,7 +16,20 @@ def clear_sqls
   $sqls.clear
 end 
 
-class Spec::Example::ExampleGroup
+unless defined?(RSpec)
+  module Spec::Matchers
+    class BeWithin
+      include Spec::Matchers
+      def initialize(delta); @delta = delta; end
+      def of(expected); be_close(expected, @delta); end 
+    end
+    def be_within(delta)
+      BeWithin.new(delta)
+    end
+  end
+end
+
+(defined?(RSpec) ? RSpec::Core::ExampleGroup : Spec::Example::ExampleGroup).class_eval do
   def log
     begin
       INTEGRATION_DB.loggers << Logger.new(STDOUT)

data/spec/integration/timezone_test.rb

@@ -7,7 +7,7 @@ describe "Sequel timezone support" do
       @db[:t].insert(t)
       t2 = @db[:t].single_value
       t2 = Sequel.database_to_application_timestamp(t2.to_s) unless t2.is_a?(Time)
-      (t2 - t).should be_close(0, 2)
+      (t2 - t).should be_within(2).of(0)
       t2.utc_offset.should == 0 if Sequel.application_timezone == :utc
       t2.utc_offset.should == t.getlocal.utc_offset if Sequel.application_timezone == :local
       @db[:t].delete
@@ -20,7 +20,7 @@ describe "Sequel timezone support" do
       @db[:t].insert(dt)
       dt2 = @db[:t].single_value
       dt2 = Sequel.database_to_application_timestamp(dt2.to_s) unless dt2.is_a?(DateTime)
-      (dt2 - dt).should be_close(0, 0.00002)
+      (dt2 - dt).should be_within(0.00002).of(0)
       dt2.offset.should == 0 if Sequel.application_timezone == :utc
       dt2.offset.should == dt.offset if Sequel.application_timezone == :local
       @db[:t].delete
@@ -37,13 +37,13 @@ describe "Sequel timezone support" do
     Sequel.datetime_class = Time
   end
 
-  cspecify "should support using UTC for database storage and local time for the application", [:swift], [:do, proc{|db| db.database_type != :sqlite}] do
+  cspecify "should support using UTC for database storage and local time for the application", [:swift], [:tinytds], [:do, proc{|db| db.database_type != :sqlite}] do
     Sequel.database_timezone = :utc
     Sequel.application_timezone = :local
     test_timezone
   end
 
-  cspecify "should support using local time for database storage and UTC for the application", [:swift], [:do, proc{|db| db.database_type != :sqlite}] do
+  cspecify "should support using local time for database storage and UTC for the application", [:swift], [:tinytds], [:do, proc{|db| db.database_type != :sqlite}] do
     Sequel.database_timezone = :local
     Sequel.application_timezone = :utc
     test_timezone

data/spec/integration/type_test.rb

@@ -79,7 +79,7 @@ describe "Supported types" do
     ds.first[:tim].strftime('%Y%m%d%H%M%S').should == t.strftime('%Y%m%d%H%M%S')
   end
   
-  cspecify "should support generic file type", [:do], [:odbc, :mssql], [:mysql2], [:swift] do
+  cspecify "should support generic file type", [:do], [:odbc, :mssql], [:mysql2], [:swift], [:tinytds] do
     ds = create_items_table_with_column(:name, File)
     ds.insert(:name => ("a\0"*300).to_sequel_blob)
     ds.all.should == [{:name=>("a\0"*300).to_sequel_blob}]

data/spec/model/model_spec.rb

@@ -511,7 +511,7 @@ describe Sequel::Model, ".[]" do
   end
 end
 
-context "Model#inspect" do
+describe "Model#inspect" do
   before do
     @o = Sequel::Model.load(:x => 333)
   end
@@ -521,7 +521,7 @@ context "Model#inspect" do
   end
 end
 
-context "Model.db_schema" do
+describe "Model.db_schema" do
   before do
     @c = Class.new(Sequel::Model(:items)) do
       def self.columns; orig_columns; end
@@ -618,7 +618,7 @@ context "Model.db_schema" do
   end
 end
 
-context "Model#use_transactions" do
+describe "Model#use_transactions" do
   before do
     @c = Class.new(Sequel::Model(:items))
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sequel
 version: !ruby/object:Gem::Version 
-  hash: 87
+  hash: 83
   prerelease: false
   segments: 
   - 3
-  - 20
+  - 21
   - 0
-  version: 3.20.0
+  version: 3.21.0
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-01 00:00:00 -08:00
+date: 2011-03-01 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -84,6 +84,7 @@ extra_rdoc_files:
 - doc/release_notes/3.18.0.txt
 - doc/release_notes/3.19.0.txt
 - doc/release_notes/3.20.0.txt
+- doc/release_notes/3.21.0.txt
 files: 
 - MIT-LICENSE
 - CHANGELOG
@@ -135,6 +136,7 @@ files:
 - doc/release_notes/3.18.0.txt
 - doc/release_notes/3.19.0.txt
 - doc/release_notes/3.20.0.txt
+- doc/release_notes/3.21.0.txt
 - doc/sharding.rdoc
 - doc/sql.rdoc
 - doc/virtual_rows.rdoc
@@ -213,6 +215,7 @@ files:
 - spec/extensions/tree_spec.rb
 - spec/extensions/xml_serializer_spec.rb
 - spec/extensions/to_dot_spec.rb
+- spec/extensions/association_autoreloading_spec.rb
 - spec/integration/associations_test.rb
 - spec/integration/database_test.rb
 - spec/integration/dataset_test.rb
@@ -321,6 +324,7 @@ files:
 - lib/sequel/adapters/swift/mysql.rb
 - lib/sequel/adapters/swift/postgres.rb
 - lib/sequel/adapters/swift/sqlite.rb
+- lib/sequel/adapters/tinytds.rb
 - lib/sequel/connection_pool.rb
 - lib/sequel/connection_pool/sharded_single.rb
 - lib/sequel/connection_pool/sharded_threaded.rb
@@ -405,6 +409,7 @@ files:
 - lib/sequel/plugins/list.rb
 - lib/sequel/plugins/tree.rb
 - lib/sequel/plugins/xml_serializer.rb
+- lib/sequel/plugins/association_autoreloading.rb
 - lib/sequel/sql.rb
 - lib/sequel/timezones.rb
 - lib/sequel/version.rb