Pratik Naik 5f3f100ce2 Merge branch 'master' into active_model ...

Conflicts:
	activeresource/lib/active_resource/validations.rb

2009-04-22 15:26:03 +01:00

..

associations

Ensure JoinAssociation uses aliased table name when multiple associations have hash conditions on the same table

2009-04-20 13:51:11 +01:00

connection_adapters

Add microsecond support for sqlite adapter [#1982 state:resolved]

2009-04-21 18:05:07 +01:00

locale

Merge docrails

2009-01-18 18:10:58 +00:00

locking

Ensure Model#destroy respects optimistic locking [#1966 state:resolved]

2009-03-09 14:56:09 +00:00

serializers

Ensure ActiveRecord#to_xml respects :skip_types for included associations [#1632 state:resolved]

2009-03-10 11:17:16 +00:00

validations

Move validate_on_create and validate_on_update from ActiveModel to ActiveRecord

2009-03-21 01:11:38 +00:00

aggregations.rb

Merge docrails

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

association_preload.rb

Fix :include of has_one with :primary_key option

2008-12-26 23:26:37 +00:00

associations.rb

Ensure :dependent => :delete_all works for association with hash conditions

2009-04-20 18:12:40 +01:00

attribute_methods.rb

Support true/false in query_attribute for calculated columns

2009-02-06 13:39:08 +13:00

autosave_association.rb

Move all the Active Record validations to Active Model

2009-03-19 23:28:59 +00:00

base.rb

Ensure JoinAssociation uses aliased table name when multiple associations have hash conditions on the same table

2009-04-20 13:51:11 +01:00

batches.rb

Merge docrails

2009-03-16 11:28:36 +00:00

calculations.rb

Ensure calculations respect scoped :select [#1334 state:resolved]

2009-03-07 15:26:56 +00:00

callbacks.rb

Merge with docrails

2009-02-24 12:29:25 +00:00

dirty.rb

Fixing bug on ActiveRecord::Dirty#field_changed? for nullable numeric columns, NULL gets stored in database for blank (i.e. '') values. Only integer columns were considered.

2009-01-16 10:00:39 +13: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

dynamic_scope_match.rb

Introduce dynamic scopes for ActiveRecord: you can now use class methods like scoped_by_user_name(user_name) and scoped_by_user_name_and_password(user_name, password) that will use the scoped method with attributes you supply. [#1648 state:committed]

2008-12-28 20:52:46 +01:00

fixtures.rb

Merge with docrails

2009-02-24 12:29:25 +00: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

Migrations: make default database connection overridable

2009-02-04 12:21:22 -08:00

named_scope.rb

Returning nil from named scope lambda is equivalent to an empty hash [#1773 state:resolved]

2009-03-12 15:06:19 +00:00

nested_attributes.rb

Changed API of NestedAttributes to take an array, or hash with index keys, of hashes that have the id on the inside of the attributes hash and updated the FormBuilder to produce such hashes. Also fixed NestedAttributes with composite ids.

2009-02-13 21:47:56 +13: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

ActiveRecord::QueryCache middleware

2008-12-22 11:31:18 -06:00

reflection.rb

Ensure belongs_to association with a counter cache in name spaced model works [#1678 state:resolved]

2009-03-06 22:05:18 +00:00

schema_dumper.rb

Merge with docrails

2008-12-07 03:27:53 +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

session_store.rb

Bring abstract_controller up to date with rails/master

2009-04-13 15:18:45 -07:00

test_case.rb

DRY with_kcode in Active Record tests

2009-03-07 11:06:44 +00:00

timestamp.rb

Added :touch option to belongs_to associations that will touch the parent record when the current record is saved or destroyed [DHH]

2009-04-16 17:25:55 -05:00

transactions.rb

Merge docrails

2009-04-05 12:36:36 +01:00

validations.rb

Deprecate Model#validate/validate_on_create/validate_on_update. Use Model.validate :method and likewise

2009-03-21 19:07:15 +00:00

version.rb

Prepare for final 2.3 release

2009-03-15 22:06:50 -05:00