Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |||||
* | 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. | ||||
| * | Fix eager association test related to different ordering on sqlite | Chad Woolley | 2009-05-21 | 1 | -1/+1 |
| | | | | | | | | | | | | [#2686 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Remove 'core' fluff. Hookable ActiveSupport.load_all! | Jeremy Kemper | 2009-05-20 | 1 | -1/+1 |
| | | |||||
| * | Add missing models and fixtures [#2673 state:resolved] | Emilio Tagua | 2009-05-19 | 3 | -25/+32 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-05-18 | 1 | -2/+2 |
| |\ | |||||
| | * | Remove unnecessary condition and local variable [#2602 state:resolved] | Emilio Tagua | 2009-05-18 | 1 | -2/+2 |
| | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-05-18 | 5 | -3/+36 |
| |\| | |||||
| | * | Ensure HasManyThroughAssociation#destroy delete orphan records [#2251 ↵ | Luca Guidi | 2009-05-18 | 2 | -2/+15 |
| | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| | * | Make sure default_scope#create checks for options[:conditions] [#2181 ↵ | Pratik Naik | 2009-05-18 | 3 | -1/+21 |
| | | | | | | | | | | | | state:resolved] [James Le Cuirot] | ||||
| * | | Reimplement Fixtures.identify so that it consistently generates identities ↵ | Ken Collins | 2009-05-18 | 2 | -4/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | across ruby versions. [#2633 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | | Missing 1.8.7 backport extensions | Jeremy Kemper | 2009-05-18 | 2 | -0/+3 |
| | | | |||||
| * | | Revert "Get AR CI passing again by requiring the entire core_ext" | Jeremy Kemper | 2009-05-18 | 1 | -3/+0 |
| |/ | | | | | | | This reverts commit 8e6a18d8672f7efe6ef79b49185e4a6a23e4e547. | ||||
| * | Add missing model and fixtures to finder_test [#2671 state:resolved] | Emilio Tagua | 2009-05-18 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Fixed limited eager loading associations with numbers in the name [#2668 ↵ | Benjamin Floering | 2009-05-18 | 5 | -2/+11 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Fix reset_session with ActiveRecord store [#2200 state:resolved] | Joshua Peek | 2009-05-17 | 1 | -1/+9 |
| | | |||||
| * | replace the aaa_create_tables_test hack with loading test database schema in ↵ | Mislav Marohnić | 2009-05-17 | 4 | -31/+22 |
| | | | | | | | | | | | | the test helper [#2663 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Implement #many? for NamedScope and AssociationCollection using #size [#1500 ↵ | Chris Kampmeier | 2009-05-17 | 5 | -1/+94 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | has_one :through should not create a new association when assigned nil [#698 ↵ | Daniel Guettler | 2009-05-17 | 2 | -9/+16 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Get AR CI passing again by requiring the entire core_ext | Yehuda Katz | 2009-05-16 | 1 | -0/+3 |
| | | | | | | | | | | Note that this includes Time and Date; we should really figure out what parts of core_ext are really required for AR and require just those. | ||||
| * | Merge commit 'origin/master' | Yehuda Katz + Carl Lerche | 2009-05-14 | 3 | -12/+13 |
| |\ | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/abstract/base.rb actionpack/lib/action_controller/routing.rb | ||||
| | * | Changed ActiveRecord::Base#exists? to invoke find_initial so that it is ↵ | Peter Marklund | 2009-05-14 | 2 | -8/+9 |
| |/ | | | | | | | | | | | | | compatible with, and doesn't lose, :include scopes (references to eager loaded tables) Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2543 state:committed] | ||||
| * | Simple examples for require profiling | Jeremy Kemper | 2009-05-13 | 1 | -0/+14 |
| | | |||||
| * | Cherry-pick core extensions | Jeremy Kemper | 2009-05-13 | 30 | -33/+82 |
| | | |||||
| * | isolated_test task | Jeremy Kemper | 2009-05-13 | 1 | -6/+14 |
| | | |||||
| * | Remove support for deprecated validation message interpolation format | Jeremy Kemper | 2009-05-13 | 3 | -53/+8 |
| | | |||||
| * | Use DependencyModule for included hooks in ActiveRecord | Bryan Helmkamp | 2009-05-11 | 21 | -125/+111 |
| | | |||||
| * | Revert "Fixed bug with polymorphic has_one :as pointing to an STI record" | Jeremy Kemper | 2009-05-11 | 6 | -21/+5 |
| | | | | | | | | | | | | [#2594 state:open] This reverts commit 99c103be1165da9c8299bc0977188ecf167e06a5. |