Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Ensure that mass assignment options are preserved | Andrew White | 2012-06-10 | 2 | -10/+13 |
| | | | | | | | | | | | | | | | | There are two possible scenarios where the @mass_assignment_options instance variable can become corrupted: 1. If the assign_attributes doesn't complete correctly, then subsequent calls to a nested attribute assignment method will use whatever options were passed to the previous assign_attributes call. 2. With nested assign_attributes calls, the inner call will overwrite the current options. This will only affect nested attributes as the attribute hash is sanitized before any methods are called. To fix this we save the current options in a local variable and then restore these options in an ensure block. | ||||
* | Build fix broken here 03f2249153ae4d2078646e6796d8b9e5ef747fba | Arun Agrawal | 2012-06-10 | 1 | -1/+1 |
| | |||||
* | Use . instead of :: for class methods, add CHANGELOG entries | José Valim | 2012-06-10 | 1 | -2/+2 |
| | |||||
* | Merge pull request #6665 from schneems/schneems/raise-migration-error | José Valim | 2012-06-10 | 2 | -0/+39 |
|\ | | | | | Notify A User they Have Pending Migrations | ||||
| * | raise error for pending migration | schneems | 2012-06-09 | 2 | -2/+33 |
| | | | | | | can be configured by setting config.active_record.migration. Setting to :page_load will raise an error on each page refresh if there are migrations that are pending. Setting to :page_load is defaulted in development for new applications. | ||||
| * | add convenience methods for checking migrations | schneems | 2012-06-03 | 1 | -0/+8 |
| | | | | | | if a rails project needs to be migrated ActiveRecord::Migrator.needs_migration? will be true or false if the current version matches the last version. | ||||
* | | Merge pull request #6683 from stevecj/fix-fragile-assert-queries | Rafael Mendonça França | 2012-06-09 | 1 | -19/+31 |
|\ \ | | | | | | | Fix fragile #assert_queries implementation and usages. | ||||
| * | | Fix fragile #assert_queries implementation and usages. | Steve Jorgensen | 2012-06-09 | 1 | -19/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Several tests that passed when run in the order they are loaded by rake test were failing when run in different sequences due to problems with the implementation of assert_queries and assert_no_queries as well as incorrect assumptions made about how many queries might be executed by a database adapter in various cases. | ||||
* | | | Remove conditional committed by accident | Santiago Pastorino | 2012-06-09 | 1 | -1/+1 |
| | | | |||||
* | | | Use each_with_object instead of each here | Santiago Pastorino | 2012-06-09 | 2 | -4/+4 |
| | | | |||||
* | | | Merge pull request #6687 from tiegz/3-2-optimizations | José Valim | 2012-06-09 | 1 | -1/+3 |
|/ / | | | | | | | ActiveRecord#attributes optimization: minimize objects created | ||||
* | | Merge pull request #6629 from marcandre/destroy | Carlos Antonio da Silva | 2012-06-06 | 2 | -0/+20 |
|\ \ | | | | | | | Add ActiveRecord::Base#destroy! | ||||
| * | | + ActiveRecord::Base#destroy! | Marc-Andre Lafortune | 2012-06-06 | 2 | -0/+20 |
| | | | |||||
* | | | reduce number of Strings | Akira Matsuda | 2012-06-06 | 1 | -1/+1 |
| | | | |||||
* | | | Symbol responds_to :upcase & :downcase in Ruby >= 1.9 | Akira Matsuda | 2012-06-06 | 1 | -1/+1 |
|/ / | |||||
* | | Fix #6591. If a field with timezone isn't changed, we don't call will_change!. | kennyj | 2012-06-04 | 1 | -1/+2 |
| | | |||||
* | | minor comment revision | Xavier Noria | 2012-06-01 | 1 | -1/+1 |
| | | |||||
* | | improve readability of AR explain result | Akira Matsuda | 2012-06-01 | 1 | -1/+7 |
| | | |||||
* | | unused method arguments | Akira Matsuda | 2012-06-01 | 1 | -7/+6 |
| | | |||||
* | | modulize AR::NullRelation | Akira Matsuda | 2012-06-01 | 2 | -3/+3 |
| | | | | | | | | now we can invoke previously added scope extension methods | ||||
* | | Merge branch 'master-sec' | Aaron Patterson | 2012-05-31 | 2 | -3/+18 |
|\ \ | | | | | | | | | | | | | | | | * master-sec: Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this! predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this | ||||
| * | | predicate builder should not recurse for determining where columns. | Aaron Patterson | 2012-05-30 | 2 | -3/+18 |
| | | | | | | | | | | | | | | | | | | Thanks to Ben Murphy for reporting this CVE-2012-2661 | ||||
* | | | Psych is always available on 1.9 | Jeremy Kemper | 2012-05-31 | 2 | -29/+23 |
| | | | |||||
* | | | Fix wrong example for count method with block [ci skip] | Carlos Antonio da Silva | 2012-05-31 | 1 | -1/+1 |
| | | | | | | | | | | | | Thanks @splattael. | ||||
* | | | Work around undiagnosed bug that's draining a relation's bind_values | Jeremy Kemper | 2012-05-31 | 1 | -0/+1 |
| | | | |||||
* | | | Fix backward compatibility with stored Hash values. Wrap coders to convert ↵ | Jeremy Kemper | 2012-05-30 | 1 | -2/+32 |
| | | | | | | | | | | | | serialized values to indifferent access. | ||||
* | | | Merge pull request #6477 from steveklabnik/close_discovered_pg_connection | Rafael Mendonça França | 2012-05-30 | 1 | -1/+2 |
|\ \ \ | |_|/ |/| | | Properly discover a connection is closed in postgresql_adapter | ||||
| * | | Properly discover a connection is closed in postgresql_adapter | Steve Klabnik | 2012-05-24 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PQstatus doesn't properly test if future operations will succeed. A PQping function is added to libpq in PostgreSQL 9.1, but if we rely on it, everyone on earlier versions of Postgres is out of luck, and the pg gem wouldn't have the 'fix' until the next release. Thanks to @cbrecabarren and @ged for handling all the dirty details. Closes #3392. | ||||
* | | | Merge pull request #5810 from kennyj/fix_5797 | Aaron Patterson | 2012-05-30 | 3 | -5/+6 |
|\ \ \ | | | | | | | | | Fix #5797. Error calling dup method on AR model with serialized field | ||||
| * | | | Fix #5797. Error calling dup method on AR model with serialized field | kennyj | 2012-05-30 | 3 | -5/+6 |
| | | | | |||||
* | | | | Merge pull request #6386 from kennyj/fix_logs_name_consistency | Aaron Patterson | 2012-05-30 | 3 | -18/+15 |
|\ \ \ \ | | | | | | | | | | | Fix logs name consistency. | ||||
| * | | | | Fix logs name consistency. | kennyj | 2012-05-19 | 3 | -18/+15 |
| | | | | | |||||
* | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-30 | 4 | -23/+33 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | copy edit the batches docs [ci skip] | Vijay Dev | 2012-05-30 | 1 | -9/+7 |
| | | | | | |||||
| * | | | | change example on CollectionProxy#delete to accept multiple values | Francesco Rodriguez | 2012-05-28 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Adds to Batch processing documentation [ci skip] | Alvaro Pereyra | 2012-05-28 | 1 | -9/+20 |
| | | | | | |||||
| * | | | | fix typo and remove 'examples' noise [ci skip] | Francesco Rodriguez | 2012-05-28 | 1 | -18/+6 |
| | | | | | |||||
| * | | | | Updates examples for FinderMethods [ci skip] | Alvaro Pereyra | 2012-05-28 | 1 | -2/+14 |
| | | | | | |||||
| * | | | | Merge branch 'master' of github.com:lifo/docrails | Alvaro Pereyra | 2012-05-28 | 27 | -86/+715 |
| |\ \ \ \ | |||||
| | * | | | | "a sql" -> "an SQL" per API documentation guidelines | Mark Rushakoff | 2012-05-27 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Adds examples to FinderMethods#first [ci skip] | Alvaro Pereyra | 2012-05-28 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | Fix #5847 and #4045 on master. | kennyj | 2012-05-30 | 1 | -0/+2 |
| | | | | | | |||||
* | | | | | | Use runner hook to load ActiveRecord::Base. | kennyj | 2012-05-30 | 1 | -0/+4 |
| | | | | | | |||||
* | | | | | | SchemaMigration should be loaded lazily. | kennyj | 2012-05-29 | 2 | -2/+0 |
| | | | | | | |||||
* | | | | | | Yield only one argument instead of splatting. | Carlos Antonio da Silva | 2012-05-28 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Add Changelog entry. Closes #4003 | ||||
* | | | | | | Allow blocks for count with ActiveRecord::Relation. Document and test that ↵ | chrisfinne | 2012-05-28 | 1 | -3/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | sum allows blocks | ||||
* | | | | | | Add support for CollectionAssociation#delete by Fixnum or String | Francesco Rodriguez | 2012-05-28 | 2 | -0/+27 |
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I found the next issue between CollectionAssociation `delete` and `destroy`. class Person < ActiveRecord::Base has_many :pets end person.pets.destroy(1) # => OK, returns the destroyed object person.pets.destroy("2") # => OK, returns the destroyed object person.pets.delete(1) # => ActiveRecord::AssociationTypeMismatch person.pets.delete("2") # => ActiveRecord::AssociationTypeMismatch Adding support for deleting with a fixnum or string like `destroy` method. | ||||
* | | | | | remove unnecessary ruby 1.8 reference from active_record/core [ci skip] | Francesco Rodriguez | 2012-05-26 | 1 | -3/+4 |
| | | | | | |||||
* | | | | | add CollectionProxy#uniq documentation | Francesco Rodriguez | 2012-05-26 | 1 | -0/+21 |
| | | | | | |||||
* | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-26 | 1 | -2/+188 |
|\ \ \ \ \ |