Changeset 6859

Timestamp:

05/26/07 06:26:50 (1 year ago)

Author:

bitsweat

Message:

Oracle binary fixtures; pull fixture insertion into the adapters. Closes #7987.

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb (modified) (1 diff)
• trunk/activerecord/lib/active_record/connection_adapters/oracle_adapter.rb (modified) (2 diffs)
• trunk/activerecord/lib/active_record/fixtures.rb (modified) (2 diffs)
• trunk/activerecord/test/binary_test.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Oracle: support binary fixtures.  #7987 [Michael Schoen]
+
+* Fixtures: pull fixture insertion into the database adapters.  #7987 [Michael Schoen]
-
-* Announce migration versions as they're performed.  [Jeremy Kemper]

trunk/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb

@@ -120 +120 @@
-      end
-
+      # Inserts the given fixture into the table. Overriden in adapters that require
+      # something beyond a simple insert (eg. Oracle).
+      def insert_fixture(fixture, table_name)
+        execute "INSERT INTO #{table_name} (#{fixture.key_list}) VALUES (#{fixture.value_list})", 'Fixture Insert'
+      end
+
-      protected
-        # Returns an array of record hashes with the column names as keys and

trunk/activerecord/lib/active_record/connection_adapters/oracle_adapter.rb

@@ -45 +45 @@
-      # and write back the data.
-      after_save :write_lobs
-()
+
-        if connection.is_a?(ConnectionAdapters::OracleAdapter)
-
-
-
-
-
-
-
-
-
+
-        end
-      end
@@ -274 +266 @@
-
-
+        # Inserts the given fixture into the table. Overriden to properly handle lobs.
+        def insert_fixture(fixture, table_name)
+          super
+
+          klass = fixture.class_name.constantize rescue nil
+          if klass.respond_to?(:ancestors) && klass.ancestors.include?(ActiveRecord::Base)
+            write_lobs(table_name, klass, fixture)
+          end
+        end
+
+        # Writes LOB values from attributes, as indicated by the LOB columns of klass.
+        def write_lobs(table_name, klass, attributes)
+          id = quote(attributes[klass.primary_key])
+          klass.columns.select { |col| col.sql_type =~ /LOB$/i }.each do |col|
+            value = attributes[col.name]
+            value = value.to_yaml if col.text? && klass.serialized_attributes[col.name]
+            next if value.nil?  || (value == '')
+            lob = select_one("SELECT #{col.name} FROM #{table_name} WHERE #{klass.primary_key} = #{id}",
+                             'Writable Large Object')[col.name]
+            lob.write value
+          end
+        end
+
+
-        # SCHEMA STATEMENTS ========================================
-        #

trunk/activerecord/lib/active_record/fixtures.rb

@@ -291 +291 @@
-  def insert_fixtures
-    values.each do |fixture|
-execute "INSERT INTO #{@table_name} (#{fixture.key_list}) VALUES (#{fixture.value_list})", 'Fixture Insert'
+insert_fixture fixture, @table_name
-    end
-  end
@@ -381 +381 @@
-  class FormatError < FixtureError#:nodoc:
-  end
+
+  attr_reader :class_name
-
-  def initialize(fixture, class_name)

trunk/activerecord/test/binary_test.rb

@@ -21 +21 @@
-  # BLOB data with DB2 or Firebird, because the length of a statement
-  # is limited to 32KB.
-%w(SQLServer Sybase DB2 Oracle Firebird).include? ActiveRecord::Base.connection.adapter_name
+current_adapter?(:SQLServerAdapter, :SybaseAdapter, :DB2Adapter, :FirebirdAdapter)
-    def test_load_save
-      bin = Binary.new