Permalink
Commits on Dec 28, 2011
  1. Merge pull request #4222 from amatsuda/ar_predicate_builder_refactor

    tenderlove committed Dec 28, 2011
    refactor AR::PredicateBuilder.build_from_hash
  2. Merge pull request #4221 from tonycoco/master

    jonleighton committed Dec 28, 2011
    Rails template creation issue
  3. Delete some stray lines

    jonleighton committed Dec 28, 2011
  4. Revert "Merge pull request #4220 from bensie/singleton-class-master"

    jonleighton committed Dec 28, 2011
    This reverts commit 90df0d4, reversing
    changes made to 5e6fc81.
    
    Reason: build breakage
  5. Avoid deprecation warning

    jonleighton committed Dec 28, 2011
  6. Support establishing connection on ActiveRecord::Model.

    jonleighton committed Dec 28, 2011
    This is the 'top level' connection, inherited by any models that include
    ActiveRecord::Model or inherit from ActiveRecord::Base.
  7. Support configuration on ActiveRecord::Model.

    jonleighton committed Dec 28, 2011
    The problem: We need to be able to specify configuration in a way that
    can be inherited to models that include ActiveRecord::Model. So it is
    no longer sufficient to put 'top level' config on ActiveRecord::Base,
    but we do want configuration specified on ActiveRecord::Base and
    descendants to continue to work.
    
    So we need something like class_attribute that can be defined on a
    module but that is inherited when ActiveRecord::Model is included.
    
    The solution: added ActiveModel::Configuration module which provides a
    config_attribute macro. It's a bit specific hence I am not putting this
    in Active Support or making it a 'public API' at present.
  8. Merge pull request #4207 from nashby/deprecate-base64-encode64s

    tenderlove committed Dec 28, 2011
    deprecate Base64.encode64s from AS
  9. Add CHANGELOG entry

    spastorino committed Dec 28, 2011
  10. Merge pull request #4220 from bensie/singleton-class-master

    tenderlove committed Dec 28, 2011
    Further simplify singleton_class checking in class_attribute
  11. Merge pull request #4218 from bogdan/reset_runner_callbacks

    josevalim committed Dec 28, 2011
    Refactor AS::Callbacks
  12. Refactor AS::Callbacks

    bogdan committed Dec 28, 2011
    Extracted `__reset_runner` from `__define_runner`
    And call it in proper places
  13. Merge pull request #4213 from amatsuda/ar_where_array_of_nil_and_a_value

    jonleighton committed Dec 28, 2011
    AR#where with an Array of 2 elements including a nil
  14. Bump to rack 1.4.0

    spastorino committed Dec 28, 2011
  15. Merge pull request #4153 from alexeymuranov/my_fix_for_prefix_suffix_…

    jonleighton committed Dec 28, 2011
    …fixtures_test
    
    Fix a fixtures test case with table prefix/suffix
  16. Use the correct table name from fixture

    Alexey Muranov committed Dec 27, 2011
    Fixed a bug in fixtures.rb where the table name was incorrectly inferred from the fixture path which was ambiguously called "table_name" but was also used as the fixture name.
    Now, the "correct" table name is taken from an instance variable.
  17. where(foo: [1, nil]) becomes "WHERE foo = 1 OR foo IS NULL"

    amatsuda committed Dec 28, 2011
    was "WHERE foo IN (1) OR foo IS NULL" before
Commits on Dec 27, 2011
  1. Merge pull request #4201 from arunagw/no_worry_about_1.9.2

    spastorino committed Dec 27, 2011
    Revert "This conditions is required to work with database create task.
  2. Merge pull request #4198 from castlerock/remove_GC_checks_for_ruby19

    spastorino committed Dec 27, 2011
    remove conditions for GC::Profiler in ruby19
  3. Revert "This conditions is required to work with database create task…

    arunagw committed Dec 27, 2011
    …. 1.9.2 is having a bug with "Calling return within begin still executes else". "
    
    No need to worry about 1.9.2 with master
    This reverts commit fbf4bee.
  4. Merge pull request #4199 from cibernox/patch-1

    josevalim committed Dec 27, 2011
    Removed RUBY_ENGINE checks for ruby18
  5. Fix a fixtures test case with table prefix/suffix

    Alexey Muranov committed Dec 19, 2011
    Make sure the table name of a model is reset in a test case after assigning ActiveRecord::Base.table_name_prefix and ActiveRecord::Base.table_name_suffix.
Commits on Dec 26, 2011
  1. Merge pull request #4195 from castlerock/remove_19_condition_for_GC_P…

    spastorino committed Dec 26, 2011
    …rofiler
    
    GC::Profiler available in ruby19
  2. Merge pull request #4197 from nashby/refactor-range-include

    josevalim committed Dec 26, 2011
    refactor Range#include? for range value
  3. Merge pull request #4194 from castlerock/remove_18_test_support

    josevalim committed Dec 26, 2011
    remove ForClassicTestUnit support for ruby 1.8 in performance and setup and teardown