File tree Expand file tree Collapse file tree 1 file changed +6
-1
lines changed
Expand file tree Collapse file tree 1 file changed +6
-1
lines changed Original file line number Diff line number Diff line change 3535# specify which database version is used (will be verified in one test)
3636DATABASE_VERSION = ENV [ 'DATABASE_VERSION' ] || '10.2.0.4'
3737
38+ def get_eazy_connect_url ( svc_separator = "" )
39+ "#{ DATABASE_HOST } :#{ DATABASE_PORT } #{ svc_separator } #{ DATABASE_SERVICE_NAME } "
40+ end
41+
3842def get_connection ( user_number = 0 )
3943 database_user , database_password = DATABASE_USERS_AND_PASSWORDS [ user_number ]
4044 unless defined? ( JRUBY_VERSION )
45+ url = ( ENV [ 'DATABASE_USE_TNS' ] == 'NO' ) ? get_eazy_connect_url ( "/" ) : DATABASE_NAME
4146 try_to_connect ( OCIError ) do
42- OCI8 . new ( database_user , database_password , DATABASE_NAME )
47+ OCI8 . new ( database_user , database_password , url )
4348 end
4449 else
4550 try_to_connect ( NativeException ) do
You can’t perform that action at this time.
0 commit comments