diff options
author | Sean Griffin <sean@seantheprogrammer.com> | 2017-02-14 05:47:32 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-14 05:47:32 -0500 |
commit | b9661c786a6dd5322659af35944731e82118baa7 (patch) | |
tree | 214c1e22cc344b8d93437877c890b6afd7fd1d8e /activerecord/test/cases | |
parent | 437020aa6dd4bae19706628daab6725fcb786a45 (diff) | |
parent | b8e3af79ed0c2121c11bbb675dbf47126e95e0a0 (diff) | |
download | rails-b9661c786a6dd5322659af35944731e82118baa7.tar.gz rails-b9661c786a6dd5322659af35944731e82118baa7.tar.bz2 rails-b9661c786a6dd5322659af35944731e82118baa7.zip |
Merge pull request #27961 from jordanlewis/simplify-postgres-primary-keys-v2
Simplify and optimize Postgres query for primary_keys()
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r-- | activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb | 6 | ||||
-rw-r--r-- | activerecord/test/cases/adapters/postgresql/schema_test.rb | 8 |
2 files changed, 0 insertions, 14 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb b/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb index 4de04646ed..3054f0271f 100644 --- a/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb +++ b/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb @@ -54,12 +54,6 @@ module ActiveRecord end end - def test_primary_key_raises_error_if_table_not_found - assert_raises(ActiveRecord::StatementInvalid) do - @connection.primary_key("unobtainium") - end - end - def test_exec_insert_with_returning_disabled connection = connection_without_insert_returning result = connection.exec_insert("insert into postgresql_partitioned_table_parent (number) VALUES (1)", nil, [], "id", "postgresql_partitioned_table_parent_id_seq") diff --git a/activerecord/test/cases/adapters/postgresql/schema_test.rb b/activerecord/test/cases/adapters/postgresql/schema_test.rb index 8756507531..7b065ff320 100644 --- a/activerecord/test/cases/adapters/postgresql/schema_test.rb +++ b/activerecord/test/cases/adapters/postgresql/schema_test.rb @@ -366,14 +366,6 @@ class SchemaTest < ActiveRecord::PostgreSQLTestCase end end - def test_primary_key_raises_error_if_table_not_found_on_schema_search_path - with_schema_search_path(SCHEMA2_NAME) do - assert_raises(ActiveRecord::StatementInvalid) do - @connection.primary_key(PK_TABLE_NAME) - end - end - end - def test_pk_and_sequence_for_with_schema_specified pg_name = ActiveRecord::ConnectionAdapters::PostgreSQL::Name [ |