Merge pull request rails#54141 from arthurhess/fix/enum-types-with-comma

Fix: ensure PostgreSQL enum types can contain commas

Author: byroot

activerecord/lib/active_record/connection_adapters/postgresql/schema_dumper.rb

@@ -22,7 +22,7 @@ def types(stream)
               stream.puts "  # Custom types defined in this database."
               stream.puts "  # Note that some types may not work with other database engines. Be careful if changing database."
               types.sort.each do |name, values|
-                stream.puts "  create_enum #{name.inspect}, #{values.split(",").inspect}"
+                stream.puts "  create_enum #{name.inspect}, #{values.inspect}"
               end
               stream.puts
             end

activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

@@ -521,7 +521,7 @@ def enum_types
             type.typname AS name,
             type.OID AS oid,
             n.nspname AS schema,
-            string_agg(enum.enumlabel, ',' ORDER BY enum.enumsortorder) AS value
+            array_agg(enum.enumlabel ORDER BY enum.enumsortorder) AS value
           FROM pg_enum AS enum
           JOIN pg_type AS type ON (type.oid = enum.enumtypid)
           JOIN pg_namespace n ON type.typnamespace = n.oid

activerecord/test/cases/adapters/postgresql/invertible_migration_test.rb

@@ -79,7 +79,7 @@ def test_migrate_revert_create_enum
     CreateEnumMigration.new.migrate(:up)
 
     assert @connection.column_exists?(:enums, :best_color, sql_type: "color", default: "blue", null: false)
-    assert_equal [["color", "blue,green"]], @connection.enum_types
+    assert_equal [["color", ["blue", "green"]]], @connection.enum_types
 
     CreateEnumMigration.new.migrate(:down)
 
@@ -94,7 +94,7 @@ def test_migrate_revert_drop_enum
     assert_equal [], @connection.enum_types
 
     DropEnumMigration.new.migrate(:down)
-    assert_equal [["color", "blue,green"]], @connection.enum_types
+    assert_equal [["color", ["blue", "green"]]], @connection.enum_types
   end
 
   def test_migrate_revert_add_and_validate_check_constraint

activerecord/test/cases/schema_dumper_test.rb

@@ -433,6 +433,28 @@ def test_schema_dump_include_limit_for_float4_field
       output = dump_table_schema "numeric_data"
       assert_match %r{t\.float\s+"temperature_with_limit",\s+limit: 24$}, output
     end
+
+    def test_schema_dump_keeps_enum_intact_if_it_contains_comma
+      original, $stdout = $stdout, StringIO.new
+
+      migration = Class.new(ActiveRecord::Migration::Current) do
+        def up
+          create_enum "enum_with_comma", ["value1", "value,2", "value3"]
+        end
+
+        def down
+          drop_enum "enum_with_comma"
+        end
+      end
+
+      migration.migrate(:up)
+      output = dump_all_table_schema
+
+      assert_includes output, 'create_enum "enum_with_comma", ["value1", "value,2", "value3"]', output
+    ensure
+      migration.migrate(:down)
+      $stdout = original
+    end
   end
 
   def test_schema_dump_keeps_large_precision_integer_columns_as_decimal