Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-08-06 | 1 | -2/+1 | |
|\| | ||||||
| * | Ruby 1.9.2 compat: Array#* uses to_str instead of to_s to join values since ↵ | Akira Matsuda | 2009-08-05 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | Ruby 1.9.2 [#2959 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-08-05 | 17 | -209/+324 | |
|\| | ||||||
| * | Revert "fallback_string_to_date sets Date._parse comp arg to true, so that ↵ | Geoff Buesing | 2009-08-05 | 3 | -9/+1 | |
| | | | | | | | | | | | | strings with two-digit years, e.g. '1/1/09', are interpreted as modern years" [#2019 state:wontfix] This reverts commit 55d1d12c32a1b99f3f07d2346b49a63650ba2e9d. | |||||
| * | Extract generic attribute method generation to AMo | Joshua Peek | 2009-08-04 | 7 | -299/+16 | |
| | | ||||||
| * | whitespace | Joshua Peek | 2009-08-04 | 1 | -5/+5 | |
| | | ||||||
| * | Added reset_attribute! method to ActiveRecord::AttributeMethods::Dirty which ↵ | Paul Gillard | 2009-08-04 | 2 | -12/+39 | |
| | | | | | | | | | | | | will reset an attribute to its original value should it have changed. Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
| * | Modified ActiveRecord::AttributeMethods to allow classes to specify ↵ | Paul Gillard | 2009-08-04 | 5 | -56/+200 | |
| | | | | | | | | | | | | attribute method prefixes and/or suffixes. Previously only suffixes were allowed. Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
| * | Add simple support for ActiveModel's StateMachine for ActiveRecord | Joshua Peek | 2009-08-04 | 5 | -0/+101 | |
| | | ||||||
| * | fallback_string_to_date sets Date._parse comp arg to true, so that strings ↵ | Matt Ganderup | 2009-08-03 | 3 | -1/+9 | |
| | | | | | | | | with two-digit years, e.g. '1/1/09', are interpreted as modern years [#2019 state:resolved] | |||||
| * | quoted_date converts time-like objects to ↵ | Geoff Buesing | 2009-08-03 | 4 | -1/+127 | |
| | | | | | | | | ActiveRecord::Base.default_timezone before serialization. This allows you to use Time.now in find conditions and have it correctly be serialized as the current time in UTC when default_timezone == :utc [#2946 state:resolved] | |||||
* | | Added collection iteration to AR::Relation. | Emilio Tagua | 2009-08-03 | 2 | -1/+4 | |
| | | ||||||
* | | Don't use local vars before testing its conditional. | Emilio Tagua | 2009-08-03 | 2 | -8/+6 | |
| | | ||||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-08-03 | 6 | -36/+21 | |
|\| | ||||||
| * | Track generated attribute methods in a separate module | Joshua Peek | 2009-08-02 | 4 | -35/+19 | |
| | | ||||||
| * | SQLite: drop support for 'dbfile' option in favor of 'database.' | Jeremy Kemper | 2009-08-01 | 2 | -1/+2 | |
| | | ||||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-07-31 | 28 | -571/+763 | |
|\| | | | | | | | | | 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 | 4 | -24/+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 | 3 | -3/+27 | |
| | | ||||||
| * | 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 | 4 | -32/+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 | 3 | -12/+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 | 2 | -0/+21 | |
| | | | | | | | | | | | | 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 | 3 | -3/+98 | |
| | | | | | | | | 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 | 8 | -54/+77 | |
| | | | | | | | | 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 | 15 | -19/+173 | |
| |\ | ||||||
| * | | 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 | |
| | | | ||||||
* | | | Removed legacy test. | Emilio Tagua | 2009-07-20 | 1 | -19/+0 | |
| | | | ||||||
* | | | Merge commit 'rails/master' | Emilio Tagua | 2009-07-16 | 14 | -16/+159 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Add primary_key option to belongs_to association | Szymon Nowak | 2009-07-15 | 14 | -16/+159 | |
| | | | | | | | | | | | | | | | | | | [#765 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> |