Fixed Base#clone for use with PostgreSQL #565 [hanson@surgery.wisc.edu]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@519 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

3 files changed, 13 insertions, 4 deletions

diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 167a548c5a..cb8217b3e1 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,3 +1,8 @@
+*SVN*
+
+* Fixed Base#clone for use with PostgreSQL #565 [hanson@surgery.wisc.edu]
+
+
 *1.6.0* (January 25th, 2005)
 
 * Added that has_many association build and create methods can take arrays of record data like Base#create and Base#build to build/create multiple records at once.
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 293fe0c833..3342fc7092 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -832,9 +832,9 @@ module ActiveRecord #:nodoc:
 
       # Returns a clone of the record that hasn't been assigned an id yet and is treated as a new record.
       def clone
-        cloned_record = self.class.new(self.attributes)
-        cloned_record.instance_variable_set "@new_record", true
-        cloned_record.id = nil
+        attrs = self.attributes
+	attrs.delete(self.class.primary_key)
+        cloned_record = self.class.new(attrs)
         cloned_record
       end
             
@@ -1253,4 +1253,4 @@ module ActiveRecord #:nodoc:
         string[0..3] == "--- "
       end
   end
-end
\ No newline at end of file
+end
diff --git a/activerecord/test/base_test.rb b/activerecord/test/base_test.rb
index 0f93f2ffbc..9f79bf58c2 100755
--- a/activerecord/test/base_test.rb
+++ b/activerecord/test/base_test.rb
@@ -543,6 +543,10 @@ class BasicsTest < Test::Unit::TestCase
     cloned_topic = topic.clone
     cloned_topic.title["a"] = "c" 
     assert_equal "b", topic.title["a"]
+
+    cloned_topic.save
+    assert !cloned_topic.new_record?
+    assert cloned_topic.id != topic.id
   end
   
   def test_bignum