Rubocop fixes (#21)

* Update Rubocop and fix some rules

* Rubocop updates

Author: mlarraz

.rubocop.yml

@@ -1,6 +1,7 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
+  NewCops: enable
   DisplayCopNames: true
   DisplayStyleGuide: true
   TargetRubyVersion: 3.3
@@ -22,9 +23,6 @@ Metrics/CyclomaticComplexity:
 Metrics/MethodLength:
   Enabled: false
 
-Layout/LineLength:
-  Enabled: false
-
 Metrics/PerceivedComplexity:
   Enabled: false
 
@@ -38,3 +36,12 @@ Style/PercentLiteralDelimiters:
   PreferredDelimiters:
     default: '[]'
     '%r': '{}'
+
+Layout/HashAlignment:
+  EnforcedColonStyle: table
+
+Layout/FirstArrayElementIndentation:
+  EnforcedStyle: consistent
+
+Style/TrailingCommaInArguments:
+  EnforcedStyleForMultiline: comma

.rubocop_todo.yml

@@ -1,106 +1,86 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-03-14 22:30:45 UTC using RuboCop version 1.26.0.
+# on 2025-04-15 19:53:18 UTC using RuboCop version 1.75.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-# Configuration parameters: Include.
-# Include: **/*.gemspec
-Gemspec/RequiredRubyVersion:
+# Offense count: 3
+# Configuration parameters: EnforcedStyle, AllowedGems, Include.
+# SupportedStyles: Gemfile, gems.rb, gemspec
+# Include: **/*.gemspec, **/Gemfile, **/gems.rb
+Gemspec/DevelopmentDependencies:
   Exclude:
     - 'odbc_adapter.gemspec'
 
-# Offense count: 6
-# This cop supports safe auto-correction (--auto-correct).
-Layout/EmptyLineAfterGuardClause:
-  Exclude:
-    - 'lib/odbc_adapter/adapters/postgresql_odbc_adapter.rb'
-    - 'lib/odbc_adapter/column_metadata.rb'
-    - 'lib/odbc_adapter/quoting.rb'
-    - 'lib/odbc_adapter/registry.rb'
-    - 'lib/odbc_adapter/schema_statements.rb'
-
-# Offense count: 16
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
-# SupportedHashRocketStyles: key, separator, table
-# SupportedColonStyles: key, separator, table
-# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
-Layout/HashAlignment:
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Severity, Include.
+# Include: **/*.gemspec
+Gemspec/RequireMFA:
   Exclude:
-    - 'lib/odbc_adapter/column_metadata.rb'
-    - 'lib/odbc_adapter/registry.rb'
-    - 'lib/odbc_adapter/schema_statements.rb'
+    - 'odbc_adapter.gemspec'
 
 # Offense count: 1
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: AllowInHeredoc.
-Layout/TrailingWhitespace:
+# This cop supports safe autocorrection (--autocorrect).
+Lint/AmbiguousOperatorPrecedence:
   Exclude:
-    - 'lib/odbc_adapter/adapters/null_odbc_adapter.rb'
+    - 'lib/odbc_adapter/registry.rb'
 
 # Offense count: 1
-Lint/MissingSuper:
-  Exclude:
-    - 'test/registry_test.rb'
+# Configuration parameters: CountComments, CountAsOne.
+Metrics/ModuleLength:
+  Max: 102
 
 # Offense count: 2
 # Configuration parameters: Max, CountKeywordArgs.
 Metrics/ParameterLists:
   MaxOptionalParameters: 4
 
-# Offense count: 35
-# This cop supports safe auto-correction (--auto-correct).
+# Offense count: 6
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, BlockForwardingName.
+# SupportedStyles: anonymous, explicit
+Naming/BlockForwarding:
+  Exclude:
+    - 'lib/odbc_adapter/adapters/mysql_odbc_adapter.rb'
+    - 'lib/odbc_adapter/registry.rb'
+    - 'test/crud_test.rb'
+
+# Offense count: 4
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowOnlyRestArgument, UseAnonymousForwarding, RedundantRestArgumentNames, RedundantKeywordRestArgumentNames, RedundantBlockArgumentNames.
+# RedundantRestArgumentNames: args, arguments
+# RedundantKeywordRestArgumentNames: kwargs, options, opts
+# RedundantBlockArgumentNames: blk, block, proc
+Style/ArgumentsForwarding:
+  Exclude:
+    - 'lib/odbc_adapter/registry.rb'
+
+# Offense count: 32
+# This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
   Enabled: false
 
-# Offense count: 5
-# This cop supports safe auto-correction (--auto-correct).
-Style/IfUnlessModifier:
-  Exclude:
-    - 'lib/odbc_adapter/adapters/mysql_odbc_adapter.rb'
-    - 'lib/odbc_adapter/quoting.rb'
-    - 'lib/odbc_adapter/schema_statements.rb'
-
 # Offense count: 1
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: literals, strict
-Style/MutableConstant:
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AllowSplatArgument.
+Style/HashConversion:
   Exclude:
-    - 'lib/active_record/connection_adapters/odbc_adapter.rb'
+    - 'lib/odbc_adapter/database_metadata.rb'
 
 # Offense count: 1
-# Configuration parameters: AllowedMethods.
-# AllowedMethods: respond_to_missing?
-Style/OptionalBooleanParameter:
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/MapToHash:
   Exclude:
-    - 'lib/odbc_adapter/column.rb'
+    - 'lib/active_record/connection_adapters/odbc_adapter.rb'
 
 # Offense count: 1
-# This cop supports safe auto-correction (--auto-correct).
-Style/RedundantRegexpEscape:
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AutoCorrect, AllowComments.
+Style/RedundantInitialize:
   Exclude:
-    - 'lib/odbc_adapter/quoting.rb'
-
-# Offense count: 4
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods.
-# AllowedMethods: present?, blank?, presence, try, try!
-Style/SafeNavigation:
-  Exclude:
-    - 'lib/odbc_adapter/column_metadata.rb'
-    - 'lib/odbc_adapter/schema_statements.rb'
-
-# Offense count: 2
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: AllowModifier.
-Style/SoleNestedConditional:
-  Exclude:
-    - 'lib/odbc_adapter/adapters/mysql_odbc_adapter.rb'
-    - 'lib/odbc_adapter/quoting.rb'
+    - 'test/registry_test.rb'

lib/odbc_adapter/adapters/mysql_odbc_adapter.rb

@@ -31,7 +31,7 @@ def truncate(table_name, name = nil)
       # Quotes a string, escaping any ' (single quote) and \ (backslash)
       # characters.
       def quote_string(string)
-        string.gsub(/\\/, '\&\&').gsub(/'/, "''")
+        string.gsub("\\", '\&\&').gsub("'", "''")
       end
 
       def quoted_true
@@ -70,10 +70,11 @@ def disable_referential_integrity(&_block)
       #   create_database 'rails_development'
       #   create_database 'rails_development', charset: :big5
       def create_database(name, options = {})
+        charset = options[:charset] || "utf8"
         if options[:collation]
-          execute("CREATE DATABASE `#{name}` DEFAULT CHARACTER SET `#{options[:charset] || 'utf8'}` COLLATE `#{options[:collation]}`")
+          execute("CREATE DATABASE `#{name}` DEFAULT CHARACTER SET `#{charset}` COLLATE `#{options[:collation]}`")
         else
-          execute("CREATE DATABASE `#{name}` DEFAULT CHARACTER SET `#{options[:charset] || 'utf8'}`")
+          execute("CREATE DATABASE `#{name}` DEFAULT CHARACTER SET `#{charset}`")
         end
       end
 
@@ -95,11 +96,10 @@ def rename_table(name, new_name)
       end
 
       def change_column(table_name, column_name, type, options = {})
-        unless options_include_default?(options)
-          options[:default] = column_for(table_name, column_name).default
-        end
+        options[:default] = column_for(table_name, column_name).default unless options_include_default?(options)
 
-        change_column_sql = "ALTER TABLE #{table_name} CHANGE #{column_name} #{column_name} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
+        column_type = type_to_sql(type, options[:limit], options[:precision], options[:scale])
+        change_column_sql = "ALTER TABLE #{table_name} CHANGE #{column_name} #{column_name} #{column_type}"
         add_column_options!(change_column_sql, options)
         execute(change_column_sql)
       end
@@ -114,7 +114,11 @@ def change_column_null(table_name, column_name, null, default = nil)
         column = column_for(table_name, column_name)
 
         unless null || default.nil?
-          execute("UPDATE #{quote_table_name(table_name)} SET #{quote_column_name(column_name)}=#{quote(default)} WHERE #{quote_column_name(column_name)} IS NULL")
+          quoted_table_name = quote_table_name(table_name)
+          quoted_column_name = quote_column_name(column_name)
+          execute <<~SQL
+            UPDATE #{quoted_table_name} SET #{quoted_column_name}=#{quote(default)} WHERE #{quoted_column_name} IS NULL
+          SQL
         end
         change_column(table_name, column_name, column.sql_type, null: null)
       end
@@ -128,18 +132,17 @@ def rename_column(table_name, column_name, new_column_name)
 
       # Skip primary key indexes
       def indexes(table_name, name = nil)
-        super(table_name, name).reject { |i| i.unique && i.name =~ /^PRIMARY$/ }
+        super.reject { |i| i.unique && i.name =~ /^PRIMARY$/ }
       end
 
       # MySQL 5.x doesn't allow DEFAULT NULL for first timestamp column in a
       # table
-      def options_include_default?(options)
-        if options.include?(:default) && options[:default].nil?
-          if options.include?(:column) && options[:column].native_type =~ /timestamp/i
-            options.delete(:default)
-          end
+      def options_include_default?(opts)
+        if opts.key?(:default) && opts[:default].nil? && opts.key?(:column) && opts[:column].native_type =~ /timestamp/i
+          opts.delete(:default)
         end
-        super(options)
+
+        super
       end
 
       protected

lib/odbc_adapter/adapters/null_odbc_adapter.rb

@@ -4,7 +4,7 @@ module Adapters
     # registry. This allows for minimal support for DBMSs for which we don't
     # have an explicit adapter.
     class NullODBCAdapter < ActiveRecord::ConnectionAdapters::ODBCAdapter
-      class BindSubstitution < Arel::Visitors::ToSql  
+      class BindSubstitution < Arel::Visitors::ToSql
       end
 
       # Using a BindVisitor so that the SQL string gets substituted before it is

lib/odbc_adapter/adapters/postgresql_odbc_adapter.rb

@@ -58,6 +58,7 @@ def type_cast(value, column)
         case value
         when String
           return super unless column.native_type == "bytea"
+
           { value: value, format: 1 }
         else
           super
@@ -67,7 +68,7 @@ def type_cast(value, column)
       # Quotes a string, escaping any ' (single quote) and \ (backslash)
       # characters.
       def quote_string(string)
-        string.gsub(/\\/, '\&\&').gsub(/'/, "''")
+        string.gsub("\\", '\&\&').gsub("'", "''")
       end
 
       def disable_referential_integrity
@@ -122,7 +123,8 @@ def rename_table(name, new_name)
       end
 
       def change_column(table_name, column_name, type, options = {})
-        execute("ALTER TABLE #{table_name} ALTER  #{column_name} TYPE #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}")
+        column_type = type_to_sql(type, options[:limit], options[:precision], options[:scale])
+        execute("ALTER TABLE #{table_name} ALTER  #{column_name} TYPE #{column_type}")
         change_column_default(table_name, column_name, options[:default]) if options_include_default?(options)
       end
 

lib/odbc_adapter/column_metadata.rb

@@ -27,6 +27,7 @@ def native_database_types
       GENERICS.each_with_object({}) do |(abstract, candidates), mapped|
         candidates.detect do |candidate|
           next unless grouped[candidate]
+
           mapped[abstract] = native_type_mapping(abstract, grouped[candidate])
         end
       end
@@ -41,6 +42,7 @@ def native_type_mapping(abstract, rows)
       # ODBC doesn't provide any info on a DBMS's native syntax for
       # autoincrement columns. So we use a lookup instead.
       return adapter.class::PRIMARY_KEY if abstract == :primary_key
+
       selected_row = rows[0]
 
       # If more than one native type corresponds to the SQL type we're
@@ -69,7 +71,7 @@ def reported_types
           stmt = adapter.raw_connection.types
           stmt.fetch_all
         ensure
-          stmt.drop unless stmt.nil?
+          stmt&.drop
         end
     end
   end

lib/odbc_adapter/quoting.rb

@@ -2,7 +2,7 @@ module ODBCAdapter
   module Quoting
     # Quotes a string, escaping any ' (single quote) characters.
     def quote_string(string)
-      string.gsub(/\'/, "''")
+      string.gsub("'", "''")
     end
 
     # Returns a quoted form of the column name.
@@ -11,15 +11,14 @@ def quote_column_name(name)
       quote_char = database_metadata.identifier_quote_char.to_s.strip
 
       return name if quote_char.empty?
+
       quote_char = quote_char[0]
 
       # Avoid quoting any already quoted name
       return name if name[0] == quote_char && name[-1] == quote_char
 
       # If upcase identifiers, only quote mixed case names.
-      if database_metadata.upcase_identifiers?
-        return name unless name =~ /([A-Z]+[a-z])|([a-z]+[A-Z])/
-      end
+      return name if database_metadata.upcase_identifiers? && name !~ /([A-Z]+[a-z])|([a-z]+[A-Z])/
 
       "#{quote_char.chr}#{name}#{quote_char.chr}"
     end
@@ -31,9 +30,7 @@ def quoted_date(value)
         default_tz = ActiveRecord.try(:default_timezone) || ActiveRecord::Base.default_timezone
         zone_conversion_method = default_tz == :utc ? :getutc : :getlocal
 
-        if value.respond_to?(zone_conversion_method)
-          value = value.send(zone_conversion_method)
-        end
+        value = value.send(zone_conversion_method) if value.respond_to?(zone_conversion_method)
         value.strftime("%Y-%m-%d %H:%M:%S") # Time, DateTime
       else
         value.strftime("%Y-%m-%d") # Date

lib/odbc_adapter/registry.rb

@@ -4,7 +4,7 @@ class Registry
 
     def initialize
       @dbs = {
-        /my.*sql/i  => :MySQL,
+        /my.*sql/i => :MySQL,
         /postgres/i => :PostgreSQL,
         /snowflake/i => :Snowflake
       }
@@ -28,6 +28,7 @@ def register(pattern, superclass = Object, &block)
 
     def normalize_adapter(adapter)
       return adapter unless adapter.is_a?(Symbol)
+
       require "odbc_adapter/adapters/#{adapter.downcase}_odbc_adapter"
       Adapters.const_get(:"#{adapter}ODBCAdapter")
     end