Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Jun 26, 2013
  1. @carlosantoniodasilva
  2. @carlosantoniodasilva

    Merge pull request #10373 from janko-m/fix-store-accessor

    carlosantoniodasilva authored
    Fix a bug in ActiveRecord::Store accessors
Commits on Apr 3, 2013
  1. @carlosantoniodasilva

    Merge pull request #7792 from seejee/chained_scopes_preload_properly

    carlosantoniodasilva authored
    Fixes Issue #7490: Chained scopes will preload properly
Commits on Mar 20, 2013
  1. @carlosantoniodasilva
Commits on Mar 18, 2013
  1. @carlosantoniodasilva
  2. @carlosantoniodasilva
Commits on Feb 28, 2013
  1. @carlosantoniodasilva
Commits on Feb 26, 2013
  1. @carlosantoniodasilva
Commits on Feb 12, 2013
  1. @carlosantoniodasilva
Commits on Jan 22, 2013
  1. @carlosantoniodasilva
Commits on Jan 15, 2013
  1. @carlosantoniodasilva

    Revert "Merge pull request #7983 from georgebrock/bug7950-squashed"

    carlosantoniodasilva authored
    This reverts commit 88a296d, reversing
    changes made to 666a7e3.
    
    Conflicts:
    	activerecord/CHANGELOG.md
    
    Reason: this has been resulting in some hard to track bugs and is
    introducing a possible breackage in a stable version.
Commits on Jan 9, 2013
  1. @carlosantoniodasilva
Commits on Dec 11, 2012
  1. @carlosantoniodasilva

    Add :nsec format only for Ruby 1.9

    carlosantoniodasilva authored
    Ruby 1.8 does not support this format in Time, so the format will only
    be added to the available date formats on Ruby 1.9. Changelog entry was
    changed to explain that as well.
Commits on Dec 7, 2012
  1. @carlosantoniodasilva

    Unscope update_column(s) query to ignore default scope

    carlosantoniodasilva authored
    When applying default_scope to a class with a where clause, using
    update_column(s) could generate a query that would not properly update
    the record due to the where clause from the default_scope being applied
    to the update query.
    
        class User < ActiveRecord::Base
          default_scope where(active: true)
        end
    
        user = User.first
        user.active = false
        user.save!
    
        user.update_column(:active, true) # => false
    
    In this situation we want to skip the default_scope clause and just
    update the record based on the primary key. With this change:
    
        user.update_column(:active, true) # => true
    
    Backport of #8436 fix.
    
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/persistence.rb
    	activerecord/test/cases/persistence_test.rb
Commits on Nov 26, 2012
  1. @carlosantoniodasilva

    Merge pull request #8311 from alisdair/dirty-nullable-datetime

    carlosantoniodasilva authored
    Don't call will_change! for datetime nil->"".
    
    Setting a nil datetime attribute to a blank string should not cause the
    attribute to be dirty.
    
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
Commits on Nov 16, 2012
  1. @carlosantoniodasilva

    Merge pull request #7983 from georgebrock/bug7950-squashed

    carlosantoniodasilva authored
    Backport 4bc2ae0 to fix #7950
    
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/relation/calculations.rb
Commits on Nov 12, 2012
  1. @carlosantoniodasilva

    Merge pull request #8154 from bogdan/has_one_association_performance

    carlosantoniodasilva authored
    Remove unwanted transaction when has one association is built
    
    Conflicts:
    	activerecord/CHANGELOG.md
Commits on Nov 1, 2012
  1. @carlosantoniodasilva

    Fix issue with collection associations and first(n)/last(n)

    carlosantoniodasilva authored
    When calling first(n) or last(n) in a collection, Active Record was
    improperly trying to set the inverse of instance in case that option
    existed. This change was introduced by
    fdf4eae.
    
    In such cases we don't need to do that "manually", since the way
    collection will be loaded will already handle that, so we just skip
    setting the inverse association when any argument is given to
    first(n)/last(n).
    
    The test included ensures that these scenarios will have the inverse of
    instance set properly.
    
    Fixes #8087, Closes #8094.
Commits on Oct 29, 2012
  1. @carlosantoniodasilva @rafaelfranca

    Merge pull request #8053 from henrik/update_columns_with_primary_key

    carlosantoniodasilva authored rafaelfranca committed
    Unbreak update_column/update_columns for the primary key attribute.
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/persistence.rb
    	activerecord/test/cases/persistence_test.rb
Commits on Aug 21, 2012
  1. @carlosantoniodasilva

    Merge pull request #7377 from brainopia/use_inversed_parent_for_first…

    carlosantoniodasilva authored
    …_and_last_child
    
    Use inversed parent for first and last child of has_many association
    
    [Backport] Closes #3223.
    
    Conflicts:
    	activerecord/lib/active_record/associations/collection_association.rb
Commits on Aug 15, 2012
  1. @carlosantoniodasilva
Something went wrong with that request. Please try again.