aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* AS::Concern redefines "include" to lazy include modules as dependenciesJoshua Peek2009-05-291-2/+2
|
* AS::Concern includes InstanceMethods module if it existsJoshua Peek2009-05-291-2/+0
|
* Merge branch 'master' into active_modelJoshua Peek2009-05-2983-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 Peek2009-05-2821-21/+21
| | | | | | | | "included" block DSL into separate modules. But, unify both approaches under AS::Concern.
| * Fix eager association test related to different ordering on sqliteChad Woolley2009-05-211-1/+1
| | | | | | | | | | | | [#2686 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Remove 'core' fluff. Hookable ActiveSupport.load_all!Jeremy Kemper2009-05-201-1/+1
| |
| * Add missing models and fixtures [#2673 state:resolved]Emilio Tagua2009-05-193-25/+32
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-05-181-2/+2
| |\
| | * Remove unnecessary condition and local variable [#2602 state:resolved]Emilio Tagua2009-05-181-2/+2
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-05-185-3/+36
| |\|
| | * Ensure HasManyThroughAssociation#destroy delete orphan records [#2251 ↵Luca Guidi2009-05-182-2/+15
| | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | * Make sure default_scope#create checks for options[:conditions] [#2181 ↵Pratik Naik2009-05-183-1/+21
| | | | | | | | | | | | state:resolved] [James Le Cuirot]
| * | Reimplement Fixtures.identify so that it consistently generates identities ↵Ken Collins2009-05-182-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | across ruby versions. [#2633 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * | Missing 1.8.7 backport extensionsJeremy Kemper2009-05-182-0/+3
| | |
| * | Revert "Get AR CI passing again by requiring the entire core_ext"Jeremy Kemper2009-05-181-3/+0
| |/ | | | | | | This reverts commit 8e6a18d8672f7efe6ef79b49185e4a6a23e4e547.
| * Add missing model and fixtures to finder_test [#2671 state:resolved]Emilio Tagua2009-05-181-2/+2
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Fixed limited eager loading associations with numbers in the name [#2668 ↵Benjamin Floering2009-05-185-2/+11
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Fix reset_session with ActiveRecord store [#2200 state:resolved]Joshua Peek2009-05-171-1/+9
| |
| * replace the aaa_create_tables_test hack with loading test database schema in ↵Mislav Marohnić2009-05-174-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 Kampmeier2009-05-175-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 Guettler2009-05-172-9/+16
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Get AR CI passing again by requiring the entire core_extYehuda Katz2009-05-161-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 Lerche2009-05-143-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 Marklund2009-05-142-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 profilingJeremy Kemper2009-05-131-0/+14
| |
| * Cherry-pick core extensionsJeremy Kemper2009-05-1330-33/+82
| |
| * isolated_test taskJeremy Kemper2009-05-131-6/+14
| |
| * Remove support for deprecated validation message interpolation formatJeremy Kemper2009-05-133-53/+8
| |
| * Use DependencyModule for included hooks in ActiveRecordBryan Helmkamp2009-05-1121-125/+111
| |
| * Revert "Fixed bug with polymorphic has_one :as pointing to an STI record"Jeremy Kemper2009-05-116-21/+5
| | | | | | | | | | | | [#2594 state:open] This reverts commit 99c103be1165da9c8299bc0977188ecf167e06a5.
| * Allow you to pass :all_blank to :reject_if option to automatically create a ↵Mike Breen2009-05-104-2/+30
| | | | | | | | Proc that will reject any record with blank attributes.
| * Fixed eager load error on find with include => [:table_name] and hash ↵Anthony Crumley2009-05-102-4/+28
| | | | | | | | | | | | conditions like {:table_name => {:column => 'value'}} Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * honour :inverse_of for joins based includeFrederick Cheung2009-05-102-2/+36
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * honour inverse_of when preloading associationsFrederick Cheung2009-05-102-1/+36
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Providing support for :inverse_of as an option to associations.Murray Steele2009-05-0418-12/+418
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Don't use #tap before Active Support is available, since older versions of ↵Chris Kampmeier2009-05-041-3/+2
| | | | | | | | | | | | | | | | ruby don't have native implementations [#2603 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Check for sibling Active Support firstJeremy Kemper2009-05-021-8/+3
| |
| * Fixed bug with polymorphic has_one :as pointing to an STI recordRuy Asan2009-05-016-5/+21
| | | | | | | | | | | | [#2594 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Default scope :order should be overridden by named scopes.Alexander Podgorbunsky2009-05-012-5/+5
| | | | | | | | | | | | [#2346 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Tests should use ActiveRecord::Base.connection.rollback_db_transaction to ↵steve2009-05-011-1/+1
| | | | | | | | | | | | rollback a transaction Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Ensure ActiveRecord::Base.connection_pool.with_connection creates a new ↵steve2009-05-012-5/+35
| | | | | | | | | | | | connection only when needed [#1752 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Use table_exists? in #initialize_schema_migrations_table [#1923 state:resolved]Ken Collins2009-05-011-2/+2
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Selectively require rake sshpublisher so full gem isn't requiredJeremy Kemper2009-04-301-1/+2
| |
| * Explicitly require builder for to_xmlJeremy Kemper2009-04-301-0/+2
| |
| * Fix duplicated test nameEmilio Tagua2009-04-291-1/+1
| | | | | | | | | | | | [#2581 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Show executed queries when assert_sql assertion fails [#2573 state:resolved]Emilio Tagua2009-04-281-1/+1
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Ensure the parent record is always saved when the child is invalid. [#2249 ↵Eloy Duran2009-04-272-5/+31
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Fix differing rails_to_json arityJeremy Kemper2009-04-261-3/+6
| |
| * Use Array.wrapJeremy Kemper2009-04-261-4/+4
| |
| * Fix models load order to be able to run unit tests.Emilio Tagua2009-04-234-13/+13
| | | | | | | | | | | | [#2550 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>