We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 944f5bf commit a746afeCopy full SHA for a746afe
1 file changed
spec/spec_helper.rb
@@ -35,11 +35,16 @@
35
# specify which database version is used (will be verified in one test)
36
DATABASE_VERSION = ENV['DATABASE_VERSION'] || '10.2.0.4'
37
38
+def get_eazy_connect_url(svc_separator = "")
39
+ "#{DATABASE_HOST}:#{DATABASE_PORT}#{svc_separator}#{DATABASE_SERVICE_NAME}"
40
+end
41
+
42
def get_connection(user_number = 0)
43
database_user, database_password = DATABASE_USERS_AND_PASSWORDS[user_number]
44
unless defined?(JRUBY_VERSION)
45
+ url = (ENV['DATABASE_USE_TNS'] == 'NO') ? get_eazy_connect_url("/") : DATABASE_NAME
46
try_to_connect(OCIError) do
- OCI8.new(database_user, database_password, DATABASE_NAME)
47
+ OCI8.new(database_user, database_password, url)
48
end
49
else
50
try_to_connect(NativeException) do
0 commit comments