aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases
diff options
context:
space:
mode:
authorkares <self@kares.org>2014-05-14 13:38:34 +0200
committerkares <self@kares.org>2014-05-14 13:38:34 +0200
commitc0bfc3f412834ffe8327a15ae3a46602cc28e425 (patch)
tree599400b4a230513536b5da2bf61d3c093d534c3d /activerecord/test/cases
parentad0ec07f0076a0eb460332c2a98746864bd15c4c (diff)
downloadrails-c0bfc3f412834ffe8327a15ae3a46602cc28e425.tar.gz
rails-c0bfc3f412834ffe8327a15ae3a46602cc28e425.tar.bz2
rails-c0bfc3f412834ffe8327a15ae3a46602cc28e425.zip
PostgreSQLAdapter::Utils seems to be only used from a single spot - quite redundant
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r--activerecord/test/cases/adapters/postgresql/schema_test.rb15
-rw-r--r--activerecord/test/cases/adapters/postgresql/utils_test.rb20
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