Revert "Added default_scope to Base [#1381 state:committed] (Paweł Kondzior)" -- won't gel with threads.

This reverts commit ff594b2b.

This reverts commit 8adb79b9.

Conflicts:

	activerecord/CHANGELOG

Fixed the sanitize helper to avoid double escaping already properly escaped entities [#683 state:committed]

Stop logging SHOW FIELDS and SET SQL_AUTO_IS_NULL=0 for the MysqlAdapter as they only clutter up the log and offer no value [DHH]

Stop logging SHOW FIELDS and SET SQL_AUTO_IS_NULL=0 for the MysqlAdapter as they only clutter up the log and offer no value [DHH]

Signed-off-by: NDavid Heinemeier Hansson <david@loudthinking.com>

Fixed that serialized strings should never be type-casted (i.e. turning "Yes" to a boolean)(Andreas Korth) [#857 state:committed]

Signed-off-by: NPratik Naik <pratiknaik@gmail.com>

[#1043 state:committed]
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

Base.skip_time_zone_conversion_for_attributes uses class_inheritable_accessor, so that subclasses don't overwrite Base [#346 state:resolved]

Revert "Add :accessible option to Associations for allowing mass assignments using hash. [#474 state:resolved]"

This reverts commit e0750d6a.

Conflicts:

	activerecord/CHANGELOG
	activerecord/lib/active_record/associations.rb
	activerecord/lib/active_record/associations/association_collection.rb

Add special AssociationReflection methods for creating association objects, and modify the code base to use those methods instead of creating association objects directly. This allows plugins to hook into association object creation behavior.

[#986 state:resolved]
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

Make the options that has_many, belongs_to and other association generation methods can accept, configurable.

[#985 state:resolved]
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

Previously this would have committed the transaction but not carried out save or destroy operation.

[#891 state:committed]
Signed-off-by: NMichael Koziarski <michael@koziarski.com>

Patch originally from http://dev.rubyonrails.org/ticket/5470

Set config.active_record.timestamped_migrations = false to have migrations with numeric prefix instead of UTC timestamp. [#446 state:resolved]
Signed-off-by: NPratik Naik <pratiknaik@gmail.com>

Also added change_column_null to both mysql and sqlite to keep the api features closer to postgresql.

[#617 state:resolved]

Fixed that create database statements would always include "DEFAULT NULL" (Nick Sieger) [#334 status:committed]

Add :accessible option to Associations for allowing mass assignments using hash. [#474 state:resolved]

Allows nested Hashes (i.e. from nested forms) to hydrate the appropriate
ActiveRecord models.

class Post < ActiveRecord::Base
  belongs_to :author,   :accessible => true
  has_many   :comments, :accessible => true
end

post = Post.create({
  :title    => 'Accessible Attributes',
  :author   => { :name => 'David Dollar' },
  :comments => [
    { :body => 'First Post!' },
    { :body => 'Nested Hashes are great!' }
  ]
})

post.comments << { :body => 'Another Comment' }
Signed-off-by: NPratik Naik <pratiknaik@gmail.com>

Signed-off-by: NPratik Naik <pratiknaik@gmail.com>

Examples:

  User.all :joins => :items, :conditions => { :age => 10, :items => { :color => 'black' } }
  Item.first :conditions => { :items => { :color => 'red' } }

Note : Hash key in :conditions is referring to the actual table name or the alias defined in query.

Signed-off-by: NPratik Naik <pratiknaik@gmail.com>