Cosmetic changes

Shopify · Jan 28, 2025 · c41d82a · c41d82a
1 parent 1108c65
commit c41d82a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/schema_creation.rb b/activerecord/lib/active_record/connection_adapters/postgresql/schema_creation.rb
@@ -5,25 +5,25 @@ module ConnectionAdapters
     module PostgreSQL
       class SchemaCreation < SchemaCreation # :nodoc:
         private
-          delegate :quoted_include_columns_for_index, :create_enum, :drop_enum, to: :@conn
+          delegate :quoted_include_columns_for_index, :create_enum, to: :@conn
 
           def visit_TableDefinition(o)
-            add_enum_types(o.columns)
+            create_enums(o.columns)
             super
           end
 
           def visit_AlterTable(o)
-            add_enum_types(o.adds.map(&:column))
+            create_enums(o.adds.map(&:column))
             sql = super
             sql << o.constraint_validations.map { |fk| visit_ValidateConstraint fk }.join(" ")
             sql << o.exclusion_constraint_adds.map { |con| visit_AddExclusionConstraint con }.join(" ")
             sql << o.unique_constraint_adds.map { |con| visit_AddUniqueConstraint con }.join(" ")
           end
 
-          def add_enum_types(columns)
-            enums_to_add = columns.select { |c| c.type == :enum && c.options[:values] }
+          def create_enums(columns)
+            return unless enums_to_create = columns.select { |c| c.type == :enum && c.options[:values] }
 
-            enums_to_add.each do |c|
+            enums_to_create.each do |c|
               enum_type = c.options[:enum_type] || c.name
               create_enum(enum_type, c.options[:values])
             end

diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/schema_dumper.rb b/activerecord/lib/active_record/connection_adapters/postgresql/schema_dumper.rb
@@ -82,8 +82,8 @@ def prepare_column_options(column)
 
             if column.enum?
               spec[:enum_type] = column.sql_type.inspect unless column.name == column.sql_type
-              enum_type = @connection.enum_types.find{ |k, v| k == column.sql_type }[1]
-              spec[:values] = enum_type.inspect
+              _name, values = @connection.enum_types.find { |name, _values| name == column.sql_type }
+              spec[:values] = values.inspect
             end
 
             spec