sequel 3.21.0 → 3.36.0

data/spec/extensions/list_spec.rb

@@ -8,32 +8,10 @@ describe "List plugin" 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)
@@ -89,18 +67,49 @@ describe "List plugin" do
   end
 
   it "should have at_position return the model object at the given position" do
-    y(@c, :id=>1, :position=>1)
+    @c.dataset._fetch = {:id=>1, :position=>1}
     @o.at_position(10).should == @c.load(:id=>1, :position=>1)
-    y(@sc, :id=>2, :position=>2, :scope_id=>5)
+    @sc.dataset._fetch = {: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 position field set to max+1 when creating if not already set" do
+    @c.instance_dataset._fetch = @c.dataset._fetch = [[{:pos=>nil}], [{:id=>1, :position=>1}], [{:pos=>1}], [{:id=>2, :position=>2}]]
+    @c.instance_dataset.autoid = @c.dataset.autoid = 1
+    @c.create.values.should == {:id=>1, :position=>1}
+    @c.create.values.should == {:id=>2, :position=>2}
+    @db.sqls.should == ["SELECT max(position) FROM items LIMIT 1",
+      "INSERT INTO items (position) VALUES (1)", 
+      "SELECT * FROM items WHERE (id = 1) ORDER BY position LIMIT 1",
+      "SELECT max(position) FROM items LIMIT 1",
+      "INSERT INTO items (position) VALUES (2)", 
+      "SELECT * FROM items WHERE (id = 2) ORDER BY position LIMIT 1"]
+  end
+
+  it "should have position field set to max+1 in scope when creating if not already set" do
+    @sc.instance_dataset._fetch = @sc.dataset._fetch = [[{:pos=>nil}], [{:id=>1, :scope_id=>1, :position=>1}], [{:pos=>1}], [{:id=>2, :scope_id=>1, :position=>2}], [{:pos=>nil}], [{:id=>3, :scope_id=>2, :position=>1}]]
+    @sc.instance_dataset.autoid = @sc.dataset.autoid = 1
+    @sc.create(:scope_id=>1).values.should == {:id=>1, :scope_id=>1, :position=>1}
+    @sc.create(:scope_id=>1).values.should == {:id=>2, :scope_id=>1, :position=>2}
+    @sc.create(:scope_id=>2).values.should == {:id=>3, :scope_id=>2, :position=>1}
+    sqls = @db.sqls
+    sqls.slice!(7).should =~ /INSERT INTO items \((scope_id|position), (scope_id|position)\) VALUES \([12], [12]\)/
+    sqls.slice!(4).should =~ /INSERT INTO items \((scope_id|position), (scope_id|position)\) VALUES \([12], [12]\)/
+    sqls.slice!(1).should =~ /INSERT INTO items \((scope_id|position), (scope_id|position)\) VALUES \(1, 1\)/
+    sqls.should == ["SELECT max(position) FROM items WHERE (scope_id = 1) LIMIT 1",
+      "SELECT * FROM items WHERE (id = 1) ORDER BY scope_id, position LIMIT 1",
+      "SELECT max(position) FROM items WHERE (scope_id = 1) LIMIT 1",
+      "SELECT * FROM items WHERE (id = 2) ORDER BY scope_id, position LIMIT 1",
+      "SELECT max(position) FROM items WHERE (scope_id = 2) LIMIT 1",
+      "SELECT * FROM items WHERE (id = 3) 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)
+    @c.dataset._fetch  = {:max=>10}
     @o.last_position.should == 10
-    y(@sc, :max=>20)
+    @sc.dataset._fetch = {: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"]
@@ -115,7 +124,7 @@ describe "List plugin" do
   end
 
   it "should have move_down without an argument move down a single position" do
-    y(@c, :max=>10)
+    @c.dataset._fetch = {:max=>10}
     @o.move_down.should == @o
     @o.position.should == 4
     @db.sqls.should == ["SELECT max(position) FROM items LIMIT 1",
@@ -124,7 +133,7 @@ describe "List plugin" do
   end
 
   it "should have move_down with an argument move down the given number of positions" do
-    y(@c, :max=>10)
+    @c.dataset._fetch = {:max=>10}
     @o.move_down(3).should == @o
     @o.position.should == 6
     @db.sqls.should == ["SELECT max(position) FROM items LIMIT 1",
@@ -141,11 +150,11 @@ describe "List plugin" do
 
   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)
+    @c.dataset._fetch = {: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
+  it "should have move_to use a transaction if the instance is configured to use transactions" do
     @o.use_transactions = true
     @o.move_to(2)
     @db.sqls.should == ["BEGIN",
@@ -167,13 +176,13 @@ describe "List plugin" do
   end
 
   it "should have move to shift entries correctly between current and target if moving down" do
-    y(@c, :max=>10)
+    @c.dataset._fetch = {: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)
+    @c.dataset._fetch = {: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))",
@@ -201,7 +210,7 @@ describe "List plugin" do
   end
 
   it "should have move_up with a negative argument move down the given number of positions" do
-    y(@c, :max=>10)
+    @c.dataset._fetch = {:max=>10}
     @o.move_up(-1).should == @o
     @o.position.should == 4
     @db.sqls.should == ["SELECT max(position) FROM items LIMIT 1",
@@ -210,19 +219,19 @@ describe "List plugin" do
   end
 
   it "should have next return the next entry in the list if not given an argument" do
-    y(@c, :id=>9, :position=>4)
+    @c.dataset._fetch = {: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)
+    @c.dataset._fetch = {: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)
+    @c.dataset._fetch = {: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
@@ -232,19 +241,19 @@ describe "List plugin" do
   end
 
   it "should have prev return the previous entry in the list if not given an argument" do
-    y(@c, :id=>9, :position=>2)
+    @c.dataset._fetch = {: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)
+    @c.dataset._fetch = {: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)
+    @c.dataset._fetch = {: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