aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'rails/master'Emilio Tagua2009-05-1231-155/+246
|\
| * 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>
* | Refactor to calculations. Migration's versions are string not integer. ARel ↵Emilio Tagua2009-05-063-24/+23
| | | | | | | | submodule updated.
* | Merge commit 'rails/master'Emilio Tagua2009-05-0518-12/+418
|\|
| * 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>
* | Fixes to have all test passing on PostgreSQL.Emilio Tagua2009-05-042-17/+28
| | | | | | | | | | | | Calculations now use construct_calculation_arel, making construct_finder_arel less hackish. Updated ARel to support PostgreSQL.
* | Merge commit 'rails/master'Emilio Tagua2009-05-041-9/+3
|\|
| * 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
| |
* | Revert "Work around count returning string (bug)"Emilio Tagua2009-05-021-1/+1
| | | | | | | | This reverts commit 4bb6f77059a34ea7c8575523397032b4cc67e00a.
* | Refactor to use arel_table method, and also use the same method name for ↵Emilio Tagua2009-05-023-21/+18
| | | | | | | | instance and class methods.
* | Removed ARel table assignmentEmilio Tagua2009-05-021-1/+0
| |
* | Merge commit 'rails/master'Emilio Tagua2009-05-0211-17/+63
|\|
| * 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
| |
* | 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
| |
* | Work around count returning string (bug)Jeremy Kemper2009-04-301-1/+1
| |
* | Make ruby-debug optionalJeremy Kemper2009-04-301-2/+5
| |
* | exists? method now uses ARelEmilio Tagua2009-04-301-10/+5
| |
* | Added arel_attributes_values methods, refactored locking and AR#update to ↵Emilio Tagua2009-04-302-17/+24
| | | | | | | | use this method
* | Merge commit 'rails/master'Emilio Tagua2009-04-295-13/+42
|\|
| * 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
| |
* | Calculations now use Arel to construct the query.Emilio Tagua2009-04-298-161/+149
| | | | | | | | Implemented other methods in AR::Base with Arel support.
* | construct_finder_sql now use ArelEmilio Tagua2009-04-245-25/+90
| |
* | Refactored locking updateEmilio Tagua2009-04-241-7/+9
| |
* | Merge commit 'rails/master'Emilio Tagua2009-04-244-13/+13
|\|
| * 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>
* | Changed locking to use Arel. Arel updatedEmilio Tagua2009-04-241-14/+19
| |
* | Added ruby-debugEmilio Tagua2009-04-241-0/+3
| |
* | Remove connection method definition, since it's called just once.Emilio Tagua2009-04-231-5/+1
| |
* | More progress on migrations. Arel updated.Emilio Tagua2009-04-231-1/+2
| |
* | Added Arel integration to migration's version update tableEmilio Tagua2009-04-231-25/+25
| |
* | Removed blank linesEmilio Tagua2009-04-231-2/+0
| |
* | Require ArelEmilio Tagua2009-04-231-0/+5
|/
* * Add pluggable JSON backends with support for the JSON gem. [rick]rick2009-04-232-59/+63
| | | | | | | | | | | | | | 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