aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge commit 'rails/master'Emilio Tagua2009-08-061-2/+1
|\|
| * Ruby 1.9.2 compat: Array#* uses to_str instead of to_s to join values since ↵Akira Matsuda2009-08-051-2/+1
| | | | | | | | | | | | | | | | Ruby 1.9.2 [#2959 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | Merge commit 'rails/master'Emilio Tagua2009-08-0517-209/+324
|\|
| * Revert "fallback_string_to_date sets Date._parse comp arg to true, so that ↵Geoff Buesing2009-08-053-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 AMoJoshua Peek2009-08-047-299/+16
| |
| * whitespaceJoshua Peek2009-08-041-5/+5
| |
| * Added reset_attribute! method to ActiveRecord::AttributeMethods::Dirty which ↵Paul Gillard2009-08-042-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 Gillard2009-08-045-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 ActiveRecordJoshua Peek2009-08-045-0/+101
| |
| * fallback_string_to_date sets Date._parse comp arg to true, so that strings ↵Matt Ganderup2009-08-033-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 Buesing2009-08-034-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 Tagua2009-08-032-1/+4
| |
* | Don't use local vars before testing its conditional.Emilio Tagua2009-08-032-8/+6
| |
* | Merge commit 'rails/master'Emilio Tagua2009-08-036-36/+21
|\|
| * Track generated attribute methods in a separate moduleJoshua Peek2009-08-024-35/+19
| |
| * SQLite: drop support for 'dbfile' option in favor of 'database.'Jeremy Kemper2009-08-012-1/+2
| |
* | Merge commit 'rails/master'Emilio Tagua2009-07-3128-571/+763
|\| | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb
| * Start separating primary key concernsJoshua Peek2009-07-304-65/+76
| |
| * Make sure we use send for the default attribute method body because the ↵Joshua Peek2009-07-301-1/+1
| | | | | | | | suffix maybe an invalid method name
| * Make sure to reset defined methods after calling attribute_method_suffixJoshua Peek2009-07-301-9/+7
| |
| * Move attribute_types_cached_by_default into attribute methods reading concernJoshua Peek2009-07-302-10/+11
| |
| * Don't need to pass attr_name to evaluate_attribute_method anymoreJoshua Peek2009-07-304-9/+9
| |
| * Undefine id and let it automatically be generatedJoshua Peek2009-07-304-24/+6
| |
| * Redirect method missing for primary key to read_attributeJoshua Peek2009-07-302-5/+3
| |
| * ditto for id=Joshua Peek2009-07-302-8/+4
| |
| * Don't define id_before_type_cast, just let it be generated on its ownJoshua Peek2009-07-302-6/+6
| |
| * Move id attribute methods into their related concernJoshua Peek2009-07-304-29/+28
| |
| * Restore DangerousAttributeErrorJoshua Peek2009-07-303-3/+27
| |
| * Wrap up attribute method reset concerns in 'undefine_attribute_methods'Joshua Peek2009-07-302-2/+7
| |
| * read_attribute is always available through attributeJoshua Peek2009-07-301-7/+1
| |
| * cache_attributes is related to attribute readingJoshua Peek2009-07-302-19/+19
| |
| * Generate methods for all suffixesJoshua Peek2009-07-304-32/+12
| |
| * Concernify AR AttributeMethodsJoshua Peek2009-07-3010-383/+451
| |
| * Revert "Methods invoked within named scope Procs should respect the scope ↵Jeremy Kemper2009-07-293-12/+1
| | | | | | | | | | | | | | | | | | | | stack. [#1267 state:resolved]" This reverts commit 6a13376525f34a00e013fc3a6022838329dfe856. Conflicts: activerecord/test/cases/named_scope_test.rb
| * Merge docrailsPratik Naik2009-07-2512-21/+147
| |
| * Patch to ActiveModel's (and ActiveRecord, by association) XML serialization: ↵John Maxwell2009-07-222-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 conditionalEmilio Tagua2009-07-313-3/+98
| | | | | | | | hashes and arrays like #find does.
* | Performance: cache/reload arel relation when possible to speed up things.Emilio Tagua2009-07-212-6/+7
| |
* | Removed unused local variable.Emilio Tagua2009-07-211-1/+0
| |
* | Introduced ActiveRecord::Relation, a layer between an ARel relation and an ↵Emilio Tagua2009-07-218-54/+77
| | | | | | | | AR relation
* | Merge commit 'rails/master'Emilio Tagua2009-07-212-8/+2
|\|
| * AMo conversion helperJoshua Peek2009-07-211-7/+1
| |
| * Add wrap_with_notifications helper to AMo observingJoshua Peek2009-07-201-1/+1
| |
* | Merge commit 'rails/master'Emilio Tagua2009-07-201-0/+7
|\|
| * Merge branch 'master' of git@github.com:rails/railsYehuda Katz2009-07-1915-19/+173
| |\
| * | Define ActiveModel API ComplianceYehuda Katz2009-07-201-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#createEmilio Tagua2009-07-201-3/+4
| | |
* | | Removed legacy test.Emilio Tagua2009-07-201-19/+0
| | |
* | | Merge commit 'rails/master'Emilio Tagua2009-07-1614-16/+159
|\ \ \ | | |/ | |/|
| * | Add primary_key option to belongs_to associationSzymon Nowak2009-07-1514-16/+159
| | | | | | | | | | | | | | | | | | [#765 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>