Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-07-31 | 23 | -556/+757 | |
|\| | | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb | |||||
| * | Start separating primary key concerns | Joshua Peek | 2009-07-30 | 4 | -65/+76 | |
| | | ||||||
| * | Make sure we use send for the default attribute method body because the ↵ | Joshua Peek | 2009-07-30 | 1 | -1/+1 | |
| | | | | | | | | suffix maybe an invalid method name | |||||
| * | Make sure to reset defined methods after calling attribute_method_suffix | Joshua Peek | 2009-07-30 | 1 | -9/+7 | |
| | | ||||||
| * | Move attribute_types_cached_by_default into attribute methods reading concern | Joshua Peek | 2009-07-30 | 2 | -10/+11 | |
| | | ||||||
| * | Don't need to pass attr_name to evaluate_attribute_method anymore | Joshua Peek | 2009-07-30 | 4 | -9/+9 | |
| | | ||||||
| * | Undefine id and let it automatically be generated | Joshua Peek | 2009-07-30 | 2 | -15/+6 | |
| | | ||||||
| * | Redirect method missing for primary key to read_attribute | Joshua Peek | 2009-07-30 | 2 | -5/+3 | |
| | | ||||||
| * | ditto for id= | Joshua Peek | 2009-07-30 | 2 | -8/+4 | |
| | | ||||||
| * | Don't define id_before_type_cast, just let it be generated on its own | Joshua Peek | 2009-07-30 | 2 | -6/+6 | |
| | | ||||||
| * | Move id attribute methods into their related concern | Joshua Peek | 2009-07-30 | 4 | -29/+28 | |
| | | ||||||
| * | Restore DangerousAttributeError | Joshua Peek | 2009-07-30 | 2 | -3/+13 | |
| | | ||||||
| * | Wrap up attribute method reset concerns in 'undefine_attribute_methods' | Joshua Peek | 2009-07-30 | 2 | -2/+7 | |
| | | ||||||
| * | read_attribute is always available through attribute | Joshua Peek | 2009-07-30 | 1 | -7/+1 | |
| | | ||||||
| * | cache_attributes is related to attribute reading | Joshua Peek | 2009-07-30 | 2 | -19/+19 | |
| | | ||||||
| * | Generate methods for all suffixes | Joshua Peek | 2009-07-30 | 3 | -18/+12 | |
| | | ||||||
| * | Concernify AR AttributeMethods | Joshua Peek | 2009-07-30 | 10 | -383/+451 | |
| | | ||||||
| * | Revert "Methods invoked within named scope Procs should respect the scope ↵ | Jeremy Kemper | 2009-07-29 | 1 | -6/+1 | |
| | | | | | | | | | | | | | | | | | | | | stack. [#1267 state:resolved]" This reverts commit 6a13376525f34a00e013fc3a6022838329dfe856. Conflicts: activerecord/test/cases/named_scope_test.rb | |||||
| * | Merge docrails | Pratik Naik | 2009-07-25 | 12 | -21/+147 | |
| | | ||||||
| * | Patch to ActiveModel's (and ActiveRecord, by association) XML serialization: ↵ | John Maxwell | 2009-07-22 | 1 | -0/+15 | |
| | | | | | | | | | | | | If two parameters are present in Procs supplied to to_xml's :procs option, the model being serialized will be passed as the second argument [#2373 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
* | | Added ActiveRecord::Relation tests. Allow Relation to accept conditional | Emilio Tagua | 2009-07-31 | 2 | -3/+20 | |
| | | | | | | | | hashes and arrays like #find does. | |||||
* | | Performance: cache/reload arel relation when possible to speed up things. | Emilio Tagua | 2009-07-21 | 2 | -6/+7 | |
| | | ||||||
* | | Removed unused local variable. | Emilio Tagua | 2009-07-21 | 1 | -1/+0 | |
| | | ||||||
* | | Introduced ActiveRecord::Relation, a layer between an ARel relation and an ↵ | Emilio Tagua | 2009-07-21 | 4 | -45/+68 | |
| | | | | | | | | AR relation | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-07-21 | 2 | -8/+2 | |
|\| | ||||||
| * | AMo conversion helper | Joshua Peek | 2009-07-21 | 1 | -7/+1 | |
| | | ||||||
| * | Add wrap_with_notifications helper to AMo observing | Joshua Peek | 2009-07-20 | 1 | -1/+1 | |
| | | ||||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-07-20 | 1 | -0/+7 | |
|\| | ||||||
| * | Merge branch 'master' of git@github.com:rails/rails | Yehuda Katz | 2009-07-19 | 4 | -10/+43 | |
| |\ | ||||||
| * | | Define ActiveModel API Compliance | Yehuda Katz | 2009-07-20 | 1 | -0/+7 | |
| | | | | | | | | | | | | | | | | | | - Define to_model on AR - Define to_model on ActiveModel::APICompliant - Update test fixtures to be API Compliant - Start using to_model in AP | |||||
* | | | Performance boost for AR#create | Emilio Tagua | 2009-07-20 | 1 | -3/+4 | |
| | | | ||||||
* | | | Merge commit 'rails/master' | Emilio Tagua | 2009-07-16 | 4 | -9/+35 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Add primary_key option to belongs_to association | Szymon Nowak | 2009-07-15 | 4 | -9/+35 | |
| | | | | | | | | | | | | | | | | | | [#765 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | | | Added ActiveRecord::Base#(where|join|project|group|order|take|skip) methods. | Emilio Tagua | 2009-07-16 | 2 | -40/+59 | |
| | | | ||||||
* | | | Merge commit 'rails/master' | Emilio Tagua | 2009-07-14 | 4 | -115/+26 | |
|\| | | ||||||
| * | | Use map! instead of map for <association>_ids | Pratik Naik | 2009-07-13 | 1 | -2/+2 | |
| | | | ||||||
| * | | Optimize <association>_ids for hm:t with belongs_to source | Pratik Naik | 2009-07-13 | 1 | -1/+8 | |
| |/ | ||||||
| * | Integrate AMo XML serializer into AR | Joshua Peek | 2009-07-11 | 1 | -109/+4 | |
| | | ||||||
| * | Make it so AR attributes which conflict with object-private methods (e.g. ↵ | Sam Goldstein | 2009-07-09 | 1 | -4/+9 | |
| | | | | | | | | | | | | | | | | | | system) don't 'randomly' cause NoMethodErrors Previously if you called this attribute before others, you'd get exceptions. But if it was the second-or-subsequent attribute you retrieved you'd get the correct behaviour. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2808 state:committed] | |||||
| * | Add support for dumping non-standard primary keys when using the SQLite3 ↵ | Hongli Lai (Phusion) | 2009-07-07 | 1 | -1/+5 | |
| | | | | | | | | | | | | adapter. Fix unit tests so that this feature is tested for all adapters. [#2868 state:resolved] Signed-off-by: Yehuda Katz <wycats@yehuda-katzs-macbookpro41.local> | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-07-06 | 3 | -141/+24 | |
|\| | ||||||
| * | Integrate AMo JSON serializer into AR | Joshua Peek | 2009-07-03 | 3 | -141/+24 | |
| | | ||||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-07-01 | 1 | -0/+7 | |
|\| | ||||||
| * | Added AR:B#dup method for duplicationg object without frozen attributes ↵ | Yehuda Katz + Carl Lerche | 2009-07-01 | 1 | -0/+7 | |
| | | | | | | | | | | [#2859 state:resolved] Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | |||||
* | | Create is now powered by Arel. Removed methods that are no longer used. | Emilio Tagua | 2009-07-01 | 3 | -18/+19 | |
| | | ||||||
* | | Small refactor to update_all. | Emilio Tagua | 2009-07-01 | 1 | -3/+3 | |
| | | ||||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-30 | 4 | -28/+16 | |
|\| | ||||||
| * | Revert "Revert "Generate proper :counter_sql from :finder_sql when there is ↵ | Pratik Naik | 2009-07-01 | 4 | -28/+16 | |
| | | | | | | | | | | | | | | | | | | a newline character immediately following 'SELECT' [#2118 state:resolved]"" This reverts commit 80f1f863cd0f9cba89079511282de5710a2e1832. The feature doesn't work on Postgres, so don't test it on Postgres. Also, Postgres compatibility is irrelevant to the ticket/patch in question. | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-30 | 2 | -5/+5 | |
|\| | | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb | |||||
| * | Bump up the version to 3.0.pre | Carl Lerche | 2009-06-30 | 1 | -3/+3 | |
| | |