sequel 3.36.1 → 3.37.0

data/spec/extensions/pg_statement_cache_spec.rb

@@ -23,8 +23,7 @@ describe "pg_statement_cache and pg_auto_parameterize extensions" do
             end
           end)
         end)
-      @db.extend Sequel::Postgres::AutoParameterize::DatabaseMethods
-      @db.extend Sequel::Postgres::StatementCache::DatabaseMethods
+      @db.extension :pg_auto_parameterize, :pg_statement_cache
       @db.extend(Module.new do
         attr_accessor :exec_raise
         def _execute(c, sql, opts={})

data/spec/extensions/query_literals_spec.rb

@@ -2,8 +2,7 @@ require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "query_literals extension" do
   before do
-    @ds = Sequel::Dataset.new(nil).from(:t)
-    @ds.extend(Sequel::QueryLiterals)
+    @ds = Sequel::Dataset.new(nil).from(:t).extension(:query_literals)
   end
 
   it "should not use special support if given a block" do

data/spec/extensions/schema_dumper_spec.rb

@@ -157,9 +157,9 @@ describe "Sequel::Database dump methods" do
     s.should_not =~ /:deferrable/
   end
 
-  it "should dump primary key columns with explicit :type equal to the database type when :same_db option is passed" do
+  it "should dump primary key columns with explicit type equal to the database type when :same_db option is passed" do
     @d.meta_def(:schema){|*s| [[:c1, {:db_type=>'somedbspecifictype', :primary_key=>true, :allow_null=>false}]]}
-    @d.dump_table_schema(:t7, :same_db => true).should == "create_table(:t7) do\n  primary_key :c1, :type=>\"somedbspecifictype\"\nend"
+    @d.dump_table_schema(:t7, :same_db => true).should == "create_table(:t7) do\n  column :c1, \"somedbspecifictype\", :null=>false\n  \n  primary_key [:c1]\nend"
   end
 
   it "should use a composite primary_key calls if there is a composite primary key" do
@@ -183,7 +183,7 @@ describe "Sequel::Database dump methods" do
   it "should support dumping the whole database as a migration" do
     @d.dump_schema_migration.should == <<-END_MIG
 Sequel.migration do
-  up do
+  change do
     create_table(:t1) do
       primary_key :c1
       String :c2, :size=>20
@@ -196,10 +196,6 @@ Sequel.migration do
       primary_key [:c1, :c2]
     end
   end
-  
-  down do
-    drop_table(:t2, :t1)
-  end
 end
 END_MIG
   end
@@ -208,7 +204,7 @@ END_MIG
     @d.meta_def(:tables){|o| [:t2, :t1]}
     @d.dump_schema_migration.should == <<-END_MIG
 Sequel.migration do
-  up do
+  change do
     create_table(:t1) do
       primary_key :c1
       String :c2, :size=>20
@@ -221,10 +217,6 @@ Sequel.migration do
       primary_key [:c1, :c2]
     end
   end
-  
-  down do
-    drop_table(:t2, :t1)
-  end
 end
 END_MIG
   end
@@ -239,7 +231,7 @@ END_MIG
     end
     @d.dump_schema_migration.should == <<-END_MIG
 Sequel.migration do
-  up do
+  change do
     create_table(:t2) do
       primary_key :c1
     end
@@ -248,10 +240,6 @@ Sequel.migration do
       foreign_key :c2, :t2, :key=>[:c1]
     end
   end
-  
-  down do
-    drop_table(:t1, :t2)
-  end
 end
 END_MIG
   end
@@ -266,7 +254,7 @@ END_MIG
     end
     @d.dump_schema_migration.should == <<-END_MIG
 Sequel.migration do
-  up do
+  change do
     create_table(:t1) do
       Integer :c2
     end
@@ -279,10 +267,6 @@ Sequel.migration do
       add_foreign_key [:c2], :t2, :key=>[:c1]
     end
   end
-  
-  down do
-    drop_table(:t2, :t1)
-  end
 end
 END_MIG
   end
@@ -298,7 +282,7 @@ END_MIG
     end
     @d.dump_schema_migration.should == <<-END_MIG
 Sequel.migration do
-  up do
+  change do
     create_table(:t2) do
       primary_key :c1
     end
@@ -307,10 +291,6 @@ Sequel.migration do
       foreign_key :c2, :t2, :key=>[:c1]
     end
   end
-  
-  down do
-    drop_table(:t1, :t2)
-  end
 end
 END_MIG
   end
@@ -319,7 +299,7 @@ END_MIG
     @d.dump_table_schema(:t1, :same_db=>true).should == "create_table(:t1) do\n  primary_key :c1\n  column :c2, \"varchar(20)\"\nend"
     @d.dump_schema_migration(:same_db=>true).should == <<-END_MIG
 Sequel.migration do
-  up do
+  change do
     create_table(:t1) do
       primary_key :c1
       column :c2, "varchar(20)"
@@ -332,10 +312,6 @@ Sequel.migration do
       primary_key [:c1, :c2]
     end
   end
-  
-  down do
-    drop_table(:t2, :t1)
-  end
 end
 END_MIG
   end
@@ -348,7 +324,7 @@ END_MIG
     @d.dump_table_schema(:t1, :index_names=>false).should == "create_table(:t1, :ignore_index_errors=>true) do\n  primary_key :c1\n  String :c2, :size=>20\n  \n  index [:c1]\n  index [:c2, :c1], :unique=>true\nend"
     @d.dump_schema_migration(:index_names=>false).should == <<-END_MIG
 Sequel.migration do
-  up do
+  change do
     create_table(:t1, :ignore_index_errors=>true) do
       primary_key :c1
       String :c2, :size=>20
@@ -367,10 +343,6 @@ Sequel.migration do
       index [:c2, :c1], :unique=>true
     end
   end
-  
-  down do
-    drop_table(:t2, :t1)
-  end
 end
 END_MIG
   end
@@ -383,7 +355,7 @@ END_MIG
     @d.dump_table_schema(:t1, :index_names=>:namespace).should == "create_table(:t1, :ignore_index_errors=>true) do\n  primary_key :c1\n  String :c2, :size=>20\n  \n  index [:c1], :name=>:i1\n  index [:c2, :c1]\nend"
     @d.dump_schema_migration(:index_names=>:namespace).should == <<-END_MIG
 Sequel.migration do
-  up do
+  change do
     create_table(:t1, :ignore_index_errors=>true) do
       primary_key :c1
       String :c2, :size=>20
@@ -402,10 +374,6 @@ Sequel.migration do
       index [:c2, :c1], :name=>:t1_c2_c1_index
     end
   end
-  
-  down do
-    drop_table(:t2, :t1)
-  end
 end
 END_MIG
   end
@@ -419,7 +387,7 @@ END_MIG
     @d.dump_table_schema(:t1, :index_names=>:namespace).should == "create_table(:t1, :ignore_index_errors=>true) do\n  primary_key :c1\n  String :c2, :size=>20\n  \n  index [:c1], :name=>:t1_i1\n  index [:c2, :c1]\nend"
     @d.dump_schema_migration(:index_names=>:namespace).should == <<-END_MIG
 Sequel.migration do
-  up do
+  change do
     create_table(:t1, :ignore_index_errors=>true) do
       primary_key :c1
       String :c2, :size=>20
@@ -438,10 +406,6 @@ Sequel.migration do
       index [:c2, :c1], :name=>:t2_t1_c2_c1_index
     end
   end
-  
-  down do
-    drop_table(:t2, :t1)
-  end
 end
 END_MIG
   end
@@ -454,7 +418,7 @@ END_MIG
     @d.dump_table_schema(:t1, :indexes=>false).should == "create_table(:t1) do\n  primary_key :c1\n  String :c2, :size=>20\nend"
     @d.dump_schema_migration(:indexes=>false).should == <<-END_MIG
 Sequel.migration do
-  up do
+  change do
     create_table(:t1) do
       primary_key :c1
       String :c2, :size=>20
@@ -467,10 +431,6 @@ Sequel.migration do
       primary_key [:c1, :c2]
     end
   end
-  
-  down do
-    drop_table(:t2, :t1)
-  end
 end
 END_MIG
   end
@@ -497,15 +457,10 @@ END_MIG
     end
     @d.dump_indexes_migration.should == <<-END_MIG
 Sequel.migration do
-  up do
+  change do
     add_index :t1, [:c1], :ignore_errors=>true, :name=>:i1
     add_index :t1, [:c2, :c1], :ignore_errors=>true, :unique=>true
   end
-  
-  down do
-    drop_index :t1, [:c2, :c1], :ignore_errors=>true, :unique=>true
-    drop_index :t1, [:c1], :ignore_errors=>true, :name=>:i1
-  end
 end
 END_MIG
   end
@@ -518,15 +473,10 @@ END_MIG
     end
     @d.dump_indexes_migration(:index_names=>false).should == <<-END_MIG
 Sequel.migration do
-  up do
+  change do
     add_index :t1, [:c1], :ignore_errors=>true
     add_index :t1, [:c2, :c1], :ignore_errors=>true, :unique=>true
   end
-  
-  down do
-    drop_index :t1, [:c2, :c1], :ignore_errors=>true, :unique=>true
-    drop_index :t1, [:c1], :ignore_errors=>true
-  end
 end
 END_MIG
   end
@@ -539,21 +489,13 @@ END_MIG
     end
     @d.dump_indexes_migration(:index_names=>:namespace).should == <<-END_MIG
 Sequel.migration do
-  up do
+  change do
     add_index :t1, [:c1], :ignore_errors=>true, :name=>:i1
     add_index :t1, [:c2, :c1], :ignore_errors=>true
     
     add_index :t2, [:c1], :ignore_errors=>true, :name=>:i1
     add_index :t2, [:c2, :c1], :ignore_errors=>true, :name=>:t1_c2_c1_index
   end
-  
-  down do
-    drop_index :t2, [:c2, :c1], :ignore_errors=>true, :name=>:t1_c2_c1_index
-    drop_index :t2, [:c1], :ignore_errors=>true, :name=>:i1
-    
-    drop_index :t1, [:c2, :c1], :ignore_errors=>true
-    drop_index :t1, [:c1], :ignore_errors=>true, :name=>:i1
-  end
 end
 END_MIG
   end
@@ -567,21 +509,13 @@ END_MIG
     end
     @d.dump_indexes_migration(:index_names=>:namespace).should == <<-END_MIG
 Sequel.migration do
-  up do
+  change do
     add_index :t1, [:c1], :ignore_errors=>true, :name=>:t1_i1
     add_index :t1, [:c2, :c1], :ignore_errors=>true
     
     add_index :t2, [:c1], :ignore_errors=>true, :name=>:t2_i1
     add_index :t2, [:c2, :c1], :ignore_errors=>true, :name=>:t2_t1_c2_c1_index
   end
-  
-  down do
-    drop_index :t2, [:c2, :c1], :ignore_errors=>true, :name=>:t2_t1_c2_c1_index
-    drop_index :t2, [:c1], :ignore_errors=>true, :name=>:t2_i1
-    
-    drop_index :t1, [:c2, :c1], :ignore_errors=>true
-    drop_index :t1, [:c1], :ignore_errors=>true, :name=>:t1_i1
-  end
 end
 END_MIG
   end
@@ -590,11 +524,7 @@ END_MIG
     @d.meta_def(:tables){|o| [:t1]}
     @d.dump_indexes_migration.should == <<-END_MIG
 Sequel.migration do
-  up do
-    
-  end
-  
-  down do
+  change do
     
   end
 end
@@ -605,7 +535,7 @@ END_MIG
     @d.meta_def(:tables){|o| [:t1]}
     @d.dump_foreign_key_migration.should == <<-END_MIG
 Sequel.migration do
-  up do
+  change do
     
   end
 end
@@ -629,7 +559,7 @@ END_MIG
     end
     @d.dump_foreign_key_migration.should == <<-END_MIG
 Sequel.migration do
-  up do
+  change do
     alter_table(:t1) do
       add_foreign_key [:c2], :t2, :key=>[:c1]
     end
@@ -771,7 +701,36 @@ create_table(:x) do
   Integer :c70
   Integer :c71
   Integer :c72
+  
+  check Sequel::SQL::BooleanExpression.new(:>=, Sequel::SQL::Identifier.new(:c64), 0)
+  check Sequel::SQL::BooleanExpression.new(:>=, Sequel::SQL::Identifier.new(:c65), 0)
+  check Sequel::SQL::BooleanExpression.new(:>=, Sequel::SQL::Identifier.new(:c66), 0)
+  check Sequel::SQL::BooleanExpression.new(:>=, Sequel::SQL::Identifier.new(:c67), 0)
+  check Sequel::SQL::BooleanExpression.new(:>=, Sequel::SQL::Identifier.new(:c68), 0)
+  check Sequel::SQL::BooleanExpression.new(:>=, Sequel::SQL::Identifier.new(:c69), 0)
 end
 END_MIG
   end
+
+  it "should use separate primary_key call with non autoincrementable types" do
+    @d.meta_def(:schema){|*s| [[:c1, {:db_type=>'varchar(8)', :primary_key=>true}]]}
+    @d.dump_table_schema(:t3).should == "create_table(:t3) do\n  String :c1, :size=>8\n  \n  primary_key [:c1]\nend"
+    @d.dump_table_schema(:t3, :same_db=>true).should == "create_table(:t3) do\n  column :c1, \"varchar(8)\"\n  \n  primary_key [:c1]\nend"
+  end
+
+  it "should use explicit type for non integer foreign_key types" do
+    @d.meta_def(:schema){|*s| [[:c1, {:db_type=>'date', :primary_key=>true}]]}
+    @d.meta_def(:foreign_key_list){|t, *a| [{:columns=>[:c1], :table=>:t3, :key=>[:c1]}] if t == :t4}
+    ["create_table(:t4) do\n  foreign_key :c1, :t3, :type=>Date, :key=>[:c1]\n  \n  primary_key [:c1]\nend",
+     "create_table(:t4) do\n  foreign_key :c1, :t3, :key=>[:c1], :type=>Date\n  \n  primary_key [:c1]\nend"].should include(@d.dump_table_schema(:t4))
+    ["create_table(:t4) do\n  foreign_key :c1, :t3, :type=>\"date\", :key=>[:c1]\n  \n  primary_key [:c1]\nend",
+     "create_table(:t4) do\n  foreign_key :c1, :t3, :key=>[:c1], :type=>\"date\"\n  \n  primary_key [:c1]\nend"].should include(@d.dump_table_schema(:t4, :same_db=>true))
+  end
+
+  it "should correctly handing autoincrementing primary keys that are also foreign keys" do
+    @d.meta_def(:schema){|*s| [[:c1, {:db_type=>'integer', :primary_key=>true}]]}
+    @d.meta_def(:foreign_key_list){|t, *a| [{:columns=>[:c1], :table=>:t3, :key=>[:c1]}] if t == :t4}
+    ["create_table(:t4) do\n  primary_key :c1, :table=>:t3, :key=>[:c1]\nend",
+     "create_table(:t4) do\n  primary_key :c1, :key=>[:c1], :table=>:t3\nend"].should include(@d.dump_table_schema(:t4))
+  end
 end

data/spec/extensions/serialization_spec.rb

@@ -1,11 +1,8 @@
 require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
-begin
 require 'yaml'
 require 'json'
-rescue LoadError => e
-  skip_warn "serialization plugin: can't load json (#{e.class}: #{e})"
-else
+
 describe "Serialization plugin" do
   before do
     @c = Class.new(Sequel::Model(:items)) do
@@ -252,4 +249,3 @@ describe "Serialization plugin" do
     o.abc.should == 9
   end
 end
-end

data/spec/extensions/server_block_spec.rb

@@ -44,7 +44,7 @@ end
 describe "Database#with_server single threaded" do
   before do
     @db = Sequel.mock(:single_threaded=>true, :servers=>{:a=>{}, :b=>{}})
-    @db.extend Sequel::ServerBlock
+    @db.extension :server_block
   end
 
   it_should_behave_like "Database#with_server"
@@ -53,7 +53,7 @@ end
 describe "Database#with_server multi threaded" do
   before do
     @db = Sequel.mock(:servers=>{:a=>{}, :b=>{}, :c=>{}, :d=>{}})
-    @db.extend Sequel::ServerBlock
+    @db.extension :server_block
   end
 
   it_should_behave_like "Database#with_server"

data/spec/extensions/spec_helper.rb

@@ -1,4 +1,13 @@
 require 'rubygems'
+
+if defined?(RSpec)
+  begin
+    require 'rspec/expectations'
+  rescue LoadError
+    nil
+  end
+end
+
 unless Object.const_defined?('Sequel')
   $:.unshift(File.join(File.dirname(File.expand_path(__FILE__)), "../../lib/"))
   require 'sequel/core'
@@ -12,11 +21,12 @@ begin
   # Attempt to load ActiveSupport inflector first, so Sequel inflector
   # can override it.
   require 'active_support/inflector'
-  require 'active_support/string/inflections'
+  require 'active_support/core_ext/string/inflections'
 rescue LoadError
+  nil
 end
 
-Sequel.extension(*%w'string_date_time inflector pagination query pretty_table blank migration schema_dumper looser_typecasting sql_expr thread_local_timezones to_dot columns_introspection server_block arbitrary_servers pg_auto_parameterize pg_statement_cache pg_hstore pg_hstore_ops pg_inet schema_caching null_dataset select_remove query_literals')
+Sequel.extension(*%w'string_date_time inflector pagination query pretty_table blank migration schema_dumper looser_typecasting sql_expr thread_local_timezones to_dot columns_introspection server_block arbitrary_servers pg_auto_parameterize pg_statement_cache pg_array pg_array_ops pg_hstore pg_hstore_ops pg_range pg_range_ops pg_json pg_inet schema_caching null_dataset select_remove query_literals eval_inspect')
 {:hook_class_methods=>[], :schema=>[], :validation_class_methods=>[]}.each{|p, opts| Sequel::Model.plugin(p, *opts)}
 
 Sequel::Dataset.introspect_all_columns if ENV['SEQUEL_COLUMNS_INTROSPECTION']

data/spec/extensions/split_array_nil_spec.rb

@@ -0,0 +1,24 @@
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+
+describe "split_array_nil extension" do
+  before do
+    @ds = Sequel.mock[:table].extension(:split_array_nil)
+  end
+
+  specify "should split IN with nil in array into separate OR IS NULL clause" do
+    @ds.filter(:a=>[1, nil]).sql.should == "SELECT * FROM table WHERE ((a IN (1)) OR (a IS NULL))"
+  end
+
+  specify "should split NOT IN with nil in array into separate AND IS NOT NULL clause" do
+    @ds.exclude(:a=>[1, nil]).sql.should == "SELECT * FROM table WHERE ((a NOT IN (1)) AND (a IS NOT NULL))"
+  end
+
+  specify "should not affect other IN/NOT in clauses" do
+    @ds.filter(:a=>[1, 2]).sql.should == "SELECT * FROM table WHERE (a IN (1, 2))"
+    @ds.exclude(:a=>[1, 2]).sql.should == "SELECT * FROM table WHERE (a NOT IN (1, 2))"
+  end
+
+  specify "should not affect other types of filters clauses" do
+    @ds.filter(:a=>1).sql.should == "SELECT * FROM table WHERE (a = 1)"
+  end
+end