composite_primary_keys 0.8.5 → 0.8.6

data/History.txt

@@ -1,3 +1,8 @@
+== 0.8.6 / 2007-6-12
+
+* 1 emergency fix due to Rails Core change
+  * Rails v7004 removed #quote; fixed with connection.quote_column_name [thx nerdrew]
+
 == 0.8.5 / 2007-6-5
 
 * 1 change due to Rails Core change

data/lib/composite_primary_keys/associations.rb

@@ -273,7 +273,7 @@ module ActiveRecord::Associations
         when @reflection.options[:as]
           @finder_sql = 
             "#{@reflection.klass.table_name}.#{@reflection.options[:as]}_id = #{@owner.quoted_id} AND " + 
-            "#{@reflection.klass.table_name}.#{@reflection.options[:as]}_type = #{@owner.class.quote @owner.class.base_class.name.to_s}"
+            "#{@reflection.klass.table_name}.#{@reflection.options[:as]}_type = #{@owner.class.connection.quote_column_name(@owner.class.base_class.name.to_s)}"
           @finder_sql << " AND (#{conditions})" if conditions
             
         else
@@ -300,7 +300,7 @@ module ActiveRecord::Associations
         when @reflection.options[:as]
           @finder_sql = 
             "#{@reflection.klass.table_name}.#{@reflection.options[:as]}_id = #{@owner.quoted_id} AND " + 
-            "#{@reflection.klass.table_name}.#{@reflection.options[:as]}_type = #{@owner.class.quote @owner.class.base_class.name.to_s}"          
+            "#{@reflection.klass.table_name}.#{@reflection.options[:as]}_type = #{@owner.class.connection.quote_column_name(@owner.class.base_class.name.to_s)}"          
         else
           @finder_sql = full_columns_equals(@reflection.klass.table_name, 
                                   @reflection.primary_key_name, @owner.quoted_id)
@@ -313,7 +313,7 @@ module ActiveRecord::Associations
     def construct_conditions
       conditions = if @reflection.through_reflection.options[:as]
           "#{@reflection.through_reflection.table_name}.#{@reflection.through_reflection.options[:as]}_id = #{@owner.quoted_id} " + 
-          "AND #{@reflection.through_reflection.table_name}.#{@reflection.through_reflection.options[:as]}_type = #{@owner.class.quote @owner.class.base_class.name.to_s}"
+          "AND #{@reflection.through_reflection.table_name}.#{@reflection.through_reflection.options[:as]}_type = #{@owner.class.connection.quote_column_name(@owner.class.base_class.name.to_s)}"
       else
         @finder_sql = full_columns_equals(@reflection.through_reflection.table_name, 
                                   @reflection.through_reflection.primary_key_name, @owner.quoted_id)
@@ -334,7 +334,7 @@ module ActiveRecord::Associations
         if @reflection.source_reflection.options[:as]
           polymorphic_join = "AND %s.%s = %s" % [
             @reflection.table_name, "#{@reflection.source_reflection.options[:as]}_type",
-                @owner.class.quote(@reflection.through_reflection.klass.name)
+                @owner.class.connection.quote_column_name(@reflection.through_reflection.klass.name)
               ]
             end
           end

data/lib/composite_primary_keys/version.rb

@@ -2,7 +2,7 @@ module CompositePrimaryKeys
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 8
-    TINY  = 5
+    TINY  = 6
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>Composite Primary Keys</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/compositekeys"; return false'>
       Get Version
-      <a href="http://rubyforge.org/projects/compositekeys" class="numbers">0.8.5</a>
+      <a href="http://rubyforge.org/projects/compositekeys" class="numbers">0.8.6</a>
     </div>
     <h1>&#x2192; Ruby on Rails</h1>
 

data/website/version-raw.js

@@ -1,3 +1,3 @@
 // Announcement JS file
-var version = "0.8.5";
+var version = "0.8.6";
 MagicAnnouncement.show('compositekeys', version);

data/website/version.js

@@ -1,4 +1,4 @@
 // Version JS file
-var version = "0.8.5";
+var version = "0.8.6";
 
 document.write(" - " + version);

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4.1
 specification_version: 1
 name: composite_primary_keys
 version: !ruby/object:Gem::Version 
-  version: 0.8.5
-date: 2007-06-05 00:00:00 +02:00
+  version: 0.8.6
+date: 2007-06-12 00:00:00 +02:00
 summary: Composite key support for ActiveRecords
 require_paths: 
 - lib