Changeset 6065

Timestamp:

01/28/07 08:51:33 (2 years ago)

Author:

bitsweat

Message:

Merge [6064] from trunk. References #6778.

Files:

• branches/1-2-stable/activerecord/CHANGELOG (modified) (1 diff)
• branches/1-2-stable/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb (modified) (1 diff)
• branches/1-2-stable/activerecord/test/finder_test.rb (modified) (1 diff)

branches/1-2-stable/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* MySQL: SET SQL_AUTO_IS_NULL=0 so 'where id is null' doesn't select the last inserted id.  #6778 [Jonathan Viney, timc]
-
-* Fixtures use the table name and connection from set_fixture_class.  #7330 [Anthony Eden]

branches/1-2-stable/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

@@ -389 +389 @@
-          @connection.real_connect(*@connection_options)
-          execute("SET NAMES '#{encoding}'") if encoding
+
+          # By default, MySQL 'where id is null' selects the last inserted id.
+          # Turn this off. http://dev.rubyonrails.org/ticket/6778
+          execute("SET SQL_AUTO_IS_NULL=0")
-        end
-

branches/1-2-stable/activerecord/test/finder_test.rb

@@ -451 +451 @@
-  end
-
+  # http://dev.rubyonrails.org/ticket/6778
+  def test_find_ignores_previously_inserted_record
+    post = Post.create!
+    assert_equal [], Post.find_all_by_id(nil)
+  end
+
-  def test_find_by_empty_ids
-    assert_equal [], Post.find([])