Skip to content

Commit 8b89f63

Browse files
committed
Postgres, skip jndi test and and delete some dedundant unit tests
1 parent 4ab7470 commit 8b89f63

File tree

1 file changed

+1
-68
lines changed

1 file changed

+1
-68
lines changed

test/db/postgresql/unit_test.rb

Lines changed: 1 addition & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ class PostgresUnitTest < Test::Unit::TestCase
55
context 'connection' do
66

77
test 'jndi configuration' do
8+
skip "postgresql_connection was removed, find ways to integrate jndi if needed since AR 7.1 & 7.2 changed so much"
89
connection_handler = connection_handler_stub
910

1011
config = { :jndi => 'jdbc/TestDS' }
@@ -31,72 +32,4 @@ def connection.database_product; "PostgreSQL 9.6.8" end
3132
ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.any_instance.stubs(:initialize_type_map)
3233
ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.new(connection, nil, {})
3334
end
34-
35-
end if defined? JRUBY_VERSION
36-
37-
class PostgresActiveSchemaUnitTest < Test::Unit::TestCase
38-
39-
setup do
40-
connection = ActiveRecord::Base.connection
41-
def connection.execute(sql, name = nil); sql; end
42-
end
43-
44-
teardown do
45-
connection = ActiveRecord::Base.connection
46-
meta_class = class << connection; self; end
47-
meta_class.send :remove_method, :execute
48-
end
49-
50-
def test_add_index
51-
# add_index calls data_source_exists? which can't work since execute is stubbed
52-
ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.send(:define_method, :data_source_exists?) do |_name|
53-
true
54-
end
55-
redefined_data_source_check = true
56-
57-
# add_index calls index_name_exists? which can't work since execute is stubbed
58-
ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.send(:define_method, :index_name_exists?) do |*|
59-
false
60-
end
61-
redefined_index_check = true
62-
63-
expected = %(CREATE UNIQUE INDEX "index_people_on_last_name" ON "people" ("last_name") WHERE state = 'active')
64-
assert_equal expected, add_index(:people, :last_name, :unique => true, :where => "state = 'active'")
65-
66-
expected = %(CREATE INDEX CONCURRENTLY "index_people_on_last_name" ON "people" ("last_name"))
67-
assert_equal expected, add_index(:people, :last_name, :algorithm => :concurrently)
68-
69-
%w(gin gist hash btree).each do |type|
70-
expected = %(CREATE INDEX "index_people_on_last_name" ON "people" USING #{type} ("last_name"))
71-
assert_equal expected, add_index(:people, :last_name, :using => type)
72-
73-
expected = %(CREATE INDEX CONCURRENTLY "index_people_on_last_name" ON "people" USING #{type} ("last_name"))
74-
assert_equal expected, add_index(:people, :last_name, :using => type, :algorithm => :concurrently)
75-
end
76-
77-
assert_raise ArgumentError do
78-
add_index(:people, :last_name, :algorithm => :copy)
79-
end
80-
expected = %(CREATE UNIQUE INDEX "index_people_on_last_name" ON "people" USING gist ("last_name"))
81-
assert_equal expected, add_index(:people, :last_name, :unique => true, :using => :gist)
82-
83-
expected = %(CREATE UNIQUE INDEX "index_people_on_last_name" ON "people" USING gist ("last_name") WHERE state = 'active')
84-
assert_equal expected, add_index(:people, :last_name, :unique => true, :where => "state = 'active'", :using => :gist)
85-
86-
ensure
87-
ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.send(:remove_method, :data_source_exists?) if redefined_data_source_check
88-
ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.send(:remove_method, :index_name_exists?) if redefined_index_check
89-
end
90-
91-
def test_rename_index
92-
expected = "ALTER INDEX \"last_name_index\" RENAME TO \"name_index\""
93-
assert_equal expected, rename_index(:people, :last_name_index, :name_index)
94-
end
95-
96-
private
97-
98-
def method_missing(method_symbol, ...)
99-
ActiveRecord::Base.connection.send(method_symbol, ...)
100-
end
101-
10235
end

0 commit comments

Comments
 (0)