Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixing multi-word automatic inverse detection. | wangjohn | 2013-08-15 | 1 | -2/+2 |
| | | | | | Currently, ActiveRecord models with multiple words cannot have their inverse associations detected automatically. | ||||
* | Rescue invalid ip address exceptions on assign. | Paul Nikitochkin | 2013-08-14 | 1 | -1/+5 |
| | | | | In order that set attribute should not be bang method | ||||
* | Merge pull request #11838 from vipulnsward/drop_extra_var | Steve Klabnik | 2013-08-12 | 1 | -2/+2 |
|\ | | | | | drop extra variable | ||||
| * | drop extra variable | Vipul A M | 2013-08-12 | 1 | -2/+2 |
| | | |||||
* | | Restore the use of `#add_to_target` for nested attribute updates on existing ↵ | Ben Woosley | 2013-08-12 | 2 | -15/+14 |
| | | | | | | | | | | | | | | | | | | records, and don't bother updating the association if the update is going to be rejected anyway. This requires adding a `skip_callbacks` argument to `#add_to_target` so that we don't call the callbacks multiple times in this case, which is functionally an application of existing association data, rather than an addition of a new record to the association. | ||||
* | | Fix interactions between :before_add callbacks and nested attributes assignment | Dr.(USA) Joerg Schray | 2013-08-12 | 1 | -10/+9 |
| | | | | | | | | | | Issue #1: :before_add callback is called when nested attributes assignment assigns to existing record if the association is not yet loaded Issue #2: Nested Attributes assignment does not affect the record in the association target when callback triggers loading of the association | ||||
* | | chmod -x | Akira Matsuda | 2013-08-12 | 3 | -0/+0 |
| | | |||||
* | | only reconnect if there was already an active connection | Aaron Patterson | 2013-08-11 | 1 | -1/+4 |
| | | | | | | | | | | If you're using an in-memory database for the test database, reconnecting will lose all information that schema:load did for us. | ||||
* | | Make 'enable_extension' revertible | Eric Tipton | 2013-08-10 | 1 | -1/+2 |
|/ | | | | | If 'enable_extension' is used in a migration's 'change' method, use 'disable_extension' on down migration (and vice-versa). | ||||
* | Remove redundant `string_to_binary` from type-casting | Vipul A M | 2013-08-09 | 5 | -18/+4 |
| | |||||
* | Merge pull request #11802 from ko1/fix_field_encoding_for_mysql | Aaron Patterson | 2013-08-07 | 3 | -1/+14 |
|\ | | | | | Set field encoding to client_encoding for mysql adapter. | ||||
| * | Set field encoding to client_encoding for mysql adapter. | Koichi Sasada | 2013-08-08 | 3 | -1/+14 |
| | | |||||
* | | cast hstore values on write to be consistent with reading from the db. | Yves Senn | 2013-08-08 | 2 | -4/+12 |
|/ | |||||
* | Merge pull request #11331 from vipulnsward/remove_conditional | Aaron Patterson | 2013-08-07 | 1 | -8/+1 |
|\ | | | | | Remove conditional, results are always an instance of `ActiveRecord::Result` | ||||
| * | Remove conditional, since results are always an instance of ↵ | Vipul A M | 2013-07-06 | 1 | -8/+1 |
| | | | | | | | | `ActiveRecord::Result` | ||||
* | | Fix multidimensional PG arrays containing non-string items | Yves Senn | 2013-08-07 | 1 | -1/+9 |
| | | |||||
* | | config[:database] should be a string | Rafael Mendonça França | 2013-08-05 | 1 | -3/+3 |
| | | | | | | | | | | This change was breaking the Railties tests. See https://travis-ci.org/rails/rails/jobs/9865969 | ||||
* | | Remove deprecated branch on the scope method. | Rafael Mendonça França | 2013-08-05 | 1 | -6/+2 |
| | | | | | | | | The deprecation message was removed on 50cbc03d18c5984347965a94027879623fc44cce but the code was not. | ||||
* | | Merge pull request #11767 from kassio/master-load-fixtures-from-linked-folder | Rafael Mendonça França | 2013-08-05 | 1 | -2/+2 |
|\ \ | | | | | | | Load fixtures from linked folders[master] | ||||
| * | | load fixtures from linked folders | Kassio Borges | 2013-08-05 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #11762 from peterkovacs/patch-2 | Carlos Antonio da Silva | 2013-08-05 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Free result_metadata directly instead of freeing 2nd, redundant call. | ||||
| * | | | Free result_metadata directly instead of freeing 2nd, redundant call. | Peter Kovacs | 2013-08-05 | 1 | -1/+1 |
| | | | | | | | | | | | | `result_metadata` returns a new object each time it is called, so calling `result_metadata.free` is essentially a noop. Instead call `free` directly on the metadata when we're done with it. | ||||
* | | | | Create sqlite3 directory if not present | schneems | 2013-08-05 | 1 | -3/+5 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the `db/` directory is not present on a remote machine it will blow up in unexpected ways with error messages that do not indicate there is a missing directory: ``` SQLite3::CantOpenException: unable to open database file ``` This PR checks to see if a directory exists for the sqlite3 file and if not creates it for you. This PR is an alternative to #11692 as suggested by @josevalim | ||||
* | | | Merge pull request #11693 from egilburg/minor_relation_refactor | Rafael Mendonça França | 2013-08-04 | 1 | -38/+45 |
|\ \ \ | | | | | | | | | Minor optimization and code cleanup in query_methods.rb | ||||
| * | | | Minor optimization and code cleanup in query_methods. | Eugene Gilburg | 2013-07-31 | 1 | -38/+45 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use symbols rather than strings where possible to avoid extra object construction - Use destructive methods where possible to avoid extra object construction - Use array union rather than concat followed by uniq - Use shorthand block syntax where possible - Use consistent multiline block styles, method names, method parenteses style, and spacing | ||||
* | | | | use flat_map | Neeraj Singh | 2013-08-03 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | Merge pull request #11455 from antonio/fix_enable_extension_not_being_defined | Rafael Mendonça França | 2013-08-02 | 1 | -0/+8 |
|\ \ \ | | | | | | | | | Define enable_extension method to prevent undefined method error | ||||
| * | | | Define enable_extension method to prevent undefined method error | Antonio Santos | 2013-08-02 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | When mixing postgresql and another adapter like sqlite3 (for dev and test respectively), the task `db:test:prepare` will fail due to the `enable_extension` method not being defined in the abstract adapter. This patch simply adds an empty definition to prevent it. | ||||
* | | | | Merge pull request #11714 from jetthoughts/11706_remove_bad_override_of_xml | Rafael Mendonça França | 2013-08-02 | 1 | -7/+3 |
|\ \ \ \ | | | | | | | | | | | Removed redundant xml override from pg adapter | ||||
| * | | | | Removed redundant xml override from pg adapter | Paul Nikitochkin | 2013-08-02 | 1 | -7/+3 |
| | | | | | | | | | | | | | | | | | | | | Closes: #11706 | ||||
* | | | | | Use map! to avoid an extra object creation | Carlos Antonio da Silva | 2013-08-02 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Remove useless begin..end | Carlos Antonio da Silva | 2013-08-02 | 1 | -2/+1 |
|/ / / / | |||||
* | | | | extract habtm handling to a method | Aaron Patterson | 2013-08-01 | 1 | -8/+12 |
| | | | | |||||
* | | | | use drop and avoid a range object | Aaron Patterson | 2013-08-01 | 1 | -1/+1 |
| | | | | |||||
* | | | | remove intermediate assignments | Aaron Patterson | 2013-08-01 | 2 | -7/+4 |
| | | | | |||||
* | | | | push option handling "chrome" outside `initialize` | Aaron Patterson | 2013-08-01 | 1 | -8/+7 |
| | | | | |||||
* | | | | remove `valid_options` class method | Aaron Patterson | 2013-08-01 | 1 | -4/+3 |
| | | | | |||||
* | | | | association builder classes no longer need the model | Aaron Patterson | 2013-08-01 | 2 | -7/+6 |
| | | | | | | | | | | | | | | | | | | | | decouple the builder classes from the model. Builder objects should be easier to reuse now. | ||||
* | | | | remove more mutations from the `build` method | Aaron Patterson | 2013-08-01 | 1 | -7/+2 |
| | | | | |||||
* | | | | make mutation method apis more consistent | Aaron Patterson | 2013-08-01 | 2 | -4/+5 |
| | | | | |||||
* | | | | push more mutations outside the factory method | Aaron Patterson | 2013-08-01 | 2 | -8/+6 |
| | | | | |||||
* | | | | push module building to the constructor | Aaron Patterson | 2013-08-01 | 1 | -14/+20 |
| | | | | |||||
* | | | | users should be warned if clobbering constants | Aaron Patterson | 2013-08-01 | 1 | -3/+1 |
| | | | | |||||
* | | | | defning extensions happens once, no need to cache | Aaron Patterson | 2013-08-01 | 1 | -5/+3 |
| | | | | |||||
* | | | | assert that constants have been set rather than the names | Aaron Patterson | 2013-08-01 | 1 | -3/+3 |
| | | | | |||||
* | | | | remove dead code | Aaron Patterson | 2013-08-01 | 1 | -4/+0 |
| | | | | |||||
* | | | | pushing out more callback definitions | Aaron Patterson | 2013-08-01 | 1 | -2/+6 |
| | | | | |||||
* | | | | push more mutations out of the builder | Aaron Patterson | 2013-08-01 | 2 | -12/+15 |
| | | | | | | | | | | | | | | | | | | | | `configure_dependency` actually defined callbacks, so rename the method and move it to the appropriate method. | ||||
* | | | | remove dependency on @model when defining callbacks | Aaron Patterson | 2013-08-01 | 2 | -8/+8 |
| | | | | |||||
* | | | | extract more mutations to the caller | Aaron Patterson | 2013-08-01 | 2 | -13/+16 |
| | | | |