From d94d5e9ca7d81ba295d9e0bf3d9062bc7b3928fa Mon Sep 17 00:00:00 2001 From: Peter Ramm Date: Mon, 25 Aug 2025 17:30:25 +0200 Subject: [PATCH] Ensure fixed DB session setting for test, eg. nls_numeric_characters: ".," --- spec/spec_helper.rb | 48 ++++++++++++--------------------------------- 1 file changed, 12 insertions(+), 36 deletions(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 29ef18ec3..b7b1819c6 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -154,56 +154,32 @@ def dump_table_schema(table, connection = ActiveRecord::Base.connection) host: DATABASE_HOST, port: DATABASE_PORT, username: DATABASE_USER, - password: DATABASE_PASSWORD + password: DATABASE_PASSWORD, + nls_numeric_characters: ".," } -CONNECTION_WITH_SCHEMA_PARAMS = { - adapter: "oracle_enhanced", - database: DATABASE_NAME, - host: DATABASE_HOST, - port: DATABASE_PORT, - username: DATABASE_USER, - password: DATABASE_PASSWORD, +CONNECTION_WITH_SCHEMA_PARAMS = CONNECTION_PARAMS.merge({ schema: DATABASE_SCHEMA -} +}) -CONNECTION_WITH_TIMEZONE_PARAMS = { - adapter: "oracle_enhanced", - database: DATABASE_NAME, - host: DATABASE_HOST, - port: DATABASE_PORT, - username: DATABASE_USER, - password: DATABASE_PASSWORD, +CONNECTION_WITH_TIMEZONE_PARAMS = CONNECTION_PARAMS.merge({ time_zone: "Europe/Riga" -} +}) -SYS_CONNECTION_PARAMS = { - adapter: "oracle_enhanced", - database: DATABASE_NAME, - host: DATABASE_HOST, - port: DATABASE_PORT, +SYS_CONNECTION_PARAMS = CONNECTION_PARAMS.merge({ username: "sys", password: DATABASE_SYS_PASSWORD, privilege: "SYSDBA" -} +}) -SYSTEM_CONNECTION_PARAMS = { - adapter: "oracle_enhanced", - database: DATABASE_NAME, - host: DATABASE_HOST, - port: DATABASE_PORT, +SYSTEM_CONNECTION_PARAMS = CONNECTION_PARAMS.merge({ username: "system", password: DATABASE_SYS_PASSWORD -} +}) -SERVICE_NAME_CONNECTION_PARAMS = { - adapter: "oracle_enhanced", +SERVICE_NAME_CONNECTION_PARAMS = CONNECTION_PARAMS.merge({ database: "/#{DATABASE_NAME}", - host: DATABASE_HOST, - port: DATABASE_PORT, - username: DATABASE_USER, - password: DATABASE_PASSWORD -} +}) DATABASE_NON_DEFAULT_TABLESPACE = config["database"]["non_default_tablespace"] || ENV["DATABASE_NON_DEFAULT_TABLESPACE"] || "SYSTEM"