aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into active_modelPratik Naik2009-04-228-70/+169
|\ | | | | | | | | Conflicts: activeresource/lib/active_resource/validations.rb
| * Add microsecond support for sqlite adapter [#1982 state:resolved]Alex Pooley2009-04-211-0/+10
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Fixed dumping from postgresql columns in index in wrong order. [#2515 ↵Max Lapshin2009-04-211-15/+18
| | | | | | | | | | | | state:resolved] Signed-off-by: Tarmo Tänav <tarmo@itech.ee>
| * Quote table names when casting to regclass so that capitalized tables are ↵Scott Woods2009-04-211-3/+3
| | | | | | | | | | | | 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 Lapshin2009-04-211-1/+1
| | | | | | | | Signed-off-by: Tarmo Tänav <tarmo@itech.ee>
| * Ensure :dependent => :delete_all works for association with hash conditionsPratik Naik2009-04-201-1/+1
| |
| * Ensure JoinAssociation uses aliased table name when multiple associations ↵Pratik Naik2009-04-203-5/+5
| | | | | | | | have hash conditions on the same table
| * Added :touch option to belongs_to associations that will touch the parent ↵David Heinemeier Hansson2009-04-162-26/+58
| | | | | | | | record when the current record is saved or destroyed [DHH]
| * Added ActiveRecord::Base#touch to update the updated_at/on attributes with ↵David Heinemeier Hansson2009-04-161-9/+29
| | | | | | | | the current time [DHH]
| * Bring abstract_controller up to date with rails/masterCarl Lerche & Yehuda Katz2009-04-1330-402/+1310
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolved all the conflicts since 2.3.0 -> HEAD. Following is a list of commits that could not be applied cleanly or are obviated with the abstract_controller refactor. They all need to be revisited to ensure that fixes made in 2.3 do not reappear in 3.0: 2259ecf368e6a6715966f69216e3ee86bf1a82a7 AR not available * This will be reimplemented with ActionORM or equivalent 06182ea02e92afad579998aa80144588e8865ac3 implicitly rendering a js response should not use the default layout [#1844 state:resolved] * This will be handled generically 893e9eb99504705419ad6edac14d00e71cef5f12 Improve view rendering performance in development mode and reinstate template recompiling in production [#1909 state:resolved] * We will need to reimplement rails-dev-boost on top of the refactor; the changes here are very implementation specific and cannot be cleanly applied. The following commits are implicated: 199e750d46c04970b5e7684998d09405648ecbd4 3942cb406e1d5db0ac00e03153809cc8dc4cc4db f8ea9f85d4f1e3e6f3b5d895bef6b013aa4b0690 e3b166aab37ddc2fbab030b146eb61713b91bf55 ae9f258e03c9fd5088da12c1c6cd216cc89a01f7 44423126c6f6133a1d9cf1d0832b527e8711d40f 0cb020b4d6d838025859bd60fb8151c8e21b8e84 workaround for picking layouts based on wrong view_paths [#1974 state:resolved] * The specifics of this commit no longer apply. Since it is a two-line commit, we will reimplement this change. 8c5cc66a831aadb159f3daaffa4208064c30af0e make action_controller/layouts pick templates from the current instance's view_paths instead of the class view_paths [#1974 state:resolved] * This does not apply at all. It should be trivial to apply the feature to the reimplemented ActionController::Base. 87e8b162463f13bd50d27398f020769460a770e3 fix HTML fallback for explicit templates [#2052 state:resolved] * There were a number of patches related to this that simply compounded each other. Basically none of them apply cleanly, and the underlying issue needs to be revisited. After discussing the underlying problem with Koz, we will defer these fixes for further discussion.
| | * Support multiple schemas in table names for postgresql [#390 state:resolved]Max Lapshin2009-04-051-1/+30
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | * Merge docrailsPratik Naik2009-04-051-0/+2
| | |
| | * Ensure SqlBypass use ActiveRecord::Base connectionLuca Guidi2009-04-051-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#https://rails.lighthouseapp.com/attachments/106066/0001-Ensure-SqlBypass-use-ActiveRecord-Base-connection.patch state:committed]
| | * Merge docrailsPratik Naik2009-03-241-10/+13
| | |
| * | Merge commit 'rails/3-0-unstable'Yehuda Katz2009-01-301-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/base.rb actionpack/lib/action_dispatch/http/mime_type.rb actionpack/lib/action_dispatch/http/request.rb actionpack/lib/action_view/base.rb actionpack/lib/action_view/paths.rb actionpack/test/controller/session/cookie_store_test.rb actionpack/test/dispatch/rack_test.rb actionpack/test/dispatch/request_test.rb
| | * | Move HTTP libs and middleware into ActionDispatch componentJoshua Peek2009-01-271-1/+1
| | | |
* | | | Deprecate Model#validate/validate_on_create/validate_on_update. Use ↵Pratik Naik2009-03-211-13/+14
| | | | | | | | | | | | | | | | Model.validate :method and likewise
* | | | Move validate_on_create and validate_on_update from ActiveModel to ActiveRecordPratik Naik2009-03-212-4/+13
| | | |
* | | | Add I18n translations to ActiveModel and move more AR specific parts to ↵Pratik Naik2009-03-201-0/+115
| | | | | | | | | | | | | | | | ActiveRecord::Validations
* | | | Include ActiveModel::Validations from ActiveRecord::ValidationsPratik Naik2009-03-202-21/+30
| | | |
* | | | Move uniqueness and association validations to Active RecordPratik Naik2009-03-193-0/+211
| | | |
* | | | Move all the Active Record validations to Active ModelPratik Naik2009-03-193-1003/+4
| |_|/ |/| |
* | | Merge docrailsPratik Naik2009-03-164-23/+35
| | |
* | | Prepare for final 2.3 releaseDavid Heinemeier Hansson2009-03-151-1/+1
| | |
* | | SQLite adapters now support DDL transactions [#2080 state:resolved]Jason King2009-03-141-22/+33
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | | Fix spelling of an internal method [#1734 state:resolved]Chris Kampmeier2009-03-122-4/+4
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | | Ensure AutosaveAssociation runs remove callbacks [#2146 state:resolved]Luca Guidi2009-03-122-20/+33
| | | | | | | | | | | | | | | 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 Miller2009-03-121-0/+1
| | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | | Ensure NoMethodError isn't raised when some of the nested eager loaded ↵Murray Steele2009-03-121-4/+9
| | | | | | | | | | | | | | | | | | 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 Bryant2009-03-121-1/+1
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | | Ensure ActiveRecord::Base.find_in_batches fires doesnt fire an extra query ↵Pratik Naik2009-03-111-1/+4
| | | | | | | | | | | | unless needed
* | | Add tests for AssociationCollection#find_each and ↵Pratik Naik2009-03-111-1/+1
| | | | | | | | | | | | AssociationCollection#find_in_batches
* | | Rename ActiveRecord::Base.each to ActiveRecord::Base.find_eachPratik Naik2009-03-111-2/+2
| | |
* | | Don't duplicate :order from scope and options, it makes mysql do extra workJeremy Kemper2009-03-101-1/+3
| | |
* | | Ensure nested with_scope merges conditions inside out [#2193 state:resolved]Manfred Stienstra2009-03-102-13/+10
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | | Ensure ActiveRecord#to_xml respects :skip_types for included associations ↵Bruce Krysiak2009-03-101-6/+12
| | | | | | | | | | | | | | | | | | [#1632 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | | Ensure Model#destroy respects optimistic locking [#1966 state:resolved]Curtis Hawthorne2009-03-091-0/+33
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | | Ensure has_many :through works with changed primary keys [#736 state:resolved]Jim Remsik and Tim Pope2009-03-091-1/+1
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | | Allow find(:last) :order be a symbol [#2024 state:resolved]Rob Anderton2009-03-091-1/+1
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | | Fix find_by_last when order is given [#2127 state:committed]Jan De Poorter2009-03-091-1/+1
| | | | | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* | | Add ActiveRecord::Base#invalid? as the opposite of #valid? [#2159 ↵Jeffrey Hardy2009-03-081-0/+5
| | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | | Ensure SQLite adapters stores the config [#1947 state:resolved] [John ↵John Aughey2009-03-082-3/+8
| | | | | | | | | | | | | | | | | | Aughey, Pratik Naik] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | | Ensure calculations respect scoped :select [#1334 state:resolved]stopdropandrew2009-03-071-5/+13
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | | Ensure validates_uniqueness_of considers limit on the field. [#1042 ↵Arthur Klepchukov2009-03-071-4/+4
| | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | | Fix RDoc grammar and ensure hm:t tests can run in isolation. [#1644 ↵Adam Milligan2009-03-072-3/+3
| | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | | DRY with_kcode in Active Record testsPratik Naik2009-03-071-0/+13
| | |
* | | Allow :having conditions to be sanitized like regular :condition. [#2158 ↵Will Bryant2009-03-062-5/+7
| | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | | Ensure belongs_to association with a counter cache in name spaced model ↵Adam Cooper2009-03-062-4/+2
| | | | | | | | | | | | | | | | | | works [#1678 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | | Ensure replacing has_one associations respects the supplied :dependent ↵Dimitri Krassovski2009-03-061-2/+11
| | | | | | | | | | | | | | | | | | option. [#1305 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | | Ensure supplie :from has precedence over scoped :from [#1370 state:resolved]Pratik Naik2009-03-061-1/+1
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 05:55:46 +0000