sequel 3.7.0 → 3.8.0

data/spec/core/dataset_spec.rb

@@ -1534,19 +1534,28 @@ context "Dataset#from_self" do
   before do
     @ds = Sequel::Dataset.new(nil).from(:test).select(:name).limit(1)
   end
+  
   specify "should set up a default alias" do
     @ds.from_self.sql.should == 'SELECT * FROM (SELECT name FROM test LIMIT 1) AS t1'
   end
+  
   specify "should modify only the new dataset" do
     @ds.from_self.select(:bogus).sql.should == 'SELECT bogus FROM (SELECT name FROM test LIMIT 1) AS t1'
   end
+  
   specify "should use the user-specified alias" do
     @ds.from_self(:alias=>:some_name).sql.should == 'SELECT * FROM (SELECT name FROM test LIMIT 1) AS some_name'
   end
+  
   specify "should use the user-specified alias for joins" do
     @ds.from_self(:alias=>:some_name).inner_join(:posts, :alias=>:name).sql.should == \
       'SELECT * FROM (SELECT name FROM test LIMIT 1) AS some_name INNER JOIN posts ON (posts.alias = some_name.name)'
   end
+  
+  specify "should not options such as server" do
+    @ds.server(:blah).from_self(:alias=>:some_name).opts[:server].should == :blah
+  end
+
 end
 
 context "Dataset#join_table" do
@@ -3060,6 +3069,30 @@ context "Sequel::Dataset#server" do
   end
 end
 
+context "Sequel::Dataset#each_server" do
+  before do
+    @db = Sequel::Database.new(:servers=>{:s=>{}, :i=>{}})
+    @ds = @db[:items]
+    sqls = @sqls = []
+    @db.meta_def(:execute) do |sql, opts|
+      sqls << [sql, opts[:server]]
+    end
+    def @ds.fetch_rows(sql, &block)
+      execute(sql)
+    end
+  end
+
+  specify "should yield a dataset for each server" do
+    @ds.each_server do |ds|
+      ds.should be_a_kind_of(Sequel::Dataset)
+      ds.should_not == @ds
+      ds.sql.should == @ds.sql
+      ds.all
+    end
+    @sqls.sort_by{|sql, s| s.to_s}.should == [['SELECT * FROM items', :default], ['SELECT * FROM items', :i], ['SELECT * FROM items', :s]]
+  end
+end
+
 context "Sequel::Dataset #set_defaults" do
   before do
     @ds = Sequel::Dataset.new(nil).from(:items).set_defaults(:x=>1)

data/spec/core/spec_helper.rb

@@ -24,6 +24,7 @@ class MockDataset < Sequel::Dataset
 end
 
 class MockDatabase < Sequel::Database
+  set_adapter_scheme :mock
   @@quote_identifiers = false
   self.identifier_input_method = nil
   self.identifier_output_method = nil

data/spec/extensions/boolean_readers_spec.rb

@@ -83,4 +83,10 @@ describe Sequel::Model, "BooleanReaders plugin" do
     o.y?.should == nil
     proc{o.b?}.should raise_error(NoMethodError)
   end
+
+  specify "should handle cases where getting the columns raises an error" do
+    @c.meta_def(:columns){raise Sequel::Error}
+    proc{@c.plugin(:boolean_readers)}.should_not raise_error
+    proc{@c.new.b?}.should raise_error(NoMethodError)
+  end
 end

data/spec/extensions/identity_map_spec.rb

@@ -4,6 +4,7 @@ describe "Sequel::Plugins::IdentityMap" do
   before do
     class ::IdentityMapModel < Sequel::Model
       plugin :identity_map
+      attr_accessor :foo
       columns :id
       ds = dataset
       def ds.fetch_rows(sql)
@@ -103,10 +104,37 @@ describe "Sequel::Plugins::IdentityMap" do
       MODEL_DB.sqls.length.should == 0
       o = @c[1]
       MODEL_DB.sqls.length.should == 1
+      o.foo = 1
+      @c[1].foo.should == o.foo
+      MODEL_DB.sqls.length.should == 1
+      @c[2].foo.should_not == o.foo
+      MODEL_DB.sqls.length.should == 2
+    end
+  end
+
+  it "should remove instances from the identity map if they are deleted or destroyed" do
+    @c.with_identity_map do
+      MODEL_DB.sqls.length.should == 0
+      o = @c[1]
+      MODEL_DB.sqls.length.should == 1
+      o.foo = 1
       @c[1].should == o
       MODEL_DB.sqls.length.should == 1
-      @c[2].should_not == o
+      o.destroy
+      MODEL_DB.sqls.length.should == 2
+      @c[1].foo.should_not == o.foo
+      MODEL_DB.sqls.length.should == 3
+
+      MODEL_DB.reset
+      o = @c[2]
+      MODEL_DB.sqls.length.should == 1
+      o.foo = 1
+      @c[2].should == o
+      MODEL_DB.sqls.length.should == 1
+      o.delete
       MODEL_DB.sqls.length.should == 2
+      @c[2].foo.should_not == o.foo
+      MODEL_DB.sqls.length.should == 3
     end
   end
 

data/spec/extensions/inflector_spec.rb

@@ -159,7 +159,6 @@ describe 'Default inflections' do
       :index=>:indices,
       :mouse=>:mice,
       :louse=>:lice,
-      :ox=>:oxen,
       :quiz=>:quizzes,
       :motive=>:motives,
       :movie=>:movies,

data/spec/extensions/validation_helpers_spec.rb

@@ -258,6 +258,29 @@ describe "Sequel::Plugins::ValidationHelpers" do
     @m.should be_valid
     @m.value = '.0123'
   end
+  
+  specify "should support validates_type" do
+    @c.set_validations{validates_type(Integer, :value)}
+    @m.value = 123
+    @m.should be_valid
+    @m.value = '123'
+    @m.should_not be_valid
+    @m.errors.full_messages.should == ['value is not a Integer']
+    
+    @c.set_validations{validates_type(:String, :value)}
+    @m.value = '123'
+    @m.should be_valid
+    @m.value = 123
+    @m.should_not be_valid
+    @m.errors.full_messages.should == ['value is not a String']
+    
+    @c.set_validations{validates_type('Integer', :value)}
+    @m.value = 123
+    @m.should be_valid
+    @m.value = 123.05
+    @m.should_not be_valid
+    @m.errors.full_messages.should == ['value is not a Integer']
+  end
 
   specify "should support validates_presence" do
     @c.set_validations{validates_presence(:value)}

data/spec/integration/type_test.rb

@@ -78,7 +78,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], :h2, [:odbc, :mssql] do
+  cspecify "should support generic file type", [:do], [:odbc, :mssql] 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}]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 3.7.0
+  version: 3.8.0
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-01 00:00:00 -08:00
+date: 2010-01-04 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -23,7 +23,6 @@ extra_rdoc_files:
 - README.rdoc
 - CHANGELOG
 - COPYING
-- doc/advanced_associations.rdoc
 - doc/cheat_sheet.rdoc
 - doc/dataset_filtering.rdoc
 - doc/opening_databases.rdoc
@@ -31,8 +30,9 @@ extra_rdoc_files:
 - doc/reflection.rdoc
 - doc/schema.rdoc
 - doc/sharding.rdoc
+- doc/advanced_associations.rdoc
 - doc/virtual_rows.rdoc
-- doc/release_notes/1.0.txt
+- doc/release_notes/3.8.0.txt
 - doc/release_notes/1.1.txt
 - doc/release_notes/1.3.txt
 - doc/release_notes/1.4.0.txt
@@ -56,6 +56,7 @@ extra_rdoc_files:
 - doc/release_notes/3.3.0.txt
 - doc/release_notes/3.4.0.txt
 - doc/release_notes/3.5.0.txt
+- doc/release_notes/1.0.txt
 - doc/release_notes/3.6.0.txt
 - doc/release_notes/3.7.0.txt
 files: 
@@ -64,13 +65,7 @@ files:
 - README.rdoc
 - Rakefile
 - bin/sequel
-- doc/advanced_associations.rdoc
-- doc/cheat_sheet.rdoc
-- doc/dataset_filtering.rdoc
-- doc/opening_databases.rdoc
-- doc/prepared_statements.rdoc
-- doc/reflection.rdoc
-- doc/release_notes/1.0.txt
+- doc/release_notes/3.8.0.txt
 - doc/release_notes/1.1.txt
 - doc/release_notes/1.3.txt
 - doc/release_notes/1.4.0.txt
@@ -94,20 +89,31 @@ files:
 - doc/release_notes/3.3.0.txt
 - doc/release_notes/3.4.0.txt
 - doc/release_notes/3.5.0.txt
+- doc/release_notes/1.0.txt
 - doc/release_notes/3.6.0.txt
 - doc/release_notes/3.7.0.txt
+- doc/cheat_sheet.rdoc
+- doc/dataset_filtering.rdoc
+- doc/opening_databases.rdoc
+- doc/prepared_statements.rdoc
+- doc/reflection.rdoc
 - doc/schema.rdoc
 - doc/sharding.rdoc
+- doc/advanced_associations.rdoc
 - doc/virtual_rows.rdoc
-- spec/adapters/firebird_spec.rb
-- spec/adapters/informix_spec.rb
-- spec/adapters/mysql_spec.rb
-- spec/adapters/oracle_spec.rb
-- spec/adapters/postgres_spec.rb
-- spec/adapters/spec_helper.rb
-- spec/adapters/sqlite_spec.rb
-- spec/adapters/mssql_spec.rb
-- spec/core/connection_pool_spec.rb
+- spec/model/validations_spec.rb
+- spec/model/associations_spec.rb
+- spec/model/base_spec.rb
+- spec/model/dataset_methods_spec.rb
+- spec/model/eager_loading_spec.rb
+- spec/model/hooks_spec.rb
+- spec/model/inflector_spec.rb
+- spec/model/model_spec.rb
+- spec/model/plugins_spec.rb
+- spec/model/record_spec.rb
+- spec/model/spec_helper.rb
+- spec/model/association_reflection_spec.rb
+- spec/core/version_spec.rb
 - spec/core/core_sql_spec.rb
 - spec/core/database_spec.rb
 - spec/core/dataset_spec.rb
@@ -116,166 +122,162 @@ files:
 - spec/core/schema_generator_spec.rb
 - spec/core/schema_spec.rb
 - spec/core/spec_helper.rb
-- spec/core/version_spec.rb
+- spec/core/connection_pool_spec.rb
+- spec/extensions/validation_helpers_spec.rb
+- spec/extensions/association_dependencies_spec.rb
+- spec/extensions/association_proxies_spec.rb
 - spec/extensions/blank_spec.rb
+- spec/extensions/boolean_readers_spec.rb
 - spec/extensions/caching_spec.rb
+- spec/extensions/class_table_inheritance_spec.rb
+- spec/extensions/force_encoding_spec.rb
 - spec/extensions/hook_class_methods_spec.rb
 - spec/extensions/identity_map_spec.rb
 - spec/extensions/inflector_spec.rb
+- spec/extensions/instance_hooks_spec.rb
 - spec/extensions/lazy_attributes_spec.rb
-- spec/extensions/many_through_many_spec.rb
+- spec/extensions/looser_typecasting_spec.rb
+- spec/extensions/query_spec.rb
 - spec/extensions/migration_spec.rb
+- spec/extensions/many_through_many_spec.rb
+- spec/extensions/named_timezones_spec.rb
+- spec/extensions/nested_attributes_spec.rb
 - spec/extensions/pagination_spec.rb
 - spec/extensions/pretty_table_spec.rb
-- spec/extensions/query_spec.rb
 - spec/extensions/schema_dumper_spec.rb
 - spec/extensions/schema_spec.rb
 - spec/extensions/serialization_spec.rb
 - spec/extensions/single_table_inheritance_spec.rb
 - spec/extensions/spec_helper.rb
+- spec/extensions/sql_expr_spec.rb
 - spec/extensions/string_date_time_spec.rb
+- spec/extensions/subclasses_spec.rb
 - spec/extensions/tactical_eager_loading_spec.rb
-- spec/extensions/validation_class_methods_spec.rb
-- spec/extensions/validation_helpers_spec.rb
-- spec/extensions/association_proxies_spec.rb
 - spec/extensions/timestamps_spec.rb
-- spec/extensions/instance_hooks_spec.rb
-- spec/extensions/boolean_readers_spec.rb
-- spec/extensions/nested_attributes_spec.rb
-- spec/extensions/looser_typecasting_spec.rb
+- spec/extensions/thread_local_timezones_spec.rb
+- spec/extensions/touch_spec.rb
 - spec/extensions/typecast_on_load_spec.rb
-- spec/extensions/subclasses_spec.rb
+- spec/extensions/validation_class_methods_spec.rb
 - spec/extensions/active_model_spec.rb
-- spec/extensions/association_dependencies_spec.rb
-- spec/extensions/sql_expr_spec.rb
-- spec/extensions/touch_spec.rb
-- spec/extensions/named_timezones_spec.rb
-- spec/extensions/thread_local_timezones_spec.rb
-- spec/extensions/force_encoding_spec.rb
-- spec/extensions/class_table_inheritance_spec.rb
+- spec/integration/type_test.rb
 - spec/integration/database_test.rb
 - spec/integration/dataset_test.rb
 - spec/integration/eager_loader_test.rb
+- spec/integration/model_test.rb
+- spec/integration/plugin_test.rb
 - spec/integration/prepared_statement_test.rb
 - spec/integration/schema_test.rb
 - spec/integration/spec_helper.rb
-- spec/integration/transaction_test.rb
-- spec/integration/type_test.rb
 - spec/integration/timezone_test.rb
-- spec/integration/plugin_test.rb
+- spec/integration/transaction_test.rb
 - spec/integration/associations_test.rb
-- spec/integration/model_test.rb
-- spec/model/association_reflection_spec.rb
-- spec/model/associations_spec.rb
-- spec/model/base_spec.rb
-- spec/model/dataset_methods_spec.rb
-- spec/model/eager_loading_spec.rb
-- spec/model/hooks_spec.rb
-- spec/model/inflector_spec.rb
-- spec/model/model_spec.rb
-- spec/model/plugins_spec.rb
-- spec/model/record_spec.rb
-- spec/model/spec_helper.rb
-- spec/model/validations_spec.rb
+- spec/adapters/sqlite_spec.rb
+- spec/adapters/informix_spec.rb
+- spec/adapters/mssql_spec.rb
+- spec/adapters/mysql_spec.rb
+- spec/adapters/oracle_spec.rb
+- spec/adapters/postgres_spec.rb
+- spec/adapters/spec_helper.rb
+- spec/adapters/firebird_spec.rb
 - spec/rcov.opts
-- spec/spec_config.rb
 - spec/spec_config.rb.example
-- lib/sequel.rb
-- lib/sequel/adapters/ado.rb
-- lib/sequel/adapters/amalgalite.rb
-- lib/sequel/adapters/db2.rb
-- lib/sequel/adapters/dbi.rb
-- lib/sequel/adapters/do.rb
-- lib/sequel/adapters/do/mysql.rb
-- lib/sequel/adapters/do/postgres.rb
-- lib/sequel/adapters/do/sqlite.rb
-- lib/sequel/adapters/firebird.rb
-- lib/sequel/adapters/informix.rb
-- lib/sequel/adapters/jdbc.rb
-- lib/sequel/adapters/jdbc/h2.rb
-- lib/sequel/adapters/jdbc/mysql.rb
-- lib/sequel/adapters/jdbc/oracle.rb
-- lib/sequel/adapters/jdbc/postgresql.rb
-- lib/sequel/adapters/jdbc/sqlite.rb
-- lib/sequel/adapters/jdbc/mssql.rb
-- lib/sequel/adapters/mysql.rb
-- lib/sequel/adapters/odbc.rb
-- lib/sequel/adapters/openbase.rb
-- lib/sequel/adapters/oracle.rb
-- lib/sequel/adapters/postgres.rb
-- lib/sequel/adapters/shared/mssql.rb
-- lib/sequel/adapters/shared/mysql.rb
-- lib/sequel/adapters/shared/oracle.rb
-- lib/sequel/adapters/shared/postgres.rb
-- lib/sequel/adapters/shared/progress.rb
-- lib/sequel/adapters/shared/sqlite.rb
-- lib/sequel/adapters/sqlite.rb
-- lib/sequel/adapters/utils/stored_procedures.rb
-- lib/sequel/adapters/ado/mssql.rb
-- lib/sequel/adapters/odbc/mssql.rb
-- lib/sequel/connection_pool.rb
-- lib/sequel/core.rb
-- lib/sequel/core_sql.rb
-- lib/sequel/database.rb
+- spec/spec_config.rb
 - lib/sequel/database/schema_generator.rb
 - lib/sequel/database/schema_methods.rb
 - lib/sequel/database/schema_sql.rb
-- lib/sequel/dataset.rb
-- lib/sequel/dataset/convenience.rb
-- lib/sequel/dataset/graph.rb
-- lib/sequel/dataset/prepared_statements.rb
-- lib/sequel/dataset/sql.rb
-- lib/sequel/dataset/actions.rb
-- lib/sequel/dataset/features.rb
-- lib/sequel/dataset/query.rb
-- lib/sequel/exceptions.rb
-- lib/sequel/extensions/blank.rb
-- lib/sequel/extensions/inflector.rb
-- lib/sequel/extensions/migration.rb
-- lib/sequel/extensions/pagination.rb
-- lib/sequel/extensions/pretty_table.rb
-- lib/sequel/extensions/query.rb
-- lib/sequel/extensions/schema_dumper.rb
-- lib/sequel/extensions/string_date_time.rb
-- lib/sequel/extensions/looser_typecasting.rb
-- lib/sequel/extensions/sql_expr.rb
-- lib/sequel/extensions/named_timezones.rb
-- lib/sequel/extensions/thread_local_timezones.rb
-- lib/sequel/metaprogramming.rb
-- lib/sequel/model.rb
-- lib/sequel/model/associations.rb
-- lib/sequel/model/base.rb
 - lib/sequel/model/errors.rb
+- lib/sequel/model/base.rb
+- lib/sequel/model/default_inflections.rb
+- lib/sequel/model/associations.rb
 - lib/sequel/model/exceptions.rb
 - lib/sequel/model/inflections.rb
 - lib/sequel/model/plugins.rb
-- lib/sequel/model/default_inflections.rb
+- lib/sequel/plugins/validation_helpers.rb
+- lib/sequel/plugins/association_dependencies.rb
+- lib/sequel/plugins/association_proxies.rb
+- lib/sequel/plugins/boolean_readers.rb
 - lib/sequel/plugins/caching.rb
+- lib/sequel/plugins/class_table_inheritance.rb
+- lib/sequel/plugins/force_encoding.rb
 - lib/sequel/plugins/hook_class_methods.rb
 - lib/sequel/plugins/identity_map.rb
+- lib/sequel/plugins/instance_hooks.rb
 - lib/sequel/plugins/lazy_attributes.rb
 - lib/sequel/plugins/many_through_many.rb
+- lib/sequel/plugins/nested_attributes.rb
 - lib/sequel/plugins/schema.rb
 - lib/sequel/plugins/serialization.rb
 - lib/sequel/plugins/single_table_inheritance.rb
+- lib/sequel/plugins/subclasses.rb
 - lib/sequel/plugins/tactical_eager_loading.rb
-- lib/sequel/plugins/validation_class_methods.rb
-- lib/sequel/plugins/validation_helpers.rb
-- lib/sequel/plugins/association_proxies.rb
 - lib/sequel/plugins/timestamps.rb
-- lib/sequel/plugins/boolean_readers.rb
-- lib/sequel/plugins/instance_hooks.rb
-- lib/sequel/plugins/nested_attributes.rb
 - lib/sequel/plugins/touch.rb
 - lib/sequel/plugins/typecast_on_load.rb
-- lib/sequel/plugins/subclasses.rb
+- lib/sequel/plugins/validation_class_methods.rb
 - lib/sequel/plugins/active_model.rb
-- lib/sequel/plugins/association_dependencies.rb
-- lib/sequel/plugins/force_encoding.rb
-- lib/sequel/plugins/class_table_inheritance.rb
+- lib/sequel/extensions/thread_local_timezones.rb
+- lib/sequel/extensions/inflector.rb
+- lib/sequel/extensions/looser_typecasting.rb
+- lib/sequel/extensions/migration.rb
+- lib/sequel/extensions/named_timezones.rb
+- lib/sequel/extensions/pagination.rb
+- lib/sequel/extensions/pretty_table.rb
+- lib/sequel/extensions/query.rb
+- lib/sequel/extensions/schema_dumper.rb
+- lib/sequel/extensions/sql_expr.rb
+- lib/sequel/extensions/string_date_time.rb
+- lib/sequel/extensions/blank.rb
+- lib/sequel/dataset/graph.rb
+- lib/sequel/dataset/convenience.rb
+- lib/sequel/dataset/features.rb
+- lib/sequel/dataset/actions.rb
+- lib/sequel/dataset/prepared_statements.rb
+- lib/sequel/dataset/query.rb
+- lib/sequel/dataset/sql.rb
+- lib/sequel/adapters/do/mysql.rb
+- lib/sequel/adapters/do/postgres.rb
+- lib/sequel/adapters/do/sqlite.rb
+- lib/sequel/adapters/ado/mssql.rb
+- lib/sequel/adapters/shared/mssql.rb
+- lib/sequel/adapters/shared/mysql.rb
+- lib/sequel/adapters/shared/oracle.rb
+- lib/sequel/adapters/shared/postgres.rb
+- lib/sequel/adapters/shared/progress.rb
+- lib/sequel/adapters/shared/sqlite.rb
+- lib/sequel/adapters/odbc/mssql.rb
+- lib/sequel/adapters/jdbc/h2.rb
+- lib/sequel/adapters/jdbc/mssql.rb
+- lib/sequel/adapters/jdbc/mysql.rb
+- lib/sequel/adapters/jdbc/oracle.rb
+- lib/sequel/adapters/jdbc/postgresql.rb
+- lib/sequel/adapters/jdbc/sqlite.rb
+- lib/sequel/adapters/utils/stored_procedures.rb
+- lib/sequel/adapters/ado.rb
+- lib/sequel/adapters/firebird.rb
+- lib/sequel/adapters/informix.rb
+- lib/sequel/adapters/jdbc.rb
+- lib/sequel/adapters/dbi.rb
+- lib/sequel/adapters/mysql.rb
+- lib/sequel/adapters/odbc.rb
+- lib/sequel/adapters/db2.rb
+- lib/sequel/adapters/openbase.rb
+- lib/sequel/adapters/oracle.rb
+- lib/sequel/adapters/postgres.rb
+- lib/sequel/adapters/amalgalite.rb
+- lib/sequel/adapters/sqlite.rb
+- lib/sequel/adapters/do.rb
+- lib/sequel/exceptions.rb
+- lib/sequel/metaprogramming.rb
+- lib/sequel/model.rb
 - lib/sequel/sql.rb
-- lib/sequel/version.rb
 - lib/sequel/timezones.rb
+- lib/sequel/version.rb
+- lib/sequel/connection_pool.rb
+- lib/sequel/core.rb
+- lib/sequel/core_sql.rb
+- lib/sequel/database.rb
+- lib/sequel/dataset.rb
+- lib/sequel.rb
 - lib/sequel_core.rb
 - lib/sequel_model.rb
 has_rdoc: true