aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'mainstream/master'Pratik Naik2008-09-2729-63/+463
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb railties/Rakefile railties/doc/guides/activerecord/association_basics.txt railties/doc/guides/debugging/debugging_rails_applications.txt railties/doc/guides/getting_started_with_rails/getting_started_with_rails.txt railties/doc/guides/index.txt railties/doc/guides/migrations/foreign_keys.txt railties/doc/guides/migrations/migrations.txt railties/doc/guides/migrations/writing_a_migration.txt railties/doc/guides/routing/routing_outside_in.txt
| * Ignore all exceptions for validates_acceptance_of columns fetch so it can ↵Tarmo Tänav2008-09-261-1/+1
| | | | | | | | | | | | run even without a database connection Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Changed ActiveRecord attributes to respect access control.Adam Milligan2008-09-242-5/+54
| | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1084 state:committed]
| * Refactor configure_dependency_for_has_many to use a few more methods.Hongli Lai (Phusion)2008-09-241-3/+34
| | | | | | | | | | | | | | Add an additional conditions option to make it slightly easier for certain plugins. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1087 state:committed]
| * Allowed passing arrays-of-strings to :join everywhere. Merge duplicate join ↵Pivotal Labs2008-09-244-13/+68
| | | | | | | | | | | | | | strings to avoid table aliasing problems. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1077 state:committed]
| * Make AssociationCollection start transactions in the correct database.Hongli Lai (Phusion)2008-09-235-6/+48
| | | | | | | | | | | | | | | | | | | | AssociationCollection now starts transactions by calling AssociationCollection#transaction instead of @owner.transaction or @reflection.klass.transaction. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1081 state:committed]
| * Merge branch 'patches' into multibyteMichael Koziarski2008-09-228-7/+59
| |\
| | * Bump the Version constants to align with the *next* release rather than the ↵Michael Koziarski2008-09-221-1/+1
| | | | | | | | | | | | | | | | | | previous release. This allows people tracking non-release gems or git submodules to use the constants.
| | * Association#first and last should not load the association if not needed. ↵Jan De Poorter2008-09-223-4/+18
| | | | | | | | | | | | | | | | | | [#1091 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | * Add Model#delete instance method, similar to Model.delete class method. ↵Hongli Lai (Phusion2008-09-214-2/+40
| | | | | | | | | | | | | | | | | | [#1086 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | Change all calls to String#chars to String#mb_chars.Manfred Stienstra2008-09-213-7/+7
| | |
| * | Fix a test that assumes .mb_chars to always return an instance of the ↵Manfred Stienstra2008-09-211-7/+23
| | | | | | | | | | | | proxy_class.
| * | Change all calls to String#chars to String#mb_chars. Remove a exception for ↵Manfred Stienstra2008-09-211-2/+2
| |/ | | | | | | Ruby <= 1.9.
| * applied patch to fix the associations with blocks in modules bug from an old ↵Adeh DeSandies2008-09-202-4/+19
| | | | | | | | trac ticket
| * I18n: Introduce I18n.load_path in favor of I18n.load_translations and change ↵Sven Fuchs2008-09-202-2/+6
| | | | | | | | | | | | Simple backend to load translations lazily. [#1048 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * I18n: move old-style interpolation syntax deprecation to Active Record. ↵Sven Fuchs2008-09-202-1/+27
| | | | | | | | | | | | [#1044 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Fixed an error triggered by a reload followed by a foreign key assignment.Nathaniel Talbott2008-09-202-1/+13
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Update the documentation to reflect the change handling :group earlierMichael Koziarski2008-09-161-1/+4
| |
| * When counting grouped records the target should be loaded to return a valid ↵miloops2008-09-152-0/+4
| | | | | | | | | | | | | | | | | | groups count result. Without this change count_records will group for the count in the query and return erroneous results. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#937 state:committed]
| * stop AR's debug.log filling with warnings about not being able to load ↵Frederick Cheung2008-09-141-0/+14
| | | | | | | | | | | | | | | | fixture classes [#1045 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Deal with MySQL's quirky handling of defaults and blob/text columnsFrederick Cheung2008-09-146-3/+49
| | | | | | | | | | | | [#1043 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Multiparameter attributes skip time zone conversion for time-only columns ↵gbuesing2008-09-143-1/+21
| | | | | | | | [#1030 state:resolved]
| * Base.skip_time_zone_conversion_for_attributes uses ↵miloops2008-09-143-1/+12
| | | | | | | | class_inheritable_accessor, so that subclasses don't overwrite Base [#346 state:resolved]
| * Merge docrailsPratik Naik2008-09-133-48/+116
| |
* | Change 'racing condition' to 'race condition'.Hongli Lai (Phusion)2008-09-221-2/+2
| |
* | Improve documentation for attributes= and document its ↵Hongli Lai (Phusion)2008-09-221-3/+18
| | | | | | | | 'guard_protected_attributes' parameter.
* | In ActiveRecord::Base#destroy's documention, also mention that ↵Hongli Lai (Phusion)2008-09-211-0/+3
| | | | | | | | before/after_delete callbacks and :dependent callbacks are run.
* | Document some of the internals of associations handling.Hongli Lai (Phusion)2008-09-211-0/+6
| |
* | Improve various examples and API description texts.Hongli Lai (Phusion)2008-09-211-6/+15
| |
* | In some of ActiveRecord::Base's API documentation, replace 'Attributes' with ↵Hongli Lai (Phusion)2008-09-211-12/+12
| | | | | | | | 'Parameters' because that's more correct.
* | Fix another typo.Hongli Lai (Phusion)2008-09-201-1/+1
| |
* | Fix typo.Hongli Lai (Phusion)2008-09-201-3/+3
| |
* | Fix minor formatting error.Hongli Lai (Phusion)2008-09-201-2/+2
| |
* | Document concurrency issues in validates_uniqueness_of.Hongli Lai (Phusion)2008-09-201-4/+64
| |
* | s/ActionPack/Action Pack/Hongli Lai (Phusion)2008-09-201-1/+1
| |
* | Improve documentation for ActiveRecord::Base#to_param.Hongli Lai (Phusion)2008-09-201-1/+22
| |
* | Document ActiveRecord::AssociationPreload.Hongli Lai (Phusion)2008-09-201-3/+87
| |
* | Improve documentation for AbstractAdapter#add_limit_offset!Hongli Lai (Phusion)2008-09-181-1/+7
| |
* | Improve documentation for create_table.Hongli Lai (Phusion)2008-09-181-2/+8
| |
* | Document ActiveRecord::ConnectionAdapters::ConnectionHandler.Hongli Lai (Phusion)2008-09-171-0/+23
| |
* | Improve documentation for ConnectionPool, again.Hongli Lai (Phusion)2008-09-171-3/+22
| |
* | Improve documentation for ConnectionPool.Hongli Lai (Phusion)2008-09-171-3/+29
| |
* | Update documentation for AbstractAdapter#reset!Hongli Lai (Phusion)2008-09-171-3/+4
| |
* | Improve the overview documentation for AbstractAdapter: explain what it is for.Hongli Lai (Phusion)2008-09-171-7/+11
| |
* | Improve documentation for the connection methods in AbstractAdapter.Hongli Lai (Phusion)2008-09-171-8/+16
| |
* | Document ActiveRecord::Base.configurations.Hongli Lai (Phusion)2008-09-171-0/+25
| |
* | Improve documentation for ActiveRecord::Base#reset_column_informationHongli Lai (Phusion)2008-09-171-1/+26
| |
* | s/class/Model/Hongli Lai (Phusion)2008-09-161-1/+1
| |
* | Warn about statement errors causing a transaction to become unusable on ↵Hongli Lai (Phusion)2008-09-161-0/+28
| | | | | | | | PostgreSQL.
* | Add more information about transactions.Hongli Lai (Phusion)2008-09-161-2/+16
| |