Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Missed extend for eager_autoload | Dmitry Vorotilin | 2012-07-26 | 1 | -0/+1 |
| | |||||
* | Merge pull request #7166 from ayrton/patch-1 | Jon Leighton | 2012-07-26 | 1 | -13/+13 |
|\ | | | | | Update activerecord/CHANGELOG.md | ||||
| * | Update activerecord/CHANGELOG.md | Ayrton De Craene | 2012-07-26 | 1 | -13/+13 |
| | | | | | | Fixed markdown code indenting | ||||
* | | Merge pull request #7161 from ↵ | Jon Leighton | 2012-07-26 | 1 | -5/+7 |
|\ \ | |/ |/| | | | | | michaelfairley/eager_load_active_record_association_helpers Eager autoload ActiveRecord association helpers | ||||
| * | Eager autoload ActiveRecord association helpers | Michael Fairley | 2012-07-25 | 1 | -5/+7 |
| | | |||||
* | | Switched update_column recommendation in changelog to update_columns | Philip Arndt | 2012-07-26 | 1 | -1/+1 |
| | | | | | | | | | | Related to #7164 Looks like the last one; thanks! | ||||
* | | Merge pull request #6654 from stevecj/postgresql-auto-reconnect-2 | Aaron Patterson | 2012-07-25 | 3 | -1/+76 |
|\ \ | | | | | | | Postgresql auto reconnect 2 | ||||
| * | | Stop being silly with formatting of method aliasing. | Steve Jorgensen | 2012-07-16 | 1 | -3/+3 |
| | | | |||||
| * | | Simulated & actual (manual/skipped) PostgreSQL auto-reconnection tests. | Steve Jorgensen | 2012-07-16 | 3 | -0/+75 |
| | | | |||||
| * | | Don't crash exception translation w/ nil result attribute. | Steve Jorgensen | 2012-07-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | Exception.result is nil when attempting a query after PostgreSQL disconnect, resulting in new exception: NoMethodError: undefined method `error_field' for nil:NilClass | ||||
* | | | Use string datatype for the setting attribute | Yasuo Honda | 2012-07-26 | 1 | -1/+1 |
| | | | | | | | | | | | | to make store works all database adapters. | ||||
* | | | Deprecate update_column in favor of update_columns. | Rafael Mendonça França | 2012-07-24 | 15 | -47/+85 |
| | | | | | | | | | | | | Closes #1190 | ||||
* | | | Use update_columns to implemente the update_column | Rafael Mendonça França | 2012-07-24 | 2 | -19/+54 |
| | | | |||||
* | | | New #update_columns method. | Sebastian Martinez | 2012-07-24 | 2 | -0/+74 |
| | | | |||||
* | | | This pull requests addresses ORA-01400 errors and also supports #6115 issue ↵ | Yasuo Honda | 2012-07-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | tested. Issue #6115 has been fixed and tested with the attribute `:null => false, :default => ""` However `:null => false` attribute is not necessary to test this issue, which causes many ORA-01400 errors with Oracle enhanced adapter. | ||||
* | | | Restore connection_id on error. | kennyj | 2012-07-23 | 2 | -4/+22 |
| | | | |||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-07-21 | 7 | -27/+108 |
|\ \ \ | |||||
| * | | | improve NullRelation docs [ci skip] | Vijay Dev | 2012-07-21 | 2 | -5/+4 |
| | | | | |||||
| * | | | minor copy edits [ci skip] | Vijay Dev | 2012-07-21 | 2 | -4/+2 |
| | | | | |||||
| * | | | Fix typos | Oscar Del Ben | 2012-07-19 | 1 | -3/+3 |
| | | | | |||||
| * | | | Add nodocs to delegation module and docs for merge! | Oscar Del Ben | 2012-07-17 | 2 | -1/+2 |
| | | | | |||||
| * | | | Update batches docs | Oscar Del Ben | 2012-07-17 | 1 | -6/+6 |
| | | | | |||||
| * | | | Add nodoc to HashMerger and Merger | Oscar Del Ben | 2012-07-17 | 1 | -2/+2 |
| | | | | |||||
| * | | | Fix typos and add nodocs to NullRelation | Oscar Del Ben | 2012-07-17 | 2 | -4/+4 |
| | | | | |||||
| * | | | Improve docs for AR Relation | Oscar Del Ben | 2012-07-17 | 1 | -7/+19 |
| | | | | |||||
| * | | | Add docs for Relation initialize, create and create! | Oscar Del Ben | 2012-07-16 | 1 | -1/+34 |
| | | | | |||||
| * | | | Don't link to edgeguides in docs | Oscar Del Ben | 2012-07-16 | 1 | -1/+1 |
| | | | | |||||
| * | | | Typo | Oscar Del Ben | 2012-07-16 | 1 | -1/+0 |
| | | | | |||||
| * | | | Add documentation for query_methods bang methods | Oscar Del Ben | 2012-07-16 | 1 | -1/+20 |
| | | | | |||||
| * | | | Add nodoc to create_with_value | Oscar Del Ben | 2012-07-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Reason: all *_value methods are defined dynamically and so don't appear in the documentation. | ||||
| * | | | Add documentation for arel and build_arel | Oscar Del Ben | 2012-07-16 | 1 | -0/+2 |
| | | | | |||||
| * | | | Add documentation for create_with | Oscar Del Ben | 2012-07-16 | 1 | -1/+19 |
| | | | | |||||
* | | | | rm unnecessary test | Jon Leighton | 2012-07-20 | 3 | -12/+0 |
| | | | | | | | | | | | | | | | | | | | | interpolation is no longer a thing separate from "normal" assoc conditions. | ||||
* | | | | rm redundant test | Jon Leighton | 2012-07-20 | 2 | -9/+0 |
| | | | | | | | | | | | | | | | | now everything is converted to the new style, this is not needed | ||||
* | | | | remove unused method | Jon Leighton | 2012-07-20 | 1 | -4/+0 |
| | | | | |||||
* | | | | we don't need this arg | Jon Leighton | 2012-07-20 | 1 | -2/+2 |
| | | | | |||||
* | | | | Remove :finder_sql, :counter_sql, :insert_sql, :delete_sql. | Jon Leighton | 2012-07-20 | 15 | -339/+48 |
| | | | | |||||
* | | | | Remove obsolete line. | Jon Leighton | 2012-07-20 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code is broken (it should say association_scope.uniq_value rather than options[:uniq]) but the tests still pass. I think it is designed to uniq-ify associations using finder_sql. However, I am about to remove that anyway. | ||||
* | | | | Convert association macros to the new syntax | Jon Leighton | 2012-07-20 | 16 | -135/+136 |
| | | | | |||||
* | | | | Avoid options ever being nil | Jon Leighton | 2012-07-20 | 2 | -8/+8 |
| | | | | | | | | | | | | | | | | This fixes active_record_deprecated_finders. | ||||
* | | | | Merge pull request #7078 from kennyj/logging_query_plan | Rafael Mendonça França | 2012-07-19 | 2 | -2/+14 |
|\ \ \ \ | | | | | | | | | | | Log query plan when we use count_by_sql method. | ||||
| * | | | | Log query plan when we use count_by_sql method. | kennyj | 2012-07-18 | 2 | -2/+14 |
| | | | | | |||||
* | | | | | Create default join table name using a Symbol | Carlos Antonio da Silva | 2012-07-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Lets stick with a symbol in join table name, it was removed in 993e1643650b7b0939437f86b7b4cda0d92b0b8f and broke the build. | ||||
* | | | | | Use attributes instead of table names in migration example | José Valim | 2012-07-19 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Add fkey attributes to `join_table` migration generator | Aleksey Magusev | 2012-07-19 | 3 | -6/+14 |
| | | | | | |||||
* | | | | | revert Default timestamps to non-null | Dave Kroondyk | 2012-07-18 | 3 | -7/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 3dbedd2 added NOT NULL constraints to timestamps. Commit fcef728 started to revert this, but was incomplete. With this commit, 3dbedd2 should be fully reverted and timestamps will no longer default to NOT NULL. | ||||
* | | | | | Update changelog for migration generator change | José Valim | 2012-07-18 | 1 | -0/+7 |
| | | | | | |||||
* | | | | | Merge pull request #7028 from lexmag/join_table_indexes | José Valim | 2012-07-18 | 5 | -15/+51 |
|\ \ \ \ \ | | | | | | | | | | | | | Add indexes to create_join_table method | ||||
| * | | | | | Add join table migration generator | Aleksey Magusev | 2012-07-18 | 5 | -15/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For instance, running rails g migration CreateMediaJoinTable artists musics:uniq will create a migration with create_join_table :artists, :musics do |t| # t.index [:artist_id, :music_id] t.index [:music_id, :artist_id], unique: true end | ||||
* | | | | | | AR::Integration must be included after AM::Conversion | John Firebaugh | 2012-07-17 | 2 | -1/+7 |
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integration's definition of #to_param must override Conversion's. Otherwise, there is a regression from 3.1 in the behavior of a non-persisted AR::Base instance which nevertheless has an id. |