activerecord 1.6.0 → 1.7.0

data/CHANGELOG

@@ -1,3 +1,81 @@
+*1.7.0* (24th February, 2005)
+
+* Changed the auto-timestamping feature to use ActiveRecord::Base.default_timezone instead of entertaining the parallel ActiveRecord::Base.timestamps_gmt method. The latter is now deprecated and will throw a warning on use (but still work) #710 [Jamis Buck]
+
+* Added a OCI8-based Oracle adapter that has been verified to work with Oracle 8 and 9 #629 [Graham Jenkins]. Usage notes:
+
+    1.  Key generation uses a sequence "rails_sequence" for all tables. (I couldn't find a simple
+        and safe way of passing table-specific sequence information to the adapter.)
+    2.  Oracle uses DATE or TIMESTAMP datatypes for both dates and times. Consequently I have had to
+        resort to some hacks to get data converted to Date or Time in Ruby.
+        If the column_name ends in _at (like created_at, updated_at) it's created as a Ruby Time. Else if the
+        hours/minutes/seconds are 0, I make it a Ruby Date. Else it's a Ruby Time.
+        This is nasty - but if you use Duck Typing you'll probably not care very much.
+        In 9i it's tempting to map DATE to Date and TIMESTAMP to Time but I don't think that is
+        valid - too many databases use DATE for both.
+        Timezones and sub-second precision on timestamps are not supported.
+    3.  Default values that are functions (such as "SYSDATE") are not supported. This is a
+        restriction of the way active record supports default values.
+    4.  Referential integrity constraints are not fully supported. Under at least
+        some circumstances, active record appears to delete parent and child records out of
+        sequence and out of transaction scope. (Or this may just be a problem of test setup.)
+
+  The OCI8 driver can be retrieved from http://rubyforge.org/projects/ruby-oci8/
+
+* Added option :schema_order to the PostgreSQL adapter to support the use of multiple schemas per database #697 [YuriSchimke]
+
+* Optimized the SQL used to generate has_and_belongs_to_many queries by listing the join table first #693 [yerejm]
+
+* Fixed that when using validation macros with a custom message, if you happened to use single quotes in the message string you would get a parsing error #657 [tonka]
+
+* Fixed that Active Record would throw Broken Pipe errors with FCGI when the MySQL connection timed out instead of reconnecting #428 [Nicholas Seckar]
+
+* Added options to specify an SSL connection for MySQL. Define the following attributes in the connection config (config/database.yml in Rails) to use it: sslkey, sslcert, sslca, sslcapath, sslcipher. To use SSL with no client certs, just set :sslca = '/dev/null'. http://dev.mysql.com/doc/mysql/en/secure-connections.html #604 [daniel@nightrunner.com]
+
+* Added automatic dropping/creating of test tables for running the unit tests on all databases #587 [adelle@bullet.net.au]
+
+* Fixed that find_by_* would fail when column names had numbers #670 [demetrius]
+
+* Fixed the SQL Server adapter on a bunch of issues #667 [DeLynn]
+
+    1. Created a new columns method that is much cleaner. 
+    2. Corrected a problem with the select and select_all methods 
+       that didn't account for the LIMIT clause being passed into raw SQL statements. 
+    3. Implemented the string_to_time method in order to create proper instances of the time class. 
+    4. Added logic to the simplified_type method that allows the database to specify the scale of float data. 
+    5. Adjusted the quote_column_name to account for the fact that MS SQL is bothered by a forward slash in the data string.
+
+* Fixed that the dynamic finder like find_all_by_something_boolean(false) didn't work #649 [lmarlow@yahoo.com]
+
+* Added validates_each that validates each specified attribute against a block #610 [bitsweat]. Example:
+    
+    class Person < ActiveRecord::Base
+      validates_each :first_name, :last_name do |record, attr|
+        record.errors.add attr, 'starts with z.' if attr[0] == ?z
+      end
+    end
+
+* Added :allow_nil as an explicit option for validates_length_of, so unless that's set to true having the attribute as nil will also return an error if a range is specified as :within #610 [bitsweat]
+
+* Added that validates_* now accept blocks to perform validations #618 [Tim Bates]. Example:
+
+    class Person < ActiveRecord::Base
+      validate { |person| person.errors.add("title", "will never be valid") if SHOULD_NEVER_BE_VALID }
+    end
+
+* Addded validation for validate all the associated objects before declaring failure with validates_associated #618 [Tim Bates]
+
+* Added keyword-style approach to defining the custom relational bindings #545 [Jamis Buck]. Example:
+
+    class Project < ActiveRecord::Base
+      primary_key "sysid"
+      table_name "XYZ_PROJECT"
+      inheritance_column { original_inheritance_column + "_id" }
+    end
+
+* Fixed Base#clone for use with PostgreSQL #565 [hanson@surgery.wisc.edu]
+
+
 *1.6.0* (January 25th, 2005)
 
 * Added that has_many association build and create methods can take arrays of record data like Base#create and Base#build to build/create multiple records at once.

data/README

@@ -29,7 +29,7 @@ A short rundown of the major features:
 
    ...which again gives Product#name and Product#name=(new_name) 
    
-  Learn more in link:classes/ActiveRecord/Base.html
+  {Learn more}[link:classes/ActiveRecord/Base.html]
 
 
 * Associations between objects controlled by simple meta-programming macros. 
@@ -40,7 +40,7 @@ A short rundown of the major features:
      belongs_to :conglomorate
    end
 
-  Learn more in link:classes/ActiveRecord/Associations/ClassMethods.html
+  {Learn more}[link:classes/ActiveRecord/Associations/ClassMethods.html]
 
 
 * Aggregations of value objects controlled by simple meta-programming macros. 
@@ -52,7 +52,7 @@ A short rundown of the major features:
                  :mapping => [%w(address_street street), %w(address_city city)]
    end
 
-  Learn more in link:classes/ActiveRecord/Aggregations/ClassMethods.html
+  {Learn more}[link:classes/ActiveRecord/Aggregations/ClassMethods.html]
 
 
 * Validation rules that can differ for new or existing objects.
@@ -64,7 +64,7 @@ A short rundown of the major features:
       validates_confirmation_of :password, :email_address, :on => :create
     end
 
-  Learn more in link:classes/ActiveRecord/Validations.html
+  {Learn more}[link:classes/ActiveRecord/Validations.html]
 
 
 * Acts that can make records work as lists or trees:
@@ -77,6 +77,8 @@ A short rundown of the major features:
     item.move_higher
     item.move_to_bottom
 
+  Learn about {acts_as_list}[link:classes/ActiveRecord/Acts/List/ClassMethods.html], {the instance methods acts_as_list provides}[link:classes/ActiveRecord/Acts/List/InstanceMethods.html], and
+  {acts_as_tree}[link:classes/ActiveRecord/Acts/Tree/ClassMethods.html]
  
 * Callbacks as methods or queues on the entire lifecycle (instantiation, saving, destroying, validating, etc).
 
@@ -90,18 +92,18 @@ A short rundown of the major features:
      after_find :eager_load, 'self.class.announce(#{id})'
    end
 
-  Learn more in link:classes/ActiveRecord/Callbacks.html
+  {Learn more}[link:classes/ActiveRecord/Callbacks.html]
 
 
 * Observers for the entire lifecycle
 
    class CommentObserver < ActiveRecord::Observer
      def after_create(comment) # is called just after Comment#save
-       NotificationService.send_email("david@loudthinking.com", comment)
+       Notifications.deliver_new_comment("david@loudthinking.com", comment)
      end
    end
 
-  Learn more in link:classes/ActiveRecord/Observer.html
+  {Learn more}[link:classes/ActiveRecord/Observer.html]
 
 
 * Inheritance hierarchies 
@@ -111,7 +113,7 @@ A short rundown of the major features:
    class Client < Company; end
    class PriorityClient < Client; end
 
-  Learn more in link:classes/ActiveRecord/Base.html
+  {Learn more}[link:classes/ActiveRecord/Base.html]
 
 
 * Transaction support on both a database and object level. The latter is implemented 
@@ -129,7 +131,7 @@ A short rundown of the major features:
       mary.deposit(100)
     end
 
-  Learn more in link:classes/ActiveRecord/Transactions/ClassMethods.html
+  {Learn more}[link:classes/ActiveRecord/Transactions/ClassMethods.html]
 
 
 * Reflections on columns, associations, and aggregations
@@ -138,7 +140,7 @@ A short rundown of the major features:
     reflection.klass # => Client (class)
     Firm.columns # Returns an array of column descriptors for the firms table
 
-  Learn more in link:classes/ActiveRecord/Reflection/ClassMethods.html
+  {Learn more}[link:classes/ActiveRecord/Reflection/ClassMethods.html]
 
 
 * Direct manipulation (instead of service invocation)
@@ -158,7 +160,7 @@ A short rundown of the major features:
      # something even more interesting involving a the same cat...
      cat.save
 
-  Learn more in link:classes/ActiveRecord/Base.html
+  {Learn more}[link:classes/ActiveRecord/Base.html]
 
 
 * Database abstraction through simple adapters (~100 lines) with a shared connector
@@ -173,7 +175,8 @@ A short rundown of the major features:
      :database => "activerecord"
    )
 
-  Learn more in link:classes/ActiveRecord/Base.html#M000081
+  {Learn more}[link:classes/ActiveRecord/Base.html#M000081] and read about the built-in support for
+  MySQL[link:classes/ActiveRecord/ConnectionAdapters/MysqlAdapter.html], PostgreSQL[link:classes/ActiveRecord/ConnectionAdapters/PostgreSQLAdapter.html], SQLite[link:classes/ActiveRecord/ConnectionAdapters/SQLiteAdapter.html], Oracle[link:classes/ActiveRecord/ConnectionAdapters/OCIAdapter.html], SQLServer[link:classes/ActiveRecord/ConnectionAdapters/SQLServerAdapter.html], and DB2[link:classes/ActiveRecord/ConnectionAdapters/DB2Adapter.html].
 
 
 * Logging support for Log4r[http://log4r.sourceforge.net] and Logger[http://www.ruby-doc.org/stdlib/libdoc/logger/rdoc]
@@ -295,17 +298,6 @@ the examples themselves.
 It's also highly recommended to have a look at the unit tests. Read more in link:files/RUNNING_UNIT_TESTS.html
 
 
-== Database support
-
-Active Record ships with adapters for MySQL/Ruby[http://www.tmtm.org/en/mysql/ruby/] 
-(compatible with Ruby/MySQL[http://www.tmtm.org/ruby/mysql/README_en.html]), 
-PostgreSQL[http://www.postgresql.jp/interfaces/ruby/], and 
-SQLite[http://rubyforge.org/projects/sqlite-ruby/] (needs SQLite 2.8.13+ and SQLite-Ruby 1.1.2+).
-The adapters are around 100 lines of code fulfilling the interface specified by 
-ActiveRecord::ConnectionAdapters::AbstractAdapter. Writing a new adapter should be a small task --
-especially considering the extensive test suite that'll make sure you're fulfilling the contract.
-
-
 == Philosophy 
 
 Active Record attempts to provide a coherent wrapping for the inconvenience that is 
@@ -332,7 +324,7 @@ The latest version of Active Record can be found at
 
 Documentation can be found at 
 
-* http://ar.rubyonrails.org
+* http://ar.rubyonrails.com
 
 
 == Installation
@@ -341,7 +333,7 @@ The prefered method of installing Active Record is through its GEM file. You'll
 RubyGems[http://rubygems.rubyforge.org/wiki/wiki.pl] installed for that, though. If you have,
 then use:
 
-  % [sudo] gem install activerecord-0.9.0.gem
+  % [sudo] gem install activerecord-1.7.0.gem
 
 You can also install Active Record the old-fashion way with the following command:
 
@@ -352,12 +344,12 @@ from its distribution directory.
 
 == License
 
-Active Record is released under the same license as Ruby.
+Active Record is released under the MIT license.
 
 
 == Support
 
-The Active Record homepage is http://activerecord.rubyonrails.org. You can find the Active Record
+The Active Record homepage is http://www.rubyonrails.com. You can find the Active Record
 RubyForge page at http://rubyforge.org/projects/activerecord. And as Jim from Rake says:
 
    Feel free to submit commits or feature requests.  If you send a patch,
@@ -365,5 +357,4 @@ RubyForge page at http://rubyforge.org/projects/activerecord. And as Jim from Ra
    new feature to be submitted in the form of new unit tests.
 
 For other information, feel free to ask on the ruby-talk mailing list
-(which is mirrored to comp.lang.ruby) or contact mailto:david@loudthinking.com.
-
+(which is mirrored to comp.lang.ruby) or contact mailto:david@loudthinking.com.

data/RUNNING_UNIT_TESTS

@@ -8,8 +8,7 @@ When you have the database online, you can import the fixture tables with
 the test/fixtures/db_definitions/*.sql files.
 
 Make sure that you create database objects with the same user that you specified in i
-connection.rb otherwise (on Postgres, at least) tests for default values will fail
-(see http://dev.rubyonrails.org/trac.cgi/ticket/118)
+connection.rb otherwise (on Postgres, at least) tests for default values will fail.
 
 == Running with Rake
 

data/examples/validation.rb

@@ -16,9 +16,6 @@ logger.info "\nCreate tables"
 # Class setup ---------------
 
 class Person < ActiveRecord::Base
-  # Active Record can only guess simple table names like Card/cards, Company/companies
-  def self.table_name() "people" end
-
   # Using 
   def self.authenticate(name, pass)
     # find_first "name = '#{name}' AND pass = '#{pass}'" would be open to sql-injection (in a web-app scenario)

data/install.rb

@@ -18,7 +18,7 @@ unless $sitedir
   end
 end
 
-makedirs = %w{ active_record/associations active_record/connection_adapters active_record/support active_record/vendor active_record/acts active_record/support/core_ext active_record/support/core_ext/hash active_record/support/core_ext/numeric active_record/support/core_ext/string }
+makedirs = %w{ active_record/associations active_record/connection_adapters active_record/support active_record/vendor active_record/acts }
 makedirs.each {|f| File::makedirs(File.join($sitedir, *f.split(/\//)))}
 
 # deprecated files that should be removed
@@ -37,6 +37,7 @@ files = %w-
  active_record/connection_adapters/abstract_adapter.rb
  active_record/connection_adapters/db2_adapter.rb
  active_record/connection_adapters/mysql_adapter.rb
+ active_record/connection_adapters/oracle_adapter.rb
  active_record/connection_adapters/postgresql_adapter.rb
  active_record/connection_adapters/sqlite_adapter.rb
  active_record/connection_adapters/sqlserver_adapter.rb
@@ -47,24 +48,10 @@ files = %w-
  active_record/reflection.rb
  active_record/acts/list.rb
  active_record/acts/tree.rb
- active_record/support/class_attribute_accessors.rb
- active_record/support/class_inheritable_attributes.rb
- active_record/support/clean_logger.rb
- active_record/support/core_ext/hash/keys.rb
- active_record/support/core_ext/hash.rb
- active_record/support/core_ext/object_and_class.rb
- active_record/support/core_ext/numeric/bytes.rb
- active_record/support/core_ext/numeric/time.rb
- active_record/support/core_ext/numeric.rb
- active_record/support/core_ext/string/inflections.rb
- active_record/support/core_ext/string.rb
- active_record/support/core_ext.rb
- active_record/support/inflector.rb
- active_record/support/misc.rb
- active_record/support/module_attribute_accessors.rb
  active_record/timestamp.rb
  active_record/transactions.rb
  active_record/validations.rb
+ active_record/vendor/db2.rb
  active_record/vendor/mysql.rb
  active_record/vendor/mysql411.rb
  active_record/vendor/simple.rb

data/lib/active_record.rb

@@ -24,10 +24,16 @@
 
 $:.unshift(File.dirname(__FILE__))
 
-require 'active_record/support/core_ext'
-require 'active_record/support/clean_logger'
-require 'active_record/support/misc'
-require 'active_record/support/dependencies'
+begin
+  require 'active_support'
+rescue LoadError
+  begin
+    require File.dirname(__FILE__) + '/../../activesupport/lib/active_support'
+  rescue LoadError
+    require 'rubygems'
+    require_gem 'activesupport'
+  end
+end
 
 require 'active_record/base'
 require 'active_record/observer'
@@ -60,3 +66,4 @@ require 'active_record/connection_adapters/postgresql_adapter'
 require 'active_record/connection_adapters/sqlite_adapter'
 require 'active_record/connection_adapters/sqlserver_adapter'
 require 'active_record/connection_adapters/db2_adapter'
+require 'active_record/connection_adapters/oci_adapter'

data/lib/active_record/aggregations.rb

@@ -94,7 +94,7 @@ module ActiveRecord
     # relational unique identifiers (such as primary keys). Normal ActiveRecord::Base classes are entity objects.
     #
     # It's also important to treat the value objects as immutable. Don't allow the Money object to have its amount changed after
-    # creation. Create a new money object with the new value instead. This is examplified by the Money#exchanged_to method that
+    # creation. Create a new money object with the new value instead. This is exemplified by the Money#exchanged_to method that
     # returns a new value object instead of changing its own values. Active Record won't persist value objects that have been
     # changed through other means than the writer method.
     #
@@ -108,7 +108,7 @@ module ActiveRecord
       # <tt>composed_of :address</tt> would add <tt>address</tt> and <tt>address=(new_address)</tt>.
       #
       # Options are:
-      # * <tt>:class_name</tt>  - specify the class name of the association. Use it only if that name can't be infered
+      # * <tt>:class_name</tt>  - specify the class name of the association. Use it only if that name can't be inferred
       #   from the part id. So <tt>composed_of :address</tt> will by default be linked to the +Address+ class, but
       #   if the real class name is +CompanyAddress+, you'll have to specify it with this option.
       # * <tt>:mapping</tt> - specifies a number of mapping arrays (attribute, parameter) that bind an attribute name

data/lib/active_record/associations.rb

@@ -43,7 +43,7 @@ module ActiveRecord
     #
     # == Example
     #
-    # link:../examples/associations.png
+    # link:../../examples/associations.png
     #
     # == Is it belongs_to or has_one?
     #
@@ -160,7 +160,7 @@ module ActiveRecord
       # * <tt>collection.find(id)</tt> - finds an associated object responding to the +id+ and that
       #   meets the condition that it has to be associated with this object.
       # * <tt>collection.find_all(conditions = nil, orderings = nil, limit = nil, joins = nil)</tt> - finds all associated objects responding 
-      #   criterias mentioned (like in the standard find_all) and that meets the condition that it has to be associated with this object.
+      #   criteria mentioned (like in the standard find_all) and that meets the condition that it has to be associated with this object.
       # * <tt>collection.build(attributes = {})</tt> - returns a new object of the collection type that has been instantiated
       #   with +attributes+ and linked to this object through a foreign key but has not yet been saved.
       # * <tt>collection.create(attributes = {})</tt> - returns a new object of the collection type that has been instantiated
@@ -180,7 +180,7 @@ module ActiveRecord
       # The declaration can also include an options hash to specialize the behavior of the association.
       # 
       # Options are:
-      # * <tt>:class_name</tt>  - specify the class name of the association. Use it only if that name can't be infered
+      # * <tt>:class_name</tt>  - specify the class name of the association. Use it only if that name can't be inferred
       #   from the association name. So <tt>has_many :products</tt> will by default be linked to the +Product+ class, but
       #   if the real class name is +SpecialProduct+, you'll have to specify it with this option.
       # * <tt>:conditions</tt>  - specify the conditions that the associated objects must meet in order to be included as a "WHERE"
@@ -263,7 +263,7 @@ module ActiveRecord
       # The declaration can also include an options hash to specialize the behavior of the association.
       # 
       # Options are:
-      # * <tt>:class_name</tt>  - specify the class name of the association. Use it only if that name can't be infered
+      # * <tt>:class_name</tt>  - specify the class name of the association. Use it only if that name can't be inferred
       #   from the association name. So <tt>has_one :manager</tt> will by default be linked to the +Manager+ class, but
       #   if the real class name is +Person+, you'll have to specify it with this option.
       # * <tt>:conditions</tt>  - specify the conditions that the associated object must meet in order to be included as a "WHERE"
@@ -320,7 +320,7 @@ module ActiveRecord
       # * <tt>association.create(attributes = {})</tt> - returns a new object of the associated type that has been instantiated
       #   with +attributes+ and linked to this object through a foreign key and that has already been saved (if it passed the validation).
       #
-      # Example: A Post class declares <tt>has_one :author</tt>, which will add:
+      # Example: A Post class declares <tt>belongs_to :author</tt>, which will add:
       # * <tt>Post#author</tt> (similar to <tt>Author.find(author_id)</tt>)
       # * <tt>Post#author=(author)</tt> (similar to <tt>post.author_id = author.id</tt>)
       # * <tt>Post#author?</tt> (similar to <tt>post.author == some_author</tt>)
@@ -330,7 +330,7 @@ module ActiveRecord
       # The declaration can also include an options hash to specialize the behavior of the association.
       # 
       # Options are:
-      # * <tt>:class_name</tt>  - specify the class name of the association. Use it only if that name can't be infered
+      # * <tt>:class_name</tt>  - specify the class name of the association. Use it only if that name can't be inferred
       #   from the association name. So <tt>has_one :author</tt> will by default be linked to the +Author+ class, but
       #   if the real class name is +Person+, you'll have to specify it with this option.
       # * <tt>:conditions</tt>  - specify the conditions that the associated object must meet in order to be included as a "WHERE"
@@ -403,7 +403,7 @@ module ActiveRecord
       #
       # Adds the following methods for retrieval and query.
       # +collection+ is replaced with the symbol passed as the first argument, so 
-      # <tt>has_and_belongs_to_many :categories</tt> would add among others +categories.empty?+.
+      # <tt>has_and_belongs_to_many :categories</tt> would add among others <tt>categories.empty?</tt>.
       # * <tt>collection(force_reload = false)</tt> - returns an array of all the associated objects.
       #   An empty array is returned if none is found.
       # * <tt>collection<<(object, ...)</tt> - adds one or more objects to the collection by creating associations in the join table 
@@ -432,7 +432,7 @@ module ActiveRecord
       # The declaration may include an options hash to specialize the behavior of the association.
       # 
       # Options are:
-      # * <tt>:class_name</tt> - specify the class name of the association. Use it only if that name can't be infered
+      # * <tt>:class_name</tt> - specify the class name of the association. Use it only if that name can't be inferred
       #   from the association name. So <tt>has_and_belongs_to_many :projects</tt> will by default be linked to the 
       #   +Project+ class, but if the real class name is +SuperProject+, you'll have to specify it with this option.
       # * <tt>:join_table</tt> - specify the name of the join table if the default based on lexical order isn't what you want.

data/lib/active_record/associations/association_collection.rb

@@ -99,7 +99,7 @@ module ActiveRecord
           false
         end
 
-        # Array#flatten has problems with rescursive arrays. Going one level deeper solves the majority of the problems.
+        # Array#flatten has problems with recursive arrays. Going one level deeper solves the majority of the problems.
         def flatten_deeper(array)
           array.collect { |element| element.respond_to?(:flatten) ? element.flatten : element }.flatten
         end

data/lib/active_record/associations/has_and_belongs_to_many_association.rb

@@ -147,7 +147,7 @@ module ActiveRecord
         def construct_sql
           interpolate_sql_options!(@options, :finder_sql, :delete_sql)
           @finder_sql = @options[:finder_sql] ||
-                "SELECT t.*, j.* FROM #{@association_table_name} t, #{@join_table} j " +
+                "SELECT t.*, j.* FROM #{@join_table} j, #{@association_table_name} t " +
                 "WHERE t.#{@association_class.primary_key} = j.#{@association_foreign_key} AND " +
                 "j.#{@association_class_primary_key_name} = #{@owner.quoted_id} " +
                 (@options[:conditions] ? " AND " + interpolate_sql(@options[:conditions]) : "") + " " +

data/lib/active_record/base.rb

@@ -1,6 +1,6 @@
-require 'active_record/support/class_attribute_accessors'
-require 'active_record/support/class_inheritable_attributes'
-require 'active_record/support/inflector'
+require 'active_support/class_attribute_accessors'
+require 'active_support/class_inheritable_attributes'
+require 'active_support/inflector'
 require 'yaml'
 
 module ActiveRecord #:nodoc:
@@ -97,6 +97,16 @@ module ActiveRecord #:nodoc:
   #     end
   #   end
   # 
+  # == Accessing attributes before they have been type casted
+  #
+  # Some times you want to be able to read the raw attribute data without having the column-determined type cast run its course first.
+  # That can be done by using the <attribute>_before_type_cast accessors that all attributes have. For example, if your Account model
+  # has a balance attribute, you can call account.balance_before_type_cast or account.id_before_type_cast. 
+  #
+  # This is especially useful in validation situations where the user might supply a string for an integer field and you want to display
+  # the original string back in an error message. Accessing the attribute normally would type cast the string to 0, which isn't what you
+  # want.
+  #
   # == Dynamic attribute-based finders
   #
   # Dynamic attribute-based finders are a cleaner way of getting objects by simple queries without turning to SQL. They work by
@@ -112,7 +122,7 @@ module ActiveRecord #:nodoc:
   # is actually Payment.find_all_by_amount(amount, orderings = nil, limit = nil, joins = nil). And the full interface to Person.find_by_user_name is
   # actually Person.find_by_user_name(user_name, orderings = nil)
   #
-  # == Saving arrays, hashes, and other non-mappeable objects in text columns
+  # == Saving arrays, hashes, and other non-mappable objects in text columns
   # 
   # Active Record can serialize any object in text columns using YAML. To do so, you must specify this with a call to the class method +serialize+. 
   # This makes it possible to store arrays, hashes, and other non-mappeable objects without doing any additional work. Example:
@@ -144,7 +154,7 @@ module ActiveRecord #:nodoc:
   #   class Client < Company; end
   #   class PriorityClient < Client; end
   #
-  # When you do Firm.create("name" => "37signals"), this record with be saved in the companies table with type = "Firm". You can then
+  # When you do Firm.create("name" => "37signals"), this record will be saved in the companies table with type = "Firm". You can then
   # fetch this row again using Company.find_first "name = '37signals'" and it will return a Firm object.
   #
   # If you don't have a type column defined in your table, single-table inheritance won't be triggered. In that case, it'll work just
@@ -168,7 +178,7 @@ module ActiveRecord #:nodoc:
   # * +ActiveRecordError+ -- generic error class and superclass of all other errors raised by Active Record
   # * +AdapterNotSpecified+ -- the configuration hash used in <tt>establish_connection</tt> didn't include a 
   #   <tt>:adapter</tt> key.
-  # * +AdapterNotSpecified+ -- the <tt>:adapter</tt> key used in <tt>establish_connection</tt> specified an unexisting adapter
+  # * +AdapterNotSpecified+ -- the <tt>:adapter</tt> key used in <tt>establish_connection</tt> specified an non-existent adapter
   #   (or a bad spelling of an existing one). 
   # * +AssociationTypeMismatch+ -- the object assigned to the association wasn't of the type specified in the association definition. 
   # * +SerializationTypeMismatch+ -- the object serialized wasn't of the class specified as the second parameter. 
@@ -221,7 +231,7 @@ module ActiveRecord #:nodoc:
     @@primary_key_prefix_type = nil
 
     # Accessor for the name of the prefix string to prepend to every table name. So if set to "basecamp_", all 
-    # table names will be named like "basecamp_projects", "basecamp_people", etc. This is a convinient way of creating a namespace
+    # table names will be named like "basecamp_projects", "basecamp_people", etc. This is a convenient way of creating a namespace
     # for tables in a shared database. By default, the prefix is the empty string.
     cattr_accessor :table_name_prefix
     @@table_name_prefix = ""
@@ -447,7 +457,7 @@ module ActiveRecord #:nodoc:
         write_inheritable_array("attr_protected", attributes)
       end
       
-      # Returns an array of all the attributes that have been protected from mass-assigment.
+      # Returns an array of all the attributes that have been protected from mass-assignment.
       def protected_attributes # :nodoc:
         read_inheritable_attribute("attr_protected")
       end
@@ -460,14 +470,14 @@ module ActiveRecord #:nodoc:
         write_inheritable_array("attr_accessible", attributes)
       end
       
-      # Returns an array of all the attributes that have been made accessible to mass-assigment.
+      # Returns an array of all the attributes that have been made accessible to mass-assignment.
       def accessible_attributes # :nodoc:
         read_inheritable_attribute("attr_accessible")
       end
 
       # Specifies that the attribute by the name of +attr_name+ should be serialized before saving to the database and unserialized
       # after loading from the database. The serialization is done through YAML. If +class_name+ is specified, the serialized
-      # object must be of that class on retrival or +SerializationTypeMismatch+ will be raised.
+      # object must be of that class on retrieval or +SerializationTypeMismatch+ will be raised.
       def serialize(attr_name, class_name = Object)
         write_inheritable_attribute("attr_serialized", serialized_attributes.update(attr_name.to_s => class_name))
       end
@@ -479,20 +489,8 @@ module ActiveRecord #:nodoc:
 
       # Guesses the table name (in forced lower-case) based on the name of the class in the inheritance hierarchy descending
       # directly from ActiveRecord. So if the hierarchy looks like: Reply < Message < ActiveRecord, then Message is used
-      # to guess the table name from even when called on Reply. The guessing rules are as follows:
-      #
-      # * Class name ends in "x", "ch" or "ss": "es" is appended, so a Search class becomes a searches table.
-      # * Class name ends in "y" preceded by a consonant or "qu": The "y" is replaced with "ies", so a Category class becomes a categories table. 
-      # * Class name ends in "fe": The "fe" is replaced with "ves", so a Wife class becomes a wives table.
-      # * Class name ends in "lf" or "rf": The "f" is replaced with "ves", so a Half class becomes a halves table.
-      # * Class name ends in "person": The "person" is replaced with "people", so a Salesperson class becomes a salespeople table.
-      # * Class name ends in "man": The "man" is replaced with "men", so a Spokesman class becomes a spokesmen table.
-      # * Class name ends in "sis": The "i" is replaced with an "e", so a Basis class becomes a bases table.
-      # * Class name ends in "tum" or "ium": The "um" is replaced with an "a", so a Datum class becomes a data table.
-      # * Class name ends in "child": The "child" is replaced with "children", so a NodeChild class becomes a node_children table.
-      # * Class name ends in an "s": No additional characters are added or removed.
-      # * Class name doesn't end in "s": An "s" is appended, so a Comment class becomes a comments table.
-      # * Class name with word compositions: Compositions are underscored, so CreditCard class becomes a credit_cards table.
+      # to guess the table name from even when called on Reply. The rules used to do the guess are handled by the Inflector class
+      # in Active Support, which knows almost all common English inflections (report a bug if your inflection isn't covered).
       #
       # Additionally, the class-level table_name_prefix is prepended to the table_name and the table_name_suffix is appended.
       # So if you have "myapp_" as a prefix, the table name guess for an Account class becomes "myapp_accounts".
@@ -501,13 +499,13 @@ module ActiveRecord #:nodoc:
       # "mice" table. Example:
       #
       #   class Mouse < ActiveRecord::Base
-      #      def self.table_name() "mice" end
+      #      table_name "mice"
       #   end
       def table_name
         table_name_prefix + undecorated_table_name(class_name_of_active_record_descendant(self)) + table_name_suffix
       end
 
-      # Defines the primary key field -- can be overridden in subclasses. Overwritting will negate any effect of the
+      # Defines the primary key field -- can be overridden in subclasses. Overwriting will negate any effect of the
       # primary_key_prefix_type setting, though.
       def primary_key
         case primary_key_prefix_type
@@ -525,6 +523,49 @@ module ActiveRecord #:nodoc:
         "type"
       end
 
+      # Sets the table name to use to the given value, or (if the value
+      # is nil or false) to the value returned by the given block.
+      #
+      # Example:
+      #
+      #   class Project < ActiveRecord::Base
+      #     set_table_name "project"
+      #   end
+      def set_table_name( value=nil, &block )
+        define_attr_method :table_name, value, &block
+      end
+      alias :table_name= :set_table_name
+
+      # Sets the name of the primary key column to use to the given value,
+      # or (if the value is nil or false) to the value returned by the given
+      # block.
+      #
+      # Example:
+      #
+      #   class Project < ActiveRecord::Base
+      #     set_primary_key "sysid"
+      #   end
+      def set_primary_key( value=nil, &block )
+        define_attr_method :primary_key, value, &block
+      end
+      alias :primary_key= :set_primary_key
+
+      # Sets the name of the inheritance column to use to the given value,
+      # or (if the value # is nil or false) to the value returned by the
+      # given block.
+      #
+      # Example:
+      #
+      #   class Project < ActiveRecord::Base
+      #     set_inheritance_column do
+      #       original_inheritance_column + "_id"
+      #     end
+      #   end
+      def set_inheritance_column( value=nil, &block )
+        define_attr_method :inheritance_column, value, &block
+      end
+      alias :inheritance_column= :set_inheritance_column
+
       # Turns the +table_name+ back into a class name following the reverse rules of +table_name+.
       def class_name(table_name = table_name) # :nodoc:
         # remove any prefix and/or suffix from the table name
@@ -567,13 +608,14 @@ module ActiveRecord #:nodoc:
         @columns = @columns_hash = @content_columns = @dynamic_methods_hash = nil
       end
 
-      def reset_column_information_and_inheritable_attributes_for_all_subclasses
+      def reset_column_information_and_inheritable_attributes_for_all_subclasses#:nodoc:
         subclasses.each { |klass| klass.reset_inheritable_attributes; klass.reset_column_information }
       end
 
       # Transforms attribute key names into a more humane format, such as "First name" instead of "first_name". Example:
       #   Person.human_attribute_name("first_name") # => "First name"
-      def human_attribute_name(attribute_key_name)
+      # Deprecated in favor of just calling "first_name".humanize
+      def human_attribute_name(attribute_key_name) #:nodoc:
         attribute_key_name.humanize
       end
       
@@ -581,12 +623,12 @@ module ActiveRecord #:nodoc:
         superclass == Base || !columns_hash.has_key?(inheritance_column)
       end
 
-      def quote(object)
+      def quote(object) #:nodoc:
         connection.quote(object)
       end
 
       # Used to sanitize objects before they're used in an SELECT SQL-statement. Delegates to <tt>connection.quote</tt>.
-      def sanitize(object) # :nodoc:
+      def sanitize(object) #:nodoc:
         connection.quote(object)
       end
 
@@ -599,11 +641,18 @@ module ActiveRecord #:nodoc:
       #     project.milestones << Milestone.find_all
       #   end
       def benchmark(title)
+        result = nil
+        bm = Benchmark.measure { result = silence { yield } }
+        logger.info "#{title} (#{sprintf("%f", bm.real)})"
+        return result
+      end
+      
+      # Silences the logger for the duration of the block.
+      def silence
         result = nil
         logger.level = Logger::ERROR
-        bm = Benchmark.measure { result = yield }
+        result = yield
         logger.level = Logger::DEBUG
-        logger.info "#{title} (#{sprintf("%f", bm.real)})"
         return result
       end
 
@@ -674,18 +723,43 @@ module ActiveRecord #:nodoc:
         def method_missing(method_id, *arguments)
           method_name = method_id.id2name
 
-          if method_name =~ /find_(all_by|by)_([_a-z]+)/
+          if method_name =~ /find_(all_by|by)_([_a-z][_a-z\d]*)/
             finder, attributes = ($1 == "all_by" ? :find_all : :find_first), $2.split("_and_")
             attributes.each { |attr_name| super unless column_methods_hash[attr_name.intern] }
 
             attr_index = -1
-            conditions = attributes.collect { |attr_name| attr_index += 1; "#{attr_name} #{arguments[attr_index] ? "=" : "IS"} ? " }.join(" AND ")
+            conditions = attributes.collect { |attr_name| attr_index += 1; "#{attr_name} #{arguments[attr_index].nil? ? "IS" : "="} ? " }.join(" AND ")
             send(finder, [conditions, *arguments[0...attributes.length]], *arguments[attributes.length..-1])
           else
             super
           end
         end
 
+        # Defines an "attribute" method (like #inheritance_column or
+        # #table_name). A new (class) method will be created with the
+        # given name. If a value is specified, the new method will
+        # return that value (as a string). Otherwise, the given block
+        # will be used to compute the value of the method.
+        #
+        # The original method will be aliased, with the new name being
+        # prefixed with "original_". This allows the new method to
+        # access the original value.
+        #
+        # Example:
+        #
+        #   class A < ActiveRecord::Base
+        #     define_attr_method :primary_key, "sysid"
+        #     define_attr_method( :inheritance_column ) do
+        #       original_inheritance_column + "_id"
+        #     end
+        #   end
+        def define_attr_method(name, value=nil, &block)
+          sing = class << self; self; end
+          block = proc { value.to_s } if value
+          sing.send( :alias_method, "original_#{name}", name )
+          sing.send( :define_method, name, &block )
+        end
+
       protected
         def subclasses
           @@subclasses[self] ||= []
@@ -792,11 +866,11 @@ module ActiveRecord #:nodoc:
         read_attribute(self.class.primary_key)
       end
       
-      def id_before_type_cast
+      def id_before_type_cast #:nodoc:
         read_attribute_before_type_cast(self.class.primary_key)
       end
 
-      def quoted_id
+      def quoted_id #:nodoc:
         quote(id, self.class.columns_hash[self.class.primary_key])
       end
       
@@ -832,9 +906,9 @@ module ActiveRecord #:nodoc:
 
       # Returns a clone of the record that hasn't been assigned an id yet and is treated as a new record.
       def clone
-        cloned_record = self.class.new(self.attributes)
-        cloned_record.instance_variable_set "@new_record", true
-        cloned_record.id = nil
+        attrs = self.attributes
+        attrs.delete(self.class.primary_key)
+        cloned_record = self.class.new(attrs)
         cloned_record
       end
             
@@ -1047,7 +1121,7 @@ module ActiveRecord #:nodoc:
 
       # Returns the value of attribute identified by <tt>attr_name</tt> after it has been type cast (for example,
       # "2004-12-12" in a data column is cast to a date object, like Date.new(2004, 12, 12)).
-      def read_attribute(attr_name) #:doc:
+      def read_attribute(attr_name)
         if @attributes.keys.include? attr_name
           if column = column_for_attribute(attr_name)
             unserializable_attribute?(attr_name, column) ?
@@ -1086,7 +1160,7 @@ module ActiveRecord #:nodoc:
 
       # Updates the attribute identified by <tt>attr_name</tt> with the specified +value+. Empty strings for fixnum and float
       # columns are turned into nil.
-      def write_attribute(attr_name, value) #:doc:
+      def write_attribute(attr_name, value)
         @attributes[attr_name] = empty_string_for_number_column?(attr_name, value) ? nil : value
       end
 
@@ -1170,7 +1244,7 @@ module ActiveRecord #:nodoc:
       # by calling new on the column type or aggregation type (through composed_of) object with these parameters.
       # So having the pairs written_on(1) = "2004", written_on(2) = "6", written_on(3) = "24", will instantiate
       # written_on (a date type) with Date.new("2004", "6", "24"). You can also specify a typecast character in the
-      # parenteses to have the parameters typecasted before they're used in the constructor. Use i for Fixnum, f for Float,
+      # parentheses to have the parameters typecasted before they're used in the constructor. Use i for Fixnum, f for Float,
       # s for String, and a for Array. If all the values for a given attribute is empty, the attribute will be set to nil.
       def assign_multiparameter_attributes(pairs)
         execute_callstack_for_multiparameter_attributes(
@@ -1253,4 +1327,4 @@ module ActiveRecord #:nodoc:
         string[0..3] == "--- "
       end
   end
-end
+end