Merge pull request #15088 from kares/shareable-modules

[postgres] remove (outer) sub-class declarations with nested modules/classes

2 files changed, 15 insertions, 20 deletions

diff --git a/activerecord/test/cases/adapters/postgresql/schema_test.rb b/activerecord/test/cases/adapters/postgresql/schema_test.rb
index 11ec7599a3..9d4d79c0c6 100644
--- a/activerecord/test/cases/adapters/postgresql/schema_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/schema_test.rb
@@ -352,6 +352,21 @@ class SchemaTest < ActiveRecord::TestCase
     end
   end
 
+  def test_extract_schema_and_table
+    {
+      %(table_name)            => [nil,'table_name'],
+      %("table.name")          => [nil,'table.name'],
+      %(schema.table_name)     => %w{schema table_name},
+      %("schema".table_name)   => %w{schema table_name},
+      %(schema."table_name")   => %w{schema table_name},
+      %("schema"."table_name") => %w{schema table_name},
+      %("even spaces".table)   => ['even spaces','table'],
+      %(schema."table.name")   => ['schema', 'table.name']
+    }.each do |given, expect|
+      assert_equal expect, @connection.send(:extract_schema_and_table, given)
+    end
+  end
+
   private
     def columns(table_name)
       @connection.send(:column_definitions, table_name).map do |name, type, default|
diff --git a/activerecord/test/cases/adapters/postgresql/utils_test.rb b/activerecord/test/cases/adapters/postgresql/utils_test.rb
deleted file mode 100644
index 9e7b08ef34..0000000000
--- a/activerecord/test/cases/adapters/postgresql/utils_test.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require 'cases/helper'
-
-class PostgreSQLUtilsTest < ActiveSupport::TestCase
-  include ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::Utils
-
-  def test_extract_schema_and_table
-    {
-      %(table_name)            => [nil,'table_name'],
-      %("table.name")          => [nil,'table.name'],
-      %(schema.table_name)     => %w{schema table_name},
-      %("schema".table_name)   => %w{schema table_name},
-      %(schema."table_name")   => %w{schema table_name},
-      %("schema"."table_name") => %w{schema table_name},
-      %("even spaces".table)   => ['even spaces','table'],
-      %(schema."table.name")   => ['schema', 'table.name']
-    }.each do |given, expect|
-      assert_equal expect, extract_schema_and_table(given)
-    end
-  end
-end