sequel 2.9.0 → 2.10.0

data/spec/sequel_core/object_graph_spec.rb

@@ -138,7 +138,7 @@ describe Sequel::Dataset, " graphing" do
   end
 
   it "#set_graph_aliases should allow a third entry to specify an expression to use other than the default" do
-    ds = @ds1.graph(:lines, :x=>:id).set_graph_aliases(:x=>[:points, :x, 1], :y=>[:lines, :y, :random[]])
+    ds = @ds1.graph(:lines, :x=>:id).set_graph_aliases(:x=>[:points, :x, 1], :y=>[:lines, :y, :random.sql_function])
     ['SELECT 1 AS x, random() AS y FROM points LEFT OUTER JOIN lines ON (lines.x = points.id)',
     'SELECT random() AS y, 1 AS x FROM points LEFT OUTER JOIN lines ON (lines.x = points.id)'
     ].should(include(ds.sql))
@@ -241,7 +241,7 @@ describe Sequel::Dataset, " graphing" do
   end
 
   it "#graph_each should correctly map values when #set_graph_aliases is used with a third argument for each entry" do
-    ds = @ds1.graph(:lines, :x=>:id).set_graph_aliases(:x=>[:points, :z1, 2], :y=>[:lines, :z2, :random[]])
+    ds = @ds1.graph(:lines, :x=>:id).set_graph_aliases(:x=>[:points, :z1, 2], :y=>[:lines, :z2, :random.sql_function])
     def ds.fetch_rows(sql, &block)
       yield({:x=>2,:y=>3})
     end

data/spec/sequel_core/schema_generator_spec.rb

@@ -47,9 +47,9 @@ describe Sequel::Schema::Generator do
   
   it "creates foreign key column" do
     @columns[3][:name].should == :parent_id
-    @columns[3][:type].should == :integer
+    @columns[3][:type].should == Integer
     @columns[6][:name].should == :node_id
-    @columns[6][:type].should == :integer
+    @columns[6][:type].should == Integer
   end
   
   it "uses table for foreign key columns, if specified" do
@@ -107,7 +107,7 @@ describe Sequel::Schema::AlterTableGenerator do
       add_spatial_index :geom
       add_index :blah, :type => :hash
       add_index :blah, :where => {:something => true}
-      add_constraint :con1, ':fred > 100'
+      add_constraint :con1, 'fred > 100'
       drop_constraint :con2
       add_unique_constraint [:aaa, :bbb, :ccc], :name => :con3
       add_primary_key :id
@@ -130,13 +130,38 @@ describe Sequel::Schema::AlterTableGenerator do
       {:op => :add_index, :columns => [:geom], :type => :spatial},
       {:op => :add_index, :columns => [:blah], :type => :hash},
       {:op => :add_index, :columns => [:blah], :where => {:something => true}},
-      {:op => :add_constraint, :type => :check, :constraint_type => :check, :name => :con1, :check => [':fred > 100']},
+      {:op => :add_constraint, :type => :check, :constraint_type => :check, :name => :con1, :check => ['fred > 100']},
       {:op => :drop_constraint, :name => :con2},
       {:op => :add_constraint, :type => :check, :constraint_type => :unique, :name => :con3, :columns => [:aaa, :bbb, :ccc]},
-      {:op => :add_column, :name => :id, :type => :integer, :primary_key=>true, :auto_increment=>true},
-      {:op => :add_column, :name => :node_id, :type => :integer, :table=>:nodes},
+      {:op => :add_column, :name => :id, :type => Integer, :primary_key=>true, :auto_increment=>true},
+      {:op => :add_column, :name => :node_id, :type => Integer, :table=>:nodes},
       {:op => :add_constraint, :type => :check, :constraint_type => :primary_key, :columns => [:aaa, :bbb]},
       {:op => :add_constraint, :type => :check, :constraint_type => :foreign_key, :columns => [:node_id, :prop_id], :table => :nodes_props}
     ]
   end
 end
+
+describe "Sequel::Schema::Generator generic type methods" do
+  before do
+    @generator = Sequel::Schema::Generator.new(SchemaDummyDatabase.new) do
+      String :a
+      Integer :b
+      Fixnum :c
+      Bignum :d
+      Float :e
+      BigDecimal :f
+      Date :g
+      DateTime :h
+      Time :i
+      Numeric :j
+      File :k
+      TrueClass :l
+      FalseClass :m
+    end
+    @columns, @indexes = @generator.create_info
+  end
+  
+  it "should store the type class in :type for each column" do
+    @columns.map{|c| c[:type]}.should == [String, Integer, Fixnum, Bignum, Float, BigDecimal, Date, DateTime, Time, Numeric, File, TrueClass, FalseClass]
+  end
+end

data/spec/sequel_core/schema_spec.rb

@@ -38,6 +38,28 @@ context "DB#create_table" do
     end
     @db.sqls.should == ['CREATE TABLE cats (id integer, name text)']
   end
+  
+  specify "should transform types given as ruby classes to database-specific types" do
+    @db.create_table(:cats) do
+      String :a
+      Integer :b
+      Fixnum :c
+      Bignum :d
+      Float :e
+      BigDecimal :f
+      Date :g
+      DateTime :h
+      Time :i
+      Numeric :j
+      File :k
+      TrueClass :l
+      FalseClass :m
+      column :n, Fixnum
+      primary_key :o, :type=>String
+      foreign_key :p, :f, :type=>Date
+    end
+    @db.sqls.should == ['CREATE TABLE cats (o varchar(255) PRIMARY KEY AUTOINCREMENT, a varchar(255), b integer, c integer, d bigint, e double precision, f numeric, g date, h timestamp, i timestamp, j numeric, k blob, l boolean, m boolean, n integer, p date REFERENCES f)']
+  end
 
   specify "should accept primary key definition" do
     @db.create_table(:cats) do
@@ -332,7 +354,7 @@ context "DB#create_table" do
   specify "should accept unnamed constraint definitions with blocks" do
     @db.create_table(:cats) do
       integer :score
-      check {(:x > 0) & (:y < 1)}
+      check {(:x.sql_number > 0) & (:y.sql_number < 1)}
     end
     @db.sqls.should == ["CREATE TABLE cats (score integer, CHECK ((x > 0) AND (y < 1)))"]
   end
@@ -361,7 +383,7 @@ context "DB#create_table" do
 
   specify "should accept named constraint definitions with block" do
     @db.create_table(:cats) do
-      constraint(:blah_blah) {(:x > 0) & (:y < 1)}
+      constraint(:blah_blah) {(:x.sql_number > 0) & (:y.sql_number < 1)}
     end
     @db.sqls.should == ["CREATE TABLE cats (CONSTRAINT blah_blah CHECK ((x > 0) AND (y < 1)))"]
   end
@@ -510,7 +532,7 @@ context "DB#alter_table" do
 
   specify "should support add_constraint with block" do
     @db.alter_table(:cats) do
-      add_constraint(:blah_blah) {(:x > 0) & (:y < 1)}
+      add_constraint(:blah_blah) {(:x.sql_number > 0) & (:y.sql_number < 1)}
     end
     @db.sqls.should == ["ALTER TABLE cats ADD CONSTRAINT blah_blah CHECK ((x > 0) AND (y < 1))"]
   end
@@ -686,12 +708,6 @@ context "Schema Parser" do
     @sqls.should == ['x']
     @db.schema(nil, :reload=>true).should == {'x'=>[[:x, {:db_type=>"x"}]]}
     @sqls.should == ['x', 'x']
-    @db.meta_def(:schema_parse_tables) do |opts|
-      sqls << 1
-      {'x'=>[[:a, {:db_type=>"1"}]]}
-    end
-    @db.schema(nil, :reload=>true).should == {'x'=>[[:a, {:db_type=>"1"}]]}
-    @sqls.should == ['x', 'x', 1]
   end
 
   specify "should convert various types of table name arguments" do

data/spec/sequel_core/spec_helper.rb

@@ -25,7 +25,8 @@ end
 
 class MockDatabase < Sequel::Database
   @@quote_identifiers = false
-  @@upcase_identifiers = false
+  self.identifier_input_method = nil
+  self.identifier_output_method = nil
   attr_reader :sqls
   
   def execute(sql, opts={})
@@ -44,6 +45,8 @@ end
 
 class SchemaDummyDatabase < Sequel::Database
   attr_reader :sqls
+  self.identifier_input_method = nil
+  self.identifier_output_method = nil
   
   def execute(sql, opts={})
     @sqls ||= []

data/spec/sequel_core/version_spec.rb

@@ -0,0 +1,7 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+context "Sequel.version" do
+  specify "should be in the form X.Y.Z with all being numbers" do
+    Sequel.version.should =~ /\A\d+\.\d+\.\d+\z/
+  end
+end

data/spec/sequel_model/associations_spec.rb

@@ -120,7 +120,7 @@ describe Sequel::Model, "many_to_one" do
   it "should support :order, :limit (only for offset), and :dataset options, as well as a block" do
     c2 = @c2
     @c2.many_to_one :child_20, :class => @c2, :key=>:id, :dataset=>proc{c2.filter(:parent_id=>pk)}, :limit=>[10,20], :order=>:name do |ds|
-      ds.filter(:x > 1)
+      ds.filter(:x.sql_number > 1)
     end
     @c2.load(:id => 100).child_20
     MODEL_DB.sqls.should == ["SELECT * FROM nodes WHERE ((parent_id = 100) AND (x > 1)) ORDER BY name LIMIT 1 OFFSET 20"]

data/spec/sequel_model/hooks_spec.rb

@@ -37,8 +37,20 @@ describe "Model hooks" do
     c.new.before_save
     $adds.should == ['bye']
   end
-  
+
   specify "should be additive" do
+    $adds = []
+    c = Class.new(Sequel::Model)
+    c.class_eval do
+      after_save {$adds << 'hyiyie'}
+      after_save {$adds << 'byiyie'}
+    end
+
+    c.new.after_save
+    $adds.should == ['hyiyie', 'byiyie']
+  end
+  
+  specify "before hooks should run in reverse order" do
     $adds = []
     c = Class.new(Sequel::Model)
     c.class_eval do
@@ -47,7 +59,7 @@ describe "Model hooks" do
     end
     
     c.new.before_save
-    $adds.should == ['hyiyie', 'byiyie']
+    $adds.should == ['byiyie', 'hyiyie']
   end
 
   specify "should not be additive if the method or tag already exists" do
@@ -101,16 +113,16 @@ describe "Model hooks" do
     $adds = []
     a = Class.new(Sequel::Model)
     a.class_eval do
-      before_save {$adds << '123'}
+      after_save {$adds << '123'}
     end
     
     b = Class.new(a)
     b.class_eval do
-      before_save {$adds << '456'}
-      before_save {$adds << '789'}
+      after_save {$adds << '456'}
+      after_save {$adds << '789'}
     end
     
-    b.new.before_save
+    b.new.after_save
     $adds.should == ['123', '456', '789']
   end
   
@@ -139,31 +151,31 @@ describe "Model hooks" do
     
     a = Class.new(Sequel::Model)
     a.class_eval do
-      before_save {$adds << 'blah'; $flag}
-      before_save {$adds << 'cruel'}
+      after_save {$adds << 'blah'; $flag}
+      after_save {$adds << 'cruel'}
     end
     
-    a.new.before_save
+    a.new.after_save
     $adds.should == ['blah', 'cruel']
 
     # chain should not break on nil
     $adds = []
     $flag = nil
-    a.new.before_save
+    a.new.after_save
     $adds.should == ['blah', 'cruel']
     
     $adds = []
     $flag = false
-    a.new.before_save
+    a.new.after_save
     $adds.should == ['blah']
     
     b = Class.new(a)
     b.class_eval do
-      before_save {$adds << 'mau'}
+      after_save {$adds << 'mau'}
     end
     
     $adds = []
-    b.new.before_save
+    b.new.after_save
     $adds.should == ['blah']
   end
 end
@@ -428,3 +440,46 @@ describe "Model.has_hooks?" do
     @d.has_hooks?(:before_save).should be_false
   end
 end
+
+describe "Model#add_hook_type" do
+  setup do
+    class Foo < Sequel::Model(:items)
+      add_hook_type :before_bar, :after_bar
+
+      def bar
+        return :b if before_bar == false
+        return :a if after_bar == false
+        true
+      end
+    end
+    @f = Class.new(Foo)
+  end
+
+  specify "should have before_bar and after_bar class methods" do
+    @f.should respond_to(:before_bar)
+    @f.should respond_to(:before_bar)
+  end
+
+  specify "should have before_bar and after_bar instance methods" do
+    @f.new.should respond_to(:before_bar)
+    @f.new.should respond_to(:before_bar)
+  end
+
+  specify "it should return true for bar when before_bar and after_bar hooks are returing true" do
+    a = 1
+    @f.before_bar { a += 1}
+    @f.new.bar.should be_true
+    a.should == 2
+    @f.after_bar { a *= 2}
+    @f.new.bar.should be_true
+    a.should == 6
+  end
+
+  specify "it should return nil for bar when before_bar and after_bar hooks are returing false" do
+    @f.new.bar.should be_true
+    @f.after_bar { false }
+    @f.new.bar.should == :a
+    @f.before_bar { false }
+    @f.new.bar.should == :b
+  end
+end

data/spec/sequel_model/model_spec.rb

@@ -219,12 +219,12 @@ describe Sequel::Model, ".subset" do
   specify "should create a filter on the underlying dataset" do
     proc {@c.new_only}.should raise_error(NoMethodError)
     
-    @c.subset(:new_only) {:age < 'new'}
+    @c.subset(:new_only) {:age.sql_number < 'new'}
     
     @c.new_only.sql.should == "SELECT * FROM items WHERE (age < 'new')"
     @c.dataset.new_only.sql.should == "SELECT * FROM items WHERE (age < 'new')"
     
-    @c.subset(:pricey) {:price > 100}
+    @c.subset(:pricey) {:price.sql_number > 100}
     
     @c.pricey.sql.should == "SELECT * FROM items WHERE (price > 100)"
     @c.dataset.pricey.sql.should == "SELECT * FROM items WHERE (price > 100)"
@@ -262,10 +262,10 @@ describe Sequel::Model, ".find" do
   end
   
   specify "should accept filter blocks" do
-    @c.find{:id > 1}.should be_a_kind_of(@c)
+    @c.find{:id.sql_number > 1}.should be_a_kind_of(@c)
     $sqls.last.should == "SELECT * FROM items WHERE (id > 1) LIMIT 1"
 
-    @c.find {(:x > 1) & (:y < 2)}.should be_a_kind_of(@c)
+    @c.find {(:x.sql_number > 1) & (:y.sql_number < 2)}.should be_a_kind_of(@c)
     $sqls.last.should == "SELECT * FROM items WHERE ((x > 1) AND (y < 2)) LIMIT 1"
   end
 

data/spec/sequel_model/record_spec.rb

@@ -54,6 +54,28 @@ describe "Model#save" do
     o.save(:y)
     o.changed_columns.should == []
   end
+
+  it "should preserve changed_columns' and @new's value until all hook finish running" do
+    res = nil
+    @c.after_save { res = [changed_columns, @new].flatten}
+    o = @c.new(:x => 1, :y => nil)
+    o[:x] = 2
+    o.save
+    res.should == [:x,true]
+
+    res = nil
+    o = @c.load(:id => 23,:x => 1, :y => nil)
+    o[:x] = 2
+    o.save
+    res.should == [:x,false]
+
+    res = nil
+    o = @c.load(:id => 23,:x => 1, :y => nil)
+    o[:x] = 2
+    o[:y] = 22
+    o.save(:x)
+    res.should == [:x,:y,false]
+  end
   
 end
 

data/spec/sequel_model/spec_helper.rb

@@ -34,7 +34,8 @@ end
 
 class MockDatabase < Sequel::Database
   @@quote_identifiers = false
-  @@upcase_identifiers = false
+  self.identifier_input_method = nil
+  self.identifier_output_method = nil
   attr_reader :sqls
   
   def execute(sql, opts={})

data/spec/sequel_model/validations_spec.rb

@@ -120,6 +120,39 @@ describe Sequel::Model do
     atts.should == [:xx, :yy]
   end
   
+  specify "should respect allow_missing option when using multiple attributes" do
+    o = @c.new
+    def o.xx
+      self[:xx]
+    end
+    def o.yy
+      self[:yy]
+    end
+    vals = nil
+    atts = nil
+    @c.validates_each([:xx, :yy], :allow_missing=>true){|obj,a,v| atts=a; vals=v}
+
+    o.values[:xx] = 1
+    o.valid?
+    vals.should == [1,nil]
+    atts.should == [:xx, :yy]
+
+    vals = nil
+    atts = nil
+    o.values.clear
+    o.values[:yy] = 2
+    o.valid?
+    vals.should == [nil, 2]
+    atts.should == [:xx, :yy]
+
+    vals = nil
+    atts = nil
+    o.values.clear
+    o.valid?.should == true
+    vals.should == nil
+    atts.should == nil
+  end
+  
   specify "should overwrite existing validation with the same tag and attribute" do
     @c.validates_each(:xx, :xx, :tag=>:low) {|o, a, v| o.xxx; o.errors[a] << 'too low' if v < 50}
     @c.validates_each(:yy, :yy) {|o, a, v| o.yyy; o.errors[a] << 'too low' if v < 50}
@@ -243,6 +276,18 @@ describe Sequel::Model do
     @m.should_not be_valid
   end
 
+  specify "should validate acceptance_of with allow_missing => true" do
+    @c.validates_acceptance_of :value, :allow_missing => true
+    @m.should be_valid
+  end
+
+  specify "should validate acceptance_of with allow_missing => true and allow_nil => false" do
+    @c.validates_acceptance_of :value, :allow_missing => true, :allow_nil => false
+    @m.should be_valid
+    @m.value = nil
+    @m.should_not be_valid
+  end
+
   specify "should validate acceptance_of with if => true" do
     @c.validates_acceptance_of :value, :if => :dont_skip
     @m.value = '0'
@@ -300,6 +345,16 @@ describe Sequel::Model do
     @m.should be_valid
   end
 
+  specify "should validate confirmation_of with allow_missing => true" do
+    @c.send(:attr_accessor, :value_confirmation)
+    @c.validates_acceptance_of :value, :allow_missing => true
+    @m.should be_valid
+    @m.value_confirmation = 'blah'
+    @m.should be_valid
+    @m.value = nil
+    @m.should_not be_valid
+  end
+
   specify "should validate format_of" do
     @c.validates_format_of :value, :with => /.+_.+/
     @m.value = 'abc_'
@@ -327,6 +382,13 @@ describe Sequel::Model do
     @m.should be_valid
   end
   
+  specify "should validate format_of with allow_missing => true" do
+    @c.validates_format_of :value, :allow_missing => true, :with=>/./
+    @m.should be_valid
+    @m.value = nil
+    @m.should_not be_valid
+  end
+
   specify "should validate length_of with maximum" do
     @c.validates_length_of :value, :maximum => 5
     @m.should_not be_valid
@@ -386,6 +448,13 @@ describe Sequel::Model do
     @m.should be_valid
   end
 
+  specify "should validate length_of with allow_missing => true" do
+    @c.validates_length_of :value, :allow_missing => true, :minimum => 5
+    @m.should be_valid
+    @m.value = nil
+    @m.should_not be_valid
+  end
+
   specify "should allow multiple calls to validates_length_of with different options without overwriting" do
     @c.validates_length_of :value, :maximum => 5
     @c.validates_length_of :value, :minimum => 5
@@ -450,6 +519,13 @@ describe Sequel::Model do
     @m.should be_valid
   end
 
+  specify "should validate numericality_of with allow_missing => true" do
+    @c.validates_numericality_of :value, :allow_missing => true
+    @m.should be_valid
+    @m.value = nil
+    @m.should_not be_valid
+  end
+
   specify "should validate presence_of" do
     @c.validates_presence_of :value
     @m.should_not be_valid
@@ -475,6 +551,13 @@ describe Sequel::Model do
     @m.should be_valid
   end
 
+  specify "should validate presence_of with allow_missing => true" do
+    @c.validates_presence_of :value, :allow_missing => true
+    @m.should be_valid
+    @m.value = nil
+    @m.should_not be_valid
+  end
+
   specify "should validate uniqueness_of with if => true" do
     @c.validates_uniqueness_of :value, :if => :dont_skip
 
@@ -489,10 +572,11 @@ describe Sequel::Model do
     @m.should be_valid
   end
   
-  specify "should validate with :if => block" do
-    @c.validates_presence_of :value, :if => proc {false}
-    
+  specify "should validate uniqueness_of with allow_missing => true" do
+    @c.validates_uniqueness_of :value, :allow_missing => true
     @m.should be_valid
+    @m.value = nil
+    @m.should_not be_valid
   end
 end
 
@@ -631,10 +715,6 @@ describe Sequel::Model, "Validations" do
     @person.valid?.should be_true
   end
   
-  # it "should allow for :with_exactly => /[a-zA-Z]/, which wraps the supplied regex with ^<regex>$" do
-  #   pending("TODO: Add this option to Validatable#validates_format_of")
-  # end
-
   it "should validate length of column" do
     class ::Person < Sequel::Model
       validations.clear
@@ -667,6 +747,26 @@ describe Sequel::Model, "Validations" do
     @person.should be_valid
   end
   
+  it "should validate that a column doesn't have a string value" do
+    p = Class.new(Sequel::Model)
+    p.class_eval do
+      columns :age
+      self.raise_on_typecast_failure = false
+      validates_not_string :age
+      @db_schema = {:age=>{:type=>:integer}}
+    end
+    
+    @person = p.new :age => "a"
+    @person.should_not be_valid
+    @person.errors.full_messages.should == ['age is not a valid integer']
+    @person.db_schema[:age][:type] = :datetime
+    @person.should_not be_valid
+    @person.errors.full_messages.should == ['age is not a valid datetime']
+    
+    @person.age = 20
+    @person.should be_valid
+  end
+  
   it "should validate numericality of column" do
     class ::Person < Sequel::Model
       validations.clear