sequel 3.12.1 → 3.13.0

data/spec/extensions/lazy_attributes_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "Sequel::Plugins::LazyAttributes" do
   before do
@@ -24,7 +24,6 @@ describe "Sequel::Plugins::LazyAttributes" do
           end
         else
           i = where.args.last
-          i = i.instance_variable_get(:@array) if i.is_a?(Sequel::SQL::SQLArray)
           Array(i).each do |x|
             if sql =~ /SELECT name FROM/
               yield(block[:name=>x.to_s])

data/spec/extensions/list_spec.rb

@@ -0,0 +1,251 @@
+require File.join(File.dirname(File.expand_path(__FILE__)), '/spec_helper')
+
+describe "List plugin" do
+  def klass(opts={})
+    @db = MODEL_DB
+    c = Class.new(Sequel::Model(@db[:items]))
+    c.class_eval do
+      columns :id, :position, :scope_id, :pos
+      plugin :list, opts
+      self.use_transactions = false
+
+      class << self
+        attr_accessor :rows
+      end
+
+      def checked_transaction(opts={})
+        return super if @in_transaction || !use_transaction?(opts)
+        @in_transaction = true
+        db.execute 'BEGIN'
+        super
+        db.execute 'COMMIT'
+        @in_transaction = false
+      end
+    end
+    c
+  end
+
+  def y(c, *hs)
+    c.rows = hs
+    ds = c.dataset
+    def ds.fetch_rows(sql)
+      db.execute(sql)
+      yield model.rows.shift
+    end
+  end
+
+  before do
+    @c = klass
+    @o = @c.load(:id=>7, :position=>3)
+    @sc = klass(:scope=>:scope_id)
+    @so = @sc.load(:id=>7, :position=>3, :scope_id=>5)
+    @db.reset
+  end
+
+  it "should default to using :position as the position field" do
+    @c.position_field.should == :position
+    @c.new.list_dataset.sql.should == 'SELECT * FROM items ORDER BY position'
+  end
+
+  it "should accept a :field option to modify the position field" do
+    klass(:field=>:pos).position_field.should == :pos
+  end
+
+  it "should accept a :scope option with a symbol for a single scope column" do
+    @sc.new(:scope_id=>4).list_dataset.sql.should == 'SELECT * FROM items WHERE (scope_id = 4) ORDER BY scope_id, position'
+  end
+
+  it "should accept a :scope option with an array of symbols for multiple scope columns" do
+    ['SELECT * FROM items WHERE ((scope_id = 4) AND (pos = 3)) ORDER BY scope_id, pos, position',
+     'SELECT * FROM items WHERE ((pos = 3) AND (scope_id = 4)) ORDER BY scope_id, pos, position'].
+     should include(klass(:scope=>[:scope_id, :pos]).new(:scope_id=>4, :pos=>3).list_dataset.sql)
+  end
+
+  it "should accept a :scope option with a proc for a custom list scope" do
+    klass(:scope=>proc{|o| o.model.dataset.filter(:active).filter(:scope_id=>o.scope_id)}).new(:scope_id=>4).list_dataset.sql.should == 'SELECT * FROM items WHERE (active AND (scope_id = 4)) ORDER BY position'
+  end
+
+  it "should modify the order when using the plugin" do
+    c = Class.new(Sequel::Model(:items))
+    c.model.dataset.sql.should == 'SELECT * FROM items'
+    c.plugin :list
+    c.model.dataset.sql.should == 'SELECT * FROM items ORDER BY position'
+  end
+
+  it "should be able to access the position field as a class attribute" do
+    @c.position_field.should == :position
+    klass(:field=>:pos).position_field.should == :pos
+  end
+
+  it "should be able to access the scope proc as a class attribute" do
+    @c.scope_proc.should == nil
+    @sc.scope_proc[@sc.new(:scope_id=>4)].sql.should == 'SELECT * FROM items WHERE (scope_id = 4) ORDER BY scope_id, position'
+  end
+
+  it "should work correctly in subclasses" do
+    c = Class.new(klass(:scope=>:scope_id))
+    c.position_field.should == :position
+    c.scope_proc[c.new(:scope_id=>4)].sql.should == 'SELECT * FROM items WHERE (scope_id = 4) ORDER BY scope_id, position'
+  end
+
+  it "should have at_position return the model object at the given position" do
+    y(@c, :id=>1, :position=>1)
+    @o.at_position(10).should == @c.load(:id=>1, :position=>1)
+    y(@sc, :id=>2, :position=>2, :scope_id=>5)
+    @so.at_position(20).should == @sc.load(:id=>2, :position=>2, :scope_id=>5)
+    @db.sqls.should == ["SELECT * FROM items WHERE (position = 10) ORDER BY position LIMIT 1",
+      "SELECT * FROM items WHERE ((scope_id = 5) AND (position = 20)) ORDER BY scope_id, position LIMIT 1"]
+  end
+
+  it "should have last_position return the last position in the list" do
+    y(@c, :max=>10)
+    @o.last_position.should == 10
+    y(@sc, :max=>20)
+    @so.last_position.should == 20
+    @db.sqls.should == ["SELECT max(position) FROM items LIMIT 1",
+      "SELECT max(position) FROM items WHERE (scope_id = 5) LIMIT 1"]
+  end
+
+  it "should have list_dataset return the model's dataset for non scoped lists" do
+    @o.list_dataset.sql.should == 'SELECT * FROM items ORDER BY position'
+  end
+
+  it "should have list dataset return a scoped dataset for scoped lists" do
+    @so.list_dataset.sql.should == 'SELECT * FROM items WHERE (scope_id = 5) ORDER BY scope_id, position'
+  end
+
+  it "should have move_down without an argument move down a single position" do
+    y(@c, :max=>10)
+    @o.move_down.should == @o
+    @o.position.should == 4
+    @db.sqls.should == ["SELECT max(position) FROM items LIMIT 1",
+      "UPDATE items SET position = (position - 1) WHERE ((position >= 4) AND (position <= 4))",
+      "UPDATE items SET position = 4 WHERE (id = 7)"]
+  end
+
+  it "should have move_down with an argument move down the given number of positions" do
+    y(@c, :max=>10)
+    @o.move_down(3).should == @o
+    @o.position.should == 6
+    @db.sqls.should == ["SELECT max(position) FROM items LIMIT 1",
+      "UPDATE items SET position = (position - 1) WHERE ((position >= 4) AND (position <= 6))",
+      "UPDATE items SET position = 6 WHERE (id = 7)"]
+  end
+
+  it "should have move_down with a negative argument move up the given number of positions" do
+    @o.move_down(-1).should == @o
+    @o.position.should == 2
+    @db.sqls.should == ["UPDATE items SET position = (position + 1) WHERE ((position >= 2) AND (position < 3))",
+      "UPDATE items SET position = 2 WHERE (id = 7)"]
+  end
+
+  it "should have move_to raise an error if an invalid target is used" do
+    proc{@o.move_to(0)}.should raise_error(Sequel::Error)
+    y(@c, :max=>10)
+    proc{@o.move_to(11)}.should raise_error(Sequel::Error)
+  end
+
+  it "should have move_to use a transaction is the instance is configured to use transactions" do
+    @o.use_transactions = true
+    @o.move_to(2)
+    @db.sqls.should == ["BEGIN",
+      "UPDATE items SET position = (position + 1) WHERE ((position >= 2) AND (position < 3))",
+      "UPDATE items SET position = 2 WHERE (id = 7)",
+      "COMMIT"]
+  end
+
+  it "should have move_to do nothing if the target position is the same as the current position" do
+    @o.use_transactions = true
+    @o.move_to(@o.position).should == @o
+    @o.position.should == 3
+    @db.sqls.should == []
+  end
+
+  it "should have move to shift entries correctly between current and target if moving up" do
+    @o.move_to(2)
+    @db.sqls.first.should == "UPDATE items SET position = (position + 1) WHERE ((position >= 2) AND (position < 3))"
+  end
+
+  it "should have move to shift entries correctly between current and target if moving down" do
+    y(@c, :max=>10)
+    @o.move_to(4)
+    @db.sqls[1].should == "UPDATE items SET position = (position - 1) WHERE ((position >= 4) AND (position <= 4))"
+  end
+
+  it "should have move_to_bottom move the item to the last position" do
+    y(@c, :max=>10)
+    @o.move_to_bottom
+    @db.sqls.should == ["SELECT max(position) FROM items LIMIT 1",
+      "UPDATE items SET position = (position - 1) WHERE ((position >= 4) AND (position <= 10))",
+      "UPDATE items SET position = 10 WHERE (id = 7)"]
+  end
+
+  it "should have move_to_top move the item to the first position" do
+    @o.move_to_top
+    @db.sqls.should == ["UPDATE items SET position = (position + 1) WHERE ((position >= 1) AND (position < 3))",
+      "UPDATE items SET position = 1 WHERE (id = 7)"]
+  end
+
+  it "should have move_up without an argument move up a single position" do
+    @o.move_up.should == @o
+    @o.position.should == 2
+    @db.sqls.should == ["UPDATE items SET position = (position + 1) WHERE ((position >= 2) AND (position < 3))",
+      "UPDATE items SET position = 2 WHERE (id = 7)"]
+  end
+
+  it "should have move_up with an argument move up the given number of positions" do
+    @o.move_up(2).should == @o
+    @o.position.should == 1
+    @db.sqls.should == ["UPDATE items SET position = (position + 1) WHERE ((position >= 1) AND (position < 3))",
+      "UPDATE items SET position = 1 WHERE (id = 7)"]
+  end
+
+  it "should have move_up with a negative argument move down the given number of positions" do
+    y(@c, :max=>10)
+    @o.move_up(-1).should == @o
+    @o.position.should == 4
+    @db.sqls.should == ["SELECT max(position) FROM items LIMIT 1",
+      "UPDATE items SET position = (position - 1) WHERE ((position >= 4) AND (position <= 4))",
+      "UPDATE items SET position = 4 WHERE (id = 7)"]
+  end
+
+  it "should have next return the next entry in the list if not given an argument" do
+    y(@c, :id=>9, :position=>4)
+    @o.next.should == @c.load(:id=>9, :position=>4)
+    @db.sqls.should == ["SELECT * FROM items WHERE (position = 4) ORDER BY position LIMIT 1"]
+  end
+
+  it "should have next return the entry the given number of positions below the instance if given an argument" do
+    y(@c, :id=>9, :position=>5)
+    @o.next(2).should == @c.load(:id=>9, :position=>5)
+    @db.sqls.should == ["SELECT * FROM items WHERE (position = 5) ORDER BY position LIMIT 1"]
+  end
+
+  it "should have next return a previous entry if given a negative argument" do
+    y(@c, :id=>9, :position=>2)
+    @o.next(-1).should == @c.load(:id=>9, :position=>2)
+    @db.sqls.should == ["SELECT * FROM items WHERE (position = 2) ORDER BY position LIMIT 1"]
+  end
+
+  it "should have position_value return the value of the position field" do
+    @o.position_value.should == 3
+  end
+
+  it "should have prev return the previous entry in the list if not given an argument" do
+    y(@c, :id=>9, :position=>2)
+    @o.prev.should == @c.load(:id=>9, :position=>2)
+    @db.sqls.should == ["SELECT * FROM items WHERE (position = 2) ORDER BY position LIMIT 1"]
+  end
+
+  it "should have prev return the entry the given number of positions above the instance if given an argument" do
+    y(@c, :id=>9, :position=>1)
+    @o.prev(2).should == @c.load(:id=>9, :position=>1)
+    @db.sqls.should == ["SELECT * FROM items WHERE (position = 1) ORDER BY position LIMIT 1"]
+  end
+
+  it "should have prev return a following entry if given a negative argument" do
+    y(@c, :id=>9, :position=>4)
+    @o.prev(-1).should == @c.load(:id=>9, :position=>4)
+    @db.sqls.should == ["SELECT * FROM items WHERE (position = 4) ORDER BY position LIMIT 1"]
+  end
+end

data/spec/extensions/looser_typecasting_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 context "LooserTypecasting Extension" do
   before do

data/spec/extensions/many_through_many_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe Sequel::Model, "many_through_many" do
   before do
@@ -245,9 +245,9 @@ describe Sequel::Model, "many_through_many" do
     h = []
     @c1.many_through_many :tags, [[:albums_artists, :artist_id, :album_id], [:albums, :id, :id], [:albums_tags, :album_id, :tag_id]], :after_load=>:al
     @c1.class_eval do
-      @@blah = h
+      class_variable_set(:@@blah, h)
       def al(v)
-        v.each{|x| @@blah << x.pk * 20}
+        v.each{|x| self.class.send(:class_variable_get, :@@blah) << x.pk * 20}
       end
     end
     @c2.class_eval do

data/spec/extensions/migration_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
 context "Migration.descendants" do
   before do

data/spec/extensions/named_timezones_spec.rb

@@ -1,11 +1,10 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
-if (begin
+begin
   require 'tzinfo'
-  true
-  rescue LoadError
-  end) 
-
+rescue LoadError => e
+  skip_warn "named_timezones_spec: can't load tzinfo (#{e.class}: #{e})"
+else
 Sequel.extension :named_timezones
 Sequel.datetime_class = Time
 

data/spec/extensions/nested_attributes_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "NestedAttributes plugin" do
   before do

data/spec/extensions/optimistic_locking_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "optimistic_locking plugin" do
   before do

data/spec/extensions/pagination_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 context "A paginated dataset" do
   before do

data/spec/extensions/pretty_table_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
 require 'stringio'
 

data/spec/extensions/query_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 context "Database#dataset" do
   before do

data/spec/extensions/rcte_tree_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe Sequel::Model, "rcte_tree" do
   before do

data/spec/extensions/schema_dumper_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
 describe "Sequel::Schema::Generator dump methods" do
   before do
@@ -291,7 +291,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"]
+      ["timestamp(6) without time zone", "timestamp(6) with time zone", "int(12) unsigned"]
     @d.meta_def(:schema) do |t, *o|
       i = 0
       types.map{|x| [:"c#{i+=1}", {:db_type=>x, :allow_null=>true}]}
@@ -361,6 +361,7 @@ create_table(:x) do
   String :c61, :fixed=>true
   DateTime :c62, :size=>6
   DateTime :c63, :size=>6
+  Integer :c64
 end
 END_MIG
     @d.dump_table_schema(:x).should == table.chomp

data/spec/extensions/schema_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe Sequel::Model, "dataset & schema" do
   before do

data/spec/extensions/serialization_spec.rb

@@ -1,8 +1,11 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
+begin
 require 'yaml'
 require 'json'
-
+rescue LoadError => e
+  skip_warn "serialization plugin: can't load json (#{e.class}: #{e})"
+else
 describe "Serialization plugin" do
   before do
     @c = Class.new(Sequel::Model(:items)) do
@@ -207,3 +210,4 @@ describe "Serialization plugin" do
     o.abc.should == 9
   end
 end
+end

data/spec/extensions/sharding_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "sharding plugin" do
   before do

data/spec/extensions/single_table_inheritance_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe Sequel::Model, "#sti_key" do
   before do

data/spec/extensions/skip_create_refresh_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "Sequel::Plugins::SkipCreateRefresh" do
   it "should skip the refresh after saving a new object" do

data/spec/extensions/spec_helper.rb

@@ -1,16 +1,20 @@
 require 'rubygems'
 unless Object.const_defined?('Sequel')
-  $:.unshift(File.join(File.dirname(__FILE__), "../../lib/"))
+  $:.unshift(File.join(File.dirname(File.expand_path(__FILE__)), "../../lib/"))
   require 'sequel/core'
 end
 unless Sequel.const_defined?('Model')
-  $:.unshift(File.join(File.dirname(__FILE__), "../../lib/"))
+  $:.unshift(File.join(File.dirname(File.expand_path(__FILE__)), "../../lib/"))
   require 'sequel/model'
 end
 
 Sequel.extension(*%w'string_date_time inflector pagination query pretty_table blank migration schema_dumper looser_typecasting sql_expr thread_local_timezones')
 {:hook_class_methods=>[], :schema=>[], :validation_class_methods=>[]}.each{|p, opts| Sequel::Model.plugin(p, *opts)}
 
+def skip_warn(s)
+  warn "Skipping test of #{s}" if ENV["SKIPPED_TEST_WARN"]
+end
+
 class MockDataset < Sequel::Dataset
   def insert(*args)
     @db.execute insert_sql(*args)
@@ -74,7 +78,7 @@ end
 class << Sequel::Model
   alias orig_columns columns
   def columns(*cols)
-    return if cols.empty?
+    return @columns if cols.empty?
     define_method(:columns){cols}
     @dataset.instance_variable_set(:@columns, cols) if @dataset
     def_column_accessor(*cols)