Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into active_model | Joshua Peek | 2009-05-29 | 22 | -146/+666 |
|\ | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | 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> | ||||
| * | 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 | 2 | -2/+18 |
| |\ | |||||
| | * | 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 | 1 | -0/+10 |
| | | | | | | | | | | | | 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> | ||||
| * | 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 | 1 | -0/+4 |
| | | | | | | | | | | | | 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 | 2 | -24/+18 |
| | | | | | | | | | | | | 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 | 8 | -3/+15 |
| | | |||||
| * | Remove support for deprecated validation message interpolation format | Jeremy Kemper | 2009-05-13 | 1 | -26/+8 |
| | | |||||
| * | 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 | 1 | -8/+1 |
| | | | | | | | | | | | | [#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 | 1 | -1/+17 |
| | | | | | | | | 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> | ||||
| * | Providing support for :inverse_of as an option to associations. | Murray Steele | 2009-05-04 | 1 | -0/+252 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You can now add an :inverse_of option to has_one, has_many and belongs_to associations. This is best described with an example: class Man < ActiveRecord::Base has_one :face, :inverse_of => :man end class Face < ActiveRecord::Base belongs_to :man, :inverse_of => :face end m = Man.first f = m.face Without :inverse_of m and f.man would be different instances of the same object (f.man being pulled from the database again). With these new :inverse_of options m and f.man are the same in memory instance. Currently :inverse_of supports has_one and has_many (but not the :through variants) associations. It also supplies inverse support for belongs_to associations where the inverse is a has_one and it's not a polymorphic. Signed-off-by: Murray Steele <muz@h-lame.com> Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Fixed bug with polymorphic has_one :as pointing to an STI record | Ruy Asan | 2009-05-01 | 1 | -1/+8 |
| | | | | | | | | | | | | [#2594 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Default scope :order should be overridden by named scopes. | Alexander Podgorbunsky | 2009-05-01 | 1 | -3/+3 |
| | | | | | | | | | | | | [#2346 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Tests should use ActiveRecord::Base.connection.rollback_db_transaction to ↵ | steve | 2009-05-01 | 1 | -1/+1 |
| | | | | | | | | | | | | rollback a transaction Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Ensure ActiveRecord::Base.connection_pool.with_connection creates a new ↵ | steve | 2009-05-01 | 1 | -0/+29 |
| | | | | | | | | | | | | connection only when needed [#1752 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Fix duplicated test name | Emilio Tagua | 2009-04-29 | 1 | -1/+1 |
| | | | | | | | | | | | | [#2581 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Ensure the parent record is always saved when the child is invalid. [#2249 ↵ | Eloy Duran | 2009-04-27 | 1 | -0/+22 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Fix models load order to be able to run unit tests. | Emilio Tagua | 2009-04-23 | 4 | -13/+13 |
| | | | | | | | | | | | | [#2550 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | * Add pluggable JSON backends with support for the JSON gem. [rick] | rick | 2009-04-23 | 1 | -56/+56 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: ActiveSupport::JSON.backend = "JSONGem" All internal Rails JSON encoding is now handled by ActiveSupport::JSON.encode(). Use of #to_json is not recommended, as it may clash with other libraries that overwrite it. However, you can recover Rails specific functionality if you really want to use #to_json. gem 'json' ActiveSupport::JSON.backend = "JSONGem" class ActiveRecord::Base alias to_json rails_to_json end | ||||
* | | Merge branch 'master' into active_model | Pratik Naik | 2009-04-22 | 7 | -7/+179 |
|\| | | | | | | | | | Conflicts: activeresource/lib/active_resource/validations.rb | ||||
| * | Add microsecond support for sqlite adapter [#1982 state:resolved] | Alex Pooley | 2009-04-21 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Change table to prevent copying indexes on sqlite2 | Pratik Naik | 2009-04-21 | 1 | -5/+5 |
| | | |||||
| * | Specify :group with the table name for it to work on sqlite3 | Pratik Naik | 2009-04-21 | 1 | -1/+1 |
| | | |||||
| * | Fixed dumping from postgresql columns in index in wrong order. [#2515 ↵ | Max Lapshin | 2009-04-21 | 1 | -0/+5 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Tarmo Tänav <tarmo@itech.ee> | ||||
| * | Quote table names when casting to regclass so that capitalized tables are ↵ | Scott Woods | 2009-04-21 | 2 | -0/+27 |
| | | | | | | | | | | | | supported. [#2418 state:resolved] Signed-off-by: Tarmo Tänav <tarmo@itech.ee> | ||||
| * | Fixed wrong quoting of index names in postgres [#2402 state:resolved] | Max Lapshin | 2009-04-21 | 1 | -0/+10 |
| | | | | | | | | Signed-off-by: Tarmo Tänav <tarmo@itech.ee> | ||||
| * | Ensure :dependent => :delete_all works for association with hash conditions | Pratik Naik | 2009-04-20 | 1 | -0/+6 |
| | | |||||
| * | Ensure JoinAssociation uses aliased table name when multiple associations ↵ | Pratik Naik | 2009-04-20 | 1 | -0/+5 |
| | | | | | | | | have hash conditions on the same table | ||||
| * | Added :touch option to belongs_to associations that will touch the parent ↵ | David Heinemeier Hansson | 2009-04-16 | 1 | -1/+46 |
| | | | | | | | | record when the current record is saved or destroyed [DHH] | ||||
| * | Added ActiveRecord::Base#touch to update the updated_at/on attributes with ↵ | David Heinemeier Hansson | 2009-04-16 | 1 | -0/+30 |
| | | | | | | | | the current time [DHH] | ||||
| * | Support multiple schemas in table names for postgresql [#390 state:resolved] | Max Lapshin | 2009-04-05 | 1 | -0/+44 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | | Deprecate Model#validate/validate_on_create/validate_on_update. Use ↵ | Pratik Naik | 2009-03-21 | 1 | -0/+34 |
| | | | | | | | | 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 |
| | |