sequel 3.48.0 → 4.0.0

data/spec/extensions/schema_dumper_spec.rb

@@ -1,6 +1,5 @@
 require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
-
 describe "Sequel::Schema::Generator dump methods" do
   before do
     @d = Sequel::Database.new.extension(:schema_dumper)

data/spec/extensions/schema_spec.rb

@@ -33,17 +33,17 @@ describe Sequel::Model, "create_table and schema" do
         float :price, :null => false
       end
     end
-    MODEL_DB.reset
+    DB.reset
   end
 
   it "should get the create table SQL list from the db and execute it line by line" do
     @model.create_table
-    MODEL_DB.sqls.should == ['CREATE TABLE items (name text, price float NOT NULL)']
+    DB.sqls.should == ['CREATE TABLE items (name text, price float NOT NULL)']
   end
 
   it "should allow setting schema and creating the table in one call" do
     @model.create_table { text :name }
-    MODEL_DB.sqls.should == ['CREATE TABLE items (name text)']
+    DB.sqls.should == ['CREATE TABLE items (name text)']
   end
 
   it "should reload the schema from the database" do
@@ -76,7 +76,7 @@ describe Sequel::Model, "schema methods" do
   before do
     @model = Class.new(Sequel::Model(:items))
     @model.plugin :schema
-    MODEL_DB.reset
+    DB.reset
   end
 
   it "table_exists? should get the table name and question the model's db if table_exists?" do
@@ -86,28 +86,28 @@ describe Sequel::Model, "schema methods" do
 
   it "drop_table should drop the related table" do
     @model.drop_table
-    MODEL_DB.sqls.should == ['DROP TABLE items']
+    DB.sqls.should == ['DROP TABLE items']
   end
 
   it "drop_table? should drop the table if it exists" do
     @model.drop_table?
-    MODEL_DB.sqls.should == ["SELECT NULL AS nil FROM items LIMIT 1", 'DROP TABLE items']
+    DB.sqls.should == ["SELECT NULL AS nil FROM items LIMIT 1", 'DROP TABLE items']
   end
   
   it "create_table! should drop table if it exists and then create the table" do
     @model.create_table!
-    MODEL_DB.sqls.should == ["SELECT NULL AS nil FROM items LIMIT 1", 'DROP TABLE items', 'CREATE TABLE items ()']
+    DB.sqls.should == ["SELECT NULL AS nil FROM items LIMIT 1", 'DROP TABLE items', 'CREATE TABLE items ()']
   end
   
   it "create_table? should not create the table if it already exists" do
     @model.should_receive(:table_exists?).and_return(true)
     @model.create_table?
-    MODEL_DB.sqls.should == []
+    DB.sqls.should == []
   end
 
   it "create_table? should create the table if it doesn't exist" do
     @model.should_receive(:table_exists?).and_return(false)
     @model.create_table?
-    MODEL_DB.sqls.should == ['CREATE TABLE items ()']
+    DB.sqls.should == ['CREATE TABLE items ()']
   end
 end

data/spec/extensions/serialization_modification_detection_spec.rb

@@ -13,7 +13,7 @@ describe "serialization_modification_detection plugin" do
     @o2 = @c.load(:id=>1, :h=>"--- {}\n\n")
     @o3 = @c.new
     @o4 = @c.load(:id=>1, :h=>nil)
-    MODEL_DB.reset
+    DB.reset
   end
   
   it "should not detect columns that haven't been changed" do

data/spec/extensions/serialization_spec.rb

@@ -9,21 +9,21 @@ describe "Serialization plugin" do
       no_primary_key
       columns :id, :abc, :def, :ghi
     end
-    MODEL_DB.reset
+    DB.reset
   end
   
   it "should allow setting additional serializable attributes via plugin :serialization call" do
     @c.plugin :serialization, :yaml, :abc
     @c.create(:abc => 1, :def=> 2)
-    MODEL_DB.sqls.last.should =~ /INSERT INTO items \((abc, def|def, abc)\) VALUES \(('--- 1\n(\.\.\.\n)?', 2|2, '--- 1\n(\.\.\.\n)?')\)/
+    DB.sqls.last.should =~ /INSERT INTO items \((abc, def|def, abc)\) VALUES \(('--- 1\n(\.\.\.\n)?', 2|2, '--- 1\n(\.\.\.\n)?')\)/
 
     @c.plugin :serialization, :marshal, :def
     @c.create(:abc => 1, :def=> 1)
-    MODEL_DB.sqls.last.should =~ /INSERT INTO items \((abc, def|def, abc)\) VALUES \(('--- 1\n(\.\.\.\n)?', 'BAhpBg==\n'|'BAhpBg==\n', '--- 1\n(\.\.\.\n)?')\)/
+    DB.sqls.last.should =~ /INSERT INTO items \((abc, def|def, abc)\) VALUES \(('--- 1\n(\.\.\.\n)?', 'BAhpBg==\n'|'BAhpBg==\n', '--- 1\n(\.\.\.\n)?')\)/
     
     @c.plugin :serialization, :json, :ghi
     @c.create(:ghi => [123])
-    MODEL_DB.sqls.last.should =~ /INSERT INTO items \((ghi)\) VALUES \('\[123\]'\)/
+    DB.sqls.last.should =~ /INSERT INTO items \((ghi)\) VALUES \('\[123\]'\)/
   end
 
   it "should allow serializing attributes to yaml" do
@@ -31,7 +31,7 @@ describe "Serialization plugin" do
     @c.create(:abc => 1)
     @c.create(:abc => "hello")
 
-    MODEL_DB.sqls.map{|s| s.sub("...\n", '')}.should == ["INSERT INTO items (abc) VALUES ('--- 1\n')", "INSERT INTO items (abc) VALUES ('--- hello\n')"]
+    DB.sqls.map{|s| s.sub("...\n", '')}.should == ["INSERT INTO items (abc) VALUES ('--- 1\n')", "INSERT INTO items (abc) VALUES ('--- hello\n')"]
   end
 
   it "serialized_columns should be the columns serialized" do
@@ -45,7 +45,7 @@ describe "Serialization plugin" do
     @c.create(:abc => "hello")
     x = [Marshal.dump("hello")].pack('m')
 
-    MODEL_DB.sqls.should == [ \
+    DB.sqls.should == [ \
       "INSERT INTO items (abc) VALUES ('BAhpBg==\n')", \
       "INSERT INTO items (abc) VALUES ('#{x}')", \
     ]
@@ -57,7 +57,7 @@ describe "Serialization plugin" do
     @c.create(:ghi => ["hello"])
     
     x = ["hello"].to_json
-    MODEL_DB.sqls.should == [ \
+    DB.sqls.should == [ \
       "INSERT INTO items (ghi) VALUES ('[1]')", \
       "INSERT INTO items (ghi) VALUES ('#{x}')", \
     ]
@@ -66,7 +66,7 @@ describe "Serialization plugin" do
   it "should allow serializing attributes using arbitrary callable" do
     @c.plugin :serialization, [proc{|s| s.reverse}, proc{}], :abc
     @c.create(:abc => "hello")
-    MODEL_DB.sqls.should == ["INSERT INTO items (abc) VALUES ('olleh')"]
+    DB.sqls.should == ["INSERT INTO items (abc) VALUES ('olleh')"]
   end
   
   it "should raise an error if specificing serializer as an unregistered symbol" do
@@ -87,7 +87,7 @@ describe "Serialization plugin" do
 
     o.update(:abc => 23)
     @c.create(:abc => [1, 2, 3])
-    MODEL_DB.sqls.should == ["SELECT * FROM items LIMIT 1",
+    DB.sqls.should == ["SELECT * FROM items LIMIT 1",
       "UPDATE items SET abc = '#{23.to_yaml}' WHERE (id = 1)",
       "INSERT INTO items (abc) VALUES ('#{[1, 2, 3].to_yaml}')",
       "SELECT * FROM items WHERE (id = 10) LIMIT 1"]
@@ -107,7 +107,7 @@ describe "Serialization plugin" do
 
     o.update(:abc => 23)
     @c.create(:abc => [1, 2, 3])
-    MODEL_DB.sqls.should == ["SELECT * FROM items LIMIT 1",
+    DB.sqls.should == ["SELECT * FROM items LIMIT 1",
       "UPDATE items SET abc = '#{[Marshal.dump(23)].pack('m')}' WHERE (id = 1)",
       "INSERT INTO items (abc) VALUES ('#{[Marshal.dump([1, 2, 3])].pack('m')}')",
       "SELECT * FROM items WHERE (id = 10) LIMIT 1"]
@@ -148,7 +148,7 @@ describe "Serialization plugin" do
     o.update(:abc => [23])
     @c.create(:abc => [1,2,3])
     
-    MODEL_DB.sqls.should == ["SELECT * FROM items LIMIT 1",
+    DB.sqls.should == ["SELECT * FROM items LIMIT 1",
       "UPDATE items SET abc = '#{[23].to_json}' WHERE (id = 1)",
       "INSERT INTO items (abc) VALUES ('#{[1,2,3].to_json}')",
       "SELECT * FROM items WHERE (id = 10) LIMIT 1"]
@@ -169,7 +169,7 @@ describe "Serialization plugin" do
     o.update(:abc => 'foo')
     @c.create(:abc => 'bar')
     
-    MODEL_DB.sqls.should == ["SELECT * FROM items LIMIT 1",
+    DB.sqls.should == ["SELECT * FROM items LIMIT 1",
       "UPDATE items SET abc = 'oof' WHERE (id = 1)",
       "INSERT INTO items (abc) VALUES ('rab')",
       "SELECT * FROM items WHERE (id = 10) LIMIT 1"]
@@ -191,7 +191,7 @@ describe "Serialization plugin" do
     o.update(:abc => 'foo')
     @c.create(:abc => 'bar')
     
-    MODEL_DB.sqls.should == ["SELECT * FROM items LIMIT 1",
+    DB.sqls.should == ["SELECT * FROM items LIMIT 1",
       "UPDATE items SET abc = 'oof' WHERE (id = 1)",
       "INSERT INTO items (abc) VALUES ('rab')",
       "SELECT * FROM items WHERE (id = 10) LIMIT 1"]
@@ -211,23 +211,12 @@ describe "Serialization plugin" do
 
     o.update(:abc => 23)
     Class.new(@c).create(:abc => [1, 2, 3])
-    MODEL_DB.sqls.should == ["SELECT * FROM items LIMIT 1",
+    DB.sqls.should == ["SELECT * FROM items LIMIT 1",
       "UPDATE items SET abc = '#{23.to_yaml}' WHERE (id = 1)",
       "INSERT INTO items (abc) VALUES ('#{[1, 2, 3].to_yaml}')",
       "SELECT * FROM items WHERE (id = 10) LIMIT 1"]
   end
 
-  it "should clear the deserialized columns when using set_values" do
-    @c.set_primary_key :id
-    @c.plugin :serialization, :yaml, :abc, :def
-    o = @c.load(:id => 1, :abc => "--- 1\n", :def => "--- hello\n")
-    o.abc = 23
-    o.deserialized_values.length.should == 1
-    o.abc.should == 23
-    o.set_values(:id=>1)
-    o.deserialized_values.length.should == 0
-  end
-  
   it "should clear the deserialized columns when refreshing" do
     @c.set_primary_key :id
     @c.plugin :serialization, :yaml, :abc, :def
@@ -239,16 +228,16 @@ describe "Serialization plugin" do
     o.deserialized_values.length.should == 0
   end
   
-  it "should clear the deserialized columns when refreshing after saving a new object" do
+  it "should not clear the deserialized columns when refreshing after saving a new object" do
     @c.set_primary_key :id
     @c.plugin :serialization, :yaml, :abc, :def
     o = @c.new(:abc => "--- 1\n", :def => "--- hello\n")
     o.deserialized_values.length.should == 2
     o.save
-    o.deserialized_values.length.should == 0
+    o.deserialized_values.length.should == 2
   end
   
-  it "should clear the deserialized columns when refreshing after saving a new object with insert_select" do
+  it "should not clear the deserialized columns when refreshing after saving a new object with insert_select" do
     @c.set_primary_key :id
     @c.plugin :serialization, :yaml, :abc, :def
     def (@c.instance_dataset).supports_insert_select?() true end
@@ -256,7 +245,7 @@ describe "Serialization plugin" do
     o = @c.new(:abc => "--- 1\n", :def => "--- hello\n")
     o.deserialized_values.length.should == 2
     o.save
-    o.deserialized_values.length.should == 0
+    o.deserialized_values.length.should == 2
   end
   
   it "should raise an error if calling internal serialization methods with bad columns" do

data/spec/extensions/set_overrides_spec.rb

@@ -20,6 +20,10 @@ describe "Sequel::Dataset #set_defaults" do
     @ds.set_defaults(:y=>2).update_sql.should =~ /UPDATE items SET (x = 1|y = 2), (x = 1|y = 2)/
     @ds.set_defaults(:x=>2).update_sql.should == "UPDATE items SET x = 2"
   end
+
+  specify "should not affect String update arguments" do
+    @ds.update_sql('y = 2').should == "UPDATE items SET y = 2"
+  end
 end
 
 describe "Sequel::Dataset #set_overrides" do

data/spec/extensions/{many_to_one_pk_lookup_spec.rb → shared_caching_spec.rb}

@@ -1,11 +1,10 @@
 require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
-describe "Sequel::Plugins::ManyToOnePkLookup" do
+describe "Shared caching behavior" do
   before do
     @db = Sequel.mock
 
     class ::LookupModel < ::Sequel::Model(@db)
-      plugin :many_to_one_pk_lookup
       columns :id, :caching_model_id, :caching_model_id2
       many_to_one :caching_model
       many_to_one :caching_model2, :key=>[:caching_model_id, :caching_model_id2], :class=>:CachingModel
@@ -99,7 +98,6 @@ describe "Sequel::Plugins::ManyToOnePkLookup" do
       c = Class.new(Sequel::Model(@db[:lookup_model]))
       c.class_eval do
         plugin :prepared_statements_associations
-        plugin :many_to_one_pk_lookup
         columns :id, :caching_model_id
         many_to_one :caching_model, :class=>c2
       end
@@ -111,7 +109,6 @@ describe "Sequel::Plugins::ManyToOnePkLookup" do
       c = Class.new(Sequel::Model(:lookup_model))
       c.class_eval do
         plugin :prepared_statements_associations
-        plugin :many_to_one_pk_lookup
         columns :id, :caching_model_id
         many_to_one :caching_model
       end

data/spec/extensions/single_table_inheritance_spec.rb

@@ -11,7 +11,7 @@ describe Sequel::Model, "single table inheritance plugin" do
     class ::StiTestSub2 < StiTest
     end 
     @ds = StiTest.dataset
-    MODEL_DB.reset
+    DB.reset
   end
   after do
     Object.send(:remove_const, :StiTestSub1)
@@ -74,19 +74,19 @@ describe Sequel::Model, "single table inheritance plugin" do
     StiTest.new.save
     StiTestSub1.new.save
     StiTestSub2.new.save
-    MODEL_DB.sqls.should == ["INSERT INTO sti_tests (kind) VALUES ('StiTest')", "SELECT * FROM sti_tests WHERE (id = 10) LIMIT 1", "INSERT INTO sti_tests (kind) VALUES ('StiTestSub1')", "SELECT * FROM sti_tests WHERE ((sti_tests.kind IN ('StiTestSub1')) AND (id = 10)) LIMIT 1", "INSERT INTO sti_tests (kind) VALUES ('StiTestSub2')", "SELECT * FROM sti_tests WHERE ((sti_tests.kind IN ('StiTestSub2')) AND (id = 10)) LIMIT 1"]
+    DB.sqls.should == ["INSERT INTO sti_tests (kind) VALUES ('StiTest')", "SELECT * FROM sti_tests WHERE (id = 10) LIMIT 1", "INSERT INTO sti_tests (kind) VALUES ('StiTestSub1')", "SELECT * FROM sti_tests WHERE ((sti_tests.kind IN ('StiTestSub1')) AND (id = 10)) LIMIT 1", "INSERT INTO sti_tests (kind) VALUES ('StiTestSub2')", "SELECT * FROM sti_tests WHERE ((sti_tests.kind IN ('StiTestSub2')) AND (id = 10)) LIMIT 1"]
   end
 
   it "should have the before_create hook not override an existing value" do
     StiTest.create(:kind=>'StiTestSub1')
-    MODEL_DB.sqls.should == ["INSERT INTO sti_tests (kind) VALUES ('StiTestSub1')", "SELECT * FROM sti_tests WHERE (id = 10) LIMIT 1"]
+    DB.sqls.should == ["INSERT INTO sti_tests (kind) VALUES ('StiTestSub1')", "SELECT * FROM sti_tests WHERE (id = 10) LIMIT 1"]
   end
 
   it "should have the before_create hook handle columns with the same name as existing method names" do
     StiTest.plugin :single_table_inheritance, :type
     StiTest.columns :id, :type
     StiTest.create
-    MODEL_DB.sqls.should == ["INSERT INTO sti_tests (type) VALUES ('StiTest')", "SELECT * FROM sti_tests WHERE (id = 10) LIMIT 1"]
+    DB.sqls.should == ["INSERT INTO sti_tests (type) VALUES ('StiTest')", "SELECT * FROM sti_tests WHERE (id = 10) LIMIT 1"]
   end
 
   it "should add a filter to model datasets inside subclasses hook to only retreive objects with the matching key" do

data/spec/extensions/spec_helper.rb

@@ -15,7 +15,7 @@ end
 
 unless Object.const_defined?('Sequel') && Sequel.const_defined?('Model')
   $:.unshift(File.join(File.dirname(File.expand_path(__FILE__)), "../../lib/"))
-  require 'sequel/no_core_ext'
+  require 'sequel'
 end
 Sequel::Deprecation.backtrace_filter = lambda{|line, lineno| lineno < 4 || line =~ /_spec\.rb/}
 SEQUEL_EXTENSIONS_NO_DEPRECATION_WARNING = true
@@ -31,15 +31,8 @@ rescue LoadError
 end
 
 Sequel.extension :meta_def
-
-# Load core_refinements extension first, so pg_* extensions add their own refinements
 Sequel.extension :core_refinements if RUBY_VERSION >= '2.0.0'
 
-# Load most extensions by default, so that any conflicts are easily detectable.
-Sequel.extension(*%w'string_date_time inflector pagination query pretty_table blank migration schema_dumper looser_typecasting sql_expr thread_local_timezones to_dot columns_introspection server_block arbitrary_servers pg_auto_parameterize pg_statement_cache pg_array pg_array_ops pg_hstore pg_hstore_ops pg_range pg_range_ops pg_json pg_inet pg_row pg_row_ops schema_caching null_dataset select_remove query_literals eval_inspect')
-
-Sequel::Dataset.introspect_all_columns if ENV['SEQUEL_COLUMNS_INTROSPECTION']
-
 def skip_warn(s)
   warn "Skipping test of #{s}" if ENV["SKIPPED_TEST_WARN"]
 end
@@ -89,4 +82,10 @@ db = Sequel.mock(:fetch=>{:id => 1, :x => 1}, :numrows=>1, :autoid=>proc{|sql| 1
 def db.schema(*) [[:id, {:primary_key=>true}]] end
 def db.reset() sqls end
 def db.supports_schema_parsing?() true end
-Sequel::Model.db = MODEL_DB = db
+Sequel::Model.db = DB = db
+
+if ENV['SEQUEL_COLUMNS_INTROSPECTION']
+  Sequel.extension :columns_introspection
+  Sequel::Database.extension :columns_introspection
+  Sequel::Mock::Dataset.send(:include, Sequel::ColumnsIntrospection)
+end

data/spec/extensions/sql_expr_spec.rb

@@ -1,5 +1,7 @@
 require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
+Sequel.extension :sql_expr
+
 describe "Sequel sql_expr extension" do
   before do
     @ds = Sequel.mock.dataset

data/spec/extensions/string_date_time_spec.rb

@@ -1,5 +1,7 @@
 require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
+Sequel.extension :string_date_time
+
 describe "String#to_time" do
   specify "should convert the string into a Time object" do
     "2007-07-11".to_time.should == Time.parse("2007-07-11")

data/spec/extensions/string_stripper_spec.rb

@@ -35,7 +35,9 @@ describe "Sequel::Plugins::StringStripper" do
   end
 
   it "should allow skipping of columns using Model.skip_string_stripping" do
+    @c.skip_string_stripping?(:name).should == false
     @c.skip_string_stripping :name
+    @c.skip_string_stripping?(:name).should == true
     v = ' name '
     @o.name = v
     @o.name.should equal(v)

data/spec/extensions/tactical_eager_loading_spec.rb

@@ -21,7 +21,7 @@ describe "Sequel::Plugins::TacticalEagerLoading" do
     end
     @c = ::TacticalEagerLoadingModel
     @ds = TacticalEagerLoadingModel.dataset
-    MODEL_DB.reset
+    DB.reset
   end
   after do
     Object.send(:remove_const, :TacticalEagerLoadingModel)
@@ -37,19 +37,19 @@ describe "Sequel::Plugins::TacticalEagerLoading" do
   end
 
   it "association getter methods should eagerly load the association if the association isn't cached" do
-    MODEL_DB.sqls.length.should == 0
+    DB.sqls.length.should == 0
     ts = @c.all
-    MODEL_DB.sqls.length.should == 1
+    DB.sqls.length.should == 1
     ts.map{|x| x.parent}.should == [ts[2], ts[3], nil, nil]
-    MODEL_DB.sqls.length.should == 1
+    DB.sqls.length.should == 1
     ts.map{|x| x.children}.should == [[], [], [ts[0]], [ts[1]]]
-    MODEL_DB.sqls.length.should == 1
+    DB.sqls.length.should == 1
   end
 
   it "association getter methods should not eagerly load the association if the association is cached" do
-    MODEL_DB.sqls.length.should == 0
+    DB.sqls.length.should == 0
     ts = @c.all
-    MODEL_DB.sqls.length.should == 1
+    DB.sqls.length.should == 1
     ts.map{|x| x.parent}.should == [ts[2], ts[3], nil, nil]
     @ds.should_not_receive(:eager_load)
     ts.map{|x| x.parent}.should == [ts[2], ts[3], nil, nil]
@@ -65,14 +65,14 @@ describe "Sequel::Plugins::TacticalEagerLoading" do
   it "association getter methods should not eagerly load the association if an instance is frozen" do
     ts = @c.all
     ts.first.freeze
-    MODEL_DB.sqls.length.should == 1
+    DB.sqls.length.should == 1
     ts.map{|x| x.parent}.should == [ts[2], ts[3], nil, nil]
-    MODEL_DB.sqls.length.should == 2
+    DB.sqls.length.should == 2
     ts.map{|x| x.children}.should == [[], [], [ts[0]], [ts[1]]]
-    MODEL_DB.sqls.length.should == 2
+    DB.sqls.length.should == 2
     ts.map{|x| x.parent}.should == [ts[2], ts[3], nil, nil]
-    MODEL_DB.sqls.length.should == 1
+    DB.sqls.length.should == 1
     ts.map{|x| x.children}.should == [[], [], [ts[0]], [ts[1]]]
-    MODEL_DB.sqls.length.should == 1
+    DB.sqls.length.should == 1
   end
 end

data/spec/extensions/thread_local_timezones_spec.rb

@@ -1,5 +1,7 @@
 require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
+Sequel.extension :thread_local_timezones
+
 describe "Sequel thread_local_timezones extension" do
   after do
     Sequel.default_timezone = nil

data/spec/extensions/timestamps_spec.rb

@@ -77,7 +77,7 @@ describe "Sequel::Plugins::Timestamps" do
       columns :id, :x
       plugin :timestamps
       db.reset
-      def _refresh(ds); self end
+      def _save_refresh; self end
     end
     c.create(:x=>2)
     c.load(:id=>1, :x=>2).save

data/spec/extensions/to_dot_spec.rb

@@ -6,7 +6,7 @@ describe Sequel::Model, "to_dot extension" do
   end
 
   before do
-    @db = MODEL_DB
+    @db = DB
     @ds = @db.dataset
   end