style(standard): unsafe autocorrections

Author: flavorjones

CHANGELOG.md

@@ -20,6 +20,11 @@ This release drops support for Ruby 2.7. [#453] @flavorjones
 - Moved some C code into Ruby. [#451, #455] @tenderlove
 
 
+### Changed
+
+- Raise `StandardError` in a few places where `Exception` was previously raised.
+
+
 ### Removed
 
 - Remove `SQLite3::VersionProxy` which has been deprecated since v1.3.2. [#453] @flavorjones

lib/sqlite3/pragmas.rb

@@ -22,15 +22,15 @@ def set_boolean_pragma(name, mode)
         when "on", "yes", "true", "y", "t" then mode = "'ON'"
         when "off", "no", "false", "n", "f" then mode = "'OFF'"
         else
-          raise Exception,
+          raise StandardError,
             "unrecognized pragma parameter #{mode.inspect}"
         end
       when true, 1
         mode = "ON"
       when false, 0, nil
         mode = "OFF"
       else
-        raise Exception,
+        raise StandardError,
           "unrecognized pragma parameter #{mode.inspect}"
       end
 
@@ -62,7 +62,7 @@ def get_enum_pragma(name)
     def set_enum_pragma(name, mode, enums)
       match = enums.find { |p| p.find { |i| i.to_s.downcase == mode.to_s.downcase } }
       unless match
-        raise Exception,
+        raise StandardError,
           "unrecognized #{name} #{mode.inspect}"
       end
       execute("PRAGMA #{name}='#{match.first.upcase}'")
@@ -533,7 +533,7 @@ def table_info table
 
       result = [] unless block_given?
       stmt.each do |row|
-        new_row = Hash[columns.zip(row)]
+        new_row = columns.zip(row).to_h
 
         # FIXME: This should be removed but is required for older versions
         # of rails

lib/sqlite3/statement.rb

@@ -81,7 +81,7 @@ def execute(*bind_vars)
       bind_params(*bind_vars) unless bind_vars.empty?
       @results = ResultSet.new(@connection, self)
 
-      step if 0 == column_count
+      step if column_count == 0
 
       yield @results if block_given?
       @results
@@ -156,7 +156,7 @@ def get_metadata
       end
       @types = Array.new(column_count) do |column|
         val = column_decltype(column)
-        val.nil? ? nil : val.downcase
+        val&.downcase
       end
     end
   end

test/test_database.rb

@@ -26,7 +26,7 @@ def test_db_filename
       @db = SQLite3::Database.new tf.path
       assert_equal File.realdirpath(tf.path), File.realdirpath(@db.filename("main"))
     ensure
-      tf.unlink if tf
+      tf&.unlink
     end
 
     def test_filename
@@ -36,7 +36,7 @@ def test_filename
       @db = SQLite3::Database.new tf.path
       assert_equal File.realdirpath(tf.path), File.realdirpath(@db.filename)
     ensure
-      tf.unlink if tf
+      tf&.unlink
     end
 
     def test_filename_with_attachment
@@ -47,7 +47,7 @@ def test_filename_with_attachment
 
       assert_equal File.realdirpath(tf.path), File.realdirpath(@db.filename("testing"))
     ensure
-      tf.unlink if tf
+      tf&.unlink
     end
 
     def test_filename_to_path
@@ -56,8 +56,8 @@ def test_filename_to_path
       db = SQLite3::Database.new pn
       assert_equal pn.realdirpath.to_s, File.realdirpath(db.filename)
     ensure
-      tf.close! if tf
-      db.close if db
+      tf&.close!
+      db&.close
     end
 
     def test_error_code
@@ -200,14 +200,14 @@ def test_new
       db = SQLite3::Database.new(":memory:")
       assert_instance_of(SQLite3::Database, db)
     ensure
-      db.close if db
+      db&.close
     end
 
     def test_open
       db = SQLite3::Database.open(":memory:")
       assert_instance_of(SQLite3::Database, db)
     ensure
-      db.close if db
+      db&.close
     end
 
     def test_open_returns_block_result
@@ -240,7 +240,7 @@ def test_new_with_options
       db = SQLite3::Database.new(":memory:".encode(utf16), utf16: true)
       assert_instance_of(SQLite3::Database, db)
     ensure
-      db.close if db
+      db&.close
     end
 
     def test_close
@@ -296,7 +296,7 @@ def test_prepare
       stmt = db.prepare('select "hello world"')
       assert_instance_of(SQLite3::Statement, stmt)
     ensure
-      stmt.close if stmt
+      stmt&.close
     end
 
     def test_block_prepare_does_not_double_close
@@ -543,7 +543,7 @@ def call action, a, b, c, d
       stmt = @db.prepare("select 'fooooo'")
       assert_nil stmt.step
     ensure
-      stmt.close if stmt
+      stmt&.close
     end
 
     def test_authorizer_fail
@@ -570,7 +570,7 @@ def call action, a, b, c, d
       @db.authorizer = nil
       s = @db.prepare("select 'fooooo'")
     ensure
-      s.close if s
+      s&.close
     end
 
     def test_close_with_open_statements
@@ -579,7 +579,7 @@ def test_close_with_open_statements
         @db.close
       end
     ensure
-      s.close if s
+      s&.close
     end
 
     def test_execute_with_empty_bind_params
@@ -590,7 +590,7 @@ def test_query_with_named_bind_params
       resultset = @db.query("select :n", {"n" => "foo"})
       assert_equal [["foo"]], resultset.to_a
     ensure
-      resultset.close if resultset
+      resultset&.close
     end
 
     def test_execute_with_named_bind_params
@@ -669,7 +669,7 @@ def test_default_transaction_mode
         db2.close if db2 && !db2.closed?
       end
     ensure
-      tf.unlink if tf
+      tf&.unlink
     end
   end
 end

test/test_integration_aggregate.rb

@@ -174,7 +174,7 @@ def test_create_aggregate_with_invalid_arity
     end
   end
 
-  class CustomException < Exception
+  class CustomException < RuntimeError
   end
 
   def test_create_aggregate_with_exception_in_step

test/test_integration_pending.rb

@@ -1,6 +1,5 @@
 require "helper"
 
-require "thread"
 require "benchmark"
 
 class TC_Integration_Pending < SQLite3::TestCase
@@ -30,7 +29,7 @@ def test_busy_handler_impatient
         busy.lock
       end
     ensure
-      db2.close if db2
+      db2&.close
     end
     sleep 1
 
@@ -60,7 +59,7 @@ def test_busy_timeout
         busy.lock
       end
     ensure
-      db2.close if db2
+      db2&.close
     end
 
     sleep 1