Fix logs name consistency.

4 files changed, 108 insertions, 15 deletions

diff --git a/activerecord/test/cases/adapters/mysql2/connection_test.rb b/activerecord/test/cases/adapters/mysql2/connection_test.rb
index 684c7f5929..276c499276 100644
--- a/activerecord/test/cases/adapters/mysql2/connection_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/connection_test.rb
@@ -4,6 +4,13 @@ class MysqlConnectionTest < ActiveRecord::TestCase
   def setup
     super
     @connection = ActiveRecord::Model.connection
+    @connection.extend(LogIntercepter)
+    @connection.intercepted = true
+  end
+
+  def teardown
+    @connection.intercepted = false
+    @connection.logged = []
   end
 
   def test_no_automatic_reconnection_after_timeout
@@ -45,6 +52,26 @@ class MysqlConnectionTest < ActiveRecord::TestCase
     end
   end
 
+  def test_logs_name_structure_dump
+    @connection.structure_dump
+    assert_equal "SCHEMA", @connection.logged[0][1]
+    assert_equal "SCHEMA", @connection.logged[2][1]
+  end
+
+  def test_logs_name_show_variable
+    @connection.show_variable 'foo'
+    assert_equal "SCHEMA", @connection.logged[0][1]
+  end
+
+  def test_logs_name_rename_column_sql
+    @connection.execute "CREATE TABLE `bar_baz` (`foo` varchar(255))"
+    @connection.logged = []
+    @connection.send(:rename_column_sql, 'bar_baz', 'foo', 'foo2')
+    assert_equal "SCHEMA", @connection.logged[0][1]
+  ensure
+    @connection.execute "DROP TABLE `bar_baz`"
+  end
+
   private
 
   def run_without_connection
diff --git a/activerecord/test/cases/adapters/postgresql/connection_test.rb b/activerecord/test/cases/adapters/postgresql/connection_test.rb
index 4baec749ff..adb2cef010 100644
--- a/activerecord/test/cases/adapters/postgresql/connection_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/connection_test.rb
@@ -8,6 +8,13 @@ module ActiveRecord
     def setup
       super
       @connection = ActiveRecord::Base.connection
+      @connection.extend(LogIntercepter)
+      @connection.intercepted = true
+    end
+
+    def teardown
+      @connection.intercepted = false
+      @connection.logged = []
     end
 
     def test_encoding
@@ -25,5 +32,42 @@ module ActiveRecord
       expect = NonExistentTable.connection.query('show geqo').first.first
       assert_equal 'off', expect
     end
+
+    def test_tables_logs_name
+      @connection.tables('hello')
+      assert_equal 'SCHEMA', @connection.logged[0][1]
+    end
+
+    def test_indexes_logs_name
+      @connection.indexes('items', 'hello')
+      assert_equal 'SCHEMA', @connection.logged[0][1]
+    end
+
+    def test_table_exists_logs_name
+      @connection.table_exists?('items')
+      assert_equal 'SCHEMA', @connection.logged[0][1]
+    end
+
+    def test_table_alias_length_logs_name
+      @connection.instance_variable_set("@table_alias_length", nil)
+      @connection.table_alias_length
+      assert_equal 'SCHEMA', @connection.logged[0][1]
+    end
+
+    def test_current_database_logs_name
+      @connection.current_database
+      assert_equal 'SCHEMA', @connection.logged[0][1]
+    end
+
+    def test_encoding_logs_name
+      @connection.encoding
+      assert_equal 'SCHEMA', @connection.logged[0][1]
+    end
+
+    def test_schema_names_logs_name
+      @connection.schema_names
+      assert_equal 'SCHEMA', @connection.logged[0][1]
+    end
+
   end
 end
diff --git a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
index 8a7f44d0a3..5e947799cc 100644
--- a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
@@ -20,6 +20,14 @@ module ActiveRecord
             number integer
           )
         eosql
+
+        @conn.extend(LogIntercepter)
+        @conn.intercepted = true
+      end
+    
+      def teardown
+        @conn.intercepted = false
+        @conn.logged = []
       end
 
       def test_column_types
@@ -232,13 +240,23 @@ module ActiveRecord
       end
 
       def test_tables_logs_name
-        name = "hello"
-        assert_logged [[name, []]] do
-          @conn.tables(name)
+        assert_logged [['SCHEMA', []]] do
+          @conn.tables('hello')
           assert_not_nil @conn.logged.first.shift
         end
       end
 
+      def test_indexes_logs_name
+        assert_logged [["PRAGMA index_list(\"items\")", 'SCHEMA', []]] do
+          @conn.indexes('items', 'hello')
+        end
+      end
+
+      def test_table_exists_logs_name
+        assert @conn.table_exists?('items')
+        assert_equal 'SCHEMA', @conn.logged[0][1]
+      end
+
       def test_columns
         columns = @conn.columns('items').sort_by { |x| x.name }
         assert_equal 2, columns.length
@@ -274,7 +292,6 @@ module ActiveRecord
       end
 
       def test_indexes_logs
-        intercept_logs_on @conn
         assert_difference('@conn.logged.length') do
           @conn.indexes('items')
         end
@@ -326,21 +343,10 @@ module ActiveRecord
       private
 
       def assert_logged logs
-        intercept_logs_on @conn
         yield
         assert_equal logs, @conn.logged
       end
 
-      def intercept_logs_on ctx
-        @conn.extend(Module.new {
-          attr_accessor :logged
-          def log sql, name, binds = []
-            @logged << [sql, name, binds]
-            yield
-          end
-        })
-        @conn.logged = []
-      end
     end
   end
 end
diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb
index 37fa13f771..afff020561 100644
--- a/activerecord/test/cases/helper.rb
+++ b/activerecord/test/cases/helper.rb
@@ -121,3 +121,19 @@ class << Time
     @now = nil
   end
 end
+
+module LogIntercepter
+  attr_accessor :logged, :intercepted
+  def self.extended(base)
+    base.logged = []
+  end
+  def log(sql, name, binds = [], &block)
+    if @intercepted
+      @logged << [sql, name, binds]
+      yield
+    else
+      super(sql, name,binds, &block)
+    end
+  end
+end
+