From 0f198eb58ece74409827f3d4a739e49a1a0ecab5 Mon Sep 17 00:00:00 2001
From: Leon Breedt <bitserf@gmail.com>
Date: Thu, 31 Mar 2005 09:12:10 +0000
Subject: [PATCH] remove ActiveRecordSoapMarshallable, can't reproduce the
 problem it was intended to fix.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1043 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 actionwebservice/CHANGELOG                         |  2 ++
 .../vendor/ws/marshaling/soap_marshaling.rb        | 14 --------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/actionwebservice/CHANGELOG b/actionwebservice/CHANGELOG
index 6fcdaf971e..fc50e0a7b9 100644
--- a/actionwebservice/CHANGELOG
+++ b/actionwebservice/CHANGELOG
@@ -1,5 +1,7 @@
 *0.7.0* (Unreleased)
 
+* Remove ActiveRecordSoapMarshallable workaround, see #912 for details
+
 * Add scaffolding via ActionController::Base.web_service_scaffold for quick testing using a web browser
 
 * Generalize casting code to be used by both SOAP and XML-RPC (previously, it was only XML-RPC)
diff --git a/actionwebservice/lib/action_web_service/vendor/ws/marshaling/soap_marshaling.rb b/actionwebservice/lib/action_web_service/vendor/ws/marshaling/soap_marshaling.rb
index 287a64291b..14c8d8401d 100644
--- a/actionwebservice/lib/action_web_service/vendor/ws/marshaling/soap_marshaling.rb
+++ b/actionwebservice/lib/action_web_service/vendor/ws/marshaling/soap_marshaling.rb
@@ -279,19 +279,5 @@ def soap2obj(obj_class, node, info, map)
         return false
       end
     end
-
-    module ActiveRecordSoapMarshallable
-      def allocate
-        obj = super
-        attrs = {}
-        self.columns.each{|c| attrs[c.name.to_s] = c.default}
-        obj.instance_variable_set('@attributes', attrs)
-        obj
-      end
-    end
-
-    if Object.const_defined?('ActiveRecord')
-      ActiveRecord::Base.extend(ActiveRecordSoapMarshallable)
-    end
   end
 end
-- 
GitLab