sequel 4.24.0 → 4.25.0

data/spec/core/schema_spec.rb

@@ -345,10 +345,18 @@ describe "DB#create_table" do
   end
 
   it "should accept collation" do
+    @db.quote_identifiers = true
     @db.create_table(:cats) do
-      varchar :name, :collate => :utf8_bin
+      String :name, :collate => :utf8_bin
     end
-    @db.sqls.must_equal ["CREATE TABLE cats (name varchar(255) COLLATE utf8_bin)"]
+    @db.sqls.must_equal ['CREATE TABLE "cats" ("name" varchar(255) COLLATE utf8_bin)']
+  end
+
+  it "should accept collation as a String, treated literally" do
+    @db.create_table(:cats) do
+      String :name, :collate => '"utf8_bin"'
+    end
+    @db.sqls.must_equal ['CREATE TABLE cats (name varchar(255) COLLATE "utf8_bin")']
   end
 
   it "should accept inline index definition" do

data/spec/extensions/association_pks_spec.rb

@@ -350,4 +350,16 @@ describe "Sequel::Plugins::AssociationPks" do
       "COMMIT",
     ]
   end
+
+  it "should clear delayed associated pks if refreshing, if :delay plugin option is used" do
+    @Artist.one_to_many :albums, :clone=>:albums, :delay_pks=>:always
+    @Album.many_to_many :tags, :clone=>:tags, :delay_pks=>:always
+
+    ar = @Artist.load(:id=>1)
+    ar.album_pks.must_equal [1,2,3]
+    ar.album_pks = [2,4]
+    ar.album_pks.must_equal [2,4]
+    ar.refresh
+    ar.album_pks.must_equal [1,2,3]
+  end
 end

data/spec/extensions/{empty_array_ignore_nulls_spec.rb → empty_array_consider_nulls_spec.rb}

@@ -2,23 +2,23 @@ require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "filter_having extension" do
   before do
-    @dataset = Sequel.mock[:test].extension(:empty_array_ignore_nulls)
+    @dataset = Sequel.mock[:test].extension(:empty_array_consider_nulls)
   end
 
   it "should handle all types of IN/NOT IN queries with empty arrays" do
-    @dataset.filter(:id => []).sql.must_equal "SELECT * FROM test WHERE (1 = 0)"
-    @dataset.filter([:id1, :id2] => []).sql.must_equal "SELECT * FROM test WHERE (1 = 0)"
-    @dataset.exclude(:id => []).sql.must_equal "SELECT * FROM test WHERE (1 = 1)"
-    @dataset.exclude([:id1, :id2] => []).sql.must_equal "SELECT * FROM test WHERE (1 = 1)"
+    @dataset.filter(:id => []).sql.must_equal "SELECT * FROM test WHERE (id != id)"
+    @dataset.filter([:id1, :id2] => []).sql.must_equal "SELECT * FROM test WHERE ((id1 != id1) AND (id2 != id2))"
+    @dataset.exclude(:id => []).sql.must_equal "SELECT * FROM test WHERE (id = id)"
+    @dataset.exclude([:id1, :id2] => []).sql.must_equal "SELECT * FROM test WHERE ((id1 = id1) AND (id2 = id2))"
   end
 
   it "should handle IN/NOT IN queries with multiple columns and an empty dataset where the database doesn't support it" do
     @dataset.meta_def(:supports_multiple_column_in?){false}
     db = Sequel.mock
     d1 = db[:test].select(:id1, :id2).filter(:region=>'Asia').columns(:id1, :id2)
-    @dataset.filter([:id1, :id2] => d1).sql.must_equal "SELECT * FROM test WHERE (1 = 0)"
+    @dataset.filter([:id1, :id2] => d1).sql.must_equal "SELECT * FROM test WHERE ((id1 != id1) AND (id2 != id2))"
     db.sqls.must_equal ["SELECT id1, id2 FROM test WHERE (region = 'Asia')"]
-    @dataset.exclude([:id1, :id2] => d1).sql.must_equal "SELECT * FROM test WHERE (1 = 1)"
+    @dataset.exclude([:id1, :id2] => d1).sql.must_equal "SELECT * FROM test WHERE ((id1 = id1) AND (id2 = id2))"
     db.sqls.must_equal ["SELECT id1, id2 FROM test WHERE (region = 'Asia')"]
   end
 end

data/spec/extensions/inverted_subsets_spec.rb

@@ -0,0 +1,33 @@
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+
+describe "Sequel::Plugins::InvertedSubsets" do
+  it "should add an inverted subset method which inverts the condition" do
+    c = Class.new(Sequel::Model(:a))
+    c.plugin :inverted_subsets
+    c.subset(:published, :published => true)
+    c.not_published.sql.must_equal 'SELECT * FROM a WHERE (published IS NOT TRUE)'
+  end
+
+  it "should support a configuration block to customise the inverted method name" do
+    c = Class.new(Sequel::Model(:a))
+    c.plugin(:inverted_subsets){|name| "exclude_#{name}"}
+    c.subset(:published, :published => true)
+    c.exclude_published.sql.must_equal 'SELECT * FROM a WHERE (published IS NOT TRUE)'
+  end
+
+  it "should chain to existing dataset" do
+    c = Class.new(Sequel::Model(:a))
+    c.plugin :inverted_subsets
+    c.subset(:published, :published => true)
+    c.where(1=>0).not_published.sql.must_equal 'SELECT * FROM a WHERE ((1 = 0) AND (published IS NOT TRUE))'
+  end
+
+  it "should work in subclasses" do
+    c = Class.new(Sequel::Model)
+    c.plugin(:inverted_subsets){|name| "exclude_#{name}"}
+    c = Class.new(c)
+    c.dataset = :a
+    c.subset(:published, :published => true)
+    c.exclude_published.sql.must_equal 'SELECT * FROM a WHERE (published IS NOT TRUE)'
+  end
+end

data/spec/extensions/query_literals_spec.rb

@@ -111,6 +111,22 @@ describe "query_literals extension" do
     @ds.group_and_count(:a, 1).sql.must_equal 'SELECT a, 1, count(*) AS count FROM t GROUP BY a, 1'
   end
 
+  it "should have #group_append use literal string if given a single string" do
+    @ds.group(:d).group_append('a, b, c').sql.must_equal 'SELECT * FROM t GROUP BY d, a, b, c'
+  end
+
+  it "should have #group_append use placeholder literal string if given a string and additional arguments" do
+    @ds.group(:d).group_append('a, b, ?', 1).sql.must_equal 'SELECT * FROM t GROUP BY d, a, b, 1'
+  end
+
+  it "should have #group_append work the standard way if initial string is a literal string already" do
+    @ds.group(:d).group_append(Sequel.lit('a, b, ?'), 1).sql.must_equal 'SELECT * FROM t GROUP BY d, a, b, ?, 1'
+  end
+
+  it "should have #group_append work regularly if not given a string as the first argument" do
+    @ds.group(:d).group_append(:a, 1).sql.must_equal 'SELECT * FROM t GROUP BY d, a, 1'
+  end
+
   it "should have #order use literal string if given a single string" do
     @ds.order('a, b, c').sql.must_equal 'SELECT * FROM t ORDER BY a, b, c'
   end

data/spec/extensions/serialization_spec.rb

@@ -338,4 +338,25 @@ describe "Serialization plugin" do
     o.def = 'hello2'
     o.changed_columns.must_equal [:abc, :def]
   end
+
+  it "should update column_changes if the dirty plugin is used" do
+    @c.plugin :serialization, :yaml, :abc, :def
+    @c.plugin :dirty
+    @c.dataset._fetch = {:id => 1, :abc => "--- 1\n", :def => "--- hello\n"}
+    o = @c.first
+    o.column_changes.must_equal({})
+    o.abc = 1
+    o.column_changes.must_equal({})
+    o.abc = 1
+    o.column_changes.must_equal({})
+    o.abc = 2
+    o.column_changes.must_equal(:abc=>[1, 2])
+    o.def = 'hello'
+    o.column_changes.must_equal(:abc=>[1, 2])
+    o.def = 'hello'
+    o.column_changes.must_equal(:abc=>[1, 2])
+    o.def = 'hello2'
+    o.column_changes.must_equal(:abc=>[1, 2], :def=>["hello", "hello2"])
+  end
+
 end

data/spec/extensions/singular_table_names_spec.rb

@@ -0,0 +1,22 @@
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+
+describe "Sequel::Plugins::SingularTableNames" do
+  before do
+    @c = Class.new(Sequel::Model)
+    @c.plugin :singular_table_names
+  end
+  after do
+    Object.send(:remove_const, :Foo)
+  end
+
+  it "should not used the pluralized table name" do
+    class ::Foo < @c; end
+    Foo.table_name.must_equal :foo
+  end
+
+  it "should handle nested moedls name" do
+    module ::Foo; end
+    class Foo::Bar < @c; end
+    Foo::Bar.table_name.must_equal :bar
+  end
+end

data/spec/integration/dataset_test.rb

@@ -1408,6 +1408,7 @@ describe "Sequel::Dataset DSL support" do
   end
   
   it "should work empty arrays with nulls" do
+    @ds = @ds.extension(:empty_array_consider_nulls)
     @ds.insert(nil, nil)
     @ds.filter(:a=>[]).all.must_equal []
     @ds.exclude(:a=>[]).all.must_equal []
@@ -1425,7 +1426,7 @@ describe "Sequel::Dataset DSL support" do
   end
   
   it "should work empty arrays with nulls and the empty_array_ignore_nulls extension" do
-    ds = @ds.extension(:empty_array_ignore_nulls)
+    ds = @ds
     ds.insert(nil, nil)
     ds.filter(:a=>[]).all.must_equal []
     ds.exclude(:a=>[]).all.must_equal [{:a=>nil, :b=>nil}]

data/spec/integration/prepared_statement_test.rb

@@ -123,6 +123,23 @@ describe "Prepared Statements and Bound Arguments" do
     @ds.order(:id).map(:numb).must_equal [10, 20]
   end if DB.dataset.supports_insert_select?
 
+  it "should support bound variables with insert returning" do
+    @ds.returning.call(:insert, {:n=>20}, :numb=>:$n).must_equal([{:id=>2, :numb=>20}])
+    @ds.count.must_equal 2
+    @ds.order(:id).map(:numb).must_equal [10, 20]
+  end if DB.dataset.supports_returning?(:insert)
+
+  it "should support bound variables with update returning" do
+    @ds.returning.call(:update, {:n=>20}, :numb=>:$n).must_equal([{:id=>1, :numb=>20}])
+    @ds.count.must_equal 1
+    @ds.order(:id).map(:numb).must_equal [20]
+  end if DB.dataset.supports_returning?(:update)
+
+  it "should support bound variables with delete returning" do
+    @ds.where(:id=>:$id).returning.call(:delete, :id=>1).must_equal([{:id=>1, :numb=>10}])
+    @ds.count.must_equal 0
+  end if DB.dataset.supports_returning?(:delete)
+
   it "should support bound variables with delete" do
     @ds.filter(:numb=>:$n).call(:delete, :n=>10).must_equal 1
     @ds.count.must_equal 0
@@ -240,6 +257,23 @@ describe "Prepared Statements and Bound Arguments" do
     @ds.order(:id).map(:numb).must_equal [10, 20]
   end if DB.dataset.supports_insert_select?
 
+  it "should support bound variables with insert returning" do
+    @ds.returning.prepare(:insert, :insert_rn, :numb=>:$n).call(:n=>20).must_equal([{:id=>2, :numb=>20}])
+    @ds.count.must_equal 2
+    @ds.order(:id).map(:numb).must_equal [10, 20]
+  end if DB.dataset.supports_returning?(:insert)
+
+  it "should support bound variables with update returning" do
+    @ds.returning.prepare(:update, :update_rn, :numb=>:$n).call(:n=>20).must_equal([{:id=>1, :numb=>20}])
+    @ds.count.must_equal 1
+    @ds.order(:id).map(:numb).must_equal [20]
+  end if DB.dataset.supports_returning?(:update)
+
+  it "should support bound variables with delete returning" do
+    @ds.where(:id=>:$id).returning.prepare(:delete, :delete_rn).call(:id=>1).must_equal([{:id=>1, :numb=>10}])
+    @ds.count.must_equal 0
+  end if DB.dataset.supports_returning?(:delete)
+
   it "should support prepared statements with delete" do
     @ds.filter(:numb=>:$n).prepare(:delete, :delete_n)
     @db.call(:delete_n, :n=>10).must_equal 1
@@ -413,7 +447,7 @@ describe "Dataset#unbind" do
     @u[@ds.filter{items__c > 1}].must_equal(:c=>10)
   end
 
-  it "should handle deep nesting" do
+  cspecify "should handle deep nesting", :h2 do
     DB.create_table!(:items) do
       Integer :a
       Integer :b

data/spec/model/associations_spec.rb

@@ -3336,8 +3336,8 @@ describe "Filtering by associations" do
   end
 
   it "should not affect non-association IN/NOT IN filtering with an empty array" do
-    @Album.filter(:tag_id=>[]).sql.must_equal 'SELECT * FROM albums WHERE (tag_id != tag_id)'
-    @Album.exclude(:tag_id=>[]).sql.must_equal 'SELECT * FROM albums WHERE (tag_id = tag_id)'
+    @Album.filter(:tag_id=>[]).sql.must_equal 'SELECT * FROM albums WHERE (1 = 0)'
+    @Album.exclude(:tag_id=>[]).sql.must_equal 'SELECT * FROM albums WHERE (1 = 1)'
   end
 
   it "should work correctly in subclasses" do

data/spec/model/base_spec.rb

@@ -91,18 +91,23 @@ describe Sequel::Model, "dataset" do
   it "should raise if no dataset is explicitly set and the class is anonymous" do
     proc {@b.dataset}.must_raise(Sequel::Error)
   end
+end
   
+describe Sequel::Model, "implicit table names" do
+  after do
+    Object.send(:remove_const, :BlahBlah)
+  end
   it "should disregard namespaces for the table name" do
-    begin
-      module ::BlahBlah
-        class MwaHaHa < Sequel::Model
-        end
+    module ::BlahBlah
+      class MwaHaHa < Sequel::Model
       end
-    
-      BlahBlah::MwaHaHa.dataset.sql.must_equal 'SELECT * FROM mwa_ha_has'
-    ensure
-      Object.send(:remove_const, :BlahBlah)
     end
+    BlahBlah::MwaHaHa.dataset.sql.must_equal 'SELECT * FROM mwa_ha_has'
+  end
+
+  it "should automatically set datasets when anonymous class of Sequel::Model is used as superclass" do
+    class BlahBlah < Class.new(Sequel::Model); end
+    BlahBlah.dataset.sql.must_equal 'SELECT * FROM blah_blahs'
   end
 end
 

data/spec/model/class_dataset_methods_spec.rb

@@ -50,6 +50,7 @@ describe Sequel::Model, "class dataset methods"  do
     @db.sqls
     @c.grep(:id, 'a%').sql.must_equal "SELECT * FROM items WHERE ((id LIKE 'a%' ESCAPE '\\'))"
     @c.group(:a).sql.must_equal "SELECT * FROM items GROUP BY a"
+    @c.group_append(:a).sql.must_equal "SELECT * FROM items GROUP BY a"
     @c.group_and_count(:a).sql.must_equal "SELECT a, count(*) AS count FROM items GROUP BY a"
     @c.group_by(:a).sql.must_equal "SELECT * FROM items GROUP BY a"
     @c.having(:a).sql.must_equal "SELECT * FROM items HAVING a"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 4.24.0
+  version: 4.25.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -225,6 +225,7 @@ extra_rdoc_files:
 - doc/release_notes/4.22.0.txt
 - doc/release_notes/4.23.0.txt
 - doc/release_notes/4.24.0.txt
+- doc/release_notes/4.25.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -337,6 +338,7 @@ files:
 - doc/release_notes/4.22.0.txt
 - doc/release_notes/4.23.0.txt
 - doc/release_notes/4.24.0.txt
+- doc/release_notes/4.25.0.txt
 - doc/release_notes/4.3.0.txt
 - doc/release_notes/4.4.0.txt
 - doc/release_notes/4.5.0.txt
@@ -363,9 +365,7 @@ files:
 - lib/sequel/adapters/do/mysql.rb
 - lib/sequel/adapters/do/postgres.rb
 - lib/sequel/adapters/do/sqlite3.rb
-- lib/sequel/adapters/firebird.rb
 - lib/sequel/adapters/ibmdb.rb
-- lib/sequel/adapters/informix.rb
 - lib/sequel/adapters/jdbc.rb
 - lib/sequel/adapters/jdbc/as400.rb
 - lib/sequel/adapters/jdbc/cubrid.rb
@@ -462,6 +462,7 @@ files:
 - lib/sequel/extensions/current_datetime_timestamp.rb
 - lib/sequel/extensions/dataset_source_alias.rb
 - lib/sequel/extensions/date_arithmetic.rb
+- lib/sequel/extensions/empty_array_consider_nulls.rb
 - lib/sequel/extensions/empty_array_ignore_nulls.rb
 - lib/sequel/extensions/error_sql.rb
 - lib/sequel/extensions/eval_inspect.rb
@@ -548,6 +549,7 @@ files:
 - lib/sequel/plugins/insert_returning_select.rb
 - lib/sequel/plugins/instance_filters.rb
 - lib/sequel/plugins/instance_hooks.rb
+- lib/sequel/plugins/inverted_subsets.rb
 - lib/sequel/plugins/json_serializer.rb
 - lib/sequel/plugins/lazy_attributes.rb
 - lib/sequel/plugins/list.rb
@@ -571,6 +573,7 @@ files:
 - lib/sequel/plugins/serialization_modification_detection.rb
 - lib/sequel/plugins/sharding.rb
 - lib/sequel/plugins/single_table_inheritance.rb
+- lib/sequel/plugins/singular_table_names.rb
 - lib/sequel/plugins/skip_create_refresh.rb
 - lib/sequel/plugins/split_values.rb
 - lib/sequel/plugins/static_cache.rb
@@ -647,7 +650,7 @@ files:
 - spec/extensions/delay_add_association_spec.rb
 - spec/extensions/dirty_spec.rb
 - spec/extensions/eager_each_spec.rb
-- spec/extensions/empty_array_ignore_nulls_spec.rb
+- spec/extensions/empty_array_consider_nulls_spec.rb
 - spec/extensions/error_splitter_spec.rb
 - spec/extensions/error_sql_spec.rb
 - spec/extensions/eval_inspect_spec.rb
@@ -662,6 +665,7 @@ files:
 - spec/extensions/insert_returning_select_spec.rb
 - spec/extensions/instance_filters_spec.rb
 - spec/extensions/instance_hooks_spec.rb
+- spec/extensions/inverted_subsets_spec.rb
 - spec/extensions/json_serializer_spec.rb
 - spec/extensions/lazy_attributes_spec.rb
 - spec/extensions/list_spec.rb
@@ -717,6 +721,7 @@ files:
 - spec/extensions/sharding_spec.rb
 - spec/extensions/shared_caching_spec.rb
 - spec/extensions/single_table_inheritance_spec.rb
+- spec/extensions/singular_table_names_spec.rb
 - spec/extensions/skip_create_refresh_spec.rb
 - spec/extensions/spec_helper.rb
 - spec/extensions/split_array_nil_spec.rb

data/lib/sequel/adapters/firebird.rb

@@ -1,105 +0,0 @@
-require 'fb'
-Sequel.require 'adapters/shared/firebird'
-Sequel::Deprecation.deprecate 'The firebird adapter is deprecated and will be removed in a future version of Sequel.'
-
-module Sequel
-  # The Sequel Firebird adapter requires the ruby fb driver located at
-  # http://github.com/wishdev/fb.
-  module Firebird
-    class Database < Sequel::Database
-      include Sequel::Firebird::DatabaseMethods
-
-      set_adapter_scheme :firebird
-
-      DISCONNECT_ERRORS = /Unsuccessful execution caused by a system error that precludes successful execution of subsequent statements/
-
-      def connect(server)
-        opts = server_opts(server)
-
-        Fb::Database.new(
-          :database => "#{opts[:host]}:#{opts[:database]}",
-          :username => opts[:user],
-          :password => opts[:password]).connect
-      end
-
-      def disconnect_connection(conn)
-        begin
-          conn.close
-        rescue Fb::Error
-          nil
-        end
-      end
-
-      def execute(sql, opts=OPTS)
-        begin
-          synchronize(opts[:server]) do |conn|
-            if conn.transaction_started && !_trans(conn)
-              conn.rollback
-              raise DatabaseDisconnectError, "transaction accidently left open, rolling back and disconnecting"
-            end
-            r = log_yield(sql){conn.execute(sql)}
-            yield(r) if block_given?
-            r
-          end
-        rescue Fb::Error => e
-          raise_error(e, :disconnect=>DISCONNECT_ERRORS.match(e.message))
-        end
-      end
-
-      private
-
-      # Add the primary_keys instance variable so we can get the correct return values for inserted rows.
-      def adapter_initialize
-        @primary_keys = {}
-      end
-
-      def begin_transaction(conn, opts=OPTS)
-        log_yield(TRANSACTION_BEGIN) do
-          begin
-            conn.transaction
-          rescue Fb::Error => e
-            conn.rollback
-            raise_error(e, :disconnect=>true) 
-          end
-        end
-      end
-
-      def commit_transaction(conn, opts=OPTS)
-        log_yield(TRANSACTION_COMMIT){conn.commit}
-      end
-      
-      def database_error_classes
-        [Fb::Error]
-      end
-
-      def rollback_transaction(conn, opts=OPTS)
-        log_yield(TRANSACTION_ROLLBACK){conn.rollback}
-      end
-    end
-
-    # Dataset class for Firebird datasets
-    class Dataset < Sequel::Dataset
-      include Sequel::Firebird::DatasetMethods
-
-      Database::DatasetClass = self
-
-      # Yield all rows returned by executing the given SQL and converting
-      # the types.
-      def fetch_rows(sql)
-        execute(sql) do |s|
-          begin
-            @columns = columns = s.fields.map{|c| output_identifier(c.name)}
-            s.fetchall.each do |r|
-              h = {}
-              r.zip(columns).each{|v, c| h[c] = v}
-              yield h
-            end
-          ensure
-            s.close
-          end
-        end
-        self
-      end
-    end
-  end
-end