Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Removing dead code. attribute_cast_code is not called. | kennyj | 2012-09-28 | 2 | -25/+0 |
| | |||||
* | Fix destructive side effects from marshaling an association caused by ↵ | Jeremy Kemper | 2012-09-25 | 2 | -7/+7 |
| | | | | 65843e1acc0c8d285ff79f8c9c49d4d1215440be | ||||
* | Skip tests for non-supported isolation levels | Yasuo Honda | 2012-09-26 | 1 | -2/+6 |
| | | | | | | | | i.e. Oracle database does not support these isolation levels. `:read_uncommitted` `:repeatable_read` This commit also works with other databases which do not support these isolation levels. | ||||
* | Skip tests for non-supported isolation levels with Oracle | Yasuo Honda | 2012-09-25 | 1 | -0/+2 |
| | |||||
* | Merge pull request #6936 from jfoley/callbacks | Santiago Pastorino | 2012-09-24 | 2 | -0/+53 |
|\ | | | | | Fix collisions with before and after validation callbacks. | ||||
| * | Add CHANGELOG entry and update the guide | John Foley | 2012-09-23 | 1 | -0/+4 |
| | | |||||
| * | Fix collisions with before and after validation callbacks. | John Foley | 2012-09-23 | 1 | -0/+49 |
| | | | | | | | | | | | | This commit allows a user to do something like: before_validation :do_stuff, :on => [ :create, :update ] after_validation :do_more, :on => [ :create, :update ] | ||||
* | | make clear that expired db/schema_cache.dump are ignored | Xavier Noria | 2012-09-24 | 1 | -1/+1 |
|/ | |||||
* | Fix test_find_in_batches_should_use_any_column_as_primary_key | Santiago Pastorino | 2012-09-22 | 1 | -11/+8 |
| | |||||
* | start could be a string | Santiago Pastorino | 2012-09-21 | 2 | -3/+3 |
| | | | | | Related to 761bc751d31c22e2c2fdae2b4cdd435b68b6d783 and eb876c4d07130f15be2cac7be968cc393f959c62 | ||||
* | Revert "Fix find_in_batches with customized primary_key" | Santiago Pastorino | 2012-09-21 | 4 | -28/+11 |
| | | | | | | | This reverts commit 761bc751d31c22e2c2fdae2b4cdd435b68b6d783. This commit wasn't fixing any issue just using the same table for different models with different primary keys. | ||||
* | Style: remove hash noise | Jeremy Kemper | 2012-09-21 | 1 | -10/+10 |
| | |||||
* | Correct default charset/collation for mysql dbs | Jeremy Kemper | 2012-09-21 | 2 | -15/+30 |
| | |||||
* | Use default charset/collation only if *neither* is specified. Otherwise we ↵ | Jeremy Kemper | 2012-09-21 | 1 | -4/+7 |
| | | | | set utf8_unicode_ci collation on latin1 table. | ||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-09-21 | 3 | -20/+28 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/configurable.rb activesupport/lib/active_support/core_ext/module/deprecation.rb guides/source/action_controller_overview.md guides/source/active_support_core_extensions.md guides/source/ajax_on_rails.textile guides/source/association_basics.textile guides/source/upgrading_ruby_on_rails.md While resolving conflicts, I have chosen to ignore changes done in docrails at some places - these will be most likely 1.9 hash syntax changes. | ||||
| * | Add extra note about :dependent => :destroy. | Steve Klabnik | 2012-09-21 | 1 | -1/+4 |
| | | | | | | | | Callbacks may interfere with each other. | ||||
| * | fix :nodoc:s in AR::Timestamp [ci skip] | Francesco Rodriguez | 2012-09-19 | 1 | -7/+7 |
| | | |||||
| * | update code examples to 1.9 hash syntax in the AR/README [ci skip] | Francesco Rodriguez | 2012-09-17 | 1 | -12/+12 |
| | | |||||
| * | Doc typo: depenent -> dependent; trailing ws. | Henrik N | 2012-09-16 | 1 | -2/+2 |
| | | |||||
| * | Improve documentation about :dependent and callbacks. | Steve Klabnik | 2012-09-15 | 1 | -0/+5 |
| | | | | | | | | Fixes #3458. | ||||
* | | Make the serializable test much looser | Jon Leighton | 2012-09-21 | 1 | -18/+5 |
| | | | | | | | | | | It's too hard to test this properly, so let's just check that there are no errors. | ||||
* | | Support for specifying transaction isolation level | Jon Leighton | 2012-09-21 | 9 | -15/+263 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If your database supports setting the isolation level for a transaction, you can set it like so: Post.transaction(isolation: :serializable) do # ... end Valid isolation levels are: * `:read_uncommitted` * `:read_committed` * `:repeatable_read` * `:serializable` You should consult the documentation for your database to understand the semantics of these different levels: * http://www.postgresql.org/docs/9.1/static/transaction-iso.html * https://dev.mysql.com/doc/refman/5.0/en/set-transaction.html An `ActiveRecord::TransactionIsolationError` will be raised if: * The adapter does not support setting the isolation level * You are joining an existing open transaction * You are creating a nested (savepoint) transaction The mysql, mysql2 and postgresql adapters support setting the transaction isolation level. However, support is disabled for mysql versions below 5, because they are affected by a bug (http://bugs.mysql.com/bug.php?id=39170) which means the isolation level gets persisted outside the transaction. | ||||
* | | Merge pull request #5248 from ↵ | Jon Leighton | 2012-09-21 | 2 | -0/+17 |
|\ \ | | | | | | | | | | | | | jcoleman/should-unset-association-when-an-existing-record-is-destroyed Unset association when existing record is destroyed. | ||||
| * | | Unset association when existing record is destroyed. | James Coleman | 2012-03-02 | 2 | -0/+17 |
| | | | | | | | | | | | | To avoid foreign key errors (and invalid data) in the database, when a belongs_to association is destroyed, it should also be nil'd out on the parent object. | ||||
* | | | Get rid of global variable in AR transactions test | Carlos Antonio da Silva | 2012-09-20 | 1 | -7/+7 |
| | | | |||||
* | | | remove unnecessary entry and make minor edits to AR/CHANGELOG [ci skip] | Francesco Rodriguez | 2012-09-20 | 1 | -7/+2 |
| | | | |||||
* | | | rename AR::Model::Tag to AR::Tag - fixes #7714 | Francesco Rodriguez | 2012-09-20 | 6 | -14/+19 |
| | | | |||||
* | | | Freeze columns only once per Result | Santiago Pastorino | 2012-09-20 | 1 | -6/+9 |
| | | | |||||
* | | | Freeze columns just before using them as hash keys | Santiago Pastorino | 2012-09-20 | 1 | -2/+5 |
| | | | |||||
* | | | Merge pull request #7631 from jeremyevans/patch-1 | Aaron Patterson | 2012-09-19 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Freeze columns before using them as hash keys | ||||
| * | | | Freeze columns before using them as hash keys | Jeremy Evans | 2012-09-13 | 1 | -1/+1 |
| | | | | | | | | | | | | This reduces the number of allocated strings from columns * (rows + 1) to just columns. | ||||
* | | | | update AR::AttributeAssignment documentation [ci skip] | Francesco Rodriguez | 2012-09-19 | 1 | -5/+5 |
| | | | | |||||
* | | | | Merge pull request #7710 from guilleiguaran/refactor-ar-attributes-method | Rafael Mendonça França | 2012-09-19 | 1 | -10/+4 |
|\ \ \ \ | | | | | | | | | | | AR::Base#attributes= is just an alias for AR::Base#assign_attributes | ||||
| * | | | | AR::Base#attributes= is just an alias for AR::Base#assign_attributes | Guillermo Iguaran | 2012-09-19 | 1 | -10/+4 |
| | | | | | |||||
* | | | | | Fix out-of-date URL. | Alex Reisner | 2012-09-19 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Update changelogs to add entries about strong_parameters integration | Guillermo Iguaran | 2012-09-19 | 1 | -0/+14 |
| | | | | | |||||
* | | | | | Load the environment after creating the database | Jeremy Kemper | 2012-09-19 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Revert "Make sure :environment task is executed before db:schema:load or ↵ | Jeremy Kemper | 2012-09-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | db:structure:load " Breaks db:setup because it tries to load the environment before creating the database. This reverts commit 5ca11fefce6d83f5db399aa4412f1f1a0d42b2e6. | ||||
* | | | | | Improve the CHANGELOG entry for #6971 | Rafael Mendonça França | 2012-09-19 | 1 | -1/+14 |
| | | | | | |||||
* | | | | | fix querying with an empty hash | Damien Mathieu | 2012-09-19 | 3 | -3/+18 |
| | | | | | | | | | | | | | | | | | | | | Closes #6960 | ||||
* | | | | | Remove unused private method AR::NestedAttributes#unassignable_keys and ↵ | Guillermo Iguaran | 2012-09-19 | 1 | -5/+1 |
|/ / / / | | | | | | | | | | | | | reference to mass_assignment options | ||||
* | | | | Update AR::Base.create and AR:Base#update_attributes docs to remove ↵ | Guillermo Iguaran | 2012-09-18 | 1 | -11/+0 |
| | | | | | | | | | | | | | | | | references to mass assignment options | ||||
* | | | | Update docs for AR::Base#new to remove references to mass_assignment_options | Guillermo Iguaran | 2012-09-18 | 1 | -10/+1 |
| | | | | |||||
* | | | | Merge pull request #7251 from rails/integrate-strong_parameters | David Heinemeier Hansson | 2012-09-18 | 31 | -1320/+133 |
|\ \ \ \ | | | | | | | | | | | Integrate strong_parameters in Rails 4 | ||||
| * | | | | Set primary key with id= only if primary key exists | Guillermo Iguaran | 2012-09-16 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Remove mass_assignment_options from ActiveRecord | Guillermo Iguaran | 2012-09-16 | 18 | -162/+66 |
| | | | | | |||||
| * | | | | attr_accessible and attr_protected raise an exception pointing to use plugin ↵ | Guillermo Iguaran | 2012-09-16 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | or new protection model | ||||
| * | | | | Don't use assert_nothing_raised when assert_equal is used | Guillermo Iguaran | 2012-09-16 | 1 | -10/+6 |
| | | | | | |||||
| * | | | | Rename ForbiddenAttributes exception to ForbiddenAttributesError | Guillermo Iguaran | 2012-09-16 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | Add tests for ForbiddenAttributesProtection in ActiveRecord | Guillermo Iguaran | 2012-09-16 | 1 | -0/+63 |
| | | | | |