Ticket #6542: more_injection_points.diff

base.rb

@@ -444 +444 @@
-          attributes.collect { |attr| create(attr) }
-        else
-          object = new(attributes)
-scope(:create).each { |att,value| object.send("#{att}=", value) } if scoped?(:create
+create_scope_to_object(object
-          object.save
-          object
-        end
-      end
-
+      def create_scope_to_object(object)
+        scope(:create).each { |att,value| object.send("#{att}=", value) } if scoped?(:create)
+      end
+
-      # Finds the record from the passed +id+, instantly saves it with the passed +attributes+ (if the validation permits it),
-      # and returns it. If the save fails under validations, the unsaved object is still returned.
-      #
@@ -1542 +1546 @@
-      # be made (since they can't be persisted).
-      def destroy
-        unless new_record?
-
-
-
-
+
-        end
-
-        freeze
-      end
-
+      def sql_for_destroy
+        "DELETE FROM #{self.class.table_name}" + ' ' + sql_for_destroy_conditions
+      end
+
+      def sql_for_destroy_conditions
+        "WHERE #{self.class.primary_key} = #{quoted_id}"
+      end
+
-      # Returns a clone of the record that hasn't been assigned an id yet and
-      # is treated as a new record.  Note that this is a "shallow" clone:
-      # it copies the object's attributes only, not its associations.
@@ -1780 +1789 @@
-      # Updates the associated record with values matching those of the instance attributes.
-      # Returns the number of affected rows.
-      def update
-
-
-
-
-
-
+
-      end
-
+      def sql_for_update
+        "UPDATE #{self.class.table_name}" + ' ' + sql_for_update_values + ' ' + sql_for_update_conditions
+      end
+
+      def sql_for_update_values
+        "SET #{quoted_comma_pair_list(connection, attributes_for_update)}"
+      end
+
+      def attributes_for_update
+        attributes_with_quotes(false)
+      end
+
+      def sql_for_update_conditions
+        "WHERE #{self.class.primary_key} = #{quote_value(id)}"
+      end
+
-      # Creates a record with values matching those of the instance attributes
-      # and returns its id.
-      def create
@@ -1795 +1815 @@
-          self.id = connection.next_sequence_value(self.class.sequence_name)
-        end
-
-
-
-
-
-
+
-          self.class.primary_key, self.id, self.class.sequence_name
-        )
-
@@ -1807 +1823 @@
-        id
-      end
-
+      def sql_for_create
+        "INSERT INTO #{self.class.table_name} " +
+        "(#{columns_for_create.join(', ')}) " +
+        "VALUES(#{attributes_for_create.values.join(', ')})"
+      end
+
+      alias_method :columns_for_create,    :quoted_column_names
+      alias_method :attributes_for_create, :attributes_with_quotes
+
-      # Sets the attribute used for single table inheritance to this class name if this is not the ActiveRecord descendent.
-      # Considering the hierarchy Reply < Message < ActiveRecord, this makes it possible to do Reply.new without having to
-      # set Reply[Reply.inheritance_column] = "Reply" yourself. No such attribute would be set for objects of the