Skip to content

clean up connections in reverse order #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 25, 2015
Merged

clean up connections in reverse order #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions examples/spec/spec_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@
database_config = {} unless database_config.is_a?(Hash)
database_connections = database_config.keys.map{|k| k.to_sym}

database_config.each do |name, params|
# change all keys to symbols
name = name.to_sym
database_connections.each do |name|
params = database_config[name.to_s]
symbol_params = Hash[*params.map{|k,v| [k.to_sym, v]}.flatten]

plsql(name).connect! symbol_params
Expand All @@ -33,7 +32,7 @@
# Do logoff when exiting to ensure that session temporary tables
# (used when calling procedures with table types defined in packages)
at_exit do
database_connections.each do |name|
database_connections.reverse_each do |name|
if ENV['PLSQL_COVERAGE']
PLSQL::Coverage.stop(name)
coverage_directory = name == :default ? ENV['PLSQL_COVERAGE'] : "#{ENV['PLSQL_COVERAGE']}/#{name}"
Expand All @@ -55,13 +54,13 @@
end
config.after(:each) do
# Always perform rollback to savepoint after each test
database_connections.each do |name|
database_connections.reverse_each do |name|
plsql(name).rollback_to "before_each"
end
end
config.after(:all) do
# Always perform rollback after each describe block
database_connections.each do |name|
database_connections.reverse_each do |name|
plsql(name).rollback
end
end
Expand Down
11 changes: 5 additions & 6 deletions lib/plsql/spec/templates/spec_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@
database_config = {} unless database_config.is_a?(Hash)
database_connections = database_config.keys.map{|k| k.to_sym}

database_config.each do |name, params|
# change all keys to symbols
name = name.to_sym
database_connections do |name|
params = database_config[name.to_s]
symbol_params = Hash[*params.map{|k,v| [k.to_sym, v]}.flatten]

plsql(name).connect! symbol_params
Expand All @@ -33,7 +32,7 @@
# Do logoff when exiting to ensure that session temporary tables
# (used when calling procedures with table types defined in packages)
at_exit do
database_connections.each do |name|
database_connections.reverse_each do |name|
if ENV['PLSQL_COVERAGE']
PLSQL::Coverage.stop(name)
coverage_directory = name == :default ? ENV['PLSQL_COVERAGE'] : "#{ENV['PLSQL_COVERAGE']}/#{name}"
Expand All @@ -55,13 +54,13 @@
end
config.after(:each) do
# Always perform rollback to savepoint after each test
database_connections.each do |name|
database_connections.reverse_each do |name|
plsql(name).rollback_to "before_each"
end
end
config.after(:all) do
# Always perform rollback after each describe block
database_connections.each do |name|
database_connections.reverse_each do |name|
plsql(name).rollback
end
end
Expand Down