Merge pull request rails#46454 from mishaschwartz/no-extra-newline-in-structure

Do not write additional new lines when dumping sql migration versions

Author: rafaelfranca

activerecord/CHANGELOG.md

@@ -1,3 +1,9 @@
+*   Do not write additional new lines when dumping sql migration versions
+
+    This change updates the `insert_versions_sql` function so that the database insert string containing the current database migration versions does not end with two additional new lines.
+
+    *Misha Schwartz*
+
 *   Fix `composed_of` value freezing and duplication.
 
     Previously composite values exhibited two confusing behaviors:
@@ -368,6 +374,7 @@
 
     *Eileen M. Uchitelle*
 
+
 *   Allow ActiveRecord::QueryMethods#select to receive hash values.
 
     Currently, `select` might receive only raw sql and symbols to define columns and aliases to select.

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

@@ -1765,7 +1765,7 @@ def insert_versions_sql(versions)
           if versions.is_a?(Array)
             sql = +"INSERT INTO #{sm_table} (version) VALUES\n"
             sql << versions.reverse.map { |v| "(#{quote(v)})" }.join(",\n")
-            sql << ";\n\n"
+            sql << ";"
             sql
           else
             "INSERT INTO #{sm_table} (version) VALUES (#{quote(versions)});"

activerecord/test/cases/schema_dumper_test.rb

@@ -34,9 +34,8 @@ def test_dump_schema_information_outputs_lexically_reverse_ordered_versions_rega
     ('20100301010101'),
     ('20100201010101'),
     ('20100101010101');
-
     STR
-    assert_equal expected, schema_info
+    assert_equal expected.strip, schema_info
   ensure
     @schema_migration.delete_all_versions
   end