Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'rails/master' | Emilio Tagua | 2009-06-23 | 4 | -0/+42 |
|\ | |||||
| * | Revert "Generate proper :counter_sql from :finder_sql when there is a ↵ | Yehuda Katz + Carl Lerche | 2009-06-22 | 10 | -39/+11 |
| | | | | | | | | | | | | | | | | 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 | 10 | -11/+39 |
| | | | | | | | | | | | | 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 | 1 | -0/+7 |
| | | | | | | | | | | | | 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 | 1 | -0/+26 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Ensure hm:t#create respects source associations hash conditions [#2090 ↵ | mattbauer | 2009-06-21 | 3 | -0/+9 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | | Removed unused methods. | Emilio Tagua | 2009-06-23 | 1 | -21/+0 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-09 | 3 | -34/+64 |
|\| | |||||
| * | 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> | ||||
| * | Fix AR json encoding | Jeremy Kemper | 2009-06-08 | 1 | -4/+4 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-02 | 15 | -1756/+716 |
|\| | | | | | | | | | | | Conflicts: activerecord/lib/active_record.rb | ||||
| * | Schema dumper now records scale 0 decimal columns as decimal not integer. | Giles Alexander | 2009-06-01 | 2 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | 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] | ||||
| * | Merge branch 'master' into active_model | Joshua Peek | 2009-05-29 | 37 | -154/+776 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -2/+2 |
| | | | | | | | | | | | | "included" block DSL into separate modules. But, unify both approaches under AS::Concern. | ||||
| * | | Merge branch 'master' into active_model | Pratik Naik | 2009-04-22 | 12 | -16/+197 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: activeresource/lib/active_resource/validations.rb | ||||
| * | | | Deprecate Model#validate/validate_on_create/validate_on_update. Use ↵ | Pratik Naik | 2009-03-21 | 4 | -9/+53 |
| | | | | | | | | | | | | | | | | Model.validate :method and likewise | ||||
| * | | | Deprecate Errors#on_base/add_to_base/invalid?/each_full | Pratik Naik | 2009-03-21 | 1 | -2/+2 |
| | | | | |||||
| * | | | Add ActiveModel::Validations tests for regular ruby classes | Pratik Naik | 2009-03-20 | 1 | -0/+9 |
| | | | | |||||
| * | | | Add I18n translations to ActiveModel and move more AR specific parts to ↵ | Pratik Naik | 2009-03-20 | 3 | -0/+754 |
| | | | | | | | | | | | | | | | | ActiveRecord::Validations | ||||
| * | | | Deprecate Error#on(attribute) in favour of Errors#[attribute] | Pratik Naik | 2009-03-20 | 5 | -25/+25 |
| | | | | |||||
| * | | | Move relevant validation tests from Active Record to Active Model | Pratik Naik | 2009-03-20 | 6 | -2384/+506 |
| | | | | |||||
| * | | | Make Active Model test suite similar to Active Record | Pratik Naik | 2009-03-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | Move all the Active Record validations to Active Model | Pratik Naik | 2009-03-19 | 4 | -136/+134 |
| | | | | |||||
* | | | | Merge commit 'rails/master' | Emilio Tagua | 2009-05-26 | 1 | -1/+1 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | 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> | ||||
* | | | | Merge commit 'rails/master' | Emilio Tagua | 2009-05-19 | 3 | -2/+9 |
|\| | | | |||||
| * | | | 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 commit 'rails/master' | Emilio Tagua | 2009-05-18 | 4 | -2/+33 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record.rb Updated: Arel submodule | ||||
| * | | | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-05-18 | 3 | -2/+28 |
| |\ \ \ | |||||
| | * | | | Ensure HasManyThroughAssociation#destroy delete orphan records [#2251 ↵ | Luca Guidi | 2009-05-18 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -0/+20 |
| | | | | | | | | | | | | | | | | | | | | state:resolved] [James Le Cuirot] | ||||
| * | | | | Reimplement Fixtures.identify so that it consistently generates identities ↵ | Ken Collins | 2009-05-18 | 1 | -0/+5 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | across ruby versions. [#2633 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | | | | Merge branch 'master' of git://github.com/rails/rails | Emilio Tagua | 2009-05-18 | 1 | -2/+2 |
|\| | | | |||||
| * | | | 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> | ||||
* | | | | Merge commit 'rails/master' | Emilio Tagua | 2009-05-18 | 18 | -63/+139 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb activerecord/lib/active_record/migration.rb activerecord/test/cases/helper.rb | ||||
| * | | | Fixed limited eager loading associations with numbers in the name [#2668 ↵ | Benjamin Floering | 2009-05-18 | 4 | -1/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | | | 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 | 2 | -0/+73 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -1/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | | | Changed ActiveRecord::Base#exists? to invoke find_initial so that it is ↵ | Peter Marklund | 2009-05-14 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | compatible with, and doesn't lose, :include scopes (references to eager loaded tables) Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2543 state:committed] | ||||
| * | | | Cherry-pick core extensions | Jeremy Kemper | 2009-05-13 | 9 | -3/+17 |
| | | | | |||||
| * | | | Remove support for deprecated validation message interpolation format | Jeremy Kemper | 2009-05-13 | 1 | -26/+8 |
| | | | | |||||
* | | | | Merge commit 'rails/master' | Emilio Tagua | 2009-05-12 | 11 | -33/+104 |
|\| | | | |||||
| * | | | Use DependencyModule for included hooks in ActiveRecord | Bryan Helmkamp | 2009-05-11 | 2 | -12/+7 |
| | | | | |||||
| * | | | Revert "Fixed bug with polymorphic has_one :as pointing to an STI record" | Jeremy Kemper | 2009-05-11 | 5 | -20/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | [#2594 state:open] This reverts commit 99c103be1165da9c8299bc0977188ecf167e06a5. | ||||
| * | | | Allow you to pass :all_blank to :reject_if option to automatically create a ↵ | Mike Breen | 2009-05-10 | 3 | -1/+20 |
| | | | | | | | | | | | | | | | | Proc that will reject any record with blank attributes. | ||||
| * | | | Fixed eager load error on find with include => [:table_name] and hash ↵ | Anthony Crumley | 2009-05-10 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | conditions like {:table_name => {:column => 'value'}} Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | | | honour :inverse_of for joins based include | Frederick Cheung | 2009-05-10 | 1 | -0/+28 |
| | | | | | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | | | honour inverse_of when preloading associations | Frederick Cheung | 2009-05-10 | 1 | -0/+33 |
| | | | | | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | | | | Merge commit 'rails/master' | Emilio Tagua | 2009-05-05 | 10 | -0/+337 |
|\| | | |