sequel 5.7.1 → 5.8.0

data/spec/extensions/pg_enum_spec.rb

@@ -42,6 +42,13 @@ describe "pg_enum extension" do
     @db.sqls.first.must_equal "CREATE TYPE sch.foo AS ENUM ('a', 'b', 'c')"
   end
 
+  it "should support #rename_enum method for renameing an enum" do
+    @db.rename_enum(:foo, :bar)
+    @db.sqls.first.must_equal "ALTER TYPE foo RENAME TO bar"
+    @db.rename_enum(Sequel[:sch][:foo], Sequel[:sch][:bar])
+    @db.sqls.first.must_equal "ALTER TYPE sch.foo RENAME TO sch.bar"
+  end
+
   it "should support #drop_enum method for dropping an enum" do
     @db.drop_enum(:foo)
     @db.sqls.first.must_equal "DROP TYPE foo"
@@ -82,28 +89,25 @@ describe "pg_enum extension" do
   end
 
   it "should reverse a create_enum directive in a migration" do
-    c = Class.new do
-      attr_reader :actions
-      def initialize(&block)
-        @actions = []
-      end
-      def method_missing(*args)
-        @actions << args
-      end
-    end
-
-    db = c.new
-
-    p = Proc.new do
-      create_enum(:type_name, %w'value1 value2 value3')
-    end
-
-    Sequel.migration{change(&p)}.apply(db, :up)
-    Sequel.migration{change(&p)}.apply(db, :down)
+    m = Sequel.migration{change{create_enum(:type_name, %w'value1 value2 value3')}}
+    m.apply(@db, :up)
+    @db.sqls.must_equal ["CREATE TYPE type_name AS ENUM ('value1', 'value2', 'value3')",
+      "SELECT CAST(enumtypid AS integer) AS v, enumlabel FROM pg_enum ORDER BY enumtypid, enumsortorder",
+      "SELECT typname, CAST(typarray AS integer) AS v FROM pg_type WHERE ((1 = 0) AND (typarray != 0))"]
+    m.apply(@db, :down)
+    @db.sqls.must_equal ["DROP TYPE type_name", "SELECT CAST(enumtypid AS integer) AS v, enumlabel FROM pg_enum ORDER BY enumtypid, enumsortorder",
+      "SELECT typname, CAST(typarray AS integer) AS v FROM pg_type WHERE ((1 = 0) AND (typarray != 0))"]
+  end
 
-    db.actions.must_equal [
-      [:create_enum, :type_name, ["value1", "value2", "value3"] ],
-      [:drop_enum, :type_name]
-    ]
+  it "should reverse a rename_enum directive in a migration" do
+    m = Sequel.migration{change{rename_enum(:old_type_name, :new_type_name)}}
+    m.apply(@db, :up)
+    @db.sqls.must_equal ["ALTER TYPE old_type_name RENAME TO new_type_name",
+      "SELECT CAST(enumtypid AS integer) AS v, enumlabel FROM pg_enum ORDER BY enumtypid, enumsortorder",
+      "SELECT typname, CAST(typarray AS integer) AS v FROM pg_type WHERE ((1 = 0) AND (typarray != 0))"]
+    m.apply(@db, :down)
+    @db.sqls.must_equal ["ALTER TYPE new_type_name RENAME TO old_type_name",
+      "SELECT CAST(enumtypid AS integer) AS v, enumlabel FROM pg_enum ORDER BY enumtypid, enumsortorder",
+      "SELECT typname, CAST(typarray AS integer) AS v FROM pg_type WHERE ((1 = 0) AND (typarray != 0))"]
   end
 end

data/spec/extensions/tactical_eager_loading_spec.rb

@@ -28,6 +28,8 @@ describe "Sequel::Plugins::TacticalEagerLoading" do
           [{:id=>$1.to_i, :parent_id=>nil}]
         elsif sql =~ /WHERE.*\bid IN \(([\d, ]*)\)/
           $1.split(', ').map{|x| {:id=>x.to_i, :parent_id=>nil}}
+        elsif sql =~ /WHERE.*\bparent_id = (\d+)/
+           {:id=>$1.to_i - 100, :parent_id=>$1.to_i} if $1.to_i > 100
         elsif sql =~ /WHERE.*\bparent_id IN \(([\d, ]*)\)/
           $1.split(', ').map{|x| {:id=>x.to_i - 100, :parent_id=>x.to_i} if x.to_i > 100}.compact
         end
@@ -105,6 +107,15 @@ describe "Sequel::Plugins::TacticalEagerLoading" do
     parents[0..1].map{|x| x.children}.must_equal [[ts[0]], [ts[1]]]
   end
 
+  it "should not eager load when association uses :allow_eager=>false option" do
+    @c.many_to_one :parent, :clone=>:parent, :allow_eager=>false
+    @c.one_to_many :children, :clone=>:children, :allow_eager=>false
+    ts.map{|x| x.parent}.must_equal [ts[2], ts[3], nil, nil]
+    sql_match('SELECT * FROM t WHERE id = 101', 'SELECT * FROM t WHERE id = 102')
+    ts.map{|x| x.children}.must_equal [[], [], [ts[0]], [ts[1]]]
+    sql_match('SELECT * FROM t WHERE (t.parent_id = 1)', 'SELECT * FROM t WHERE (t.parent_id = 2)', 'SELECT * FROM t WHERE (t.parent_id = 101)', 'SELECT * FROM t WHERE (t.parent_id = 102)')
+  end
+
   it "should handle case where an association is valid on an instance, but not on all instances" do
     c = Class.new(@c)
     c.many_to_one :parent2, :class=>@c, :key=>:parent_id

data/spec/integration/dataset_test.rb

@@ -183,6 +183,24 @@ describe "Simple Dataset operations" do
     end
   end if DB.dataset.supports_skip_locked?
   
+  it "should raise error instead of waiting for rows correctly" do
+    @ds.insert(:number=>10)
+    q1 = Queue.new
+    q2 = Queue.new
+    ds = @ds.order(:id).for_update.nowait
+    begin
+      t = Thread.new{@db.transaction(:isolation=>:committed){q2.push(ds.get(:id)); q1.pop}}
+      q2.pop.must_equal 1
+      # Some databases do row level locking, others do page level locking
+      proc{@db.transaction(:isolation=>:committed){ds.get(:id)}}.must_raise Sequel::DatabaseLockTimeout
+    ensure
+      q1.push(nil)
+      t.join
+      # Keep only one active connection, as some other specs expect that
+      @db.disconnect
+    end
+  end if DB.dataset.supports_nowait?
+  
   it "should raise exception if raising on duplication columns" do
     proc{@ds.select_map([:id, :id])}.must_raise Sequel::DuplicateColumnError
   end if DB.opts[:on_duplicate_columns] == :raise
@@ -749,8 +767,8 @@ if DB.dataset.supports_cte?
   end
 end
 
-if DB.dataset.supports_cte?(:update) # Assume INSERT and DELETE support as well
-  describe "Common Table Expressions in INSERT/UPDATE/DELETE" do
+if DB.dataset.supports_cte?(:insert) || DB.dataset.supports_cte?(:update) || DB.dataset.supports_cte?(:delete)
+  describe "Common Table Expressions" do
     before do
       @db = DB
       @db.create_table!(:i1){Integer :id}
@@ -763,14 +781,20 @@ if DB.dataset.supports_cte?(:update) # Assume INSERT and DELETE support as well
       @db.drop_table?(:i1)
     end
     
-    it "should give correct results for WITH" do
+    it "should give correct results for WITH in insert" do
       @ds2.insert(@db[:t])
       @ds.select_order_map(:id).must_equal [1, 1, 2, 2]
+    end if DB.dataset.supports_cte?(:insert)
+
+    it "should give correct results for WITH in update" do
       @ds2.filter(:id=>@db[:t].select{max(id)}).update(:id=>Sequel.+(:id, 1))
-      @ds.select_order_map(:id).must_equal [1, 1, 3, 3]
+      @ds.select_order_map(:id).must_equal [1, 3]
+    end if DB.dataset.supports_cte?(:update)
+
+    it "should give correct results for WITH in delete" do
       @ds2.filter(:id=>@db[:t].select{max(id)}).delete
-      @ds.select_order_map(:id).must_equal [1, 1]
-    end
+      @ds.select_order_map(:id).must_equal [1]
+    end if DB.dataset.supports_cte?(:delete)
 
     it "should support a subselect in an subquery used for INSERT" do
       @db.transaction(:rollback=>:always) do

data/spec/integration/plugin_test.rb

@@ -2047,7 +2047,7 @@ describe "Sequel::Plugins::ConstraintValidations" do
       @ds.insert(@valid_row)
 
       # Test for unique constraint
-      proc{@ds.insert(@valid_row)}.must_raise(Sequel::DatabaseError, Sequel::UniqueConstraintViolation, Sequel::ConstraintViolation)
+      proc{@ds.insert(@valid_row)}.must_raise(Sequel::DatabaseError)
 
       @ds.delete
       @violations.each do |col, vals|
@@ -2057,7 +2057,7 @@ describe "Sequel::Plugins::ConstraintValidations" do
           next if val.nil? && @validation_opts[:allow_nil]
           next if val == '' && @validation_opts[:allow_nil] && @db.database_type == :oracle
           try[col] = val
-          proc{@ds.insert(try)}.must_raise(Sequel::DatabaseError, Sequel::CheckConstraintViolation, Sequel::ConstraintViolation)
+          proc{@ds.insert(try)}.must_raise(Sequel::DatabaseError)
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 5.7.1
+  version: 5.8.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-04 00:00:00.000000000 Z
+date: 2018-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -190,6 +190,7 @@ extra_rdoc_files:
 - doc/release_notes/5.2.0.txt
 - doc/release_notes/5.3.0.txt
 - doc/release_notes/5.4.0.txt
+- doc/release_notes/5.8.0.txt
 - doc/release_notes/5.7.0.txt
 files:
 - CHANGELOG
@@ -276,6 +277,7 @@ files:
 - doc/release_notes/5.5.0.txt
 - doc/release_notes/5.6.0.txt
 - doc/release_notes/5.7.0.txt
+- doc/release_notes/5.8.0.txt
 - doc/schema_modification.rdoc
 - doc/security.rdoc
 - doc/sharding.rdoc
@@ -492,6 +494,7 @@ files:
 - lib/sequel/plugins/nested_attributes.rb
 - lib/sequel/plugins/optimistic_locking.rb
 - lib/sequel/plugins/pg_array_associations.rb
+- lib/sequel/plugins/pg_auto_constraint_validations.rb
 - lib/sequel/plugins/pg_row.rb
 - lib/sequel/plugins/prepared_statements.rb
 - lib/sequel/plugins/prepared_statements_safe.rb
@@ -625,6 +628,7 @@ files:
 - spec/extensions/pg_array_associations_spec.rb
 - spec/extensions/pg_array_ops_spec.rb
 - spec/extensions/pg_array_spec.rb
+- spec/extensions/pg_auto_constraint_validations_spec.rb
 - spec/extensions/pg_enum_spec.rb
 - spec/extensions/pg_extended_date_support_spec.rb
 - spec/extensions/pg_hstore_ops_spec.rb