aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'mainstream/master'Pratik Naik2008-08-146-13/+50
|\ | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/request.rb actionpack/lib/action_controller/resources.rb
| * Fix ActiveRecord::NamedScope::Scope#respond_to? [#818 state:resolved]Eloy Duran2008-08-131-1/+5
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Fixed Time/Date object serializationTarmo Tänav2008-08-121-2/+9
| | | | | | | | | | Time/Date objects used to be converted to_s instead of to_uaml which made them unserializable.
| * Serialized attributes will now always be saved even with partial_updates ↵Tom Lea2008-08-121-1/+3
| | | | | | | | | | | | | | turned on. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#788 state:committed]
| * move logging of protected attribute removal into ↵Trevor Turk2008-08-121-1/+5
| | | | | | | | | | | | | | log_protected_attribute_removal method Signed-off-by: Michael Koziarski <michael@koziarski.com> [#804 status:committed]
| * Alias subquery used in calculations, to provide better compatibility with ↵Michalis Polakis2008-08-111-1/+1
| | | | | | | | | | | | | | | | databases such as MonetDB Signed-off-by: Michael Koziarski <michael@koziarski.com> Signed-off-by: Tom Ward <tom@popdog.net> [#796 state:committed]
| * Fixed AssociationCollection#<< resulting in unexpected values in @target ↵Ernie Miller2008-08-081-1/+1
| | | | | | | | | | | | when :uniq => true Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Added MigrationProxy to defer loading of Migration classes until they are ↵Nik Wakelin2008-08-061-6/+26
| | | | | | | | | | | | | | actually required by the migrator Signed-off-by: Michael Koziarski <michael@koziarski.com> [#747 state:resolved]
* | in save! docs: added a note about what happens if AR::Rollback is raised ↵Xavier Noria2008-08-141-2/+4
| | | | | | | | somewhere in the callback chain
* | documented how to trigger rollbacks within the callback chain, and related ↵Xavier Noria2008-08-141-1/+10
| | | | | | | | gotchas
* | removed a wrong statement, I'll look into this to document it betterXavier Noria2008-08-121-1/+0
| |
* | added a few docs about transactionsXavier Noria2008-08-121-1/+12
| |
* | An string -> A stringXavier Noria2008-08-121-1/+1
| |
* | activerecord/lib/active_record/base.rbXavier Noria2008-08-121-9/+12
| |
* | Flesh out documentation for the :select option to AR#findDave Rothlisberger2008-08-031-1/+1
| |
* | Merge commit 'mainstream/master'Pratik Naik2008-08-0313-29/+39
|\|
| * Fix file permissionsTarmo Tänav2008-07-3111-0/+0
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * validates_uniqueness_of uses database case sensitivity support instead of ↵Tarmo Tänav2008-07-313-27/+23
| | | | | | | | | | | | using ruby Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Fixed negative default integer parsing for Postgresql 8.3.3Tarmo Tänav2008-07-311-2/+2
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Cast value to string in validates_uniqueness_of if the column is of text typeTarmo Tänav2008-07-311-1/+7
| | | | | | | | | | | | This fixes an error for postgresql where "text_column = 100" fails in version 8.3 Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Raise UnknownAttributeError when unknown attributes are supplied via mass ↵Pratik Naik2008-07-311-1/+9
| | | | | | | | assignment
* | say explicitily that after_* callbacks run within the save/destroy transactionXavier Noria2008-08-031-1/+1
| |
* | escaping otherwise autolinked "scopes" in named_scope.rb (we can now assume ↵Xavier Noria2008-07-281-9/+9
| | | | | | | | rdoc is v2.1)
* | convention revision and typosXavier Noria2008-07-281-6/+6
| |
* | The :conditions for calculations are not explained in the intro, there is no ↵Evan Farrar2008-07-281-2/+2
|/ | | | intro. This must have been copy/pasted from active_record/base.rb so link there instead.
* Merge docrails changesPratik Naik2008-07-283-139/+317
|
* Revert "Ensure adapater specific code is loaded on ↵Joshua Peek2008-07-271-1/+0
| | | | | | ActiveRecord::Base.establish_connection" This reverts commit 8b858782fa693e89a47fc3dd5ae38d842ede6d04.
* Make observers define #after_find in the model only if needed.George Ogata2008-07-261-0/+3
| | | | | [#676 state:resolved] Signed-off-by: Michael Koziarski <michael@koziarski.com>
* Ensure NamedScope#any? uses COUNT query wherever possible. [#680 state:resolved]Jan De Poorter2008-07-231-1/+9
| | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Ensure adapater specific code is loaded on ↵Joshua Peek2008-07-211-0/+1
| | | | ActiveRecord::Base.establish_connection
* Use klass.sti_name to make sure associations take store_full_sti_class into ↵Daniel Guettler2008-07-221-2/+2
| | | | | | account. [#671 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Ensure checked value is a string when validating case-sensitive uniqueness ↵Tom Ward2008-07-191-1/+1
| | | | | | [#361 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Make sure association preloading works with full STI class name [#465 ↵Joachim Garth2008-07-181-1/+1
| | | | | | state:Resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Merge branch 'master' into i18n-mergeJeremy Kemper2008-07-179-40/+60
|\ | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/form_options_helper.rb activerecord/lib/active_record/validations.rb
| * Set config.active_record.timestamped_migrations = false to have migrations ↵Nik Wakelin2008-07-172-0/+20
| | | | | | | | | | | | with numeric prefix instead of UTC timestamp. [#446 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Merge with docrails.Pratik Naik2008-07-168-42/+42
| |
* | missed to remove a call to to_s while resolving conflicts in validations.rbSven Fuchs2008-07-161-1/+1
| |
* | merge forward to current rails/masterSven Fuchs2008-07-1625-147/+312
|\|
| * Observers not longer add an after_find method to the observed class.Stefan Kaes2008-07-151-5/+4
| | | | | | | | [#625 state:resolved]
| * update_counters should update nil values.miloops2008-07-151-1/+1
| | | | | | | | | | | | This allows counter columns with default null instead of requiring default 0. [#493 state:resolved]
| * Move the transaction counter to the connection object rather than ↵Jonathan Viney2008-07-153-18/+20
| | | | | | | | | | | | | | maintaining it on the current Thread. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#533 state:resolved]
| * SQLite: rename_column raises if the column doesn't exist.Tarmo Tänav2008-07-141-0/+3
| | | | | | | | [#622 state:resolved]
| * Fixed postgresql limited eager loading for the case where scoped :order was ↵Tarmo Tänav2008-07-141-3/+8
| | | | | | | | present
| * Fix integer quoting issues in association preload. [#602 state:resolved]Tiago Macedo2008-07-141-3/+12
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Add assert_sql helper method to check for specific SQL output in Active ↵Gabe da Silveira2008-07-141-2/+13
| | | | | | | | | | | | Record test suite. [#325 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Fixed mysql change_column_default to not make the column always nullable.Tarmo Tänav2008-07-142-7/+35
| | | | | | | | | | | | Also added change_column_null to both mysql and sqlite to keep the api features closer to postgresql. [#617 state:resolved]
| * PostgreSQL: don't dump :limit => 4 for integersJeremy Kemper2008-07-141-1/+0
| |
| * Faster and clearer value_to_booleanJeremy Kemper2008-07-141-5/+4
| |
| * Fixed that create database statements would always include "DEFAULT NULL" ↵David Heinemeier Hansson2008-07-141-1/+4
| | | | | | | | (Nick Sieger) [#334 status:committed]
| * Added db:charset support to PostgreSQL. [#556 state:resolved]Sebastian A. Espindola2008-07-141-0/+13
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>