From 5d33de534df8f74f7d34fe1a7df4bf2c72843f9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20=C5=A0apalas?= Date: Tue, 3 Sep 2024 09:58:44 +0300 Subject: [PATCH] Adjust checks to changes in rails 7.1 --- Gemfile.lock | 2 +- lib/pronto/rails_migrations.rb | 6 +++--- lib/pronto/rails_migrations/version.rb | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 36e9e8a..557d8df 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - pronto-rails_migrations (0.14.4) + pronto-rails_migrations (0.15.0) faraday (>= 1.10.3) multipart-post (>= 2.1.1) pronto (>= 0.11.1) diff --git a/lib/pronto/rails_migrations.rb b/lib/pronto/rails_migrations.rb index 871c666..39c4f33 100644 --- a/lib/pronto/rails_migrations.rb +++ b/lib/pronto/rails_migrations.rb @@ -37,12 +37,12 @@ def bad_structure_sql_messages structure_sql = File.read(patch.new_file_full_path) inserts = structure_sql.split("\n").grep(/\('\d+'\)/) - unordered_inserts = (inserts.sort != inserts) + unordered_inserts = (inserts.sort.reverse != inserts) *all_but_tail, tail = inserts bad_semicolons = all_but_tail.any? { |line| line.end_with?(';') } || !tail.end_with?(';') - bad_ending = structure_sql[-4, 4] !~ /[^\n]\n\n\n/ + bad_ending = structure_sql[-2, 2] !~ /[^\n]\n/ messages = [] @@ -59,7 +59,7 @@ def bad_structure_sql_messages 'last insert must end with semicolon (`;`).' ) end - messages << message(patch, '`db/structure.sql` must end with 2 empty lines.') if bad_ending + messages << message(patch, '`db/structure.sql` must end without extra empty lines.') if bad_ending messages end diff --git a/lib/pronto/rails_migrations/version.rb b/lib/pronto/rails_migrations/version.rb index 8e04c1f..95419dc 100644 --- a/lib/pronto/rails_migrations/version.rb +++ b/lib/pronto/rails_migrations/version.rb @@ -1,3 +1,3 @@ module Pronto - RAILS_MIGRATIONS_VERSION = '0.14.4' + RAILS_MIGRATIONS_VERSION = '0.15.0' end