sequel 4.26.0 → 4.27.0

data/lib/sequel/extensions/schema_dumper.rb

@@ -166,6 +166,14 @@ END_MIG
         type_hash = options[:same_db] ? {:type=>schema[:db_type]} : column_schema_to_ruby_type(schema)
         [:table, :key, :on_delete, :on_update, :deferrable].each{|f| type_hash[f] = schema[f] if schema[f]}
         if type_hash == {:type=>Integer} || type_hash == {:type=>"integer"}
+          type_hash.delete(:type)
+        end
+
+        unless gen.columns.empty?
+          type_hash[:keep_order] = true
+        end
+
+        if type_hash.empty?
           gen.primary_key(name)
         else
           gen.primary_key(name, type_hash)
@@ -378,7 +386,7 @@ END_MIG
           x.delete(:on_delete) if x[:on_delete] == :no_action
           x.delete(:on_update) if x[:on_update] == :no_action
         end
-        if pkn = primary_key_name
+        if (pkn = primary_key_name) && !@primary_key[:keep_order]
           cols.delete_if{|x| x[:name] == pkn}
           pk = @primary_key.dup
           pkname = pk.delete(:name)
@@ -391,6 +399,9 @@ END_MIG
           strings << if table = c.delete(:table)
             c.delete(:type) if c[:type] == Integer || c[:type] == 'integer'
             "foreign_key #{name.inspect}, #{table.inspect}#{opts_inspect(c)}"
+          elsif pkn == name
+            @db.serial_primary_key_options.each{|k,v| c.delete(k) if v == c[k]}
+            "primary_key #{name.inspect}#{opts_inspect(c)}"
           else
             type = c.delete(:type)
             opts = opts_inspect(c)

data/lib/sequel/model/base.rb

@@ -1743,6 +1743,32 @@ module Sequel
 
       private
       
+      # Run code directly after the INSERT query, before after_create.
+      # This is only a temporary API, it should not be overridden by external code.
+      def _after_create(pk)
+        @this = nil
+        @new = false
+        @was_new = true
+      end
+
+      # Run code after around_save returns, before calling after_commit.
+      # This is only a temporary API, it should not be overridden by external code.
+      def _after_save(pk)
+        if @was_new
+          @was_new = nil
+          pk ? _save_refresh : changed_columns.clear
+        else
+          @columns_updated = nil
+        end
+        @modified = false
+      end
+
+      # Run code directly after the UPDATE query, before after_update.
+      # This is only a temporary API, it should not be overridden by external code.
+      def _after_update
+        @this = nil
+      end
+
       # Run code before any validation is done, but also run it before saving
       # even if validation is skipped.  This is a private hook.  It exists so that
       # plugins can set values automatically before validation (as the values
@@ -1860,7 +1886,6 @@ module Sequel
       def _save(opts)
         sh = {:server=>this_server}
         db.after_rollback(sh){after_rollback} if uacr = use_after_commit_rollback
-        was_new = false
         pk = nil
         called_save = false
         called_cu = false
@@ -1868,14 +1893,11 @@ module Sequel
           called_save = true
           raise_hook_failure(:before_save) if before_save == false
           if new?
-            was_new = true
             around_create do
               called_cu = true
               raise_hook_failure(:before_create) if before_create == false
               pk = _insert
-              @this = nil
-              @new = false
-              @was_new = true
+              _after_create(pk)
               after_create
               true
             end
@@ -1898,7 +1920,7 @@ module Sequel
                 changed_columns.reject!{|c| columns.include?(c)}
               end
               _update_columns(@columns_updated)
-              @this = nil
+              _after_update
               after_update
               true
             end
@@ -1908,17 +1930,11 @@ module Sequel
           true
         end
         raise_hook_failure(:around_save) unless called_save
-        if was_new
-          @was_new = nil
-          pk ? _save_refresh : changed_columns.clear
-        else
-          @columns_updated = nil
-        end
-        @modified = false
+        _after_save(pk)
         db.after_commit(sh){after_commit} if uacr
         self
       end
-
+      
       # Refresh the object after saving it, used to get
       # default values of all columns.  Separated from _save so it
       # can be overridden to avoid the refresh.

data/lib/sequel/plugins/active_model.rb

@@ -44,6 +44,13 @@ module Sequel
           @destroyed = true
         end
 
+        # Mark current instance as destroyed if the transaction in which this
+        # instance is created is rolled back.
+        def before_create
+          db.after_rollback{@destroyed = true}
+          super
+        end
+
         # Return ::ActiveModel::Name instance for the class.
         def model_name
           model.model_name

data/lib/sequel/plugins/before_after_save.rb

@@ -0,0 +1,48 @@
+module Sequel
+  module Plugins
+    # The before_after_save plugin reorders some internal
+    # Sequel operations so they happen before after_create,
+    # after_update, and after_save are called, instead of
+    # after.  These operations are:
+    # 
+    # * Resetting the explicit modified flag
+    # * Refreshing the model or clearing changed columns after creation
+    #
+    # This behavior will become the default in Sequel 5.
+    #
+    # Usage:
+    #
+    #   # Make all model subclasses perform the operations before after_save
+    #   Sequel::Model.plugin :before_after_save
+    #
+    #   # Make the Album class perform the operations before after_save
+    #   Album.plugin :before_after_save
+    module BeforeAfterSave
+      module InstanceMethods
+        private
+
+        # Refresh and reset modified flag right after INSERT query.
+        def _after_create(pk)
+          super
+          @modified = false
+          pk ? _save_refresh : changed_columns.clear
+        end
+
+        # Don't refresh or reset modified flag, as it was already done.
+        def _after_save(pk)
+          if @was_new
+            @was_new = nil
+          else
+            @columns_updated = nil
+          end
+        end
+
+        # Refresh and reset modified flag right after UPDATE query.
+        def _after_update
+          super
+          @modified = false
+        end
+      end
+    end
+  end
+end

data/lib/sequel/plugins/defaults_setter.rb

@@ -1,12 +1,16 @@
 module Sequel
   module Plugins
-    # DefaultsSetter is a simple plugin that sets non-nil/NULL default values upon
-    # initialize:
+    # The defaults_setter plugin makes the column getter methods return the default
+    # values for new objects, if the values have not already been set.  Example:
     #
     #   # column a default NULL
     #   # column b default 2
-    #   album = Album.new.values # {:b => 2}
-    #   album = Album.new(:a=>1, :b=>3).values # {:a => 1, :b => 3}
+    #   album = Album.new
+    #   album.a # => nil
+    #   album.b # => 2
+    #   album = Album.new(:a=>1, :b=>3)
+    #   album.a # => 1
+    #   album.b # => 3
     # 
     # Usage:
     #

data/lib/sequel/version.rb

@@ -3,7 +3,7 @@ module Sequel
   MAJOR = 4
   # The minor version of Sequel.  Bumped for every non-patch level
   # release, generally around once a month.
-  MINOR = 26
+  MINOR = 27
   # The tiny version of Sequel.  Usually 0, only bumped for bugfix
   # releases that fix regressions from previous versions.
   TINY  = 0

data/spec/adapters/postgres_spec.rb

@@ -20,6 +20,7 @@ end
 describe "PostgreSQL", '#create_table' do
   before do
     @db = DB
+    @db.test_connection
     DB.sqls.clear
   end
   after do
@@ -2868,6 +2869,15 @@ describe 'PostgreSQL json type' do
         end
       end
 
+      if DB.server_version >= 90500  && json_type == :jsonb
+        @db.get(pg_json.call([nil, 2]).op.strip_nulls[1]).must_equal 2
+        @db.get(pg_json.call([nil, 2]).op.pretty).must_equal "[\n    null,\n    2\n]"
+        @db.from((jo - 'b').keys.as(:k)).select_order_map(:k).must_equal %w'a'
+        @db.from(jo.delete_path(['b','c'])['b'].keys.as(:k)).select_order_map(:k).must_equal %w'd'
+        @db.from(jo.concat('c'=>'d').keys.as(:k)).select_order_map(:k).must_equal %w'a b c'
+        @db.get(jo.set(%w'a', 'f'=>'g')['a']['f']).must_equal 'g'
+      end
+
       @db.from(jo.keys.as(:k)).select_order_map(:k).must_equal %w'a b'
       @db.from(jo.each).select_order_map(:key).must_equal %w'a b'
       @db.from(jo.each).order(:key).select_map(:value).must_equal [1, {'c'=>2, 'd'=>{'e'=>3}}]

data/spec/bin_spec.rb

@@ -203,6 +203,10 @@ END
     bin(:args=>'-S foo -C', :stderr=>true).must_equal "Error: Cannot specify -S and -C together\n"
   end
 
+  it "should warn if providing too many arguments" do
+    bin(:args=>'-c "" "" 1 2 3 4', :stderr=>true).must_equal "Warning: last 5 arguments ignored\n"
+  end
+
   it "should use a mock database if no database is given" do
     bin(:args=>'-c "print DB.adapter_scheme"', :no_conn=>true).must_equal "mock"
   end

data/spec/core/dataset_spec.rb

@@ -2728,6 +2728,23 @@ describe "Dataset#single_record" do
   end
 end
 
+describe "Dataset#single_record!" do
+  before do
+    @db = Sequel.mock
+  end
+  
+  it "should call each and return the first record" do
+    @db.fetch = [{:a=>1}, {:a=>2}]
+    @db[:test].single_record!.must_equal(:a=>1)
+    @db.sqls.must_equal ['SELECT * FROM test']
+  end
+  
+  it "should return nil if no record is present" do
+    @db[:test].single_record!.must_equal nil
+    @db.sqls.must_equal ['SELECT * FROM test']
+  end
+end
+
 describe "Dataset#single_value" do
   before do
     @db = Sequel.mock
@@ -2752,6 +2769,23 @@ describe "Dataset#single_value" do
   end
 end
 
+describe "Dataset#single_value!" do
+  before do
+    @db = Sequel.mock
+  end
+  
+  it "should call each and return the first value of the first record" do
+    @db.fetch = [{:a=>1, :b=>2}, {:a=>3, :b=>4}]
+    @db[:test].single_value!.to_s.must_match /\A(1|2)\z/
+    @db.sqls.must_equal ['SELECT * FROM test']
+  end
+  
+  it "should return nil if no records" do
+    @db[:test].single_value!.must_equal nil
+    @db.sqls.must_equal ['SELECT * FROM test']
+  end
+end
+
 describe "Dataset#get" do
   before do
     @d = Sequel.mock(:fetch=>proc{|s| {:name=>s}})[:test]

data/spec/core/schema_generator_spec.rb

@@ -30,6 +30,19 @@ describe Sequel::Schema::Generator do
     @columns[3][:primary_key].must_equal nil
   end
   
+  it "should respect existing column order if primary_key :keep_order is used" do
+    generator = Sequel::Schema::Generator.new(Sequel.mock) do
+      string :title
+      primary_key :id, :keep_order=>true
+    end
+
+    columns = generator.columns
+    columns.last[:name].must_equal :id
+    columns.last[:primary_key].must_equal true
+    columns.first[:name].must_equal :title
+    columns.first[:primary_key].must_equal nil
+  end
+  
   it "counts definitions correctly" do
     @columns.size.must_equal 6
     @indexes.size.must_equal 2

data/spec/core/schema_spec.rb

@@ -111,6 +111,18 @@ describe "DB#create_table" do
       primary_key :id, :type => :serial, :auto_increment => false
     end
     @db.sqls.must_equal ['CREATE TABLE cats (id serial PRIMARY KEY)']
+
+    @db.create_table(:cats) do
+      Integer :a
+      primary_key :id
+    end
+    @db.sqls.must_equal ['CREATE TABLE cats (id integer PRIMARY KEY AUTOINCREMENT, a integer)']
+
+    @db.create_table(:cats) do
+      Integer :a
+      primary_key :id, :keep_order=>true
+    end
+    @db.sqls.must_equal ['CREATE TABLE cats (a integer, id integer PRIMARY KEY AUTOINCREMENT)']
   end
 
   it "should allow naming primary key constraint with :primary_key_constraint_name option" do
@@ -1571,6 +1583,11 @@ describe "Schema Parser" do
     @db.schema(:x).last.last[:auto_increment].must_equal false
   end
 
+  it "should set :auto_increment to true by default if set and not the first column" do
+    meta_def(@db, :schema_parse_table){|*| [[:b, {}], [:a, {:primary_key=>true, :db_type=>'integer'}]]}
+    @db.schema(:x).last.last[:auto_increment].must_equal true
+  end
+
   it "should convert various types of table name arguments" do
     meta_def(@db, :schema_parse_table) do |t, opts|
       [[t, opts]]

data/spec/extensions/active_model_spec.rb

@@ -2,122 +2,84 @@ require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 begin
   require 'active_model'
-  begin
-    require 'minitest'
-    if defined?(MiniTest::Unit)
-      class << MiniTest::Unit
-        def autorun; end
-      end
-    end
-    if defined?(MiniTest::Test)
-      test_class = MiniTest::Test
-    end
-  rescue
-    require 'test/unit'
-    test_class = Test::Unit::TestCase
-    if Test::Unit.respond_to?(:run=)
-      Test::Unit.run = false
-      require 'test/unit/testresult'
-    end
-  end
 rescue LoadError => e
   skip_warn "active_model plugin: can't load active_model (#{e.class}: #{e})"
 else
 describe "ActiveModel plugin" do
-  it "should be compliant to the ActiveModel spec" do
-    tc = Class.new(test_class)
-    tc.class_eval do
-      define_method(:setup) do
-        class ::AMLintTest < Sequel::Model
-          set_primary_key :id
-          columns :id, :id2
-          def delete; end
-        end
-        module ::Blog
-          class Post < Sequel::Model
-             plugin :active_model
-          end
-        end
-        @c = AMLintTest
-        @c.plugin :active_model
-        @m = @model = @c.new
-        @o = @c.load({})
-        super()
-      end
-      def teardown
-        super
-        Object.send(:remove_const, :AMLintTest)
-        Object.send(:remove_const, :Blog)
+  before do
+    class ::AMLintTest < Sequel::Model
+      set_primary_key :id
+      columns :id, :id2
+      def delete; end
+    end
+    module ::Blog
+      class Post < Sequel::Model
+         plugin :active_model
       end
-      include ActiveModel::Lint::Tests
+    end
+    @c = AMLintTest
+    @c.plugin :active_model
+    @m = @model = @c.new
+    @o = @c.load({})
+  end
+  after do
+    Object.send(:remove_const, :AMLintTest)
+    Object.send(:remove_const, :Blog)
+  end
+  include ActiveModel::Lint::Tests
 
-      # Should return self, not a proxy object
-      def test__to_model
-        assert_equal @m.to_model.object_id, @m.object_id
-      end
-      
-      def test__to_key
-        assert_equal nil, @m.to_key
-        @o.id = 1
-        assert_equal [1], @o.to_key
-        @o.id = nil
-        assert_equal nil, @o.to_key
+  it ".to_model should return self, not a proxy object" do
+    @m.object_id.must_equal @m.to_model.object_id
+  end
+  
+  it "#to_key should return a key array, or nil" do
+    @o.to_key.must_equal nil
+    @o.id = 1
+    @o.to_key.must_equal [1]
+    @o.id = nil
+    @o.to_key.must_equal nil
 
-        @c.set_primary_key [:id2, :id]
-        assert_equal nil, @o.to_key
-        @o.id = 1
-        @o.id2 = 2
-        assert_equal [2, 1], @o.to_key
-        @o.destroy
-        assert_equal [2, 1], @o.to_key
-        @o.id = nil
-        assert_equal nil, @o.to_key
-      end
-      
-      def test__to_param
-        assert_equal nil, @m.to_param
-        @o.id = 1
-        assert_equal '1', @o.to_param
-        @c.set_primary_key [:id2, :id]
-        @o.id2 = 2
-        assert_equal '2-1', @o.to_param
-        @o.meta_def(:to_param_joiner){'|'}
-        assert_equal '2|1', @o.to_param
-        @o.destroy
-        assert_equal nil, @o.to_param
-      end
+    @c.set_primary_key [:id2, :id]
+    @o.to_key.must_equal nil
+    @o.id = 1
+    @o.id2 = 2
+    @o.to_key.must_equal [2, 1]
+    @o.destroy
+    @o.to_key.must_equal [2, 1]
+    @o.id = nil
+    @o.to_key.must_equal nil
+  end
+  
+  it "#to_param should return a param string or nil" do
+    @o.to_param.must_equal nil
+    @o.id = 1
+    @o.to_param.must_equal '1'
+    @c.set_primary_key [:id2, :id]
+    @o.id2 = 2
+    @o.to_param.must_equal '2-1'
+    @o.meta_def(:to_param_joiner){'|'}
+    @o.to_param.must_equal '2|1'
+    @o.destroy
+    @o.to_param.must_equal nil
+  end
 
-      def test__persisted?
-        assert_equal false, @m.persisted?
-        assert_equal true, @o.persisted?
-        @m.destroy
-        @o.destroy
-        assert_equal false, @m.persisted?
-        assert_equal false, @o.persisted?
-      end
+  it "#persisted? should return true if the object exists and has not been destroyed" do
+    @m.persisted?.must_equal false
+    @o.persisted?.must_equal true
+    @m.destroy
+    @o.destroy
+    @m.persisted?.must_equal false
+    @o.persisted?.must_equal false
+  end
 
-      # Should return self, not a proxy object
-      def test__to_partial_path
-        assert_equal 'am_lint_tests/am_lint_test', @m.to_partial_path
-        assert_equal 'blog/posts/post', Blog::Post.new.to_partial_path
-      end
-      
-    end
-    if defined?(MiniTest::Test) || defined?(MiniTest::Unit)
-      tc.instance_methods.map{|x| x.to_s}.reject{|n| n !~ /\Atest_/}.each do |m|
-        i = tc.new(m)
-        i.setup
-        i.send(m)
-        i.teardown
-      end
-    else
-      res = ::Test::Unit::TestResult.new
-      tc.suite.run(res){}
-      if res.failure_count > 0
-        puts res.instance_variable_get(:@failures)
-      end
-      res.failure_count.must_equal 0
-    end
+  it "#persisted? should return false if the object is created and the transaction is rolled back" do
+    DB.transaction(:rollback=>:always){@m.save}
+    @m.persisted?.must_equal false
+  end
+
+  it "#to_partial_path should return a path string" do
+    @m.to_partial_path.must_equal 'am_lint_tests/am_lint_test'
+    Blog::Post.new.to_partial_path.must_equal 'blog/posts/post'
   end
-end 
 end
+end