sequel 1.5.1 → 2.0.0

data/lib/sequel_model/schema.rb

@@ -1,50 +1,43 @@
 module Sequel
   class Model
-    # Defines a table schema (see Schema::Generator for more information).
-    #
-    # This is only needed if you want to use the create_table or drop_table
-    # methods.
-    def self.set_schema(name = nil, &block)
-      if name
-        set_dataset(db[name])
-      end
-      @schema = Schema::Generator.new(db, &block)
-      if @schema.primary_key_name
-        set_primary_key @schema.primary_key_name
-      end
-    end
-    
-    # Returns table schema for direct descendant of Model.
-    def self.schema
-      @schema || ((superclass != Model) && (superclass.schema))
-    end
-
-    # Returns name of table.
-    def self.table_name
-      dataset.opts[:from].first
-    end
-    
-    # Returns true if table exists, false otherwise.
-    def self.table_exists?
-      db.table_exists?(table_name)
-    end
-    
     # Creates table.
     def self.create_table
       db.create_table_sql_list(table_name, *schema.create_info).each {|s| db << s} 
-      @columns = nil
+      @db_schema = get_db_schema unless @@lazy_load_schema
       columns
     end
     
+    # Drops the table if it exists and then runs create_table.
+    def self.create_table!
+      drop_table if table_exists?
+      create_table
+    end
+    
     # Drops table.
     def self.drop_table
       db.execute db.drop_table_sql(table_name)
     end
+
+    # Returns table schema created with set_schema for direct descendant of Model.
+    # Does not retreive schema information from the database, see db_schema if you
+    # want that.
+    def self.schema
+      @schema || ((superclass != Model) && (superclass.schema))
+    end
+
+    # Defines a table schema (see Schema::Generator for more information).
+    #
+    # This is only needed if you want to use the create_table or drop_table
+    # methods.
+    def self.set_schema(name = nil, &block)
+      set_dataset(db[name]) if name
+      @schema = Schema::Generator.new(db, &block)
+      set_primary_key(@schema.primary_key_name) if @schema.primary_key_name
+    end
     
-    # Like create_table but invokes drop_table when table_exists? is true.
-    def self.create_table!
-      drop_table if table_exists?
-      create_table
+    # Returns true if table exists, false otherwise.
+    def self.table_exists?
+      db.table_exists?(table_name)
     end
   end
 end

data/lib/sequel_model/validations.rb

@@ -1,17 +1,3 @@
-class Array
-  # Removes and returns the last member of the array if it is a hash. Otherwise,
-  # an empty hash is returned This method is useful when writing methods that
-  # take an options hash as the last parameter. For example:
-  #
-  #   def validate_each(*args, &block)
-  #     opts = args.extract_options!
-  #     ...
-  #   end
-  def extract_options!
-    last.is_a?(Hash) ? pop : {}
-  end
-end
-
 # The Validations module provides validation capabilities as a mixin. When
 # included into a class, it enhances the class with class and instance
 # methods for defining validations and validating class instances.
@@ -41,12 +27,15 @@ module Validation
   # Validates the object.
   def validate
     errors.clear
+    return false if before_validation == false
     self.class.validate(self)
+    after_validation
+    nil
   end
 
   # Validates the object and returns true if no errors are reported.
   def valid?
-    validate
+    return false if validate == false
     errors.empty?
   end
 
@@ -57,9 +46,9 @@ module Validation
       @errors = Hash.new {|h, k| h[k] = []}
     end
     
-    # Returns true if no errors are stored.
-    def empty?
-      @errors.empty?
+    # Adds an error for the given attribute.
+    def add(att, msg)
+      @errors[att] << msg
     end
     
     # Clears all errors.
@@ -67,25 +56,14 @@ module Validation
       @errors.clear
     end
     
-    # Returns size of errors array
-    def size
-      @errors.size
-    end
-    
     # Iterates over errors
     def each(&block)
       @errors.each(&block)
     end
     
-    # Returns the errors for the given attribute.
-    def on(att)
-      @errors[att]
-    end
-    alias_method :[], :on
-    
-    # Adds an error for the given attribute.
-    def add(att, msg)
-      @errors[att] << msg
+    # Returns true if no errors are stored.
+    def empty?
+      @errors.empty?
     end
     
     # Returns an array of fully-formatted error messages.
@@ -95,6 +73,17 @@ module Validation
         m
       end
     end
+    
+    # Returns the errors for the given attribute.
+    def on(att)
+      @errors[att]
+    end
+    alias_method :[], :on
+    
+    # Returns size of errors array
+    def size
+      @errors.size
+    end
   end
   
   # The Generator class is used to generate validation definitions using 
@@ -114,6 +103,16 @@ module Validation
   
   # Validation class methods.
   module ClassMethods
+    # Returns true if validations are defined.
+    def has_validations?
+      !validations.empty?
+    end
+
+    # Instructs the model to skip validations defined in superclasses
+    def skip_superclass_validations
+      @skip_superclass_validations = true
+    end
+    
     # Defines validations by converting a longhand block into a series of 
     # shorthand definitions. For example:
     #
@@ -135,16 +134,6 @@ module Validation
       Generator.new(self, &block)
     end
 
-    # Returns the validations hash for the class.
-    def validations
-      @validations ||= Hash.new {|h, k| h[k] = []}
-    end
-
-    # Returns true if validations are defined.
-    def has_validations?
-      !validations.empty?
-    end
-
     # Validates the given instance.
     def validate(o)
       if superclass.respond_to?(:validate) && !@skip_superclass_validations
@@ -156,21 +145,6 @@ module Validation
       end
     end
     
-    def skip_superclass_validations
-      @skip_superclass_validations = true
-    end
-    
-    # Adds a validation for each of the given attributes using the supplied
-    # block. The block must accept three arguments: instance, attribute and 
-    # value, e.g.:
-    #
-    #   validates_each :name, :password do |object, attribute, value|
-    #     object.errors[attribute] << 'is not nice' unless value.nice?
-    #   end
-    def validates_each(*atts, &block)
-      atts.each {|a| validations[a] << block}
-    end
-
     # Validates acceptance of an attribute.
     def validates_acceptance_of(*atts)
       opts = {
@@ -198,6 +172,17 @@ module Validation
       end
     end
 
+    # Adds a validation for each of the given attributes using the supplied
+    # block. The block must accept three arguments: instance, attribute and 
+    # value, e.g.:
+    #
+    #   validates_each :name, :password do |object, attribute, value|
+    #     object.errors[attribute] << 'is not nice' unless value.nice?
+    #   end
+    def validates_each(*atts, &block)
+      atts.each {|a| validations[a] << block}
+    end
+
     # Validates the format of an attribute.
     def validates_format_of(*atts)
       opts = {
@@ -239,20 +224,23 @@ module Validation
       end
     end
 
-    NUMBER_RE = /^\d*\.{0,1}\d+$/
-    INTEGER_RE = /\A[+-]?\d+\Z/
-
     # Validates whether an attribute is a number.
     def validates_numericality_of(*atts)
       opts = {
         :message => 'is not a number',
       }.merge!(atts.extract_options!)
       
-      re = opts[:only_integer] ? INTEGER_RE : NUMBER_RE
-      
       validates_each(*atts) do |o, a, v|
         next if (v.nil? && opts[:allow_nil]) || (v.blank? && opts[:allow_blank])
-        o.errors[a] << opts[:message] unless v.to_s =~ re
+        begin
+          if opts[:only_integer]
+            Kernel.Integer(v.to_s)
+          else
+            Kernel.Float(v.to_s)
+          end
+        rescue
+          o.errors[a] << opts[:message]
+        end
       end
     end
 
@@ -297,17 +285,10 @@ module Validation
         o.errors[a] << opts[:message] unless allow
       end
     end
-  end
-end
 
-module Sequel
-  class Model
-    include Validation
-    
-    alias_method :save!, :save
-    def save(*args)
-      return false unless valid?
-      save!(*args)
+    # Returns the validations hash for the class.
+    def validations
+      @validations ||= Hash.new {|h, k| h[k] = []}
     end
   end
 end

data/spec/association_reflection_spec.rb

@@ -0,0 +1,85 @@
+require File.join(File.dirname(__FILE__), "spec_helper")
+
+describe Sequel::Model::Associations::AssociationReflection, "#associated_class" do
+  before do
+    @c = Class.new(Sequel::Model)
+    class ParParent < Sequel::Model; end
+  end
+
+  it "should use the :class value if present" do
+    @c.many_to_one :c, :class=>ParParent
+    @c.association_reflection(:c).should include(:class)
+    @c.association_reflection(:c).associated_class.should == ParParent
+  end
+  it "should figure out the class if the :class value is not present" do
+    @c.many_to_one :c, :class=>'ParParent'
+    @c.association_reflection(:c).should_not include(:class)
+    @c.association_reflection(:c).associated_class.should == ParParent
+  end
+end
+
+describe Sequel::Model::Associations::AssociationReflection, "#associated_primary_key" do
+  before do
+    @c = Class.new(Sequel::Model)
+    class ParParent < Sequel::Model; end
+  end
+
+  it "should use the :right_primary_key value if present" do
+    @c.many_to_one :c, :class=>ParParent, :associated_primary_key=>:blah__blah
+    @c.association_reflection(:c).should include(:associated_primary_key)
+    @c.association_reflection(:c).associated_primary_key.should == :blah__blah
+  end
+  it "should use the associated table's primary key if :associated_primary_key is not present" do
+    @c.many_to_one :c, :class=>'ParParent'
+    @c.association_reflection(:c).should_not include(:associated_primary_key)
+    @c.association_reflection(:c).associated_primary_key.should == :id
+  end
+end
+
+describe Sequel::Model::Associations::AssociationReflection, "#reciprocal" do
+  it "should use the :reciprocal value if present" do
+    @c = Class.new(Sequel::Model)
+    @d = Class.new(Sequel::Model)
+    @c.many_to_one :c, :class=>@d, :reciprocal=>:@xx
+    @c.association_reflection(:c).should include(:reciprocal)
+    @c.association_reflection(:c).reciprocal.should == :@xx
+  end
+
+  it "should figure out the reciprocal if the :reciprocal value is not present" do
+    class ParParent < Sequel::Model; end
+    class ParParentTwo < Sequel::Model; end
+    class ParParentThree < Sequel::Model; end
+    ParParent.many_to_one :par_parent_two
+    ParParentTwo.one_to_many :par_parents
+    ParParent.many_to_many :par_parent_threes
+    ParParentThree.many_to_many :par_parents
+
+    ParParent.association_reflection(:par_parent_two).should_not include(:reciprocal)
+    ParParent.association_reflection(:par_parent_two).reciprocal.should == :@par_parents
+    ParParentTwo.association_reflection(:par_parents).should_not include(:reciprocal)
+    ParParentTwo.association_reflection(:par_parents).reciprocal.should == :@par_parent_two
+    ParParent.association_reflection(:par_parent_threes).should_not include(:reciprocal)
+    ParParent.association_reflection(:par_parent_threes).reciprocal.should == :@par_parents
+    ParParentThree.association_reflection(:par_parents).should_not include(:reciprocal)
+    ParParentThree.association_reflection(:par_parents).reciprocal.should == :@par_parent_threes
+  end
+end
+
+describe Sequel::Model::Associations::AssociationReflection, "#select" do
+  before do
+    @c = Class.new(Sequel::Model)
+    class ParParent < Sequel::Model; end
+  end
+
+  it "should use the :select value if present" do
+    @c.many_to_one :c, :class=>ParParent, :select=>[:par_parents__id]
+    @c.association_reflection(:c).should include(:select)
+    @c.association_reflection(:c).select.should == [:par_parents__id]
+  end
+  it "should use the associated_table.* if :select is not present" do
+    @c.many_to_one :c, :class=>'ParParent'
+    @c.association_reflection(:c).should_not include(:select)
+    @c.association_reflection(:c).select.should == :par_parents.*
+  end
+end
+

data/spec/associations_spec.rb

@@ -11,9 +11,9 @@ describe Sequel::Model, "associate" do
     klass.associate :one_to_many, :par_parent1s, :class=>'ParParent'
     klass.associate :many_to_many, :par_parent2s, :class=>:ParParent
     
-    klass.send(:associated_class, klass.association_reflection(:"par_parent0")).should == ParParent
-    klass.send(:associated_class, klass.association_reflection(:"par_parent1s")).should == ParParent
-    klass.send(:associated_class, klass.association_reflection(:"par_parent2s")).should == ParParent
+    klass.association_reflection(:"par_parent0").associated_class.should == ParParent
+    klass.association_reflection(:"par_parent1s").associated_class.should == ParParent
+    klass.association_reflection(:"par_parent2s").associated_class.should == ParParent
   end
 end
 
@@ -42,7 +42,7 @@ describe Sequel::Model, "many_to_one" do
     p.class.should == @c2
     p.values.should == {:x => 1, :id => 1}
 
-    MODEL_DB.sqls.should == ["SELECT * FROM nodes WHERE (id = 234) LIMIT 1"]
+    MODEL_DB.sqls.should == ["SELECT nodes.* FROM nodes WHERE (id = 234) LIMIT 1"]
   end
   
   it "should use implicit class if omitted" do
@@ -55,7 +55,7 @@ describe Sequel::Model, "many_to_one" do
     p = d.par_parent
     p.class.should == ParParent
     
-    MODEL_DB.sqls.should == ["SELECT * FROM par_parents WHERE (id = 234) LIMIT 1"]
+    MODEL_DB.sqls.should == ["SELECT par_parents.* FROM par_parents WHERE (id = 234) LIMIT 1"]
   end
 
   it "should use class inside module if given as a string" do
@@ -70,7 +70,7 @@ describe Sequel::Model, "many_to_one" do
     p = d.par_parent
     p.class.should == Par::Parent
     
-    MODEL_DB.sqls.should == ["SELECT * FROM parents WHERE (id = 234) LIMIT 1"]
+    MODEL_DB.sqls.should == ["SELECT parents.* FROM parents WHERE (id = 234) LIMIT 1"]
   end
 
   it "should use explicit key if given" do
@@ -81,7 +81,13 @@ describe Sequel::Model, "many_to_one" do
     p.class.should == @c2
     p.values.should == {:x => 1, :id => 1}
 
-    MODEL_DB.sqls.should == ["SELECT * FROM nodes WHERE (id = 567) LIMIT 1"]
+    MODEL_DB.sqls.should == ["SELECT nodes.* FROM nodes WHERE (id = 567) LIMIT 1"]
+  end
+
+  it "should use :select option if given" do
+    @c2.many_to_one :parent, :class => @c2, :key => :blah, :select=>[:id, :name]
+    @c2.new(:id => 1, :blah => 567).parent
+    MODEL_DB.sqls.should == ["SELECT id, name FROM nodes WHERE (id = 567) LIMIT 1"]
   end
 
   it "should return nil if key value is nil" do
@@ -101,9 +107,9 @@ describe Sequel::Model, "many_to_one" do
     d = @c2.new(:id => 1, :parent_id=>555)
     MODEL_DB.sqls.should == []
     d.parent.should == nil
-    MODEL_DB.sqls.should == ['SELECT * FROM nodes WHERE (id = 555) LIMIT 1']
+    MODEL_DB.sqls.should == ['SELECT nodes.* FROM nodes WHERE (id = 555) LIMIT 1']
     d.parent.should == nil
-    MODEL_DB.sqls.should == ['SELECT * FROM nodes WHERE (id = 555) LIMIT 1']
+    MODEL_DB.sqls.should == ['SELECT nodes.* FROM nodes WHERE (id = 555) LIMIT 1']
   end
 
   it "should define a setter method" do
@@ -142,7 +148,7 @@ describe Sequel::Model, "many_to_one" do
     ds = @c2.dataset
     def ds.fetch_rows(sql, &block); MODEL_DB.sqls << sql; yield({:id=>234}) end
     e = d.parent 
-    MODEL_DB.sqls.should == ["SELECT * FROM nodes WHERE (id = 234) LIMIT 1"]
+    MODEL_DB.sqls.should == ["SELECT nodes.* FROM nodes WHERE (id = 234) LIMIT 1"]
     d.instance_variable_get("@parent").should == e
   end
 
@@ -176,7 +182,7 @@ describe Sequel::Model, "many_to_one" do
     d.parent_id = 234
     d.instance_variable_set(:@parent, 42)
     d.parent(true).should_not == 42 
-    MODEL_DB.sqls.should == ["SELECT * FROM nodes WHERE (id = 234) LIMIT 1"]
+    MODEL_DB.sqls.should == ["SELECT nodes.* FROM nodes WHERE (id = 234) LIMIT 1"]
   end
   
   it "should have the setter add to the reciprocal one_to_many cached association list if it exists" do
@@ -192,16 +198,16 @@ describe Sequel::Model, "many_to_one" do
     MODEL_DB.sqls.should == []
     d.parent = e
     e.children.should_not(include(d))
-    MODEL_DB.sqls.should == ['SELECT * FROM nodes WHERE (parent_id = 2)']
+    MODEL_DB.sqls.should == ['SELECT nodes.* FROM nodes WHERE (parent_id = 2)']
 
     MODEL_DB.reset
     d = @c2.new(:id => 1)
     e = @c2.new(:id => 2)
     e.children.should_not(include(d))
-    MODEL_DB.sqls.should == ['SELECT * FROM nodes WHERE (parent_id = 2)']
+    MODEL_DB.sqls.should == ['SELECT nodes.* FROM nodes WHERE (parent_id = 2)']
     d.parent = e
     e.children.should(include(d))
-    MODEL_DB.sqls.should == ['SELECT * FROM nodes WHERE (parent_id = 2)']
+    MODEL_DB.sqls.should == ['SELECT nodes.* FROM nodes WHERE (parent_id = 2)']
   end
 
   it "should have the setter remove the object from the previous associated object's reciprocal one_to_many cached association list if it exists" do
@@ -238,7 +244,7 @@ describe Sequel::Model, "many_to_one" do
     ds = @c2.dataset
     def ds.fetch_rows(sql, &block); MODEL_DB.sqls << sql; yield({:id=>234}) end
     e = d.parent 
-    MODEL_DB.sqls.should == ["SELECT * FROM nodes WHERE (id = 234) LIMIT 1"]
+    MODEL_DB.sqls.should == ["SELECT nodes.* FROM nodes WHERE (id = 234) LIMIT 1"]
     d.instance_variable_get("@parent").should == e
   end
 end
@@ -282,7 +288,7 @@ describe Sequel::Model, "one_to_many" do
     n = @c2.new(:id => 1234)
     a = n.attributes_dataset
     a.should be_a_kind_of(Sequel::Dataset)
-    a.sql.should == 'SELECT * FROM attributes WHERE (node_id = 1234)'
+    a.sql.should == 'SELECT attributes.* FROM attributes WHERE (node_id = 1234)'
   end
   
   it "should use implicit class if omitted" do
@@ -294,7 +300,7 @@ describe Sequel::Model, "one_to_many" do
     n = @c2.new(:id => 1234)
     v = n.historical_values_dataset
     v.should be_a_kind_of(Sequel::Dataset)
-    v.sql.should == 'SELECT * FROM historical_values WHERE (node_id = 1234)'
+    v.sql.should == 'SELECT historical_values.* FROM historical_values WHERE (node_id = 1234)'
     v.model_classes.should == {nil => HistoricalValue}
   end
   
@@ -309,7 +315,7 @@ describe Sequel::Model, "one_to_many" do
     n = @c2.new(:id => 1234)
     v = n.historical_values_dataset
     v.should be_a_kind_of(Sequel::Dataset)
-    v.sql.should == 'SELECT * FROM values WHERE (node_id = 1234)'
+    v.sql.should == 'SELECT values.* FROM values WHERE (node_id = 1234)'
     v.model_classes.should == {nil => Historical::Value}
   end
 
@@ -319,7 +325,7 @@ describe Sequel::Model, "one_to_many" do
     n = @c2.new(:id => 1234)
     a = n.attributes_dataset
     a.should be_a_kind_of(Sequel::Dataset)
-    a.sql.should == 'SELECT * FROM attributes WHERE (nodeid = 1234)'
+    a.sql.should == 'SELECT attributes.* FROM attributes WHERE (nodeid = 1234)'
   end
 
   it "should define an add_ method" do
@@ -344,18 +350,25 @@ describe Sequel::Model, "one_to_many" do
     MODEL_DB.sqls.should == ['UPDATE attributes SET node_id = NULL WHERE (id = 2345)']
   end
   
+  it "should support a select option" do
+    @c2.one_to_many :attributes, :class => @c1, :select => [:id, :name]
+
+    n = @c2.new(:id => 1234)
+    n.attributes_dataset.sql.should == "SELECT id, name FROM attributes WHERE (node_id = 1234)"
+  end
+  
   it "should support an order option" do
     @c2.one_to_many :attributes, :class => @c1, :order => :kind
 
     n = @c2.new(:id => 1234)
-    n.attributes_dataset.sql.should == "SELECT * FROM attributes WHERE (node_id = 1234) ORDER BY kind"
+    n.attributes_dataset.sql.should == "SELECT attributes.* FROM attributes WHERE (node_id = 1234) ORDER BY kind"
   end
   
   it "should support an array for the order option" do
     @c2.one_to_many :attributes, :class => @c1, :order => [:kind1, :kind2]
 
     n = @c2.new(:id => 1234)
-    n.attributes_dataset.sql.should == "SELECT * FROM attributes WHERE (node_id = 1234) ORDER BY kind1, kind2"
+    n.attributes_dataset.sql.should == "SELECT attributes.* FROM attributes WHERE (node_id = 1234) ORDER BY kind1, kind2"
   end
   
   it "should return array with all members of the association" do
@@ -368,7 +381,7 @@ describe Sequel::Model, "one_to_many" do
     atts.first.should be_a_kind_of(@c1)
     atts.first.values.should == {}
     
-    MODEL_DB.sqls.should == ['SELECT * FROM attributes WHERE (node_id = 1234)']
+    MODEL_DB.sqls.should == ['SELECT attributes.* FROM attributes WHERE (node_id = 1234)']
   end
   
   it "should accept a block" do
@@ -383,7 +396,7 @@ describe Sequel::Model, "one_to_many" do
     atts.first.should be_a_kind_of(@c1)
     atts.first.values.should == {}
     
-    MODEL_DB.sqls.should == ['SELECT * FROM attributes WHERE (node_id = 1234) AND (xxx IS NULL)']
+    MODEL_DB.sqls.should == ['SELECT attributes.* FROM attributes WHERE ((node_id = 1234) AND (xxx IS NULL))']
   end
   
   it "should support order option with block" do
@@ -398,7 +411,7 @@ describe Sequel::Model, "one_to_many" do
     atts.first.should be_a_kind_of(@c1)
     atts.first.values.should == {}
     
-    MODEL_DB.sqls.should == ['SELECT * FROM attributes WHERE (node_id = 1234) AND (xxx IS NULL) ORDER BY kind']
+    MODEL_DB.sqls.should == ['SELECT attributes.* FROM attributes WHERE ((node_id = 1234) AND (xxx IS NULL)) ORDER BY kind']
   end
   
   it "should set cached instance variable when accessed" do
@@ -409,7 +422,7 @@ describe Sequel::Model, "one_to_many" do
     n.instance_variables.include?("@attributes").should == false
     atts = n.attributes
     atts.should == n.instance_variable_get("@attributes")
-    MODEL_DB.sqls.should == ['SELECT * FROM attributes WHERE (node_id = 1234)']
+    MODEL_DB.sqls.should == ['SELECT attributes.* FROM attributes WHERE (node_id = 1234)']
   end
 
   it "should use cached instance variable if available" do
@@ -429,7 +442,7 @@ describe Sequel::Model, "one_to_many" do
     MODEL_DB.reset
     n.instance_variable_set(:@attributes, 42)
     n.attributes(true).should_not == 42
-    MODEL_DB.sqls.should == ['SELECT * FROM attributes WHERE (node_id = 1234)']
+    MODEL_DB.sqls.should == ['SELECT attributes.* FROM attributes WHERE (node_id = 1234)']
   end
 
   it "should add item to cached instance variable if it exists when calling add_" do
@@ -488,7 +501,7 @@ describe Sequel::Model, "one_to_many" do
     atts.first.should be_a_kind_of(@c1)
     atts.first.values.should == {}
     
-    MODEL_DB.sqls.should == ['SELECT * FROM attributes WHERE (node_id = 1234)']
+    MODEL_DB.sqls.should == ['SELECT attributes.* FROM attributes WHERE (node_id = 1234)']
   end
   
   it "should populate the reciprocal many_to_one instance variable when loading the one_to_many association" do
@@ -497,7 +510,7 @@ describe Sequel::Model, "one_to_many" do
     
     n = @c2.new(:id => 1234)
     atts = n.attributes
-    MODEL_DB.sqls.should == ['SELECT * FROM attributes WHERE (node_id = 1234)']
+    MODEL_DB.sqls.should == ['SELECT attributes.* FROM attributes WHERE (node_id = 1234)']
     atts.should be_a_kind_of(Array)
     atts.size.should == 1
     atts.first.should be_a_kind_of(@c1)
@@ -512,7 +525,7 @@ describe Sequel::Model, "one_to_many" do
     
     n = @c2.new(:id => 1234)
     atts = n.attributes
-    MODEL_DB.sqls.should == ['SELECT * FROM attributes WHERE (node_id = 1234)']
+    MODEL_DB.sqls.should == ['SELECT attributes.* FROM attributes WHERE (node_id = 1234)']
     atts.should be_a_kind_of(Array)
     atts.size.should == 1
     atts.first.should be_a_kind_of(@c1)
@@ -521,6 +534,55 @@ describe Sequel::Model, "one_to_many" do
     
     MODEL_DB.sqls.length.should == 1
   end
+  
+  it "should have an remove_all_ method that removes all associations" do
+    @c2.one_to_many :attributes, :class => @c1
+    @c2.new(:id => 1234).remove_all_attributes
+    MODEL_DB.sqls.first.should == 'UPDATE attributes SET node_id = NULL WHERE (node_id = 1234)'
+  end
+
+  it "remove_all should set the cached instance variable to []" do
+    @c2.one_to_many :attributes, :class => @c1
+    node = @c2.new(:id => 1234)
+    node.remove_all_attributes
+    node.instance_variable_get(:@attributes).should == []
+  end
+
+  it "remove_all should return the array of previously associated items if the cached instance variable exists" do
+    @c2.one_to_many :attributes, :class => @c1
+    attrib = @c1.new(:id=>3)
+    node = @c2.new(:id => 1234)
+    d = @c1.dataset
+    def d.fetch_rows(s); end
+    node.attributes.should == []
+    def attrib.save!; end
+    node.add_attribute(attrib)
+    node.instance_variable_get(:@attributes).should == [attrib]
+    node.remove_all_attributes.should == [attrib]
+  end
+
+  it "remove_all should return nil if the cached instance variable does not exist" do
+    @c2.one_to_many :attributes, :class => @c1
+    @c2.new(:id => 1234).remove_all_attributes.should == nil
+  end
+
+  it "remove_all should remove the current item from all reciprocal instance varaibles if it cached instance variable exists" do
+    @c2.one_to_many :attributes, :class => @c1
+    @c1.many_to_one :node, :class => @c2
+    d = @c1.dataset
+    def d.fetch_rows(s); end
+    d = @c2.dataset
+    def d.fetch_rows(s); end
+    attrib = @c1.new(:id=>3)
+    node = @c2.new(:id => 1234)
+    node.attributes.should == []
+    attrib.node.should == nil
+    def attrib.save!; end
+    node.add_attribute(attrib)
+    attrib.instance_variable_get(:@node).should == node 
+    node.remove_all_attributes
+    attrib.instance_variable_get(:@node).should == :null
+  end
 end
 
 describe Sequel::Model, "many_to_many" do
@@ -559,9 +621,7 @@ describe Sequel::Model, "many_to_many" do
     n = @c2.new(:id => 1234)
     a = n.attributes_dataset
     a.should be_a_kind_of(Sequel::Dataset)
-    ['SELECT attributes.* FROM attributes INNER JOIN attributes_nodes ON (attributes_nodes.attribute_id = attributes.id) AND (attributes_nodes.node_id = 1234)',
-     'SELECT attributes.* FROM attributes INNER JOIN attributes_nodes ON (attributes_nodes.node_id = 1234) AND (attributes_nodes.attribute_id = attributes.id)'
-    ].should(include(a.sql))
+    a.sql.should == 'SELECT attributes.* FROM attributes INNER JOIN attributes_nodes ON ((attributes_nodes.attribute_id = attributes.id) AND (attributes_nodes.node_id = 1234))'
   end
   
   it "should use implicit class if omitted" do
@@ -573,9 +633,7 @@ describe Sequel::Model, "many_to_many" do
     n = @c2.new(:id => 1234)
     a = n.tags_dataset
     a.should be_a_kind_of(Sequel::Dataset)
-    ['SELECT tags.* FROM tags INNER JOIN nodes_tags ON (nodes_tags.tag_id = tags.id) AND (nodes_tags.node_id = 1234)',
-     'SELECT tags.* FROM tags INNER JOIN nodes_tags ON (nodes_tags.node_id = 1234) AND (nodes_tags.tag_id = tags.id)'
-    ].should(include(a.sql))
+    a.sql.should == 'SELECT tags.* FROM tags INNER JOIN nodes_tags ON ((nodes_tags.tag_id = tags.id) AND (nodes_tags.node_id = 1234))'
   end
   
   it "should use class inside module if given as a string" do
@@ -589,9 +647,7 @@ describe Sequel::Model, "many_to_many" do
     n = @c2.new(:id => 1234)
     a = n.tags_dataset
     a.should be_a_kind_of(Sequel::Dataset)
-    ['SELECT tags.* FROM tags INNER JOIN nodes_tags ON (nodes_tags.tag_id = tags.id) AND (nodes_tags.node_id = 1234)',
-     'SELECT tags.* FROM tags INNER JOIN nodes_tags ON (nodes_tags.node_id = 1234) AND (nodes_tags.tag_id = tags.id)'
-    ].should(include(a.sql))
+    a.sql.should == 'SELECT tags.* FROM tags INNER JOIN nodes_tags ON ((nodes_tags.tag_id = tags.id) AND (nodes_tags.node_id = 1234))'
   end
   
   it "should use explicit key values and join table if given" do
@@ -600,9 +656,7 @@ describe Sequel::Model, "many_to_many" do
     n = @c2.new(:id => 1234)
     a = n.attributes_dataset
     a.should be_a_kind_of(Sequel::Dataset)
-    ['SELECT attributes.* FROM attributes INNER JOIN attribute2node ON (attribute2node.nodeid = 1234) AND (attribute2node.attributeid = attributes.id)',
-     'SELECT attributes.* FROM attributes INNER JOIN attribute2node ON (attribute2node.attributeid = attributes.id) AND (attribute2node.nodeid = 1234)'
-    ].should(include(a.sql))
+    a.sql.should == 'SELECT attributes.* FROM attributes INNER JOIN attribute2node ON ((attribute2node.attributeid = attributes.id) AND (attribute2node.nodeid = 1234))'
   end
   
   it "should support an order option" do
@@ -611,9 +665,7 @@ describe Sequel::Model, "many_to_many" do
     n = @c2.new(:id => 1234)
     a = n.attributes_dataset
     a.should be_a_kind_of(Sequel::Dataset)
-    ['SELECT attributes.* FROM attributes INNER JOIN attributes_nodes ON (attributes_nodes.attribute_id = attributes.id) AND (attributes_nodes.node_id = 1234) ORDER BY blah',
-     'SELECT attributes.* FROM attributes INNER JOIN attributes_nodes ON (attributes_nodes.node_id = 1234) AND (attributes_nodes.attribute_id = attributes.id) ORDER BY blah'
-    ].should(include(a.sql))
+    a.sql.should == 'SELECT attributes.* FROM attributes INNER JOIN attributes_nodes ON ((attributes_nodes.attribute_id = attributes.id) AND (attributes_nodes.node_id = 1234)) ORDER BY blah'
   end
   
   it "should support an array for the order option" do
@@ -622,9 +674,7 @@ describe Sequel::Model, "many_to_many" do
     n = @c2.new(:id => 1234)
     a = n.attributes_dataset
     a.should be_a_kind_of(Sequel::Dataset)
-    ['SELECT attributes.* FROM attributes INNER JOIN attributes_nodes ON (attributes_nodes.attribute_id = attributes.id) AND (attributes_nodes.node_id = 1234) ORDER BY blah1, blah2',
-     'SELECT attributes.* FROM attributes INNER JOIN attributes_nodes ON (attributes_nodes.node_id = 1234) AND (attributes_nodes.attribute_id = attributes.id) ORDER BY blah1, blah2'
-    ].should(include(a.sql))
+    a.sql.should == 'SELECT attributes.* FROM attributes INNER JOIN attributes_nodes ON ((attributes_nodes.attribute_id = attributes.id) AND (attributes_nodes.node_id = 1234)) ORDER BY blah1, blah2'
   end
   
   it "should support a select option" do
@@ -633,9 +683,7 @@ describe Sequel::Model, "many_to_many" do
     n = @c2.new(:id => 1234)
     a = n.attributes_dataset
     a.should be_a_kind_of(Sequel::Dataset)
-    ['SELECT blah FROM attributes INNER JOIN attributes_nodes ON (attributes_nodes.attribute_id = attributes.id) AND (attributes_nodes.node_id = 1234)',
-     'SELECT blah FROM attributes INNER JOIN attributes_nodes ON (attributes_nodes.node_id = 1234) AND (attributes_nodes.attribute_id = attributes.id)'
-    ].should(include(a.sql))
+    a.sql.should == 'SELECT blah FROM attributes INNER JOIN attributes_nodes ON ((attributes_nodes.attribute_id = attributes.id) AND (attributes_nodes.node_id = 1234))'
   end
   
   it "should support an array for the select option" do
@@ -644,9 +692,7 @@ describe Sequel::Model, "many_to_many" do
     n = @c2.new(:id => 1234)
     a = n.attributes_dataset
     a.should be_a_kind_of(Sequel::Dataset)
-    ['SELECT attributes.*, attribute_nodes.blah2 FROM attributes INNER JOIN attributes_nodes ON (attributes_nodes.attribute_id = attributes.id) AND (attributes_nodes.node_id = 1234)',
-     'SELECT attributes.*, attribute_nodes.blah2 FROM attributes INNER JOIN attributes_nodes ON (attributes_nodes.node_id = 1234) AND (attributes_nodes.attribute_id = attributes.id)'
-    ].should(include(a.sql))
+    a.sql.should == 'SELECT attributes.*, attribute_nodes.blah2 FROM attributes INNER JOIN attributes_nodes ON ((attributes_nodes.attribute_id = attributes.id) AND (attributes_nodes.node_id = 1234))'
   end
   
   it "should accept a block" do
@@ -660,9 +706,7 @@ describe Sequel::Model, "many_to_many" do
     a.should be_a_kind_of(Array)
     a.size.should == 1
     a.first.should be_a_kind_of(@c1)
-    ['SELECT attributes.* FROM attributes INNER JOIN attributes_nodes ON (attributes_nodes.attribute_id = attributes.id) AND (attributes_nodes.node_id = 1234) WHERE (xxx = 555)',
-     'SELECT attributes.* FROM attributes INNER JOIN attributes_nodes ON (attributes_nodes.node_id = 1234) AND (attributes_nodes.attribute_id = attributes.id) WHERE (xxx = 555)'
-    ].should(include(MODEL_DB.sqls.first))
+    MODEL_DB.sqls.first.should == 'SELECT attributes.* FROM attributes INNER JOIN attributes_nodes ON ((attributes_nodes.attribute_id = attributes.id) AND (attributes_nodes.node_id = 1234)) WHERE (xxx = 555)'
   end
 
   it "should allow the order option while accepting a block" do
@@ -676,9 +720,7 @@ describe Sequel::Model, "many_to_many" do
     a.should be_a_kind_of(Array)
     a.size.should == 1
     a.first.should be_a_kind_of(@c1)
-    ['SELECT attributes.* FROM attributes INNER JOIN attributes_nodes ON (attributes_nodes.attribute_id = attributes.id) AND (attributes_nodes.node_id = 1234) WHERE (xxx = 555) ORDER BY blah1, blah2',
-     'SELECT attributes.* FROM attributes INNER JOIN attributes_nodes ON (attributes_nodes.node_id = 1234) AND (attributes_nodes.attribute_id = attributes.id) WHERE (xxx = 555) ORDER BY blah1, blah2'
-    ].should(include(MODEL_DB.sqls.first))
+    MODEL_DB.sqls.first.should == 'SELECT attributes.* FROM attributes INNER JOIN attributes_nodes ON ((attributes_nodes.attribute_id = attributes.id) AND (attributes_nodes.node_id = 1234)) WHERE (xxx = 555) ORDER BY blah1, blah2'
   end
 
   it "should define an add_ method" do
@@ -698,9 +740,7 @@ describe Sequel::Model, "many_to_many" do
     n = @c2.new(:id => 1234)
     a = @c1.new(:id => 2345)
     a.should == n.remove_attribute(a)
-    ['DELETE FROM attributes_nodes WHERE (node_id = 1234) AND (attribute_id = 2345)',
-     'DELETE FROM attributes_nodes WHERE (attribute_id = 2345) AND (node_id = 1234)'
-    ].should(include(MODEL_DB.sqls.first))
+    MODEL_DB.sqls.first.should == 'DELETE FROM attributes_nodes WHERE ((node_id = 1234) AND (attribute_id = 2345))'
   end
 
   it "should provide an array with all members of the association" do
@@ -712,9 +752,7 @@ describe Sequel::Model, "many_to_many" do
     atts.size.should == 1
     atts.first.should be_a_kind_of(@c1)
 
-    ['SELECT attributes.* FROM attributes INNER JOIN attributes_nodes ON (attributes_nodes.attribute_id = attributes.id) AND (attributes_nodes.node_id = 1234)',
-     'SELECT attributes.* FROM attributes INNER JOIN attributes_nodes ON (attributes_nodes.node_id = 1234) AND (attributes_nodes.attribute_id = attributes.id)'
-    ].should(include(MODEL_DB.sqls.first))
+    MODEL_DB.sqls.first.should == 'SELECT attributes.* FROM attributes INNER JOIN attributes_nodes ON ((attributes_nodes.attribute_id = attributes.id) AND (attributes_nodes.node_id = 1234))'
   end
 
   it "should set cached instance variable when accessed" do
@@ -800,11 +838,55 @@ describe Sequel::Model, "many_to_many" do
     n = @c2.new(:id => 1234)
     a = n.attributes_dataset
     a.should be_a_kind_of(Sequel::Dataset)
-    ['SELECT attributes.* FROM attributes INNER JOIN attributes_nodes ON (attributes_nodes.attribute_id = attributes.id) AND (attributes_nodes.node_id = 1234)',
-     'SELECT attributes.* FROM attributes INNER JOIN attributes_nodes ON (attributes_nodes.node_id = 1234) AND (attributes_nodes.attribute_id = attributes.id)'
-    ].should(include(a.sql))
+    a.sql.should == 'SELECT attributes.* FROM attributes INNER JOIN attributes_nodes ON ((attributes_nodes.attribute_id = attributes.id) AND (attributes_nodes.node_id = 1234))'
   end
   
+  it "should have an remove_all_ method that removes all associations" do
+    @c2.many_to_many :attributes, :class => @c1
+    @c2.new(:id => 1234).remove_all_attributes
+    MODEL_DB.sqls.first.should == 'DELETE FROM attributes_nodes WHERE (node_id = 1234)'
+  end
+
+  it "remove_all should set the cached instance variable to []" do
+    @c2.many_to_many :attributes, :class => @c1
+    node = @c2.new(:id => 1234)
+    node.remove_all_attributes
+    node.instance_variable_get(:@attributes).should == []
+  end
+
+  it "remove_all should return the array of previously associated items if the cached instance variable exists" do
+    @c2.many_to_many :attributes, :class => @c1
+    attrib = @c1.new(:id=>3)
+    node = @c2.new(:id => 1234)
+    d = @c1.dataset
+    def d.fetch_rows(s); end
+    node.attributes.should == []
+    node.add_attribute(attrib)
+    node.instance_variable_get(:@attributes).should == [attrib]
+    node.remove_all_attributes.should == [attrib]
+  end
+
+  it "remove_all should return nil if the cached instance variable does not exist" do
+    @c2.many_to_many :attributes, :class => @c1
+    @c2.new(:id => 1234).remove_all_attributes.should == nil
+  end
+
+  it "remove_all should remove the current item from all reciprocal instance varaibles if it cached instance variable exists" do
+    @c2.many_to_many :attributes, :class => @c1
+    @c1.many_to_many :nodes, :class => @c2
+    d = @c1.dataset
+    def d.fetch_rows(s); end
+    d = @c2.dataset
+    def d.fetch_rows(s); end
+    attrib = @c1.new(:id=>3)
+    node = @c2.new(:id => 1234)
+    node.attributes.should == []
+    attrib.nodes.should == []
+    node.add_attribute(attrib)
+    attrib.instance_variable_get(:@nodes).should == [node]
+    node.remove_all_attributes
+    attrib.instance_variable_get(:@nodes).should == []
+  end
 end
 
 describe Sequel::Model, "all_association_reflections" do
@@ -821,14 +903,17 @@ describe Sequel::Model, "all_association_reflections" do
     @c1.associate :many_to_one, :parent, :class => @c1
     @c1.all_association_reflections.should == [{
       :type => :many_to_one, :name => :parent, :class_name => 'Node', 
-      :class => @c1, :key => :parent_id, :block => nil, :cache => true
+      :class => @c1, :key => :parent_id, :block => nil, :cache => true,
+      :graph_join_type=>:left_outer, :graph_conditions=>[], :eager_block => nil, :model => @c1
     }]
     @c1.associate :one_to_many, :children, :class => @c1
     @c1.all_association_reflections.sort_by{|x|x[:name].to_s}.should == [{
       :type => :one_to_many, :name => :children, :class_name => 'Node', 
-      :class => @c1, :key => :node_id, :block => nil, :cache => true}, {
+      :class => @c1, :key => :node_id, :block => nil, :cache => true,
+      :graph_join_type=>:left_outer, :graph_conditions=>[], :eager_block => nil, :model => @c1}, {
       :type => :many_to_one, :name => :parent, :class_name => 'Node',
-      :class => @c1, :key => :parent_id, :block => nil, :cache => true}]
+      :class => @c1, :key => :parent_id, :block => nil, :cache => true,
+      :graph_join_type=>:left_outer, :graph_conditions=>[], :eager_block => nil, :model => @c1}]
   end
 end
 
@@ -849,12 +934,14 @@ describe Sequel::Model, "association_reflection" do
     @c1.associate :many_to_one, :parent, :class => @c1
     @c1.association_reflection(:parent).should == {
       :type => :many_to_one, :name => :parent, :class_name => 'Node', 
-      :class => @c1, :key => :parent_id, :block => nil, :cache => true
+      :class => @c1, :key => :parent_id, :block => nil, :cache => true,
+      :graph_join_type=>:left_outer, :graph_conditions=>[], :eager_block => nil, :model => @c1
     }
     @c1.associate :one_to_many, :children, :class => @c1
     @c1.association_reflection(:children).should == {
       :type => :one_to_many, :name => :children, :class_name => 'Node', 
-      :class => @c1, :key => :node_id, :block => nil, :cache => true
+      :class => @c1, :key => :node_id, :block => nil, :cache => true,
+      :graph_join_type=>:left_outer, :graph_conditions=>[], :eager_block => nil, :model => @c1
     }
   end
 end