activerecord 1.15.2 → 1.15.3

data/CHANGELOG

@@ -1,3 +1,14 @@
+*1.15.3* (March 12th, 2007)
+
+* Allow a polymorphic :source for has_many :through associations. Closes #7143 [protocool] 
+
+* Consistently quote primary key column names.  #7763 [toolmantim]
+
+* Fixtures: fix YAML ordered map support.  #2665 [Manuel Holtgrewe, nfbuckley]
+
+* Fix has_many :through << with custom foreign keys.  #6466, #7153 [naffis, Rich Collins]
+
+
 *1.15.2* (February 5th, 2007)
 
 * Pass a range in :conditions to use the SQL BETWEEN operator.  #6974 [dcmanges]

data/Rakefile

@@ -151,7 +151,7 @@ spec = Gem::Specification.new do |s|
     s.files = s.files + Dir.glob( "#{dir}/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
   end
   
-  s.add_dependency('activesupport', '= 1.4.1' + PKG_BUILD)
+  s.add_dependency('activesupport', '= 1.4.2' + PKG_BUILD)
 
   s.files.delete "test/fixtures/fixture_database.sqlite"
   s.files.delete "test/fixtures/fixture_database_2.sqlite"
@@ -216,11 +216,11 @@ end
 
 desc "Publish the release files to RubyForge."
 task :release => [ :package ] do
-  `rubyforge login`
+  require 'rubyforge'
 
-  for ext in %w( gem tgz zip )
-    release_command = "rubyforge add_release #{PKG_NAME} #{PKG_NAME} 'REL #{PKG_VERSION}' pkg/#{PKG_NAME}-#{PKG_VERSION}.#{ext}"
-    puts release_command
-    system(release_command)
-  end
-end
+  packages = %w( gem tgz zip ).collect{ |ext| "pkg/#{PKG_NAME}-#{PKG_VERSION}.#{ext}" }
+
+  rubyforge = RubyForge.new
+  rubyforge.login
+  rubyforge.add_release(PKG_NAME, PKG_NAME, "REL #{PKG_VERSION}", *packages)
+end

data/lib/active_record/associations.rb

@@ -20,7 +20,13 @@ module ActiveRecord
       super("Cannot have a has_many :through association '#{owner_class_name}##{reflection.name}' on the polymorphic object '#{source_reflection.class_name}##{source_reflection.name}'.")
     end
   end
-
+  
+  class HasManyThroughAssociationPointlessSourceTypeError < ActiveRecordError #:nodoc:
+    def initialize(owner_class_name, reflection, source_reflection)
+      super("Cannot have a has_many :through association '#{owner_class_name}##{reflection.name}' with a :source_type option if the '#{reflection.through_reflection.class_name}##{source_reflection.name}' is not polymorphic.  Try removing :source_type on your association.")
+    end
+  end
+  
   class HasManyThroughSourceAssociationNotFoundError < ActiveRecordError #:nodoc:
     def initialize(reflection)
       through_reflection      = reflection.through_reflection
@@ -529,6 +535,8 @@ module ActiveRecord
       # * <tt>:source</tt>: Specifies the source association name used by <tt>has_many :through</tt> queries.  Only use it if the name cannot be 
       #   inferred from the association.  <tt>has_many :subscribers, :through => :subscriptions</tt> will look for either +:subscribers+ or
       #   +:subscriber+ on +Subscription+, unless a +:source+ is given.
+      # * <tt>:source_type</tt>: Specifies type of the source association used by <tt>has_many :through</tt> queries where the source association
+      #   is a polymorphic belongs_to.
       # * <tt>:uniq</tt> - if set to true, duplicates will be omitted from the collection. Useful in conjunction with :through.
       #
       # Option examples:
@@ -1087,7 +1095,7 @@ module ActiveRecord
             :class_name, :table_name, :foreign_key,
             :exclusively_dependent, :dependent,
             :select, :conditions, :include, :order, :group, :limit, :offset,
-            :as, :through, :source,
+            :as, :through, :source, :source_type,
             :uniq,
             :finder_sql, :counter_sql, 
             :before_add, :after_add, :before_remove, :after_remove, 
@@ -1491,57 +1499,65 @@ module ActiveRecord
                   case
                     when reflection.macro == :has_many && reflection.options[:through]
                       through_conditions = through_reflection.options[:conditions] ? "AND #{interpolate_sql(sanitize_sql(through_reflection.options[:conditions]))}" : ''
+
+                      jt_foreign_key = jt_as_extra = jt_source_extra = jt_sti_extra = nil
+                      first_key = second_key = as_extra = nil
+                      
                       if through_reflection.options[:as] # has_many :through against a polymorphic join
-                        polymorphic_foreign_key  = through_reflection.options[:as].to_s + '_id'
-                        polymorphic_foreign_type = through_reflection.options[:as].to_s + '_type'
-
-                        " LEFT OUTER JOIN %s ON (%s.%s = %s.%s AND %s.%s = %s) "  % [
-                          table_alias_for(through_reflection.klass.table_name, aliased_join_table_name),
-                          aliased_join_table_name, polymorphic_foreign_key,
-                          parent.aliased_table_name, parent.primary_key,
-                          aliased_join_table_name, polymorphic_foreign_type, klass.quote_value(parent.active_record.base_class.name)] +
-                        " LEFT OUTER JOIN %s ON %s.%s = %s.%s " % [table_name_and_alias,
-                          aliased_table_name, primary_key, aliased_join_table_name, options[:foreign_key] || reflection.klass.to_s.classify.foreign_key
+                        jt_foreign_key = through_reflection.options[:as].to_s + '_id'
+                        jt_as_extra = " AND %s.%s = %s" % [
+                            aliased_join_table_name, reflection.active_record.connection.quote_column_name(through_reflection.options[:as].to_s + '_type'), 
+                            klass.quote_value(parent.active_record.base_class.name)
                         ]
                       else
-                        if source_reflection.macro == :has_many && source_reflection.options[:as]
-                          " LEFT OUTER JOIN %s ON %s.%s = %s.%s "  % [
-                            table_alias_for(through_reflection.klass.table_name, aliased_join_table_name), aliased_join_table_name,
-                            through_reflection.primary_key_name,
-                            parent.aliased_table_name, parent.primary_key] +
-                          " LEFT OUTER JOIN %s ON %s.%s = %s.%s AND %s.%s = %s " % [
-                            table_name_and_alias,
-                            aliased_table_name, "#{source_reflection.options[:as]}_id", 
-                            aliased_join_table_name, options[:foreign_key] || primary_key,
-                            aliased_table_name, "#{source_reflection.options[:as]}_type", 
+                        jt_foreign_key = through_reflection.primary_key_name
+                      end
+                      
+                      case source_reflection.macro
+                      when :has_many
+                        if source_reflection.options[:as]
+                          first_key   = "#{source_reflection.options[:as]}_id"
+                          second_key  = options[:foreign_key] || primary_key
+                          as_extra    = " AND %s.%s = %s" % [
+                            aliased_table_name, reflection.active_record.connection.quote_column_name("#{source_reflection.options[:as]}_type"), 
                             klass.quote_value(source_reflection.active_record.base_class.name)
                           ]
                         else
-                          case source_reflection.macro
-                            when :belongs_to
-                              first_key  = primary_key
-                              second_key = source_reflection.options[:foreign_key] || klass.to_s.classify.foreign_key
-                              extra      = nil
-                            when :has_many
-                              first_key  = through_reflection.klass.base_class.to_s.classify.foreign_key
-                              second_key = options[:foreign_key] || primary_key
-                              extra      = through_reflection.klass.descends_from_active_record? ? nil :
-                                " AND %s.%s = %s" % [
-                                  aliased_join_table_name,
-                                  reflection.active_record.connection.quote_column_name(through_reflection.active_record.inheritance_column),
-                                  through_reflection.klass.quote_value(through_reflection.klass.name.demodulize)]
-                          end
-                          " LEFT OUTER JOIN %s ON (%s.%s = %s.%s%s) "  % [
-                            table_alias_for(through_reflection.klass.table_name, aliased_join_table_name), 
-                            aliased_join_table_name, through_reflection.primary_key_name,
-                            parent.aliased_table_name, parent.primary_key, extra] +
-                          " LEFT OUTER JOIN %s ON (%s.%s = %s.%s) " % [
-                            table_name_and_alias,
-                            aliased_table_name, first_key, 
-                            aliased_join_table_name, second_key
+                          first_key   = through_reflection.klass.base_class.to_s.classify.foreign_key
+                          second_key  = options[:foreign_key] || primary_key
+                        end
+                        
+                        unless through_reflection.klass.descends_from_active_record?
+                          jt_sti_extra = " AND %s.%s = %s" % [
+                            aliased_join_table_name,
+                            reflection.active_record.connection.quote_column_name(through_reflection.active_record.inheritance_column),
+                            through_reflection.klass.quote_value(through_reflection.klass.name.demodulize)]
+                        end
+                      when :belongs_to
+                        first_key = primary_key
+                        if reflection.options[:source_type]
+                          second_key = source_reflection.association_foreign_key
+                          jt_source_extra = " AND %s.%s = %s" % [
+                              aliased_join_table_name, reflection.active_record.connection.quote_column_name(reflection.source_reflection.options[:foreign_type]),
+                              klass.quote_value(reflection.options[:source_type])
                           ]
+                        else
+                          second_key = source_reflection.options[:foreign_key] || klass.to_s.classify.foreign_key
                         end
                       end
+                      
+                      " LEFT OUTER JOIN %s ON (%s.%s = %s.%s%s%s%s) " % [
+                        table_alias_for(through_reflection.klass.table_name, aliased_join_table_name),
+                        parent.aliased_table_name, reflection.active_record.connection.quote_column_name(parent.primary_key),
+                        aliased_join_table_name, reflection.active_record.connection.quote_column_name(jt_foreign_key), 
+                        jt_as_extra, jt_source_extra, jt_sti_extra
+                      ] +
+                      " LEFT OUTER JOIN %s ON (%s.%s = %s.%s%s) " % [
+                        table_name_and_alias, 
+                        aliased_table_name, reflection.active_record.connection.quote_column_name(first_key),
+                        aliased_join_table_name, reflection.active_record.connection.quote_column_name(second_key),
+                        as_extra
+                      ]
                     
                     when reflection.macro == :has_many && reflection.options[:as]
                       " LEFT OUTER JOIN %s ON %s.%s = %s.%s AND %s.%s = %s" % [
@@ -1588,6 +1604,7 @@ module ActiveRecord
             end
             
             protected
+
               def pluralize(table_name)
                 ActiveRecord::Base.pluralize_table_names ? table_name.to_s.pluralize : table_name
               end

data/lib/active_record/associations/has_many_through_association.rb

@@ -138,7 +138,11 @@ module ActiveRecord
 
         # Construct attributes for :through pointing to owner and associate.
         def construct_join_attributes(associate)
-          construct_owner_attributes(@reflection.through_reflection).merge(@reflection.source_reflection.association_foreign_key => associate.id)
+          returning construct_owner_attributes(@reflection.through_reflection).merge(@reflection.source_reflection.primary_key_name => associate.id) do |join_attributes|
+            if @reflection.options[:source_type]
+              join_attributes.merge!(@reflection.source_reflection.options[:foreign_type] => associate.class.base_class.name.to_s)
+            end
+          end
         end
 
         # Associate attributes pointing to owner, quoted.
@@ -176,6 +180,12 @@ module ActiveRecord
           if @reflection.through_reflection.options[:as] || @reflection.source_reflection.macro == :belongs_to
             reflection_primary_key = @reflection.klass.primary_key
             source_primary_key     = @reflection.source_reflection.primary_key_name
+            if @reflection.options[:source_type]
+              polymorphic_join = "AND %s.%s = %s" % [
+                @reflection.through_reflection.table_name, "#{@reflection.source_reflection.options[:foreign_type]}",
+                @owner.class.quote_value(@reflection.options[:source_type])
+              ]
+            end
           else
             reflection_primary_key = @reflection.source_reflection.primary_key_name
             source_primary_key     = @reflection.klass.primary_key

data/lib/active_record/base.rb

@@ -479,7 +479,7 @@ module ActiveRecord #:nodoc:
       # Deletes the record with the given +id+ without instantiating an object first. If an array of ids is provided, all of them
       # are deleted.
       def delete(id)
-        delete_all([ "#{primary_key} IN (?)", id ])
+        delete_all([ "#{connection.quote_column_name(primary_key)} IN (?)", id ])
       end
 
       # Destroys the record with the given +id+ by instantiating the object and calling #destroy (all the callbacks are the triggered).
@@ -526,12 +526,12 @@ module ActiveRecord #:nodoc:
       # for looping over a collection where each element require a number of aggregate values. Like the DiscussionBoard
       # that needs to list both the number of posts and comments.
       def increment_counter(counter_name, id)
-        update_all "#{counter_name} = #{counter_name} + 1", "#{primary_key} = #{quote_value(id)}"
+        update_all "#{connection.quote_column_name(counter_name)} = #{connection.quote_column_name(counter_name)} + 1", "#{connection.quote_column_name(primary_key)} = #{quote_value(id)}"
       end
 
       # Works like increment_counter, but decrements instead.
       def decrement_counter(counter_name, id)
-        update_all "#{counter_name} = #{counter_name} - 1", "#{primary_key} = #{quote_value(id)}"
+        update_all "#{connection.quote_column_name(counter_name)} = #{connection.quote_column_name(counter_name)} - 1", "#{connection.quote_column_name(primary_key)} = #{quote_value(id)}"
       end
 
 
@@ -1020,7 +1020,7 @@ module ActiveRecord #:nodoc:
       
         def find_one(id, options)
           conditions = " AND (#{sanitize_sql(options[:conditions])})" if options[:conditions]
-          options.update :conditions => "#{table_name}.#{primary_key} = #{quote_value(id,columns_hash[primary_key])}#{conditions}"
+          options.update :conditions => "#{table_name}.#{connection.quote_column_name(primary_key)} = #{quote_value(id,columns_hash[primary_key])}#{conditions}"
 
           # Use find_every(options).first since the primary key condition
           # already ensures we have a single record. Using find_initial adds
@@ -1035,7 +1035,7 @@ module ActiveRecord #:nodoc:
         def find_some(ids, options)
           conditions = " AND (#{sanitize_sql(options[:conditions])})" if options[:conditions]
           ids_list   = ids.map { |id| quote_value(id,columns_hash[primary_key]) }.join(',')
-          options.update :conditions => "#{table_name}.#{primary_key} IN (#{ids_list})#{conditions}"
+          options.update :conditions => "#{table_name}.#{connection.quote_column_name(primary_key)} IN (#{ids_list})#{conditions}"
 
           result = find_every(options)
 
@@ -1052,10 +1052,9 @@ module ActiveRecord #:nodoc:
         def instantiate(record)
           object =
             if subclass_name = record[inheritance_column]
-              # No type given.
               if subclass_name.empty?
+                # No type given.
                 allocate
-
               else
                 # Ignore type if no column is present since it was probably
                 # pulled in from a sloppy join.
@@ -1558,7 +1557,7 @@ module ActiveRecord #:nodoc:
         unless new_record?
           connection.delete <<-end_sql, "#{self.class.name} Destroy"
             DELETE FROM #{self.class.table_name}
-            WHERE #{self.class.primary_key} = #{quoted_id}
+            WHERE #{connection.quote_column_name(self.class.primary_key)} = #{quoted_id}
           end_sql
         end
 
@@ -1797,7 +1796,7 @@ module ActiveRecord #:nodoc:
         connection.update(
           "UPDATE #{self.class.table_name} " +
           "SET #{quoted_comma_pair_list(connection, attributes_with_quotes(false))} " +
-          "WHERE #{self.class.primary_key} = #{quote_value(id)}",
+          "WHERE #{connection.quote_column_name(self.class.primary_key)} = #{quote_value(id)}",
           "#{self.class.name} Update"
         )
       end

data/lib/active_record/fixtures.rb

@@ -301,18 +301,30 @@ class Fixtures < YAML::Omap
           yaml_string << IO.read(subfixture_path)
         end
         yaml_string << IO.read(yaml_file_path)
+
         begin
           yaml = YAML::load(erb_render(yaml_string))
         rescue Exception=>boom
           raise Fixture::FormatError, "a YAML error occurred parsing #{yaml_file_path}. Please note that YAML must be consistently indented using spaces. Tabs are not allowed. Please have a look at http://www.yaml.org/faq.html\nThe exact error was:\n  #{boom.class}: #{boom}"
-        end         
+        end
+
         if yaml
-          yaml = yaml.value if yaml.respond_to?(:type_id) and yaml.respond_to?(:value)
-          yaml.each do |name, data|
-            unless data
-              raise Fixture::FormatError, "Bad data for #{@class_name} fixture named #{name} (nil)"
+          # If the file is an ordered map, extract its children.
+          yaml_value =
+            if yaml.respond_to?(:type_id) && yaml.respond_to?(:value)
+              yaml.value
+            else
+              [yaml]
+            end
+
+          yaml_value.each do |fixture|
+            fixture.each do |name, data|
+              unless data
+                raise Fixture::FormatError, "Bad data for #{@class_name} fixture named #{name} (nil)"
+              end
+
+              self[name] = Fixture.new(data, @class_name)
             end
-            self[name] = Fixture.new(data, @class_name)
           end
         end
       elsif File.file?(csv_file_path)

data/lib/active_record/reflection.rb

@@ -186,8 +186,12 @@ module ActiveRecord
           if source_reflection.nil?
             raise HasManyThroughSourceAssociationNotFoundError.new(self)
           end
+
+          if options[:source_type] && source_reflection.options[:polymorphic].nil?
+            raise HasManyThroughAssociationPointlessSourceTypeError.new(active_record.name, self, source_reflection)
+          end
           
-          if source_reflection.options[:polymorphic]
+          if source_reflection.options[:polymorphic] && options[:source_type].nil?
             raise HasManyThroughAssociationPolymorphicError.new(active_record.name, self, source_reflection)
           end
           
@@ -205,7 +209,7 @@ module ActiveRecord
             if options[:class_name]
               options[:class_name]
             elsif through_reflection # get the class_name of the belongs_to association of the through reflection
-              source_reflection.class_name
+              options[:source_type] || source_reflection.class_name
             else
               class_name = name.to_s.camelize
               class_name = class_name.singularize if [ :has_many, :has_and_belongs_to_many ].include?(macro)

data/lib/active_record/vendor/mysql.rb

@@ -563,9 +563,9 @@ class Mysql
   def scramble41(password, message)
     return 0x00.chr if password.nil? or password.empty?
     buf = [0x14]
-    s1 = Digest::SHA1.new(password).digest
-    s2 = Digest::SHA1.new(s1).digest
-    x = Digest::SHA1.new(message + s2).digest
+    s1 = Digest::SHA1.digest(password)
+    s2 = Digest::SHA1.digest(s1)
+    x = Digest::SHA1.digest(message + s2)
     (0..s1.length - 1).each {|i| buf.push(s1[i] ^ x[i])}
     buf.pack("C*")
   end
@@ -1174,7 +1174,11 @@ class << Mysql
   def finalizer(net)
     proc {
       net.clear
-      net.write Mysql::COM_QUIT.chr
+      begin
+        net.write(Mysql::COM_QUIT.chr)
+        net.close
+      rescue  # Ignore IOError if socket is already closed.
+      end
     }
   end
 

data/lib/active_record/version.rb

@@ -2,7 +2,7 @@ module ActiveRecord
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 15
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/associations/join_model_test.rb

@@ -6,10 +6,12 @@ require 'fixtures/comment'
 require 'fixtures/author'
 require 'fixtures/category'
 require 'fixtures/categorization'
+require 'fixtures/vertex'
+require 'fixtures/edge'
 
 class AssociationsJoinModelTest < Test::Unit::TestCase
   self.use_transactional_fixtures = false
-  fixtures :posts, :authors, :categories, :categorizations, :comments, :tags, :taggings, :author_favorites
+  fixtures :posts, :authors, :categories, :categorizations, :comments, :tags, :taggings, :author_favorites, :vertices
 
   def test_has_many
     assert authors(:david).categories.include?(categories(:general))
@@ -298,6 +300,18 @@ class AssociationsJoinModelTest < Test::Unit::TestCase
       assert_equal [posts(:welcome), posts(:thinking)], tags(:general).taggings.find(:all, :include => :taggable)
     end
   end
+  
+  def test_has_many_polymorphic_with_source_type
+    assert_equal [posts(:welcome), posts(:thinking)], tags(:general).tagged_posts
+  end
+
+  def test_eager_has_many_polymorphic_with_source_type
+    tag_with_include = Tag.find(tags(:general).id, :include => :tagged_posts)
+    desired = [posts(:welcome), posts(:thinking)]
+    assert_no_queries do
+      assert_equal desired, tag_with_include.tagged_posts
+    end
+  end
 
   def test_has_many_through_has_many_find_all
     assert_equal comments(:greetings), authors(:david).comments.find(:all, :order => 'comments.id').first
@@ -414,6 +428,9 @@ class AssociationsJoinModelTest < Test::Unit::TestCase
                 message = "Expected a Tagging in taggings collection, got #{wrong.class}.")
     assert_equal(count + 4, post_thinking.tags.size)
     assert_equal(count + 4, post_thinking.tags(true).size)
+
+    # Raises if the wrong reflection name is used to set the Edge belongs_to
+    assert_nothing_raised { vertices(:vertex_1).sinks << vertices(:vertex_5) }
   end
 
   def test_adding_junk_to_has_many_through_should_raise_type_mismatch

data/test/fixtures/categories_ordered.yml

@@ -1,4 +1,4 @@
---- !omap
+--- !!omap
 <% 100.times do |i| %>
 - fixture_no_<%= i %>:
     id: <%= i %>

data/test/fixtures/db_definitions/db2.drop.sql

@@ -29,3 +29,4 @@ DROP TABLE fk_test_has_fk;
 DROP TABLE keyboards;
 DROP TABLE legacy_things;
 DROP TABLE numeric_data;
+DROP TABLE mixed_case_monkeys;

data/test/fixtures/db_definitions/db2.sql

@@ -224,3 +224,8 @@ CREATE TABLE numeric_data (
   my_house_population DECIMAL(2),
   decimal_number_with_default DECIMAL(3,2) DEFAULT 2.78
 );
+
+CREATE TABLE mixed_case_monkeys (
+ monkeyID INT NOT NULL PRIMARY KEY,
+ fleaCount INT
+);

data/test/fixtures/db_definitions/firebird.drop.sql

@@ -30,6 +30,7 @@ DROP TABLE keyboards;
 DROP TABLE defaults;
 DROP TABLE legacy_things;
 DROP TABLE numeric_data;
+DROP TABLE mixed_case_monkeys;
 
 DROP DOMAIN D_BOOLEAN;
 
@@ -59,3 +60,4 @@ DROP GENERATOR keyboards_seq;
 DROP GENERATOR defaults_seq;
 DROP GENERATOR legacy_things_seq;
 DROP GENERATOR numeric_data_seq;
+DROP GENERATOR mixed_case_monkeys_seq;

data/test/fixtures/db_definitions/firebird.sql

@@ -295,3 +295,10 @@ CREATE TABLE numeric_data (
 );
 CREATE GENERATOR numeric_data_seq;
 SET GENERATOR numeric_data_seq TO 10000;
+
+CREATE TABLE mixed_case_monkeys (
+ "monkeyID" BIGINT NOT NULL,
+ "fleaCount" INTEGER
+);
+CREATE GENERATOR mixed_case_monkeys_seq;
+SET GENERATOR mixed_case_monkeys_seq TO 10000;

data/test/fixtures/db_definitions/frontbase.drop.sql

@@ -29,3 +29,4 @@ DROP TABLE fk_test_has_pk CASCADE;
 DROP TABLE keyboards CASCADE;
 DROP TABLE legacy_things CASCADE;
 DROP TABLE numeric_data CASCADE;
+DROP TABLE mixed_case_monkeys CASCADE;

data/test/fixtures/db_definitions/frontbase.sql

@@ -260,3 +260,9 @@ CREATE TABLE "numeric_data" (
   primary key ("id")
 );
 SET UNIQUE FOR numeric_data(id);
+
+CREATE TABLE mixed_case_monkeys (
+ "monkeyID" integer DEFAULT unique,
+ "fleaCount" integer
+);
+SET UNIQUE FOR mixed_case_monkeys("monkeyID");

data/test/fixtures/db_definitions/mysql.drop.sql

@@ -29,3 +29,4 @@ DROP TABLE fk_test_has_pk;
 DROP TABLE keyboards;
 DROP TABLE legacy_things;
 DROP TABLE numeric_data;
+DROP TABLE mixed_case_monkeys;

data/test/fixtures/db_definitions/mysql.sql

@@ -226,3 +226,9 @@ CREATE TABLE `numeric_data` (
   `my_house_population` decimal(2),
   `decimal_number_with_default` decimal(3,2) DEFAULT 2.78
 ) TYPE=InnoDB;
+
+CREATE TABLE mixed_case_monkeys (
+ `monkeyID` int(11) NOT NULL auto_increment,
+ `fleaCount` int(11),
+ PRIMARY KEY (`monkeyID`)
+) TYPE=InnoDB;

data/test/fixtures/db_definitions/openbase.sql

@@ -292,3 +292,11 @@ CREATE TABLE numeric_data (
 go
 CREATE PRIMARY KEY numeric_data (id)
 go
+
+CREATE TABLE mixed_case_monkeys (
+  monkeyID INTEGER NOT NULL DEFAULT _rowid,
+  fleaCount INTEGER
+);
+go
+CREATE PRIMARY KEY mixed_case_monkeys (monkeyID)
+go

data/test/fixtures/db_definitions/oracle.drop.sql

@@ -30,6 +30,7 @@ drop table fk_test_has_fk;
 drop table keyboards;
 drop table legacy_things;
 drop table numeric_data;
+drop table mixed_case_monkeys;
 
 drop sequence accounts_seq;
 drop sequence funny_jokes_seq;
@@ -61,3 +62,4 @@ drop sequence fk_test_has_fk_seq;
 drop sequence keyboards_seq;
 drop sequence legacy_things_seq;
 drop sequence numeric_data_seq;
+drop sequence mixed_case_monkeys_seq;

data/test/fixtures/db_definitions/oracle.sql

@@ -317,3 +317,9 @@ CREATE TABLE numeric_data (
   decimal_number_with_default decimal(3,2) DEFAULT 2.78
 );
 create sequence numeric_data_seq minvalue 10000;
+
+CREATE TABLE mixed_case_monkeys (
+ "monkeyID" INTEGER NOT NULL PRIMARY KEY,
+ "fleaCount" INTEGER
+);
+create sequence mixed_case_monkeys_seq minvalue 10000;

data/test/fixtures/db_definitions/postgresql.drop.sql

@@ -34,3 +34,4 @@ DROP TABLE keyboards;
 DROP TABLE legacy_things;
 DROP TABLE numeric_data;
 DROP TABLE column_data;
+DROP TABLE mixed_case_monkeys;

data/test/fixtures/db_definitions/postgresql.sql

@@ -256,3 +256,8 @@ CREATE TABLE numeric_data (
   my_house_population decimal(2),
   decimal_number_with_default decimal(3,2) default 2.78
 );
+
+CREATE TABLE mixed_case_monkeys (
+ "monkeyID" INTEGER PRIMARY KEY,
+ "fleaCount" INTEGER
+);

data/test/fixtures/db_definitions/sqlite.drop.sql

@@ -29,3 +29,4 @@ DROP TABLE fk_test_has_pk;
 DROP TABLE keyboards;
 DROP TABLE legacy_things;
 DROP TABLE numeric_data;
+DROP TABLE mixed_case_monkeys;

data/test/fixtures/db_definitions/sqlite.sql

@@ -208,3 +208,8 @@ CREATE TABLE 'numeric_data' (
   'my_house_population' DECIMAL(2),
   'decimal_number_with_default' DECIMAL(3,2) DEFAULT 2.78
 );
+
+CREATE TABLE mixed_case_monkeys (
+ 'monkeyID' INTEGER NOT NULL PRIMARY KEY,
+ 'fleaCount' INTEGER
+);

data/test/fixtures/db_definitions/sqlserver.drop.sql

@@ -31,3 +31,4 @@ DROP TABLE keyboards;
 DROP TABLE legacy_things;
 DROP TABLE numeric_data;
 DROP TABLE [order];
+DROP TABLE mixed_case_monkeys;

data/test/fixtures/db_definitions/sqlserver.sql

@@ -236,3 +236,8 @@ CREATE TABLE [order] (
   texture varchar(255),
   flavor varchar(255)
 );
+
+CREATE TABLE mixed_case_monkeys (
+  [monkeyID] int NOT NULL IDENTITY(1, 1),
+  [fleaCount] int default NULL
+);

data/test/fixtures/db_definitions/sybase.drop.sql

@@ -29,5 +29,6 @@ DROP TABLE fk_test_has_pk
 DROP TABLE keyboards
 DROP TABLE legacy_things
 DROP TABLE numeric_data
+DROP TABLE mixed_case_monkeys
 DROP TABLE schema_info
 go

data/test/fixtures/db_definitions/sybase.sql

@@ -210,4 +210,9 @@ CREATE TABLE numeric_data (
   decimal_number_with_default numeric(3,2) DEFAULT 2.78
 )
 
+CREATE TABLE mixed_case_monkeys (
+  [monkeyID] numeric(9,0) IDENTITY PRIMARY KEY,
+  [fleaCount] numeric(9,0)
+);
+
 go

data/test/fixtures/mixed_case_monkey.rb

@@ -0,0 +1,3 @@
+class MixedCaseMonkey < ActiveRecord::Base
+  set_primary_key 'monkeyID'
+end

data/test/fixtures/mixed_case_monkeys.yml

@@ -0,0 +1,6 @@
+first:
+  monkeyID: 1
+  fleaCount: 42
+second:
+  monkeyID: 2
+  fleaCount: 43

data/test/fixtures/tag.rb

@@ -2,4 +2,6 @@ class Tag < ActiveRecord::Base
   has_many :taggings
   has_many :taggables, :through => :taggings
   has_one  :tagging
+
+  has_many :tagged_posts, :through => :taggings, :source => :taggable, :source_type => 'Post'
 end

data/test/fixtures/vertex.rb

@@ -1,7 +1,7 @@
 # This class models a vertex in a directed graph.
 class Vertex < ActiveRecord::Base
   has_many :sink_edges, :class_name => 'Edge', :foreign_key => 'source_id'
-  has_many :sinks, :through => :sink_edges, :source => :sink
+  has_many :sinks, :through => :sink_edges
 
   has_and_belongs_to_many :sources,
     :class_name => 'Vertex', :join_table => 'edges',

data/test/pk_test.rb

@@ -4,9 +4,10 @@ require 'fixtures/reply'
 require 'fixtures/subscriber'
 require 'fixtures/movie'
 require 'fixtures/keyboard'
+require 'fixtures/mixed_case_monkey'
 
 class PrimaryKeysTest < Test::Unit::TestCase
-  fixtures :topics, :subscribers, :movies
+  fixtures :topics, :subscribers, :movies, :mixed_case_monkeys
 
   def test_integer_key
     topic = Topic.find(1)
@@ -78,4 +79,26 @@ class PrimaryKeysTest < Test::Unit::TestCase
     Topic.reset_primary_key
     assert_equal "id", Topic.primary_key
   end
+  
+  def test_delete_should_quote_pkey
+    assert_nothing_raised { MixedCaseMonkey.delete(1) }
+  end
+  def test_increment_counter_should_quote_pkey_and_quote_counter_columns
+    assert_nothing_raised { MixedCaseMonkey.increment_counter(:fleaCount, 1) }
+  end
+  def test_decrement_counter_should_quote_pkey_and_quote_counter_columns
+    assert_nothing_raised { MixedCaseMonkey.decrement_counter(:fleaCount, 1) }
+  end
+  def test_find_with_one_id_should_quote_pkey
+    assert_nothing_raised { MixedCaseMonkey.find(1) }
+  end
+  def test_find_with_multiple_ids_should_quote_pkey
+    assert_nothing_raised { MixedCaseMonkey.find([1,2]) }
+  end
+  def test_instance_update_should_quote_pkey
+    assert_nothing_raised { MixedCaseMonkey.find(1).save }
+  end
+  def test_instance_destry_should_quote_pkey
+    assert_nothing_raised { MixedCaseMonkey.find(1).destroy }
+  end
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.2
 specification_version: 1
 name: activerecord
 version: !ruby/object:Gem::Version 
-  version: 1.15.2
-date: 2007-02-05 00:00:00 -06:00
+  version: 1.15.3
+date: 2007-03-13 00:00:00 -05:00
 summary: Implements the ActiveRecord pattern for ORM.
 require_paths: 
 - lib
@@ -228,6 +228,8 @@ files:
 - test/fixtures/migrations_with_decimal
 - test/fixtures/migrations_with_duplicate
 - test/fixtures/migrations_with_missing_versions
+- test/fixtures/mixed_case_monkey.rb
+- test/fixtures/mixed_case_monkeys.yml
 - test/fixtures/mixin.rb
 - test/fixtures/mixins.yml
 - test/fixtures/movie.rb
@@ -353,5 +355,5 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.4.1
+        version: 1.4.2
     version: