Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'rails/master' | Emilio Tagua | 2009-05-18 | 13 | -55/+127 |
|\ | | | | | | | | | | | | | | | 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 | 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 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-05-12 | 6 | -21/+98 |
|\| | |||||
| * | 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> | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-05-05 | 1 | -0/+252 |
|\| | |||||
| * | 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> | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-05-02 | 3 | -4/+40 |
|\| | |||||
| * | 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> | ||||
* | | Make ruby-debug optional | Jeremy Kemper | 2009-04-30 | 1 | -2/+5 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-04-29 | 2 | -1/+23 |
|\| | |||||
| * | 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> | ||||
* | | Calculations now use Arel to construct the query. | Emilio Tagua | 2009-04-29 | 4 | -26/+26 |
| | | | | | | | | Implemented other methods in AR::Base with Arel support. | ||||
* | | construct_finder_sql now use Arel | Emilio Tagua | 2009-04-24 | 2 | -2/+2 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-04-24 | 4 | -13/+13 |
|\| | |||||
| * | 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> | ||||
* | | Added ruby-debug | Emilio Tagua | 2009-04-24 | 1 | -0/+3 |
|/ | |||||
* | * 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 | ||||
* | 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> | ||||
* | SQLite adapters now support DDL transactions [#2080 state:resolved] | Jason King | 2009-03-14 | 2 | -6/+35 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Ensure AutosaveAssociation runs remove callbacks [#2146 state:resolved] | Luca Guidi | 2009-03-12 | 4 | -0/+104 |
| | | | | | Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com> Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Returning nil from named scope lambda is equivalent to an empty hash [#1773 ↵ | Elijah Miller | 2009-03-12 | 1 | -0/+6 |
| | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Ensure NoMethodError isn't raised when some of the nested eager loaded ↵ | Murray Steele | 2009-03-12 | 1 | -0/+29 |
| | | | | | | associations are empty [#1696 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Fixed autosave checks on objects with hm:t in :include [#2213 state:resolved] | Will Bryant | 2009-03-12 | 3 | -0/+48 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Ensure ActiveRecord::Base.find_in_batches fires doesnt fire an extra query ↵ | Pratik Naik | 2009-03-11 | 2 | -1/+13 |
| | | | | unless needed | ||||
* | Add tests for AssociationCollection#find_each and ↵ | Pratik Naik | 2009-03-11 | 1 | -0/+39 |
| | | | | AssociationCollection#find_in_batches |