aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Added callback details in "supported options" of has_many association"Pratik Naik2009-07-251-6/+0
| | | | | | This reverts commit abe2038d5fea7c545ffddad1ac1252c7cbab6232. Reason : It should add documentation to all the options
* Merge commit 'mainstream/master'Pratik Naik2009-07-2525-279/+258
|\
| * 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>
| * AMo conversion helperJoshua Peek2009-07-211-7/+1
| |
| * Add wrap_with_notifications helper to AMo observingJoshua Peek2009-07-201-1/+1
| |
| * Merge branch 'master' of git@github.com:rails/railsYehuda Katz2009-07-1915-19/+173
| |\
| | * Add primary_key option to belongs_to associationSzymon Nowak2009-07-1514-16/+159
| | | | | | | | | | | | | | | | | | [#765 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| | * Use map! instead of map for <association>_idsPratik Naik2009-07-131-2/+2
| | |
| | * Optimize <association>_ids for hm:t with belongs_to sourcePratik Naik2009-07-132-3/+14
| | |
| * | 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
| * Integrate AMo XML serializer into ARJoshua Peek2009-07-111-109/+4
| |
| * Make it so AR attributes which conflict with object-private methods (e.g. ↵Sam Goldstein2009-07-092-4/+25
| | | | | | | | | | | | | | | | | | 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-072-8/+12
| | | | | | | | | | | | 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>
| * Integrate AMo JSON serializer into ARJoshua Peek2009-07-033-141/+24
| |
* | Insert missing word in callbacks documentation.Mike Gunderloy2009-07-191-1/+1
| |
* | More documentation about methods taking blocks.Ryan Bigg2009-07-161-0/+12
| |
* | Document that after_create can take a block.Ryan Bigg2009-07-161-0/+4
| |
* | Updated migration documentation to reflect default for UTC timestamped ↵Mike Gunderloy2009-07-091-3/+3
| | | | | | | | migration names
* | Added callback details in "supported options" of has_many associationAbhishek Parokar2009-07-071-0/+6
| |
* | Merge commit 'mainstream/master'Pratik Naik2009-07-0342-401/+489
|\| | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller.rb actionpack/lib/action_controller/base/base.rb actionpack/lib/action_view/template/path.rb activesupport/lib/active_support/json/encoders/hash.rb
| * Added AR:B#dup method for duplicationg object without frozen attributes ↵Yehuda Katz + Carl Lerche2009-07-012-0/+11
| | | | | | | | | | [#2859 state:resolved] Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
| * Move mocha down below initial T::U require and bump version to 0.9.7 [#2858 ↵Yehuda Katz + Carl Lerche2009-07-011-2/+0
| | | | | | | | state:resolved]
| * Revert "Revert "Generate proper :counter_sql from :finder_sql when there is ↵Pratik Naik2009-07-0114-39/+57
| | | | | | | | | | | | | | | | | | 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.
| * Bump up the version to 3.0.preCarl Lerche2009-06-302-4/+4
| |
| * Changed ActiveRecord::Base.human_name to underscore the class name before it ↵Justin French2009-06-302-4/+10
| | | | | | | | | | | | | | | | | | humanizes it This gives you 'Post comment' rather than 'Postcomment' by default. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2120 state:committed]
| * Make sure the wrapped exceptions also have the original exception available.Michael Koziarski2009-06-264-7/+18
| | | | | | | | [#2419 state:committed]
| * Translate foreign key violations to ActiveRecord::InvalidForeignKey exceptions.Michael Schuerig2009-06-264-0/+16
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Translate adapter errors that indicate a violated uniqueness constraint to ↵Michael Schuerig2009-06-266-1/+47
| | | | | | | | | | | | ActiveRecord::RecordNotUnique exception derived from ActiveReecord::StatementInvalid. Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Revert "Generate proper :counter_sql from :finder_sql when there is a ↵Yehuda Katz + Carl Lerche2009-06-2214-55/+39
| | | | | | | | | | | | | | | | newline character immediately following 'SELECT' [#2118 state:resolved]" This reverts commit 4851ca9e13a4317342df02ae25b1929340523f7a. The tests do not pass for postgresql.
| * Generate proper :counter_sql from :finder_sql when there is a newline ↵Patrick Joyce2009-06-2114-39/+55
| | | | | | | | | | | | character immediately following 'SELECT' [#2118 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Fixed a bug where create_table could not be called without a block [#2221 ↵Joseph Wilk2009-06-212-1/+8
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Ensure table names are quoted while renaming for sqlite3 adapter [#2272 ↵Brian Hogan2009-06-212-1/+27
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Ensure hm:t#create respects source associations hash conditions [#2090 ↵mattbauer2009-06-214-0/+16
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Simplify AMo validation attribute readerJoshua Peek2009-06-171-4/+0
| |
| * Updated require for AMo moveYehuda Katz + Carl Lerche2009-06-171-1/+1
| |
| * Move model naming into ActiveModelJoshua Peek2009-06-171-0/+1
| |
| * uses Object#metaclass and Object#class_eval in a few spotsXavier Noria2009-06-123-4/+7
| | | | | | | | | | | | [#2797 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * HasOneThroughAssociation still shouldn't derive from HasManyThroughAssociation.Adam Milligan2009-06-124-167/+166
| | | | | | | | | | | | [#1642 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * HasOneAssociation inherits AssociationProxy since it shares nothing with ↵Emilio Tagua2009-06-121-5/+5
| | | | | | | | | | | | | | | | BelongsToAssociation. [#2796 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Move observing notify helper into AMoJoshua Peek2009-06-111-5/+0
| |
| * Integrate ActiveModel::Observing into ActiveRecordJoshua Peek2009-06-103-93/+6
| |
| * Whitelist the methods which are called by multiparameter attribute assignment.Michael Koziarski2009-06-101-8/+8
| | | | | | | | This prevents users from causing NoMethodErrors and the like by editing the parameter names, and closes a potential exploit of CVE-2009-1904.
| * disabled base_test.rb tests that were not Oracle compatible (TIME datatype ↵Raimonds Simanovskis2009-06-092-30/+60
| | | | | | | | | | | | is not supported on Oracle, UPDATE does not support ORDER BY) _before_type_cast on Oracle returns Time and not String added Oracle specific schema definition that was missing for test_default_values test Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * PostgreSQL adapter should call thread safe quote_string functionEugene Pimenov2009-06-091-2/+14
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Fix AR json encodingJeremy Kemper2009-06-083-31/+14
| |
| * Update for Active Model yielding per error not per attributeJeremy Kemper2009-06-081-0/+1
| |
* | Added example of using shorthand in create_table.Ryan Bigg2009-06-221-0/+8
| |
* | Add documentation for qualifying table names in conditions hashesJoel Chippindale2009-06-191-0/+6
| |
* | Minor spelling/grammer changes in associationsLloyd Pick2009-06-081-4/+4
| |
* | Merge commit 'mainstream/master'Pratik Naik2009-06-0138-2730/+1048
|\|