Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | 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 | |
| | | | | ||||||
* | | | | Merge commit 'rails/master' | Emilio Tagua | 2009-05-12 | 31 | -155/+246 | |
|\| | | | ||||||
| * | | | 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. | |||||
| * | | | Allow you to pass :all_blank to :reject_if option to automatically create a ↵ | Mike Breen | 2009-05-10 | 4 | -2/+30 | |
| | | | | | | | | | | | | | | | | 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 | 2 | -4/+28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -2/+36 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | |||||
| * | | | honour inverse_of when preloading associations | Frederick Cheung | 2009-05-10 | 2 | -1/+36 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | |||||
* | | | | Refactor to calculations. Migration's versions are string not integer. ARel ↵ | Emilio Tagua | 2009-05-06 | 3 | -24/+23 | |
| | | | | | | | | | | | | | | | | submodule updated. | |||||
* | | | | Merge commit 'rails/master' | Emilio Tagua | 2009-05-05 | 18 | -12/+418 | |
|\| | | | ||||||
| * | | | Providing support for :inverse_of as an option to associations. | Murray Steele | 2009-05-04 | 18 | -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> | |||||
* | | | | Fixes to have all test passing on PostgreSQL. | Emilio Tagua | 2009-05-04 | 2 | -17/+28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Calculations now use construct_calculation_arel, making construct_finder_arel less hackish. Updated ARel to support PostgreSQL. | |||||
* | | | | Merge commit 'rails/master' | Emilio Tagua | 2009-05-04 | 1 | -9/+3 | |
|\| | | | ||||||
| * | | | Don't use #tap before Active Support is available, since older versions of ↵ | Chris Kampmeier | 2009-05-04 | 1 | -3/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ruby don't have native implementations [#2603 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | | | Check for sibling Active Support first | Jeremy Kemper | 2009-05-02 | 1 | -8/+3 | |
| | | | | ||||||
* | | | | Revert "Work around count returning string (bug)" | Emilio Tagua | 2009-05-02 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | This reverts commit 4bb6f77059a34ea7c8575523397032b4cc67e00a. | |||||
* | | | | Refactor to use arel_table method, and also use the same method name for ↵ | Emilio Tagua | 2009-05-02 | 3 | -21/+18 | |
| | | | | | | | | | | | | | | | | instance and class methods. | |||||
* | | | | Removed ARel table assignment | Emilio Tagua | 2009-05-02 | 1 | -1/+0 | |
| | | | | ||||||
* | | | | Merge commit 'rails/master' | Emilio Tagua | 2009-05-02 | 11 | -17/+63 | |
|\| | | | ||||||
| * | | | Fixed bug with polymorphic has_one :as pointing to an STI record | Ruy Asan | 2009-05-01 | 6 | -5/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | [#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 | 2 | -5/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | [#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 | 2 | -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 Collins | 2009-05-01 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
| * | | | Selectively require rake sshpublisher so full gem isn't required | Jeremy Kemper | 2009-04-30 | 1 | -1/+2 | |
| | | | | ||||||
| * | | | Explicitly require builder for to_xml | Jeremy Kemper | 2009-04-30 | 1 | -0/+2 | |
| | | | | ||||||
* | | | | Selectively require rake sshpublisher so full gem isn't required | Jeremy Kemper | 2009-04-30 | 1 | -1/+2 | |
| | | | | ||||||
* | | | | Explicitly require builder for to_xml | Jeremy Kemper | 2009-04-30 | 1 | -0/+2 | |
| | | | | ||||||
* | | | | Work around count returning string (bug) | Jeremy Kemper | 2009-04-30 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Make ruby-debug optional | Jeremy Kemper | 2009-04-30 | 1 | -2/+5 | |
| | | | | ||||||
* | | | | exists? method now uses ARel | Emilio Tagua | 2009-04-30 | 1 | -10/+5 | |
| | | | | ||||||
* | | | | Added arel_attributes_values methods, refactored locking and AR#update to ↵ | Emilio Tagua | 2009-04-30 | 2 | -17/+24 | |
| | | | | | | | | | | | | | | | | use this method | |||||
* | | | | Merge commit 'rails/master' | Emilio Tagua | 2009-04-29 | 5 | -13/+42 | |
|\| | | | ||||||
| * | | | Fix duplicated test name | Emilio Tagua | 2009-04-29 | 1 | -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 Tagua | 2009-04-28 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
| * | | | Ensure the parent record is always saved when the child is invalid. [#2249 ↵ | Eloy Duran | 2009-04-27 | 2 | -5/+31 | |
| | | | | | | | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
| * | | | Fix differing rails_to_json arity | Jeremy Kemper | 2009-04-26 | 1 | -3/+6 | |
| | | | | ||||||
| * | | | Use Array.wrap | Jeremy Kemper | 2009-04-26 | 1 | -4/+4 | |
| | | | | ||||||
* | | | | Calculations now use Arel to construct the query. | Emilio Tagua | 2009-04-29 | 8 | -161/+149 | |
| | | | | | | | | | | | | | | | | Implemented other methods in AR::Base with Arel support. | |||||
* | | | | construct_finder_sql now use Arel | Emilio Tagua | 2009-04-24 | 5 | -25/+90 | |
| | | | | ||||||
* | | | | Refactored locking update | Emilio Tagua | 2009-04-24 | 1 | -7/+9 | |
| | | | |