Merge branch 'master' of github.com:lifo/docrails

2 files changed, 8 insertions, 1 deletions

diff --git a/activerecord/test/cases/adapters/mysql2/explain_test.rb b/activerecord/test/cases/adapters/mysql2/explain_test.rb
index 8ea777b72b..68ed361aeb 100644
--- a/activerecord/test/cases/adapters/mysql2/explain_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/explain_test.rb
@@ -9,12 +9,15 @@ module ActiveRecord
 
         def test_explain_for_one_query
           explain = Developer.where(:id => 1).explain
+          assert_match %(EXPLAIN for: SELECT `developers`.* FROM `developers`  WHERE `developers`.`id` = 1), explain
           assert_match %(developers | const), explain
         end
 
         def test_explain_with_eager_loading
           explain = Developer.where(:id => 1).includes(:audit_logs).explain
+          assert_match %(EXPLAIN for: SELECT `developers`.* FROM `developers`  WHERE `developers`.`id` = 1), explain
           assert_match %(developers | const), explain
+          assert_match %(EXPLAIN for: SELECT `audit_logs`.* FROM `audit_logs`  WHERE `audit_logs`.`developer_id` IN (1)), explain
           assert_match %(audit_logs | ALL), explain
         end
       end
diff --git a/activerecord/test/cases/adapters/mysql2/schema_test.rb b/activerecord/test/cases/adapters/mysql2/schema_test.rb
index 858d1da2dd..49514e1539 100644
--- a/activerecord/test/cases/adapters/mysql2/schema_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/schema_test.rb
@@ -13,7 +13,7 @@ module ActiveRecord
         table       = Post.table_name
         @db_name    = db
 
-        @omgpost = Class.new(Post) do
+        @omgpost = Class.new(ActiveRecord::Base) do
           set_table_name "#{db}.#{table}"
           def self.name; 'Post'; end
         end
@@ -23,6 +23,10 @@ module ActiveRecord
         assert @omgpost.find(:first)
       end
 
+      def test_primary_key
+        assert_equal 'id', @omgpost.primary_key
+      end
+
       def test_table_exists?
         name = @omgpost.table_name
         assert @connection.table_exists?(name), "#{name} table should exist"