Hongli Lai (Phusion) ccb96f2297 Merge commit 'origin/master' into savepoints ...

Conflicts:
	activerecord/lib/active_record/fixtures.rb
	activerecord/test/cases/defaults_test.rb

2008-12-03 19:30:35 +01:00

..

associations

Add :having option to find, to use in combination with grouped finds. Also added to has_many and has_and_belongs_to_many associations.

2008-12-01 20:22:31 +01:00

connection_adapters

Merge commit 'origin/master' into savepoints

2008-12-03 19:30:35 +01:00

locale

use :en as a default locale (in favor of :en-US)

2008-11-18 14:23:53 +01:00

locking

Partial updates don't update lock_version if nothing changed. [#426 state:resolved]

2008-06-22 20:33:43 -07:00

serializers

Merge docrails.

2008-05-25 12:29:00 +01:00

aggregations.rb

Merge docrails

2008-10-05 22:16:26 +01:00

association_preload.rb

Removed extra 'as' in :joins clause for habtm preloading

2008-12-01 20:00:19 +01:00

associations.rb

Add :having option to find, to use in combination with grouped finds. Also added to has_many and has_and_belongs_to_many associations.

2008-12-01 20:22:31 +01:00

attribute_methods.rb

"raise NoMethodError" raises NoMethodError. Raise it with NoMethodError.new instead.

2008-10-25 14:52:44 +05:30

base.rb

Add :having option to find, to use in combination with grouped finds. Also added to has_many and has_and_belongs_to_many associations.

2008-12-01 20:22:31 +01:00

calculations.rb

Make sure any Fixnum returned by a DB sum is type cast to a Float before standard converstion to a BigDecimal [#8994 state:resolved]

2008-11-13 10:45:57 -06:00

callbacks.rb

Merge docrails

2008-10-16 22:13:06 +02:00

dirty.rb

Allow for the dirty tracking to work with the aliased name of aliased attributes.

2008-09-13 11:41:14 +02:00

dynamic_finder_match.rb

Dynamic finders should use the ActiveRecord::Base::find method instead of ::find_initial, :find_last, and ::find_all.

2008-10-03 21:28:11 +02:00

fixtures.rb

Merge commit 'origin/master' into savepoints

2008-12-03 19:30:35 +01:00

i18n_interpolation_deprecation.rb

I18n: move old-style interpolation syntax deprecation to Active Record. [#1044 state:resolved]

2008-09-20 19:13:50 +01:00

migration.rb

Back to fetching all versions in ruby instead of letting SQL do it as it's difficult to get all databases to convert the text value to a number with the same SQL

2008-08-26 03:00:36 -07:00

named_scope.rb

Merge docrails

2008-09-03 17:58:47 +01:00

observer.rb

Make observers define #after_find in the model only if needed.

2008-07-26 16:26:08 +02:00

query_cache.rb

Removed query cache rescue as it could cause code to be run twice (closes #10408) [DHH]

2007-12-07 13:34:06 +00:00

reflection.rb

Remove HasManyAssociationStrategy and move the logic to ActiveRecord::Reflection::ThroughReflection.

2008-10-04 17:49:39 +01:00

schema_dumper.rb

Ensure indices don't flip order in schema.rb [#1266 state:committed]

2008-10-30 13:03:42 +01:00

schema.rb

Merge docrails.

2008-05-25 12:29:00 +01:00

serialization.rb

require json lib when serialization is loaded

2008-11-24 11:52:29 -06:00

test_case.rb

Remove SQL Server cases from tests for latest adapter work to pass rails expected behavior.

2008-11-19 18:00:56 +01:00

timestamp.rb

Partial updates play nice with updated_at/on timestamps

2008-03-31 01:49:57 +00:00

transactions.rb

Rename ActiveRecord::Base#transaction's :force option to :nest. Improve documentation for nested transactions.

2008-11-03 20:56:21 +01:00

validations.rb

Merge docrails

2008-10-05 22:16:26 +01:00

version.rb

Assume that the next version is going to be 2.3 for now

2008-11-19 14:12:38 +01:00