Skip to content
Commits on Jul 15, 2013
  1. @senny @rafaelfranca

    Merge pull request #11451 from jetthoughts/11450_do_not_resave_destro…

    senny committed with rafaelfranca Jul 15, 2013
    …yed_association
    
    Do not re-save destroyed association on saving parent object
    Conflicts:
    	activerecord/lib/active_record/autosave_association.rb
Commits on Jun 25, 2013
  1. @senny

    Revert "Revert "Merge pull request #10901 from armstrjare/fix_query_n…

    senny committed Jun 25, 2013
    …ull_foreign_key_on_new_record_collection_ids_reader""
    
    This reverts commit 5009b07.
    
    Also updated the CHANGELOG and adjusted the test-case to match the one on master.
Commits on Jun 22, 2013
  1. @senny

    Revert "Merge pull request #10901 from armstrjare/fix_query_null_fore…

    senny committed Jun 22, 2013
    …ign_key_on_new_record_collection_ids_reader"
    
    This reverts commit 6675d71, reversing
    changes made to 919d1a1.
    
    I missed to check the target branch and wrongly merged it into 3-2-stable directly.
  2. @senny

    Merge pull request #10901 from armstrjare/fix_query_null_foreign_key_…

    senny committed Jun 22, 2013
    …on_new_record_collection_ids_reader
    
    Fixes CollectionAssociation#ids_reader returning incorrect ids for new records
Commits on Jun 15, 2013
  1. @senny

    Merge pull request #10925 from senny/10917_test_to_prevent_regression

    senny committed Jun 15, 2013
    regression test + mysql2 adapter raises correct error if conn is closed.
    Conflicts:
    
    	activerecord/CHANGELOG.md
Commits on Feb 23, 2013
  1. @senny

    Sqlite preserves primary keys when copying/altering tables.

    senny committed Feb 23, 2013
    Backport #2312.
    Fixes #9367.
    
    I also added a test-case to make sure that renaming or removing
    a column preserves the primary key.
Commits on Feb 19, 2013
  1. @senny

    don't cache invalid subsets when preloading hmt associations.

    senny committed Feb 11, 2013
    Backport #9252.
    
    Conflicts:
    
    	activerecord/CHANGELOG.md
    	activerecord/test/cases/associations/eager_test.rb
    
    The preloader code on 3-2-stable is not based on relations but on option hashes.
    I had to modify the original patch and comparing the option hashes could be more
    fuzzy than comparing the relations. All the tests passed though.
Commits on Dec 19, 2012
  1. @senny

    Backport #8522, Keep index names when using with sqlite3

    senny committed with senny Dec 15, 2012
    Conflicts:
    
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
    	activerecord/test/cases/migration/rename_column_test.rb
Commits on Dec 13, 2012
  1. @senny

    recognize migrations, in folders containing numbers and 'rb'.

    senny committed with senny Dec 12, 2012
    Backport of #8500
    Closes #8492
    
    Conflicts:
    
    	activerecord/test/cases/migrator_test.rb
Commits on Dec 4, 2012
  1. @senny

    backport #8403, no intermediate AR objects when eager loading.

    senny committed with senny Dec 2, 2012
    Closes #3313
    
    Conflicts:
    
    	activerecord/CHANGELOG.md
    	activerecord/test/models/developer.rb
Commits on Nov 22, 2012
  1. @senny

    backport #8291, prevent mass assignment of polymorphic type with `build`

    senny committed Nov 21, 2012
    Closes #8265
    
    Conflicts:
    
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/associations/association.rb
Commits on Nov 13, 2012
  1. @senny

    backport #8176, `#pluck` can be used on a relation with `select` clause.

    senny committed with senny Nov 11, 2012
    Conflicts:
    
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/relation/calculations.rb
    	activerecord/test/cases/calculations_test.rb
Commits on Sep 3, 2012
  1. @senny

    set the configured #inheritance_column on #become (#7503)

    senny committed with senny Sep 2, 2012
    I had to create a new table because I needed an STI table,
    which does not have both a "type" and a "custom_type"
    
    the test fails with:
      1) Error:
    test_alt_becomes_works_with_sti(InheritanceTest):
    NoMethodError: undefined method `type=' for #<Cabbage id: 1, name: "my cucumber", custom_type: "Cucumber">
        /Users/username/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:432:in `method_missing'
        /Users/username/Projects/rails/activerecord/lib/active_record/attribute_methods.rb:100:in `method_missing'
        /Users/username/Projects/rails/activerecord/lib/active_record/persistence.rb:165:in `becomes'
        test/cases/inheritance_test.rb:134:in `test_becomes_works_with_sti'
        test/cases/inheritance_test.rb:140:in `test_alt_becomes_works_with_sti'
    
    Conflicts:
    
    	activerecord/test/cases/inheritance_test.rb
Something went wrong with that request. Please try again.