Standardrb

Author: aidanharan

lib/active_record/connection_adapters/sqlserver/database_statements.rb

@@ -14,7 +14,9 @@ def write_query?(sql) # :nodoc:
         end
 
         def perform_query(raw_connection, sql, binds, type_casted_binds, prepare:, notification_payload:, batch:)
-          result, affected_rows = if id_insert_table_name = query_requires_identity_insert?(sql)
+          id_insert_table_name = query_requires_identity_insert?(sql)
+
+          result, affected_rows = if id_insert_table_name
             # If the table name is a view, we need to get the base table name for enabling identity insert.
             id_insert_table_name = view_table_name(id_insert_table_name) if view_exists?(id_insert_table_name)
 
@@ -46,11 +48,7 @@ def affected_rows(raw_result)
 
         # Returns the affected rows from results or handle.
         def affected_rows_from_results_or_handle(raw_result, handle)
-          if affected_rows_from_result = affected_rows(raw_result)
-            affected_rows_from_result
-          else
-            handle.affected_rows
-          end
+          affected_rows(raw_result) || handle.affected_rows
         end
 
         def raw_execute(sql, name = nil, binds = [], prepare: false, async: false, allow_retry: false, materialize_transactions: true, batch: false)
@@ -157,7 +155,9 @@ def default_insert_value(column)
         def build_insert_sql(insert) # :nodoc:
           sql = "INSERT #{insert.into}"
 
-          if returning = insert.send(:insert_all).returning
+          returning = insert.send(:insert_all).returning
+
+          if returning
             returning_sql = if returning.is_a?(String)
               returning
             else
@@ -317,7 +317,7 @@ def sql_for_insert(sql, pk, binds, returning)
 
         def set_identity_insert(table_name, conn, enable)
           internal_raw_execute("SET IDENTITY_INSERT #{table_name} #{enable ? "ON" : "OFF"}", conn, perform_do: true)
-        rescue Exception
+        rescue
           raise ActiveRecordError, "IDENTITY_INSERT could not be turned #{enable ? "ON" : "OFF"} for table #{table_name}"
         end
 
@@ -456,7 +456,7 @@ def handle_to_names_and_values(handle, options = {})
         end
 
         def finish_statement_handle(handle)
-          handle.cancel if handle
+          handle&.cancel
           handle
         end
 

lib/active_record/connection_adapters/sqlserver/schema_statements.rb

@@ -592,7 +592,7 @@ def column_type(ci:)
           when /^numeric|decimal$/i
             "#{ci["type"]}(#{ci["numeric_precision"]},#{ci["numeric_scale"]})"
           when /^float|real$/i
-            "#{ci["type"]}"
+            ci["type"]
           when /^char|nchar|varchar|nvarchar|binary|varbinary|bigint|int|smallint$/
             (ci["length"].to_i == -1) ? "#{ci["type"]}(max)" : "#{ci["type"]}(#{ci["length"]})"
           else

lib/active_record/connection_adapters/sqlserver/showplan.rb

@@ -32,7 +32,7 @@ def with_showplan_on
         def set_showplan_option(enable = true)
           sql = "SET #{showplan_option} #{enable ? "ON" : "OFF"}"
           raw_execute(sql, "SCHEMA")
-        rescue Exception
+        rescue
           raise ActiveRecordError, "#{showplan_option} could not be turned #{enable ? "ON" : "OFF"}, perhaps you do not have SHOWPLAN permissions?"
         end
 

lib/active_record/connection_adapters/sqlserver/type/smalldatetime.rb

@@ -20,7 +20,7 @@ def fast_string_to_time_format
           end
 
           def apply_seconds_precision(value)
-            value.change usec: 0 if value
+            value&.change(usec: 0)
           end
         end
       end

lib/active_record/connection_adapters/sqlserver/type/time.rb

@@ -7,13 +7,12 @@ module Type
         class Time < ActiveRecord::Type::Time
           include TimeValueFractional2
 
-          def serialize(value)
+          def serialize(_value)
             value = super
             return value unless value.acts_like?(:time)
 
             time = "#{value.to_formatted_s(:_sqlserver_time)}.#{quote_fractional(value)}"
-
-            Data.new time, self
+            Data.new(time, self)
           end
 
           def deserialize(value)
@@ -34,9 +33,8 @@ def quoted(value)
 
           private
 
-          def cast_value(value)
+          def cast_value(_value)
             value = super
-
             return value unless value.is_a?(::Time)
 
             value = value.change(year: 2000, month: 0o1, day: 0o1)

lib/active_record/connection_adapters/sqlserver/type/uuid.rb

@@ -7,8 +7,6 @@ module Type
         class Uuid < String
           ACCEPTABLE_UUID = %r{\A\{?([a-fA-F0-9]{4}-?){8}\}?\z}x
 
-          alias_method :serialize, :deserialize
-
           def type
             :uuid
           end

lib/active_record/connection_adapters/sqlserver/utils.rb

@@ -113,7 +113,7 @@ def quote(part)
           end
 
           def unquote(part)
-            if part && part.start_with?("[")
+            if part&.start_with?("[")
               part[1..-2]
             else
               part

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -67,9 +67,9 @@ def dbconsole(config, options = {})
           sqlserver_config = config.configuration_hash
           args = []
 
-          args += ["-d", "#{config.database}"] if config.database
-          args += ["-U", "#{sqlserver_config[:username]}"] if sqlserver_config[:username]
-          args += ["-P", "#{sqlserver_config[:password]}"] if sqlserver_config[:password]
+          args += ["-d", config.database.to_s] if config.database
+          args += ["-U", sqlserver_config[:username].to_s] if sqlserver_config[:username]
+          args += ["-P", sqlserver_config[:password].to_s] if sqlserver_config[:password]
 
           if sqlserver_config[:host]
             host_arg = "tcp:#{sqlserver_config[:host]}"

lib/active_record/connection_adapters/sqlserver_column.rb

@@ -28,7 +28,7 @@ def is_utf8?
         end
 
         def case_sensitive?
-          collation && collation.match(/_CS/)
+          collation&.match(/_CS/)
         end
 
         def init_with(coder)

lib/arel/visitors/sqlserver.rb

@@ -125,12 +125,11 @@ def visit_Arel_Nodes_Offset(o, collector)
       def visit_Arel_Nodes_Limit(o, collector)
         if node_value(o) == 0
           collector << FETCH0
-          collector << ROWS_ONLY
         else
           collector << FETCH
           visit o.expr, collector
-          collector << ROWS_ONLY
         end
+        collector << ROWS_ONLY
       end
 
       def visit_Arel_Nodes_Grouping(o, collector)
@@ -208,7 +207,7 @@ def visit_Arel_Table(o, collector)
                 quote_table_name(o.name)
               end
             end
-          rescue Exception
+          rescue
             quote_table_name(o.name)
           end
 
@@ -335,7 +334,7 @@ def node_value(node)
       end
 
       def select_statement_lock?
-        @select_statement && @select_statement.lock
+        @select_statement&.lock
       end
 
       def make_Fetch_Possible_And_Deterministic(o)

test/cases/coerced_tests.rb

@@ -1374,7 +1374,7 @@ def test_update_all_with_group_by_coerced
 
     assert_operator posts.length, :>, 0
     assert posts.all? { |post| post.comments.length >= minimum_comments_count }
-    assert posts.all? { |post| "ig" == post.title }
+    assert posts.all? { |post| post.title == "ig" }
 
     post = Post.select(:id, :title).group(:title).joins(:comments).group("posts.id").having("count(comments.id) < #{minimum_comments_count}").first
     assert_not_equal "ig", post.title
@@ -2759,7 +2759,6 @@ def test_relation_explain_with_last_coerced
     expected_query = capture_sql {
       Car.all.last
     }.first[/EXEC sp_executesql N'(.*?) NEXT/, 1]
-    expected_query = expected_query
     message = Car.all.explain.last
 
     assert_match(/^EXPLAIN/, message)

test/cases/migration_test_sqlserver.rb

@@ -21,7 +21,7 @@ class MigrationTestSQLServer < ActiveRecord::TestCase
       begin
         migrations_dir = File.join ARTest::SQLServer.migrations_root, "transaction_table"
         quietly { ActiveRecord::MigrationContext.new(migrations_dir).up }
-      rescue Exception => e
+      rescue => e
         assert_match %r{this and all later migrations canceled}, e.message
       end
       _(connection.tables).wont_include @trans_test_table1

test/cases/schema_test_sqlserver.rb

@@ -23,7 +23,7 @@ class SchemaTestSQLServer < ActiveRecord::TestCase
       columns = connection.columns("test.sst_schema_identity")
 
       assert_equal 2, columns.size
-      assert_equal 1, columns.select { |c| c.is_identity? }.size
+      assert_equal 1, columns.count { |c| c.is_identity? }
     end
 
     it "read only column properties for table in specific schema" do
@@ -34,9 +34,9 @@ class SchemaTestSQLServer < ActiveRecord::TestCase
       assert_equal 7, test_columns.size
       assert_equal 2, dbo_columns.size
       assert_equal 2, columns.size
-      assert_equal 1, test_columns.select { |c| c.is_identity? }.size
-      assert_equal 1, dbo_columns.select { |c| c.is_identity? }.size
-      assert_equal 1, columns.select { |c| c.is_identity? }.size
+      assert_equal 1, test_columns.count { |c| c.is_identity? }
+      assert_equal 1, dbo_columns.count { |c| c.is_identity? }
+      assert_equal 1, columns.count { |c| c.is_identity? }
     end
 
     it "return correct varchar and nvarchar column limit length when table is in non-dbo schema" do

test/cases/transaction_test_sqlserver.rb

@@ -25,7 +25,7 @@ class TransactionTestSQLServer < ActiveRecord::TestCase
         raise "HELL"
       end
     end
-  rescue Exception
+  rescue
     assert_no_ships
   end
 

test/cases/utils_test_sqlserver.rb

@@ -61,7 +61,7 @@ class UtilsTestSQLServer < ActiveRecord::TestCase
         present, blank = send(:"#{part}_names")
         present.each do |n|
           name = extract_identifiers(n)
-          _(name.send(:"#{part}")).must_equal "#{part}", "With #{n.inspect} for ##{part} method"
+          _(name.send(:"#{part}")).must_equal part.to_s, "With #{n.inspect} for ##{part} method"
           _(name.send(:"#{part}_quoted")).must_equal "[#{part}]", "With #{n.inspect} for ##{part}_quoted method"
         end
         blank.each do |n|