fix: test and format errors

googleapis · Oct 30, 2023 · 998bc5c · 998bc5c
1 parent b8795bc
commit 998bc5c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/examples/snippets/tags/application.rb b/examples/snippets/tags/application.rb
@@ -10,7 +10,7 @@
 require_relative "models/album"
 
 class Application
-  def self.run # rubocop:disable Metrics/AbcSize
+  def self.run
     # Query all albums and include a request tag for the statement.
     puts ""
     puts "Query all Albums and include a request tag"

diff --git a/lib/active_record/connection_adapters/spanner/database_statements.rb b/lib/active_record/connection_adapters/spanner/database_statements.rb
@@ -50,7 +50,8 @@ def execute sql, name = nil, binds = []
                     @connection.execute_query sql, params: params, types: types, request_options: request_options
                   end
                 else
-                  @connection.execute_query sql, params: params, types: types, single_use_selector: selector, request_options: request_options
+                  @connection.execute_query sql, params: params, types: types, single_use_selector: selector,
+                                            request_options: request_options
                 end
               end
             end

diff --git a/lib/activerecord_spanner_adapter/connection.rb b/lib/activerecord_spanner_adapter/connection.rb
@@ -214,7 +214,7 @@ def execute_query sql, params: nil, types: nil, single_use_selector: nil, reques
       end
 
       selector = transaction_selector || single_use_selector
-      execute_sql_request sql, converted_params, types, selector, request_options = request_options
+      execute_sql_request sql, converted_params, types, selector, request_options
     end
 
     def execute_sql_request sql, converted_params, types, selector, request_options = nil

diff --git a/lib/arel/visitors/spanner.rb b/lib/arel/visitors/spanner.rb
@@ -95,7 +95,7 @@ def visit_Arel_Nodes_OptimizerHints o, collector
         collector
       end
 
-      def visit_Arel_Nodes_Comment(o, collector)
+      def visit_Arel_Nodes_Comment o, collector
         o.values.each do |v|
           if v.start_with?("request_tag:") || v.start_with?("transaction_tag:")
             collector.hints[:request_options] ||= \

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -192,11 +192,12 @@ def release!
     end
 
     def execute_query sql, params: nil, types: nil, transaction: nil,
-                      partition_token: nil, seqno: nil
+                      partition_token: nil, request_options: nil, seqno: nil
       MockGoogleSpanner.last_executed_sqls OpenStruct.new(
         sql: sql, options: {
           params: params, types: types, transaction: transaction,
-          partition_token: partition_token, seqno: seqno
+          partition_token: partition_token, request_options: request_options,
+          seqno: seqno
         }
       )
       OpenStruct.new(rows: MockGoogleSpanner.mocked_result || [])