From 21952dfb010eaa7ce045249876b5e18990ab224f Mon Sep 17 00:00:00 2001 From: Aidan Haran Date: Tue, 17 Oct 2023 12:07:08 +0100 Subject: [PATCH] Revert method name change --- .../connection_adapters/sqlserver/database_statements.rb | 2 +- lib/active_record/connection_adapters/sqlserver_adapter.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/active_record/connection_adapters/sqlserver/database_statements.rb b/lib/active_record/connection_adapters/sqlserver/database_statements.rb index 62e5eec78..4aa525113 100644 --- a/lib/active_record/connection_adapters/sqlserver/database_statements.rb +++ b/lib/active_record/connection_adapters/sqlserver/database_statements.rb @@ -400,7 +400,7 @@ def identity_columns(table_name) # === SQLServer Specific (Selecting) ============================ # - def raw_select(sql, conn, options = {}) + def _raw_select(sql, conn, options = {}) handle = internal_raw_execute(sql, conn) handle_to_names_and_values(handle, options) diff --git a/lib/active_record/connection_adapters/sqlserver_adapter.rb b/lib/active_record/connection_adapters/sqlserver_adapter.rb index 6ce04e794..fdf21bea4 100644 --- a/lib/active_record/connection_adapters/sqlserver_adapter.rb +++ b/lib/active_record/connection_adapters/sqlserver_adapter.rb @@ -501,7 +501,7 @@ def version_year end def sqlserver_version - @sqlserver_version ||= raw_select("SELECT @@version", @raw_connection, fetch: :rows).first.first.to_s + @sqlserver_version ||= _raw_select("SELECT @@version", @raw_connection, fetch: :rows).first.first.to_s end private @@ -526,7 +526,7 @@ def configure_connection @raw_connection.execute("SET TEXTSIZE 2147483647").do @raw_connection.execute("SET CONCAT_NULL_YIELDS_NULL ON").do - @spid = raw_select("SELECT @@SPID", @raw_connection, fetch: :rows).first.first + @spid = _raw_select("SELECT @@SPID", @raw_connection, fetch: :rows).first.first initialize_dateformatter use_database