Rubocop: Enable Naming/PredicateName cop

Author: wpolicarpo

lib/active_record/connection_adapters/sqlserver/core_ext/attribute_methods.rb

@@ -12,7 +12,7 @@ module AttributeMethods
           def attributes_for_update(attribute_names)
             super.reject do |name|
               column = self.class.columns_hash[name]
-              column && column.respond_to?(:is_identity?) && column.is_identity?
+              column && column.respond_to?(:identity?) && column.identity?
             end
           end
         end

lib/active_record/connection_adapters/sqlserver/database_statements.rb

@@ -130,7 +130,7 @@ def can_perform_case_insensitive_comparison_for?(column)
         private :can_perform_case_insensitive_comparison_for?
 
         def default_insert_value(column)
-          if column.is_identity?
+          if column.identity?
             table_name = quote(quote_table_name(column.table_name))
             Arel.sql("IDENT_CURRENT(#{table_name}) + IDENT_INCR(#{table_name})")
           else
@@ -406,7 +406,7 @@ def insert_sql?(sql)
         end
 
         def identity_columns(table_name)
-          schema_cache.columns(table_name).select(&:is_identity?)
+          schema_cache.columns(table_name).select(&:identity?)
         end
 
         # === SQLServer Specific (Selecting) ============================ #

lib/active_record/connection_adapters/sqlserver/schema_dumper.rb

@@ -15,7 +15,7 @@ class SchemaDumper < ConnectionAdapters::SchemaDumper
         private
 
         def explicit_primary_key_default?(column)
-          column.is_primary? && !column.is_identity?
+          column.primary? && !column.identity?
         end
 
         def schema_limit(column)
@@ -31,7 +31,7 @@ def schema_collation(column)
         end
 
         def default_primary_key?(column)
-          super && column.is_primary? && column.is_identity?
+          super && column.primary? && column.identity?
         end
       end
     end

lib/active_record/connection_adapters/sqlserver_column.rb

@@ -8,19 +8,19 @@ def initialize(name, default, sql_type_metadata = nil, null = true, default_func
         super
       end
 
-      def is_identity?
+      def identity?
         @sqlserver_options[:is_identity]
       end
 
-      def is_primary?
+      def primary?
         @sqlserver_options[:is_primary]
       end
 
       def table_name
         @sqlserver_options[:table_name]
       end
 
-      def is_utf8?
+      def utf8?
         sql_type =~ /nvarchar|ntext|nchar/i
       end
 

test/cases/adapter_test_sqlserver.rb

@@ -351,7 +351,7 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
     it "find identity column" do
       _(SSTestCustomersView.primary_key).must_equal "id"
       _(connection.primary_key(SSTestCustomersView.table_name)).must_equal "id"
-      _(SSTestCustomersView.columns_hash["id"]).must_be :is_identity?
+      _(SSTestCustomersView.columns_hash["id"]).must_be :identity?
     end
 
     it "find default values" do
@@ -378,7 +378,7 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
     it "find identity column" do
       _(SSTestStringDefaultsView.primary_key).must_equal "id"
       _(connection.primary_key(SSTestStringDefaultsView.table_name)).must_equal "id"
-      _(SSTestStringDefaultsView.columns_hash["id"]).must_be :is_identity?
+      _(SSTestStringDefaultsView.columns_hash["id"]).must_be :identity?
     end
 
     it "find default values" do
@@ -425,7 +425,7 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
   it "in_memory_oltp" do
     if ENV["IN_MEMORY_OLTP"] && connection.supports_in_memory_oltp?
       _(SSTMemory.primary_key).must_equal "id"
-      _(SSTMemory.columns_hash["id"]).must_be :is_identity?
+      _(SSTMemory.columns_hash["id"]).must_be :identity?
     else
       skip "supports_in_memory_oltp? => false"
     end

test/cases/schema_test_sqlserver.rb

@@ -22,7 +22,7 @@ class SchemaTestSQLServer < ActiveRecord::TestCase
     it "have only one identity column" do
       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.select { |c| c.identity? }.size
     end
 
     it "read only column properties for table in specific schema" do
@@ -32,9 +32,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.select { |c| c.identity? }.size
+      assert_equal 1, dbo_columns.select { |c| c.identity? }.size
+      assert_equal 1, columns.select { |c| c.identity? }.size
     end
 
     it "return correct varchar and nvarchar column limit length when table is in non dbo schema" do

test/cases/specific_schema_test_sqlserver.rb

@@ -167,7 +167,7 @@ def quoted_id
 
   it "returns the correct primary columns" do
     connection = ActiveRecord::Base.connection
-    assert_equal "field_1", connection.columns("test.sst_schema_test_mulitple_schema").detect(&:is_primary?).name
-    assert_equal "field_2", connection.columns("test2.sst_schema_test_mulitple_schema").detect(&:is_primary?).name
+    assert_equal "field_1", connection.columns("test.sst_schema_test_mulitple_schema").detect(&:primary?).name
+    assert_equal "field_2", connection.columns("test2.sst_schema_test_mulitple_schema").detect(&:primary?).name
   end
 end