Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'rails/master' | Emilio Tagua | 2009-06-30 | 14 | -39/+57 |
|\ | |||||
| * | 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. | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-30 | 4 | -7/+13 |
|\| | | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb | ||||
| * | 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] | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-30 | 6 | -1/+74 |
|\| | | | | | | | | | Conflicts: activerecord/test/cases/adapter_test.rb | ||||
| * | 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> | ||||
* | | Refactoring: Calculations now use construct_finder_sql instead they own method. | Emilio Tagua | 2009-06-23 | 2 | -25/+8 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-23 | 10 | -7/+53 |
|\| | |||||
| * | 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 |
| | | |||||
* | | Removed unused methods. | Emilio Tagua | 2009-06-23 | 4 | -127/+1 |
| | | |||||
* | | Arel now buils SQL queries for associations. Removed old code and | Emilio Tagua | 2009-06-23 | 3 | -67/+6 |
| | | | | | | | | updated Arel version to support this. | ||||
* | | Removed old commented code | Emilio Tagua | 2009-06-23 | 1 | -21/+0 |
| | | |||||
* | | Forget about auto scope, it's always explicit. | Emilio Tagua | 2009-06-17 | 1 | -7/+6 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-16 | 3 | -4/+7 |
|\| | |||||
| * | 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> | ||||
* | | Leave the quoting part to ARel | Emilio Tagua | 2009-06-12 | 5 | -172/+171 |
|\| | |||||
| * | 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> | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-12 | 4 | -98/+6 |
|\| | |||||
| * | 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 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-10 | 1 | -8/+8 |
|\| | |||||
| * | 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. | ||||
* | | Merge branch 'update_all' | Emilio Tagua | 2009-06-10 | 1 | -10/+28 |
|\ \ | |||||
| * | | Initial update_all migration | Emilio Tagua | 2009-06-10 | 1 | -10/+28 |
| | | | |||||
* | | | Use array of orders instead of string concatenation | Emilio Tagua | 2009-06-10 | 1 | -7/+5 |
|/ / | |||||
* | | Revert "Use ARel in SQL generation through associations" | Emilio Tagua | 2009-06-10 | 1 | -28/+10 |
| | | | | | | | | This reverts commit 7be3e3ba0547587313d87bccb788a8466a62628a. | ||||
* | | Use ARel in SQL generation through associations | Emilio Tagua | 2009-06-10 | 1 | -10/+28 |
| | | |||||
* | | Use ARel in SQL generation through associations | Emilio Tagua | 2009-06-10 | 2 | -15/+19 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-09 | 7 | -63/+89 |
|\| | |||||
| * | 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 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-02 | 38 | -2731/+1050 |
|\| | | | | | | | | | | | Conflicts: activerecord/lib/active_record.rb | ||||
| * | Schema dumper now records scale 0 decimal columns as decimal not integer. | Giles Alexander | 2009-06-01 | 3 | -2/+15 |
| | | | | | | | | | | | | | | | | | | | | The schema dumper would dump out any decimal or numeric column that had a zero scale as an integer column. This will cause problems for very large precision columns on some DBMSs, particularly PostgreSQL. It also looks strange to see your column change type after moving through schema.rb. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2741 state:committed] | ||||
| * | AS::Concern redefines "include" to lazy include modules as dependencies | Joshua Peek | 2009-05-29 | 1 | -2/+2 |
| | | |||||
| * | AS::Concern includes InstanceMethods module if it exists | Joshua Peek | 2009-05-29 | 1 | -2/+0 |
| | | |||||
| * | Merge branch 'master' into active_model | Joshua Peek | 2009-05-29 | 83 | -410/+1198 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activemodel/lib/active_model/core.rb activemodel/test/cases/state_machine/event_test.rb activemodel/test/cases/state_machine/state_transition_test.rb activerecord/lib/active_record/validations.rb activerecord/test/cases/validations/i18n_validation_test.rb activeresource/lib/active_resource.rb activeresource/test/abstract_unit.rb | ||||
| | * | Break up DependencyModule's dual function of providing a "depend_on" DSL and ↵ | Joshua Peek | 2009-05-28 | 21 | -21/+21 |
| | | | | | | | | | | | | "included" block DSL into separate modules. But, unify both approaches under AS::Concern. |