sequel 4.47.0 → 4.48.0

data/spec/model/class_dataset_methods_spec.rb

@@ -9,7 +9,9 @@ describe Sequel::Model, "class dataset methods"  do
   end
 
   it "should call the dataset method of the same name with the same args" do
-    @c.<<({}).must_equal @d
+    deprecated do
+      @c.<<({}).must_equal @d
+    end
     @db.sqls.must_equal ["INSERT INTO items DEFAULT VALUES"]
     @c.all.must_equal [@c.load(:id=>1)]
     @db.sqls.must_equal ["SELECT * FROM items"]
@@ -27,7 +29,9 @@ describe Sequel::Model, "class dataset methods"  do
     @c.except(@d, :from_self=>false).sql.must_equal "SELECT * FROM items EXCEPT SELECT * FROM items"
     @c.exclude(:a).sql.must_equal "SELECT * FROM items WHERE NOT a"
     @c.exclude_having(:a).sql.must_equal "SELECT * FROM items HAVING NOT a"
-    @c.exclude_where(:a).sql.must_equal "SELECT * FROM items WHERE NOT a"
+    deprecated do
+      @c.exclude_where(:a).sql.must_equal "SELECT * FROM items WHERE NOT a"
+    end
     @c.fetch_rows("S"){|r| r.must_equal(:id=>1)}
     @db.sqls.must_equal ["S"]
     @c.filter(:a).sql.must_equal "SELECT * FROM items WHERE a"
@@ -56,7 +60,9 @@ describe Sequel::Model, "class dataset methods"  do
     @c.insert.must_equal 2
     @db.sqls.must_equal ["INSERT INTO items DEFAULT VALUES"]
     @c.intersect(@d, :from_self=>false).sql.must_equal "SELECT * FROM items INTERSECT SELECT * FROM items"
-    @c.interval(:id).must_equal 1
+    deprecated do
+      @c.interval(:id).must_equal 1
+    end
     @db.sqls.must_equal ["SELECT (max(id) - min(id)) AS interval FROM items LIMIT 1"]
     @c.join(@c.table_name).sql.must_equal "SELECT * FROM items INNER JOIN items"
     @c.join_table(:inner, @c.table_name).sql.must_equal "SELECT * FROM items INNER JOIN items"
@@ -116,6 +122,8 @@ describe Sequel::Model, "class dataset methods"  do
     @db.sqls.must_equal ["SELECT * FROM items"]
     @c.sum(:id).must_equal 1
     @db.sqls.must_equal ["SELECT sum(id) AS sum FROM items LIMIT 1"]
+    @c.as_hash(:id, :id).must_equal(1=>1)
+    @db.sqls.must_equal ["SELECT * FROM items"]
     @c.to_hash(:id, :id).must_equal(1=>1)
     @db.sqls.must_equal ["SELECT * FROM items"]
     @c.to_hash_groups(:id, :id).must_equal(1=>[1])
@@ -134,7 +142,9 @@ describe Sequel::Model, "class dataset methods"  do
     sc.invert.sql.must_equal 'SELECT a FROM items WHERE NOT a GROUP BY a ORDER BY a LIMIT 2'
     sc.dataset = sc.dataset.with_fetch(:v1=>1, :v2=>2)
     @db.sqls
-    sc.range(:a).must_equal(1..2)
+    deprecated do
+      sc.range(:a).must_equal(1..2)
+    end
     @db.sqls.must_equal ["SELECT min(a) AS v1, max(a) AS v2 FROM (SELECT a FROM items WHERE a GROUP BY a ORDER BY a LIMIT 2) AS t1 LIMIT 1"]
     sc.reverse.sql.must_equal 'SELECT a FROM items WHERE a GROUP BY a ORDER BY a DESC LIMIT 2'
     sc.reverse_order.sql.must_equal 'SELECT a FROM items WHERE a GROUP BY a ORDER BY a DESC LIMIT 2'

data/spec/model/dataset_methods_spec.rb

@@ -38,7 +38,7 @@ describe Sequel::Model::DatasetMethods, "#destroy"  do
   end
 end
 
-describe Sequel::Model::DatasetMethods, "#to_hash"  do
+describe Sequel::Model::DatasetMethods, "#as_hash"  do
   before do
     @c = Class.new(Sequel::Model(:items)) do
       set_primary_key :name
@@ -47,6 +47,15 @@ describe Sequel::Model::DatasetMethods, "#to_hash"  do
   end
 
   it "should result in a hash with primary key value keys and model object values" do
+    @d = @d.with_fetch([{:name=>1}, {:name=>2}])
+    h = @d.as_hash
+    h.must_be_kind_of(Hash)
+    a = h.to_a
+    a.collect{|x| x[1].class}.must_equal [@c, @c]
+    a.sort_by{|x| x[0]}.collect{|x| [x[0], x[1].values]}.must_equal [[1, {:name=>1}], [2, {:name=>2}]]
+  end
+
+  it "should be aliased as to_hash" do
     @d = @d.with_fetch([{:name=>1}, {:name=>2}])
     h = @d.to_hash
     h.must_be_kind_of(Hash)
@@ -57,7 +66,7 @@ describe Sequel::Model::DatasetMethods, "#to_hash"  do
 
   it "should result in a hash with given value keys and model object values" do
     @d = @d.with_fetch([{:name=>1, :number=>3}, {:name=>2, :number=>4}])
-    h = @d.to_hash(:number)
+    h = @d.as_hash(:number)
     h.must_be_kind_of(Hash)
     a = h.to_a
     a.collect{|x| x[1].class}.must_equal [@c, @c]
@@ -66,7 +75,7 @@ describe Sequel::Model::DatasetMethods, "#to_hash"  do
 
   it "should raise an error if the class doesn't have a primary key" do
     @c.no_primary_key
-    proc{@d.to_hash}.must_raise(Sequel::Error)
+    proc{@d.as_hash}.must_raise(Sequel::Error)
   end
 end
 

data/spec/model/model_spec.rb

@@ -489,6 +489,14 @@ describe Sequel::Model, ".require_valid_table = true" do
     c.set_dataset @db[:bars]
     c.columns.must_equal [:id]
   end
+
+  deprecated "should assume nil value is the same as false" do
+    c = Class.new(Sequel::Model)
+    c.require_valid_table = nil
+    ds = @db.dataset
+    def ds.columns; raise Sequel::Error; end
+    c.set_dataset(ds)
+  end
 end
 
 describe Sequel::Model, "constructors" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 4.47.0
+  version: 4.48.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-01 00:00:00.000000000 Z
+date: 2017-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -249,6 +249,7 @@ extra_rdoc_files:
 - doc/release_notes/4.45.0.txt
 - doc/release_notes/4.46.0.txt
 - doc/release_notes/4.47.0.txt
+- doc/release_notes/4.48.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -387,6 +388,7 @@ files:
 - doc/release_notes/4.45.0.txt
 - doc/release_notes/4.46.0.txt
 - doc/release_notes/4.47.0.txt
+- doc/release_notes/4.48.0.txt
 - doc/release_notes/4.5.0.txt
 - doc/release_notes/4.6.0.txt
 - doc/release_notes/4.7.0.txt
@@ -563,6 +565,7 @@ files:
 - lib/sequel/extensions/schema_dumper.rb
 - lib/sequel/extensions/select_remove.rb
 - lib/sequel/extensions/sequel_3_dataset_methods.rb
+- lib/sequel/extensions/sequel_4_dataset_methods.rb
 - lib/sequel/extensions/server_block.rb
 - lib/sequel/extensions/server_logging.rb
 - lib/sequel/extensions/set_overrides.rb
@@ -676,8 +679,6 @@ files:
 - lib/sequel/version.rb
 - spec/adapter_spec.rb
 - spec/adapters/db2_spec.rb
-- spec/adapters/firebird_spec.rb
-- spec/adapters/informix_spec.rb
 - spec/adapters/mssql_spec.rb
 - spec/adapters/mysql_spec.rb
 - spec/adapters/oracle_spec.rb
@@ -812,6 +813,7 @@ files:
 - spec/extensions/scissors_spec.rb
 - spec/extensions/select_remove_spec.rb
 - spec/extensions/sequel_3_dataset_methods_spec.rb
+- spec/extensions/sequel_4_dataset_methods_spec.rb
 - spec/extensions/serialization_modification_detection_spec.rb
 - spec/extensions/serialization_spec.rb
 - spec/extensions/server_block_spec.rb

data/spec/adapters/firebird_spec.rb

@@ -1,405 +0,0 @@
-SEQUEL_ADAPTER_TEST = :firebird
-
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
-
-def DB.sqls
-  (@sqls ||= [])
-end
-logger = Object.new
-def logger.method_missing(m, msg)
-  DB.sqls.push(msg)
-end
-DB.loggers = [logger]
-
-DB.create_table! :test do
-  varchar :name,  :size => 50
-  integer :val,   :index => true
-end
-
-DB.create_table! :test2 do
-  integer :val
-  timestamp :time_stamp
-end
-
-DB.create_table! :test3 do
-  integer :val
-  timestamp :time_stamp
-end
-
-DB.create_table! :test5 do
-  primary_key :xid
-  integer :val
-end
-
-DB.create_table! :test6 do
-  primary_key :xid
-  blob :val
-  String :val2
-  varchar :val3, :size=>200
-  String :val4, :text=>true
-end
-
-describe "A Firebird database" do
-  before do
-    @db = DB
-  end
-
-  it "should provide disconnect functionality" do
-    @db.tables
-    @db.pool.size.must_equal 1
-    @db.disconnect
-    @db.pool.size.must_equal 0
-  end
-
-  it "should raise Sequel::Error on error" do
-    proc{@db << "SELECT 1 + 'a'"}.must_raise(Sequel::Error)
-  end
-end
-
-describe "A Firebird dataset" do
-  before do
-    @d = DB[:test].with_quote_identifiers(true)
-    @d.delete
-  end
-
-  it "should return the correct record count" do
-    @d.count.must_equal 0
-    @d << {:name => 'abc', :val => 123}
-    @d << {:name => 'abc', :val  => 456}
-    @d << {:name => 'def', :val => 789}
-    @d.count.must_equal 3
-  end
-
-  it "should return the correct records" do
-    @d.to_a.must_equal []
-    @d << {:name => 'abc', :val => 123}
-    @d << {:name => 'abc', :val => 456}
-    @d << {:name => 'def', :val => 789}
-
-    @d.order(:val).to_a.must_equal [
-      {:name => 'abc', :val => 123},
-      {:name => 'abc', :val => 456},
-      {:name => 'def', :val => 789}
-    ]
-  end
-
-  it "should update records correctly" do
-    @d << {:name => 'abc', :val => 123}
-    @d << {:name => 'abc', :val => 456}
-    @d << {:name => 'def', :val => 789}
-    @d.filter(:name => 'abc').update(:val => 530)
-
-    @d[:name => 'def'][:val].must_equal 789
-    @d.filter(:val => 530).count.must_equal 2
-  end
-
-  it "should delete records correctly" do
-    @d << {:name => 'abc', :val => 123}
-    @d << {:name => 'abc', :val => 456}
-    @d << {:name => 'def', :val => 789}
-    @d.filter(:name => 'abc').delete
-
-    @d.count.must_equal 1
-    @d.first[:name].must_equal 'def'
-  end
-
-  it "should be able to literalize booleans" do
-    @d.literal(true)
-    @d.literal(false)
-  end
-
-  it "should quote columns and tables using double quotes if quoting identifiers" do
-    @d.select(:name).sql.must_equal \
-      'SELECT "NAME" FROM "TEST"'
-
-    @d.select('COUNT(*)'.lit).sql.must_equal \
-      'SELECT COUNT(*) FROM "TEST"'
-
-    @d.select(:max[:val]).sql.must_equal \
-      'SELECT max("VAL") FROM "TEST"'
-
-    @d.select(:now[]).sql.must_equal \
-    'SELECT now() FROM "TEST"'
-
-    @d.select(:max[Sequel[:items][:val]]).sql.must_equal \
-      'SELECT max("ITEMS"."VAL") FROM "TEST"'
-
-    @d.order(:name.desc).sql.must_equal \
-      'SELECT * FROM "TEST" ORDER BY "NAME" DESC'
-
-    @d.select('TEST.NAME AS item_:name'.lit).sql.must_equal \
-      'SELECT TEST.NAME AS item_:name FROM "TEST"'
-
-    @d.select('"NAME"'.lit).sql.must_equal \
-      'SELECT "NAME" FROM "TEST"'
-
-    @d.select('max(TEST."NAME") AS "max_:name"'.lit).sql.must_equal \
-      'SELECT max(TEST."NAME") AS "max_:name" FROM "TEST"'
-
-    @d.select(:test[:ABC, 'hello']).sql.must_equal \
-      "SELECT test(\"ABC\", 'hello') FROM \"TEST\""
-
-    @d.select(:test[Sequel[:ABC][:DEF], 'hello']).sql.must_equal \
-      "SELECT test(\"ABC\".\"DEF\", 'hello') FROM \"TEST\""
-
-    @d.select(:test[Sequel[:ABC][:DEF], 'hello'].as(:X2)).sql.must_equal \
-      "SELECT test(\"ABC\".\"DEF\", 'hello') AS \"X2\" FROM \"TEST\""
-
-    @d.insert_sql(:val => 333).must_match \
-      /\AINSERT INTO "TEST" \("VAL"\) VALUES \(333\)( RETURNING NULL)?\z/
-
-    @d.insert_sql(:X => :Y).must_match \
-      /\AINSERT INTO "TEST" \("X"\) VALUES \("Y"\)( RETURNING NULL)?\z/
-  end
-
-  it "should quote fields correctly when reversing the order if quoting identifiers" do
-    @d.reverse_order(:name).sql.must_equal \
-      'SELECT * FROM "TEST" ORDER BY "NAME" DESC'
-
-    @d.reverse_order(:name.desc).sql.must_equal \
-      'SELECT * FROM "TEST" ORDER BY "NAME" ASC'
-
-    @d.reverse_order(:name, :test.desc).sql.must_equal \
-      'SELECT * FROM "TEST" ORDER BY "NAME" DESC, "TEST" ASC'
-
-    @d.reverse_order(:name.desc, :test).sql.must_equal \
-      'SELECT * FROM "TEST" ORDER BY "NAME" ASC, "TEST" DESC'
-  end
-
-  it "should support transactions" do
-    DB.transaction do
-      @d << {:name => 'abc', :val => 1}
-    end
-
-    @d.count.must_equal 1
-  end
-
-  it "should have #transaction yield the connection" do
-    DB.transaction do |conn|
-      conn.wont_equal nil
-    end
-  end
-
-  it "should correctly rollback transactions" do
-    proc do
-      DB.transaction do
-        @d << {:name => 'abc', :val => 1}
-        raise RuntimeError, 'asdf'
-      end
-    end.must_raise(RuntimeError)
-
-    @d.count.must_equal 0
-  end
-
-  it "should handle returning inside of the block by committing" do
-    def DB.ret_commit
-      transaction do
-        self[:test] << {:name => 'abc'}
-        return
-        self[:test] << {:name => 'd'}
-      end
-    end
-    @d.count.must_equal 0
-    DB.ret_commit
-    @d.count.must_equal 1
-    DB.ret_commit
-    @d.count.must_equal 2
-    proc do
-      DB.transaction do
-        raise RuntimeError, 'asdf'
-      end
-    end.must_raise(RuntimeError)
-
-    @d.count.must_equal 2
-  end
-
-  it "should quote and upcase reserved keywords" do
-    @d = DB[:testing]
-    @d.select(:select).sql.must_equal \
-      'SELECT "SELECT" FROM "TESTING"'
-  end
-end
-
-describe "A Firebird dataset with a timestamp field" do
-  before do
-    @d = DB[:test3]
-    @d.delete
-  end
-
-  it "should store milliseconds in time fields" do
-    t = Time.now
-    @d << {:val=>1, :time_stamp=>t}
-    @d.literal(@d[:val =>'1'][:time_stamp]).must_equal @d.literal(t)
-    @d[:val=>'1'][:time_stamp].usec.must_equal t.usec - t.usec % 100
-  end
-end
-
-describe "A Firebird database" do
-  before do
-    @db = DB
-    @db.drop_table?(:posts)
-    @db.sqls.clear
-  end
-
-  it "should allow us to name the sequences" do
-    @db.create_table(:posts){primary_key :id, :sequence_name => "seq_test"}
-    check_sqls do
-      @db.sqls.must_equal [
-        "DROP SEQUENCE SEQ_TEST",
-        "CREATE TABLE POSTS (ID integer PRIMARY KEY )",
-        "CREATE SEQUENCE SEQ_TEST",
-        "          CREATE TRIGGER BI_POSTS_ID for POSTS\n          ACTIVE BEFORE INSERT position 0\n          as               begin\n                if ((new.ID is null) or (new.ID = 0)) then\n                begin\n                  new.ID = next value for seq_test;\n                end\n              end\n\n"
-      ]
-    end
-  end
-
-  it "should allow us to set the starting position for the sequences" do
-    @db.create_table(:posts){primary_key :id, :sequence_start_position => 999}
-    check_sqls do
-      @db.sqls.must_equal [
-        "DROP SEQUENCE SEQ_POSTS_ID",
-        "CREATE TABLE POSTS (ID integer PRIMARY KEY )",
-        "CREATE SEQUENCE SEQ_POSTS_ID",
-        "ALTER SEQUENCE SEQ_POSTS_ID RESTART WITH 999",
-        "          CREATE TRIGGER BI_POSTS_ID for POSTS\n          ACTIVE BEFORE INSERT position 0\n          as               begin\n                if ((new.ID is null) or (new.ID = 0)) then\n                begin\n                  new.ID = next value for seq_posts_id;\n                end\n              end\n\n"
-      ]
-    end
-  end
-
-  it "should allow us to name and set the starting position for the sequences" do
-    @db.create_table(:posts){primary_key :id, :sequence_name => "seq_test", :sequence_start_position => 999}
-    check_sqls do
-      @db.sqls.must_equal [
-        "DROP SEQUENCE SEQ_TEST",
-        "CREATE TABLE POSTS (ID integer PRIMARY KEY )",
-        "CREATE SEQUENCE SEQ_TEST",
-        "ALTER SEQUENCE SEQ_TEST RESTART WITH 999",
-        "          CREATE TRIGGER BI_POSTS_ID for POSTS\n          ACTIVE BEFORE INSERT position 0\n          as               begin\n                if ((new.ID is null) or (new.ID = 0)) then\n                begin\n                  new.ID = next value for seq_test;\n                end\n              end\n\n"
-      ]
-    end
-  end
-
-  it "should allow us to name the triggers" do
-    @db.create_table(:posts){primary_key :id, :trigger_name => "trig_test"}
-    check_sqls do
-      @db.sqls.must_equal [
-        "DROP SEQUENCE SEQ_POSTS_ID",
-        "CREATE TABLE POSTS (ID integer PRIMARY KEY )",
-        "CREATE SEQUENCE SEQ_POSTS_ID",
-        "          CREATE TRIGGER TRIG_TEST for POSTS\n          ACTIVE BEFORE INSERT position 0\n          as               begin\n                if ((new.ID is null) or (new.ID = 0)) then\n                begin\n                  new.ID = next value for seq_posts_id;\n                end\n              end\n\n"
-      ]
-    end
-  end
-
-  it "should allow us to not create the sequence" do
-    @db.create_table(:posts){primary_key :id, :create_sequence => false}
-    check_sqls do
-      @db.sqls.must_equal [
-        "CREATE TABLE POSTS (ID integer PRIMARY KEY )",
-        "          CREATE TRIGGER BI_POSTS_ID for POSTS\n          ACTIVE BEFORE INSERT position 0\n          as               begin\n                if ((new.ID is null) or (new.ID = 0)) then\n                begin\n                  new.ID = next value for seq_posts_id;\n                end\n              end\n\n"
-      ]
-    end
-  end
-
-  it "should allow us to not create the trigger" do
-    @db.create_table(:posts){primary_key :id, :create_trigger => false}
-    check_sqls do
-      @db.sqls.must_equal [
-        "DROP SEQUENCE SEQ_POSTS_ID",
-        "CREATE TABLE POSTS (ID integer PRIMARY KEY )",
-        "CREATE SEQUENCE SEQ_POSTS_ID",
-      ]
-    end
-  end
-
-  it "should allow us to not create either the sequence nor the trigger" do
-    @db.create_table(:posts){primary_key :id, :create_sequence => false, :create_trigger => false}
-    check_sqls do
-      @db.sqls.must_equal [
-        "CREATE TABLE POSTS (ID integer PRIMARY KEY )"
-      ]
-    end
-  end
-
-  it "should support column operations" do
-    @db.create_table!(:test2){varchar :name, :size => 50; integer :val}
-    @db[:test2] << {}
-    @db[:test2].columns.must_equal [:name, :val]
-
-    @db.add_column :test2, :xyz, :varchar, :size => 50
-    @db[:test2].columns.must_equal [:name, :val, :xyz]
-
-    @db[:test2].columns.must_equal [:name, :val, :xyz]
-    @db.drop_column :test2, :xyz
-
-    @db[:test2].columns.must_equal [:name, :val]
-
-    @db[:test2].delete
-    @db.add_column :test2, :xyz, :varchar, :default => '000', :size => 50#, :create_domain => 'xyz_varchar'
-    @db[:test2] << {:name => 'mmm', :val => 111, :xyz => 'qqqq'}
-
-    @db[:test2].columns.must_equal [:name, :val, :xyz]
-    @db.rename_column :test2, :xyz, :zyx
-    @db[:test2].columns.must_equal [:name, :val, :zyx]
-    @db[:test2].first[:zyx].must_equal 'qqqq'
-
-    @db.add_column :test2, :xyz, :decimal, :elements => [12, 2]
-    @db[:test2].delete
-    @db[:test2] << {:name => 'mmm', :val => 111, :xyz => 56.4}
-    @db.set_column_type :test2, :xyz, :varchar, :size => 50
-
-    @db[:test2].first[:xyz].must_equal "56.40"
-  end
-
-  it "should allow us to retrieve the primary key for a table" do
-    @db.create_table!(:test2){primary_key :id}
-    @db.primary_key(:test2).must_equal ["id"]
-  end
-end
-
-describe "Postgres::Dataset#insert" do
-  before do
-    @ds = DB[:test5]
-    @ds.delete
-  end
-
-  it "should have insert_returning_sql use the RETURNING keyword" do
-    @ds.insert_returning_sql(:XID, :val=>10).must_equal "INSERT INTO TEST5 (VAL) VALUES (10) RETURNING XID"
-    @ds.insert_returning_sql('*'.lit, :val=>10).must_equal "INSERT INTO TEST5 (VAL) VALUES (10) RETURNING *"
-    @ds.insert_returning_sql('NULL'.lit, :val=>10).must_equal "INSERT INTO TEST5 (VAL) VALUES (10) RETURNING NULL"
-  end
-
-  it "should correctly return the inserted record's primary key value" do
-    value1 = 10
-    id1 = @ds.insert(:val=>value1)
-    @ds.first(:XID=>id1)[:val].must_equal value1
-    value2 = 20
-    id2 = @ds.insert(:val=>value2)
-    @ds.first(:XID=>id2)[:val].must_equal value2
-  end
-
-  it "should return nil if the table has no primary key" do
-    ds = DB[:test]
-    ds.delete
-    ds.insert(:name=>'a').must_be_nil
-  end
-end
-
-describe "Postgres::Dataset#insert" do
-  before do
-    @ds = DB[:test6]
-    @ds.delete
-  end
-
-  it "should insert and retrieve a blob successfully" do
-    value1 = "\1\2\2\2\2222\2\2\2"
-    value2 = "abcd"
-    value3 = "efgh"
-    value4 = "ijkl"
-    id1 = @ds.insert(:val=>value1, :val2=>value2, :val3=>value3, :val4=>value4)
-    @ds.first(:XID=>id1)[:val].must_equal value1
-    @ds.first(:XID=>id1)[:val2].must_equal value2
-    @ds.first(:XID=>id1)[:val3].must_equal value3
-    @ds.first(:XID=>id1)[:val4].must_equal value4
-  end
-end