activerecord 2.1.0 → 2.1.1

data/test/models/author.rb

@@ -1,6 +1,7 @@
 class Author < ActiveRecord::Base
   has_many :posts
   has_many :posts_with_comments, :include => :comments, :class_name => "Post"
+  has_many :posts_with_comments_sorted_by_comment_id, :include => :comments, :class_name => "Post", :order => 'comments.id'
   has_many :posts_with_categories, :include => :categories, :class_name => "Post"
   has_many :posts_with_comments_and_categories, :include => [ :comments, :categories ], :order => "posts.id", :class_name => "Post"
   has_many :posts_containing_the_letter_a, :class_name => "Post"
@@ -31,6 +32,9 @@ class Author < ActiveRecord::Base
   has_many :special_posts
   has_many :special_post_comments, :through => :special_posts, :source => :comments
 
+  has_many :sti_posts, :class_name => 'StiPost'
+  has_many :sti_post_comments, :through => :sti_posts, :source => :comments
+
   has_many :special_nonexistant_posts, :class_name => "SpecialPost", :conditions => "posts.body = 'nonexistant'"
   has_many :special_nonexistant_post_comments, :through => :special_nonexistant_posts, :source => :comments, :conditions => "comments.post_id = 0"
   has_many :nonexistant_comments, :through => :posts

data/test/models/category.rb

@@ -2,6 +2,7 @@ class Category < ActiveRecord::Base
   has_and_belongs_to_many :posts
   has_and_belongs_to_many :special_posts, :class_name => "Post"
   has_and_belongs_to_many :other_posts, :class_name => "Post"
+  has_and_belongs_to_many :posts_with_authors_sorted_by_author_id, :class_name => "Post", :include => :authors, :order => "authors.id"
 
   has_and_belongs_to_many(:select_testing_posts,
                           :class_name => 'Post',

data/test/models/company.rb

@@ -18,6 +18,13 @@ end
 module Namespaced
   class Company < ::Company
   end
+
+  class Firm < ::Company
+    has_many :clients, :class_name => 'Namespaced::Client'
+  end
+
+  class Client < ::Company
+  end
 end
 
 class Firm < Company
@@ -26,6 +33,7 @@ class Firm < Company
       "AND (#{QUOTED_TYPE} = 'Client' OR #{QUOTED_TYPE} = 'SpecialClient' OR #{QUOTED_TYPE} = 'VerySpecialClient' )"
   has_many :clients_sorted_desc, :class_name => "Client", :order => "id DESC"
   has_many :clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :order => "id"
+  has_many :unvalidated_clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :validate => false
   has_many :dependent_clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :order => "id", :dependent => :destroy
   has_many :exclusively_dependent_clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :order => "id", :dependent => :delete_all
   has_many :limited_clients, :class_name => "Client", :order => "id", :limit => 1
@@ -46,7 +54,8 @@ class Firm < Company
   has_many :plain_clients, :class_name => 'Client'
   has_many :readonly_clients, :class_name => 'Client', :readonly => true
 
-  has_one :account, :foreign_key => "firm_id", :dependent => :destroy
+  has_one :account, :foreign_key => "firm_id", :dependent => :destroy, :validate => true
+  has_one :unvalidated_account, :foreign_key => "firm_id", :class_name => 'Account', :validate => false
   has_one :account_with_select, :foreign_key => "firm_id", :select => "id, firm_id", :class_name=>'Account'
   has_one :readonly_account, :foreign_key => "firm_id", :class_name => "Account", :readonly => true
 end

data/test/models/developer.rb

@@ -43,6 +43,8 @@ class Developer < ActiveRecord::Base
 
   has_many :audit_logs
 
+  named_scope :jamises, :conditions => {:name => 'Jamis'}
+
   validates_inclusion_of :salary, :in => 50000..200000
   validates_length_of    :name, :within => 3..20
 
@@ -56,7 +58,8 @@ class Developer < ActiveRecord::Base
 end
 
 class AuditLog < ActiveRecord::Base
-  belongs_to :developer
+  belongs_to :developer, :validate => true
+  belongs_to :unvalidated_developer, :class_name => 'Developer'
 end
 
 DeveloperSalary = Struct.new(:amount)

data/test/models/person.rb

@@ -6,5 +6,5 @@ class Person < ActiveRecord::Base
   has_many :references
   has_many :jobs, :through => :references
   has_one :favourite_reference, :class_name => 'Reference', :conditions => ['favourite=?', true]
-
+  has_many :posts_with_comments_sorted_by_comment_id, :through => :readers, :source => :post, :include => :comments, :order => 'comments.id'
 end

data/test/models/post.rb

@@ -1,6 +1,11 @@
 class Post < ActiveRecord::Base
   named_scope :containing_the_letter_a, :conditions => "body LIKE '%a%'"
-  
+  named_scope :with_authors_at_address, lambda { |address| {
+      :conditions => [ 'authors.author_address_id = ?', address.id ],
+      :joins => 'JOIN authors ON authors.id = posts.author_id'
+    }
+  }
+
   belongs_to :author do
     def greeting
       "hello"

data/test/models/project.rb

@@ -7,7 +7,7 @@ class Project < ActiveRecord::Base
   has_and_belongs_to_many :developers_named_david, :class_name => "Developer", :conditions => "name = 'David'", :uniq => true
   has_and_belongs_to_many :developers_named_david_with_hash_conditions, :class_name => "Developer", :conditions => { :name => 'David' }, :uniq => true
   has_and_belongs_to_many :salaried_developers, :class_name => "Developer", :conditions => "salary > 0"
-  has_and_belongs_to_many :developers_with_finder_sql, :class_name => "Developer", :finder_sql => 'SELECT t.*, j.* FROM developers_projects j, developers t WHERE t.id = j.developer_id AND j.project_id = #{id}'
+  has_and_belongs_to_many :developers_with_finder_sql, :class_name => "Developer", :finder_sql => 'SELECT t.*, j.* FROM developers_projects j, developers t WHERE t.id = j.developer_id AND j.project_id = #{id} ORDER BY t.id'
   has_and_belongs_to_many :developers_by_sql, :class_name => "Developer", :delete_sql => "DELETE FROM developers_projects WHERE project_id = \#{id} AND developer_id = \#{record.id}"
   has_and_belongs_to_many :developers_with_callbacks, :class_name => "Developer", :before_add => Proc.new {|o, r| o.developers_log << "before_adding#{r.id || '<new>'}"},
                             :after_add => Proc.new {|o, r| o.developers_log << "after_adding#{r.id || '<new>'}"},

data/test/models/topic.rb

@@ -4,6 +4,7 @@ class Topic < ActiveRecord::Base
     { :conditions => ['written_on < ?', time] }
   }
   named_scope :approved, :conditions => {:approved => true}
+  named_scope 'approved_as_string', :conditions => {:approved => true}
   named_scope :replied, :conditions => ['replies_count > 0']
   named_scope :anonymous_extension do
     def one

data/test/schema/mysql_specific_schema.rb

@@ -1,5 +1,5 @@
 ActiveRecord::Schema.define do
-  create_table :binary_fields, :force => true do |t|
+  create_table :binary_fields, :force => true, :options => 'CHARACTER SET latin1' do |t|
     t.binary :tiny_blob,   :limit => 255
     t.binary :normal_blob, :limit => 65535
     t.binary :medium_blob, :limit => 16777215
@@ -9,4 +9,4 @@ ActiveRecord::Schema.define do
     t.text   :medium_text, :limit => 16777215
     t.text   :long_text,   :limit => 2147483647
   end
-end
+end

data/test/schema/schema.rb

@@ -66,6 +66,7 @@ ActiveRecord::Schema.define do
   create_table :categories, :force => true do |t|
     t.string :name, :null => false
     t.string :type
+    t.integer :categorizations_count
   end
 
   create_table :categories_posts, :force => true, :id => false do |t|
@@ -407,6 +408,13 @@ ActiveRecord::Schema.define do
     t.column :key, :string
   end
 
+  create_table :integer_limits, :force => true do |t|
+    t.integer :"c_int_without_limit"
+    (1..8).each do |i|
+      t.integer :"c_int_#{i}", :limit => i
+    end
+  end
+
   except 'SQLite' do
     # fk_test_has_fk should be before fk_test_has_pk
     create_table :fk_test_has_fk, :force => true do |t|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord
 version: !ruby/object:Gem::Version 
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -9,17 +9,18 @@ autorequire: active_record
 bindir: bin
 cert_chain: []
 
-date: 2008-05-31 00:00:00 -07:00
+date: 2008-09-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.1.0
+        version: 2.1.1
     version: 
 description: Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM. It ties database tables and classes together for business objects, like Customer or Subscription, that can find, save, and destroy themselves without resorting to manual SQL.
 email: david@loudthinking.com
@@ -87,7 +88,6 @@ files:
 - lib/active_record/transactions.rb
 - lib/active_record/validations.rb
 - lib/active_record/vendor
-- lib/active_record/vendor/db2.rb
 - lib/active_record/vendor/mysql.rb
 - lib/active_record/version.rb
 - lib/active_record.rb
@@ -107,6 +107,7 @@ files:
 - test/cases/associations/belongs_to_associations_test.rb
 - test/cases/associations/callbacks_test.rb
 - test/cases/associations/cascaded_eager_loading_test.rb
+- test/cases/associations/eager_load_includes_full_sti_class_test.rb
 - test/cases/associations/eager_load_nested_include_test.rb
 - test/cases/associations/eager_singularization_test.rb
 - test/cases/associations/eager_test.rb
@@ -126,9 +127,11 @@ files:
 - test/cases/callbacks_test.rb
 - test/cases/class_inheritable_attributes_test.rb
 - test/cases/column_alias_test.rb
+- test/cases/column_definition_test.rb
 - test/cases/connection_test_firebird.rb
 - test/cases/connection_test_mysql.rb
 - test/cases/copy_table_test_sqlite.rb
+- test/cases/database_statements_test.rb
 - test/cases/datatype_test_postgresql.rb
 - test/cases/date_time_test.rb
 - test/cases/default_test_firebird.rb
@@ -190,6 +193,7 @@ files:
 - test/connections/native_sqlite3/in_memory_connection.rb
 - test/connections/native_sybase
 - test/connections/native_sybase/connection.rb
+- test/debug.log
 - test/fixtures
 - test/fixtures/accounts.yml
 - test/fixtures/all
@@ -219,6 +223,8 @@ files:
 - test/fixtures/developers_projects.yml
 - test/fixtures/edges.yml
 - test/fixtures/entrants.yml
+- test/fixtures/fixture_database.sqlite3
+- test/fixtures/fixture_database_2.sqlite3
 - test/fixtures/fk_test_has_fk.yml
 - test/fixtures/fk_test_has_pk.yml
 - test/fixtures/funny_jokes.yml
@@ -385,7 +391,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: activerecord
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Implements the ActiveRecord pattern for ORM.

data/lib/active_record/vendor/db2.rb

@@ -1,362 +0,0 @@
-require 'db2/db2cli.rb'
-
-module DB2
-  module DB2Util
-    include DB2CLI
-
-    def free() SQLFreeHandle(@handle_type, @handle); end
-    def handle() @handle; end
-
-    def check_rc(rc)
-      if ![SQL_SUCCESS, SQL_SUCCESS_WITH_INFO, SQL_NO_DATA_FOUND].include?(rc)
-        rec = 1
-        msg = ''
-        loop do
-          a = SQLGetDiagRec(@handle_type, @handle, rec, 500)
-          break if a[0] != SQL_SUCCESS
-          msg << a[3] if !a[3].nil? and a[3] != '' # Create message.
-          rec += 1
-        end
-        raise "DB2 error: #{msg}"
-      end
-    end
-  end
-
-  class Environment
-    include DB2Util
-
-    def initialize
-      @handle_type = SQL_HANDLE_ENV
-      rc, @handle = SQLAllocHandle(@handle_type, SQL_NULL_HANDLE)
-      check_rc(rc)
-    end
-
-    def data_sources(buffer_length = 1024)
-      retval = []
-      max_buffer_length = buffer_length
-
-      a = SQLDataSources(@handle, SQL_FETCH_FIRST, SQL_MAX_DSN_LENGTH + 1, buffer_length)
-      retval << [a[1], a[3]]
-      max_buffer_length = [max_buffer_length, a[4]].max
-
-      loop do
-        a = SQLDataSources(@handle, SQL_FETCH_NEXT, SQL_MAX_DSN_LENGTH + 1, buffer_length)
-        break if a[0] == SQL_NO_DATA_FOUND
-
-        retval << [a[1], a[3]]
-        max_buffer_length = [max_buffer_length, a[4]].max
-      end
-
-      if max_buffer_length > buffer_length
-        get_data_sources(max_buffer_length)
-      else
-        retval
-      end
-    end
-  end
-
-  class Connection
-    include DB2Util
-
-    def initialize(environment)
-      @env = environment
-      @handle_type = SQL_HANDLE_DBC
-      rc, @handle = SQLAllocHandle(@handle_type, @env.handle)
-      check_rc(rc)
-    end
-
-    def connect(server_name, user_name = '', auth = '')
-      check_rc(SQLConnect(@handle, server_name, user_name.to_s, auth.to_s))
-    end
-
-    def set_connect_attr(attr, value)
-      value += "\0" if value.class == String
-      check_rc(SQLSetConnectAttr(@handle, attr, value))
-    end
-
-    def set_auto_commit_on
-      set_connect_attr(SQL_ATTR_AUTOCOMMIT, SQL_AUTOCOMMIT_ON)
-    end
-
-    def set_auto_commit_off
-      set_connect_attr(SQL_ATTR_AUTOCOMMIT, SQL_AUTOCOMMIT_OFF)
-    end
-
-    def disconnect
-      check_rc(SQLDisconnect(@handle))
-    end
-
-    def rollback
-      check_rc(SQLEndTran(@handle_type, @handle, SQL_ROLLBACK))
-    end
-
-    def commit
-      check_rc(SQLEndTran(@handle_type, @handle, SQL_COMMIT))
-    end
-  end
-
-  class Statement
-    include DB2Util
-
-    def initialize(connection)
-      @conn = connection
-      @handle_type = SQL_HANDLE_STMT
-      @parms = []                           #yun
-      @sql = ''                             #yun
-      @numParms = 0                         #yun
-      @prepared = false                     #yun
-      @parmArray = []                       #yun. attributes of the parameter markers
-      rc, @handle = SQLAllocHandle(@handle_type, @conn.handle)
-      check_rc(rc)
-    end
-
-    def columns(table_name, schema_name = '%')
-      check_rc(SQLColumns(@handle, '', schema_name.upcase, table_name.upcase, '%'))
-      fetch_all
-    end
-
-    def tables(schema_name = '%')
-      check_rc(SQLTables(@handle, '', schema_name.upcase, '%', 'TABLE'))
-      fetch_all
-    end
-
-    def indexes(table_name, schema_name = '')
-      check_rc(SQLStatistics(@handle, '', schema_name.upcase, table_name.upcase, SQL_INDEX_ALL, SQL_ENSURE))
-      fetch_all
-    end
-
-    def prepare(sql)
-      @sql = sql
-      check_rc(SQLPrepare(@handle, sql))
-      rc, @numParms = SQLNumParams(@handle) #number of question marks
-      check_rc(rc)
-      #--------------------------------------------------------------------------
-      # parameter attributes are stored in instance variable @parmArray so that
-      # they are available when execute method is called.
-      #--------------------------------------------------------------------------
-      if @numParms > 0           # get parameter marker attributes
-        1.upto(@numParms) do |i| # parameter number starts from 1
-          rc, type, size, decimalDigits = SQLDescribeParam(@handle, i)
-          check_rc(rc)
-          @parmArray << Parameter.new(type, size, decimalDigits)
-        end
-      end
-      @prepared = true
-      self
-    end
-
-    def execute(*parms)
-      raise "The statement was not prepared" if @prepared == false
-
-      if parms.size == 1 and parms[0].class == Array
-        parms = parms[0]
-      end
-
-      if @numParms != parms.size
-        raise "Number of parameters supplied does not match with the SQL statement"
-      end
-
-      if @numParms > 0            #need to bind parameters
-        #--------------------------------------------------------------------
-        #calling bindParms may not be safe. Look comment below.
-        #--------------------------------------------------------------------
-        #bindParms(parms)
-
-        valueArray = []
-        1.upto(@numParms) do |i|  # parameter number starts from 1
-          type = @parmArray[i - 1].class
-          size = @parmArray[i - 1].size
-          decimalDigits = @parmArray[i - 1].decimalDigits
-
-          if parms[i - 1].class == String
-            valueArray << parms[i - 1]
-          else
-            valueArray << parms[i - 1].to_s
-          end
-
-          rc = SQLBindParameter(@handle, i, type, size, decimalDigits, valueArray[i - 1])
-          check_rc(rc)
-        end
-      end
-
-      check_rc(SQLExecute(@handle))
-
-      if @numParms != 0
-        check_rc(SQLFreeStmt(@handle, SQL_RESET_PARAMS)) # Reset parameters
-      end
-
-      self
-    end
-
-    #-------------------------------------------------------------------------------
-    # The last argument(value) to SQLBindParameter is a deferred argument, that is,
-    # it should be available when SQLExecute is called. Even though "value" is
-    # local to bindParms method, it seems that it is available when SQLExecute
-    # is called. I am not sure whether it would still work if garbage collection
-    # is done between bindParms call and SQLExecute call inside the execute method
-    # above.
-    #-------------------------------------------------------------------------------
-    def bindParms(parms)        # This is the real thing. It uses SQLBindParms
-      1.upto(@numParms) do |i|  # parameter number starts from 1
-        rc, dataType, parmSize, decimalDigits = SQLDescribeParam(@handle, i)
-        check_rc(rc)
-        if parms[i - 1].class == String
-          value = parms[i - 1]
-        else
-          value = parms[i - 1].to_s
-        end
-        rc = SQLBindParameter(@handle, i, dataType, parmSize, decimalDigits, value)
-        check_rc(rc)
-      end
-    end
- 
-    #------------------------------------------------------------------------------
-    # bind method does not use DB2's SQLBindParams, but replaces "?" in the
-    # SQL statement with the value before passing the SQL statement to DB2.
-    # It is not efficient and can handle only strings since it puts everything in
-    # quotes.
-    #------------------------------------------------------------------------------
-    def bind(sql, args)                #does not use SQLBindParams
-      arg_index = 0
-      result = ""
-      tokens(sql).each do |part|
-        case part
-        when '?'
-          result << "'" + (args[arg_index]) + "'"  #put it into quotes
-          arg_index += 1
-        when '??'
-          result << "?"
-        else
-          result << part
-        end
-      end
-      if arg_index < args.size
-        raise "Too many SQL parameters"
-      elsif arg_index > args.size
-        raise "Not enough SQL parameters"
-      end
-      result
-    end
-
-    ## Break the sql string into parts.
-    #
-    # This is NOT a full lexer for SQL.  It just breaks up the SQL
-    # string enough so that question marks, double question marks and
-    # quoted strings are separated.  This is used when binding
-    # arguments to "?" in the SQL string.  Note: comments are not
-    # handled.
-    #
-    def tokens(sql)
-      toks = sql.scan(/('([^'\\]|''|\\.)*'|"([^"\\]|""|\\.)*"|\?\??|[^'"?]+)/)
-      toks.collect { |t| t[0] }
-    end
-
-    def exec_direct(sql)
-      check_rc(SQLExecDirect(@handle, sql))
-      self
-    end
-
-    def set_cursor_name(name)
-      check_rc(SQLSetCursorName(@handle, name))
-      self
-    end
-
-    def get_cursor_name
-      rc, name = SQLGetCursorName(@handle)
-      check_rc(rc)
-      name
-    end
-
-    def row_count
-      rc, rowcount = SQLRowCount(@handle)
-      check_rc(rc)
-      rowcount
-    end
-
-    def num_result_cols
-      rc, cols = SQLNumResultCols(@handle)
-      check_rc(rc)
-      cols
-    end
-
-    def fetch_all
-      if block_given?
-        while row = fetch do
-          yield row
-        end
-      else
-        res = []
-        while row = fetch do
-          res << row
-        end
-        res
-      end
-    end
-
-    def fetch
-      cols = get_col_desc
-      rc = SQLFetch(@handle)
-      if rc == SQL_NO_DATA_FOUND
-        SQLFreeStmt(@handle, SQL_CLOSE)        # Close cursor
-        SQLFreeStmt(@handle, SQL_RESET_PARAMS) # Reset parameters
-        return nil
-      end
-      raise "ERROR" unless rc == SQL_SUCCESS
-
-      retval = []
-      cols.each_with_index do |c, i|
-        rc, content = SQLGetData(@handle, i + 1, c[1], c[2] + 1) #yun added 1 to c[2]
-        retval << adjust_content(content)
-      end
-      retval
-    end
-
-    def fetch_as_hash
-      cols = get_col_desc
-      rc = SQLFetch(@handle)
-      if rc == SQL_NO_DATA_FOUND
-        SQLFreeStmt(@handle, SQL_CLOSE)        # Close cursor
-        SQLFreeStmt(@handle, SQL_RESET_PARAMS) # Reset parameters
-        return nil
-      end
-      raise "ERROR" unless rc == SQL_SUCCESS
-
-      retval = {}
-      cols.each_with_index do |c, i|
-        rc, content = SQLGetData(@handle, i + 1, c[1], c[2] + 1)   #yun added 1 to c[2]
-        retval[c[0]] = adjust_content(content)
-      end
-      retval
-    end
-
-    def get_col_desc
-      rc, nr_cols = SQLNumResultCols(@handle)
-      cols = (1..nr_cols).collect do |c|
-        rc, name, bl, type, col_sz = SQLDescribeCol(@handle, c, 1024)
-        [name.downcase, type, col_sz]
-      end
-    end
-
-    def adjust_content(c)
-      case c.class.to_s
-      when 'DB2CLI::NullClass'
-        return nil
-      when 'DB2CLI::Time'
-        "%02d:%02d:%02d" % [c.hour, c.minute, c.second]
-      when 'DB2CLI::Date'
-        "%04d-%02d-%02d" % [c.year, c.month, c.day]
-      when 'DB2CLI::Timestamp'
-        "%04d-%02d-%02d %02d:%02d:%02d" % [c.year, c.month, c.day, c.hour, c.minute, c.second]
-      else
-        return c
-      end
-    end
-  end
-
-  class Parameter
-    attr_reader :type, :size, :decimalDigits
-    def initialize(type, size, decimalDigits)
-      @type, @size, @decimalDigits = type, size, decimalDigits
-    end
-  end
-end