Merge pull request rails#50733 from yash/yk/fix-mysql-escapes-on-default-generated

Fix single quote escapes on default generated MySQL columns

Author: byroot

activerecord/CHANGELOG.md

@@ -1,3 +1,15 @@
+*   Fix single quote escapes on default generated MySQL columns
+
+    MySQL 5.7.5+ supports generated columns, which can be used to create a column that is computed from an expression.
+
+    Previously, the schema dump would output a string with double escapes for generated columns with single quotes in the default expression.
+
+    This would result in issues when importing the schema on a fresh instance of a MySQL database.
+
+    Now, the string will not be escaped and will be valid Ruby upon importing of the schema.
+
+    *Yash Kapadia*
+
 *   Fix Migrations with versions older than 7.1 validating options given to
     `add_reference` and `t.references`.
 

activerecord/lib/active_record/connection_adapters/mysql/schema_statements.rb

@@ -185,6 +185,7 @@ def new_column_from_field(table_name, field, _definitions)
               default, default_function = nil, default
             elsif type_metadata.extra == "DEFAULT_GENERATED"
               default = +"(#{default})" unless default.start_with?("(")
+              default = default.gsub("\\'", "'")
               default, default_function = nil, default
             elsif type_metadata.type == :text && default&.start_with?("'")
               # strip and unescape quotes

activerecord/test/cases/defaults_test.rb

@@ -175,6 +175,13 @@ class MysqlDefaultExpressionTest < ActiveRecord::TestCase
         output = dump_table_schema("defaults")
         assert_match %r/t\.binary\s+"uuid",\s+limit: 36,\s+default: -> { "\(?uuid\(\)\)?" }/i, output
       end
+
+      if current_adapter?(:Mysql2Adapter)
+        test "schema dump includes default expression with single quotes reflected correctly" do
+          output = dump_table_schema("defaults")
+          assert_match %r/t\.string\s+"char2_concatenated",\s+default: -> { "\(?concat\(`char2`,(_utf8mb4)?'-'\)\)?" }/i, output
+        end
+      end
     end
 
     if supports_datetime_with_precision?

activerecord/test/schema/mysql2_specific_schema.rb

@@ -23,6 +23,7 @@
     t.string :char2, limit: 50, default: "a varchar field"
     if ActiveRecord::TestCase.supports_default_expression?
       t.binary :uuid, limit: 36, default: -> { "(uuid())" }
+      t.string :char2_concatenated, default: -> { "(concat(`char2`, '-'))" }
     end
   end