Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Added callback details in "supported options" of has_many association" | Pratik Naik | 2009-07-25 | 1 | -6/+0 |
| | | | | | | This reverts commit abe2038d5fea7c545ffddad1ac1252c7cbab6232. Reason : It should add documentation to all the options | ||||
* | Merge commit 'mainstream/master' | Pratik Naik | 2009-07-25 | 25 | -279/+258 |
|\ | |||||
| * | 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> | ||||
| * | 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 branch 'master' of git@github.com:rails/rails | Yehuda Katz | 2009-07-19 | 15 | -19/+173 |
| |\ | |||||
| | * | 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> | ||||
| | * | 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 | 2 | -3/+14 |
| | | | |||||
| * | | 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 | ||||
| * | 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 | 2 | -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-07 | 2 | -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 AR | Joshua Peek | 2009-07-03 | 3 | -141/+24 |
| | | |||||
* | | Insert missing word in callbacks documentation. | Mike Gunderloy | 2009-07-19 | 1 | -1/+1 |
| | | |||||
* | | More documentation about methods taking blocks. | Ryan Bigg | 2009-07-16 | 1 | -0/+12 |
| | | |||||
* | | Document that after_create can take a block. | Ryan Bigg | 2009-07-16 | 1 | -0/+4 |
| | | |||||
* | | Updated migration documentation to reflect default for UTC timestamped ↵ | Mike Gunderloy | 2009-07-09 | 1 | -3/+3 |
| | | | | | | | | migration names | ||||
* | | Added callback details in "supported options" of has_many association | Abhishek Parokar | 2009-07-07 | 1 | -0/+6 |
| | | |||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-07-03 | 42 | -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 Lerche | 2009-07-01 | 2 | -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 Lerche | 2009-07-01 | 1 | -2/+0 |
| | | | | | | | | state:resolved] | ||||
| * | Revert "Revert "Generate proper :counter_sql from :finder_sql when there is ↵ | Pratik Naik | 2009-07-01 | 14 | -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.pre | Carl Lerche | 2009-06-30 | 2 | -4/+4 |
| | | |||||
| * | Changed ActiveRecord::Base.human_name to underscore the class name before it ↵ | Justin French | 2009-06-30 | 2 | -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 Koziarski | 2009-06-26 | 4 | -7/+18 |
| | | | | | | | | [#2419 state:committed] | ||||
| * | Translate foreign key violations to ActiveRecord::InvalidForeignKey exceptions. | Michael Schuerig | 2009-06-26 | 4 | -0/+16 |
| | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | Translate adapter errors that indicate a violated uniqueness constraint to ↵ | Michael Schuerig | 2009-06-26 | 6 | -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 Lerche | 2009-06-22 | 14 | -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 Joyce | 2009-06-21 | 14 | -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 Wilk | 2009-06-21 | 2 | -1/+8 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Ensure table names are quoted while renaming for sqlite3 adapter [#2272 ↵ | Brian Hogan | 2009-06-21 | 2 | -1/+27 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Ensure hm:t#create respects source associations hash conditions [#2090 ↵ | mattbauer | 2009-06-21 | 4 | -0/+16 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Simplify AMo validation attribute reader | Joshua Peek | 2009-06-17 | 1 | -4/+0 |
| | | |||||
| * | Updated require for AMo move | Yehuda Katz + Carl Lerche | 2009-06-17 | 1 | -1/+1 |
| | | |||||
| * | Move model naming into ActiveModel | Joshua Peek | 2009-06-17 | 1 | -0/+1 |
| | | |||||
| * | uses Object#metaclass and Object#class_eval in a few spots | Xavier Noria | 2009-06-12 | 3 | -4/+7 |
| | | | | | | | | | | | | [#2797 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | HasOneThroughAssociation still shouldn't derive from HasManyThroughAssociation. | Adam Milligan | 2009-06-12 | 4 | -167/+166 |
| | | | | | | | | | | | | [#1642 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | HasOneAssociation inherits AssociationProxy since it shares nothing with ↵ | Emilio Tagua | 2009-06-12 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | BelongsToAssociation. [#2796 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Move observing notify helper into AMo | Joshua Peek | 2009-06-11 | 1 | -5/+0 |
| | | |||||
| * | Integrate ActiveModel::Observing into ActiveRecord | Joshua Peek | 2009-06-10 | 3 | -93/+6 |
| | | |||||
| * | Whitelist the methods which are called by multiparameter attribute assignment. | Michael Koziarski | 2009-06-10 | 1 | -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 Simanovskis | 2009-06-09 | 2 | -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 function | Eugene Pimenov | 2009-06-09 | 1 | -2/+14 |
| | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | Fix AR json encoding | Jeremy Kemper | 2009-06-08 | 3 | -31/+14 |
| | | |||||
| * | Update for Active Model yielding per error not per attribute | Jeremy Kemper | 2009-06-08 | 1 | -0/+1 |
| | | |||||
* | | Added example of using shorthand in create_table. | Ryan Bigg | 2009-06-22 | 1 | -0/+8 |
| | | |||||
* | | Add documentation for qualifying table names in conditions hashes | Joel Chippindale | 2009-06-19 | 1 | -0/+6 |
| | | |||||
* | | Minor spelling/grammer changes in associations | Lloyd Pick | 2009-06-08 | 1 | -4/+4 |
| | | |||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-06-01 | 38 | -2730/+1048 |
|\| |