Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Revert "Fix #5667. Preloading should ignore scoping."" | Benedikt Deicke | 2012-04-19 | 1 | -2/+3 |
| | | | | | | | | This reverts commit 1166d49f62ccab789be208112163ad13183224e2. Conflicts: activerecord/test/cases/associations/eager_test.rb | ||||
* | Removes caching from ActiveRecord::Core::ClassMethods#relation | Benedikt Deicke | 2012-04-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | The #relation method gets called in four places and the return value was instantly cloned in three of them. The only place that did not clone was ActiveRecord::Scoping::Default::ClassMethods#unscoped. This introduced a bug described in #5667 and should really clone the relation, too. This means all four places would clone the relation, so it doesn't make a lot of sense caching it in the first place. The four places with calls to relations are: activerecord/lib/active_record/scoping/default.rb:110:in `block in build_default_scope'" activerecord/lib/active_record/scoping/default.rb:42:in `unscoped'" activerecord/lib/active_record/scoping/named.rb:38:in `scoped'" activerecord/lib/active_record/scoping/named.rb:52:in `scope_attributes'" Conflicts: activerecord/lib/active_record/core.rb | ||||
* | Revert "Fix #5667. Preloading should ignore scoping." | Jeremy Kemper | 2012-04-18 | 1 | -3/+2 |
| | | | | | | | | Causes a subtle regression where record.reload includes the default scope. Hard to reproduce in isolation. Seems like the relation is getting infected by some previous usage. This reverts commit dffbb521a0d00c8673a3ad6e0e8ff526f32daf4e. | ||||
* | Check for nil logger | Norman Clarke | 2012-04-18 | 1 | -1/+1 |
| | |||||
* | Merge pull request #5725 from kevmoo/remove_unused_castcode | Xavier Noria | 2012-04-09 | 1 | -2/+0 |
|\ | | | | | Remove unused castcode | ||||
| * | Remove unused 'cast_code' variable | Kevin Moore | 2012-04-03 | 1 | -2/+0 |
| | | |||||
* | | log which config format AR uses to connect with | Terence Lee | 2012-04-03 | 1 | -0/+4 |
|/ | |||||
* | DATABASE_URL allows omission of database.yml | Tim Pope | 2012-04-03 | 1 | -1/+3 |
| | |||||
* | Merge pull request #5662 from arturopie/3-2_fixing_IM_when_using_find_select | Aaron Patterson | 2012-03-30 | 2 | -10/+23 |
|\ | | | | | Fixing Identity Map when using find select in rails 3.2 | ||||
| * | refactor instantiate method in base, so we remove nesting if's which make ↵ | Arturo Pie | 2012-03-29 | 2 | -12/+19 |
| | | | | | | | | | | | | | | | | the code harder to read. Minor changes to contain_all_columns in IdentityMap. Conflicts: activerecord/lib/active_record/base.rb | ||||
| * | refactor the checking of the attributes of the record in IdentityMap#add, so ↵ | Arturo Pie | 2012-03-29 | 1 | -1/+7 |
| | | | | | | | | it's more readable | ||||
| * | Do not add record to identity map if the record doesn't have values for all ↵ | Arturo Pie | 2012-03-29 | 1 | -1/+1 |
| | | | | | | | | the columns, so we don't get 'MissingAttributeError' later when trying to access other fields of the same record. | ||||
* | | Merge branch '3-2-3' into 3-2-stable | Santiago Pastorino | 2012-03-30 | 1 | -1/+1 |
|\ \ | |||||
| * | | Bump up to 3.2.3 | Santiago Pastorino | 2012-03-30 | 1 | -1/+1 |
| | | | |||||
| * | | Bumping to 3.2.3.rc2 | Santiago Pastorino | 2012-03-29 | 1 | -1/+1 |
| | | | |||||
* | | | Fix #5667. Preloading should ignore scoping. | Jon Leighton | 2012-03-30 | 1 | -2/+3 |
| |/ |/| | | | | | | | | | Conflicts: activerecord/test/cases/associations/eager_test.rb | ||||
* | | Fix #5549. | Jon Leighton | 2012-03-28 | 2 | -3/+7 |
| | | |||||
* | | Merge pull request #5616 from cbartlett/migration-indent | Santiago Pastorino | 2012-03-28 | 1 | -2/+2 |
| | | | | | | | | Fix indenting in migration generator | ||||
* | | Merge pull request #5618 from lest/patch-1 | Piotr Sarnacki | 2012-03-27 | 1 | -0/+1 |
|\ \ | |/ |/| | force datetime attributes to be changed | ||||
| * | force datetime attributes to be changed | Sergey Nartimov | 2012-03-27 | 1 | -0/+1 |
| | | | | | | | | backport ddb5d2f756d9d2655a07791a3b62832efd588474 to 3-2-stable | ||||
* | | Bumping to 3.2.3.rc1 | Santiago Pastorino | 2012-03-27 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #2621 from icco/master | Aaron Patterson | 2012-03-26 | 1 | -1/+1 |
|/ | | | | Issue with schema dump | ||||
* | Merge pull request #5537 from kennyj/fix_4399-32 | Aaron Patterson | 2012-03-23 | 1 | -6/+22 |
|\ | | | | | [3-2-stable] migrate(:down) method with table_name_prefix | ||||
| * | migrate(:down) method with table_name_prefix | kennyj | 2012-03-21 | 1 | -6/+22 |
| | | |||||
* | | [3-2-stable] Port of #5522 'Fix adding/removing field's index when ↵ | Marcelo Silveira | 2012-03-21 | 1 | -0/+3 |
| | | | | | | | | generating migration' | ||||
* | | [3-2-stable] Remove blank line from generated migration | Marcelo Silveira | 2012-03-20 | 1 | -1/+1 |
|/ | |||||
* | Fix GH #5435. db:structure:dump should be re-enable. | kennyj | 2012-03-18 | 1 | -0/+1 |
| | |||||
* | Merge pull request #5437 from kennyj/fix_5430 | Aaron Patterson | 2012-03-15 | 1 | -1/+1 |
| | | | | Fix GH #5430. A Payload name for schema_search_path should be SCHEMA. | ||||
* | ConnectionPool.checkout takes account of ruby using 'non-blocking condition ↵ | Jonathan Rochkind | 2012-03-13 | 1 | -9/+18 |
| | | | | variables' in mutex ConditionVariables | ||||
* | [3-2-stable] Fix GH #5399. connection_pools's keys are ↵ | kennyj | 2012-03-14 | 1 | -1/+1 |
| | | | | ActiveRecord::Base::ConnectionSpecification objects. | ||||
* | fix activerecord query_method regression with offset into Fixnum | Denis Jean | 2012-03-13 | 1 | -1/+1 |
| | | | | | | add test to show offset query_methods on mysql & mysql2 change test to cover public API | ||||
* | make sure connections returned after close are marked as in_use | Aaron Patterson | 2012-03-12 | 1 | -0/+16 |
| | |||||
* | Merge pull request #5391 from jrochkind/connection_pool_doc | Aaron Patterson | 2012-03-12 | 1 | -3/+1 |
|\ | | | | | ConnectionPooll#clear_active_connections! rdoc inaccuracy since 3.2.0 | ||||
| * | inline docs for clear_active_connections! no longer says it cleans dead ↵ | Jonathan Rochkind | 2012-03-12 | 1 | -3/+1 |
| | | | | | | | | threads, it doesn't since 3.2.0 | ||||
* | | Add documentation for find_or_create_by_{attribute}! method. | Andrew White | 2012-03-12 | 1 | -0/+3 |
|/ | |||||
* | Add dynamic find_or_create_by_{attribute}! method. | Andrew White | 2012-03-12 | 2 | -1/+13 |
| | | | | | | | | | (cherry picked from commit 5282485d310d1a6ffcf55e4e7f56ab234e16880d) Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/dynamic_finder_match.rb | ||||
* | Not need to pass join attributes to association build | Rafael Mendonça França | 2012-03-08 | 2 | -4/+10 |
| | |||||
* | make active_connection? return true only if there is an open connection in ↵ | Aaron Patterson | 2012-03-08 | 1 | -3/+4 |
| | | | | use for the current thread. fixes #5330 | ||||
* | Fix doc examples for has_and_belongs_to_many association | Braden Schaeffer | 2012-03-09 | 1 | -2/+2 |
| | |||||
* | Merge pull request #5316 from Jacobkg/master | José Valim | 2012-03-07 | 1 | -1/+1 |
| | | | | Update ActiveRecord::AttributeMethods#attribute_present? to return false for empty strings | ||||
* | Fix #5069 - Protect foreign key from mass assignment throught association ↵ | Jean Boussier | 2012-03-05 | 1 | -1/+2 |
| | | | | builder | ||||
* | Whitelist all attribute assignment by default. | Michael Koziarski | 2012-03-05 | 2 | -0/+9 |
| | | | | Change the default for newly generated applications to whitelist all attribute assignment. Also update the generated model classes so users are reminded of the importance of attr_accessible. | ||||
* | fix associations when using per class databases | Lars Kanis | 2012-03-04 | 3 | -8/+5 |
| | | | | | | would get ConnectionNotEstablished error because it always tried to use ActiveRecord::Base's connection, even though it should be using the connection of the model whose context we're operating in | ||||
* | only log an error if there is a logger. fixes #5226 | Aaron Patterson | 2012-03-02 | 2 | -2/+2 |
| | | | | | | Conflicts: activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb | ||||
* | revert setting NOT NULL constraints in add_timestamps | Xavier Noria | 2012-03-01 | 1 | -2/+2 |
| | | | | | | | | | | | Commit 3dbedd2 added NOT NULL constraints both to table creation and modification. For creation the new default makes sense, but the generic situation for changing a table is that there exist records. Those records have no creation or modification timestamps, and in the general case you don't even know them, so when updating a table these constraints are not going to work. See a bug report for this use case in #3334. | ||||
* | Merge branch '3-2-2' into 3-2-stable | Aaron Patterson | 2012-03-01 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-2: bumping to 3.2.2 Ensure [] respects the status of the buffer. Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepare Merge pull request #5084 from johndouthat/patch-1 updating RAILS_VERSION delete vulnerable AS::SafeBuffer#[] use AS::SafeBuffer#clone_empty for flushing the output_buffer add AS::SafeBuffer#clone_empty fix output safety issue with select options | ||||
| * | bumping to 3.2.2 | Aaron Patterson | 2012-03-01 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepare | Aaron Patterson | 2012-02-23 | 1 | -1/+1 |
| | | | | | | | | Fix usage of psql in db:test:prepare | ||||
| * | updating RAILS_VERSION | Aaron Patterson | 2012-02-22 | 1 | -2/+2 |
| | | |||||
* | | Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931. | kennyj | 2012-02-29 | 1 | -9/+20 |
| | |