Merge branch '21383-misc-fixes'. Refs #21383

[arvados.git] / services / api / Rakefile

diff --git a/services/api/Rakefile b/services/api/Rakefile
index 3136cdd9af415feb3a108ed7ed0eb10e274b1f50..70ceb653e6f72afc79de5be38c5005486c1d2324 100644 (file)
--- a/services/api/Rakefile
+++ b/services/api/Rakefile
@@ -7,6 +7,7 @@
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
 require File.expand_path('../config/application', __FILE__)
+require 'rake/testtask'
 
 Server::Application.load_tasks
 
@@ -38,18 +39,27 @@ namespace :db do
       origfnm = File.expand_path('../db/structure.sql', __FILE__)
       tmpfnm = Tempfile.new 'structure.sql', File.expand_path('..', origfnm)
       copyright_done = false
+      started = false
       begin
         tmpfile = File.new tmpfnm, 'w'
         origfile = File.new origfnm
         origfile.each_line do |line|
           if !copyright_done
-            if !/Copyright .* Arvados/
+            if !/Copyright .* Arvados/.match(line)
                tmpfile.write "-- Copyright (C) The Arvados Authors. All rights reserved.\n--\n-- SPDX-License-Identifier: AGPL-3.0\n\n"
             end
             copyright_done = true
           end
-          if /^SET lock_timeout = 0;/ =~ line
-            # Avoid edit wars between versions that do/don't write this line.
+
+          if !started && /^[^-\n]/ !~ line
+            # Ignore the "PostgreSQL database dump" comment block,
+            # which varies from one client version to the next.
+            next
+          end
+          started = true
+
+          if /^SET (lock_timeout|idle_in_transaction_session_timeout|row_security) = / =~ line
+            # Avoid edit wars between versions that do/don't write (and can/can't execute) this line.
             next
           elsif /^COMMENT ON EXTENSION/ =~ line
             # Avoid warning message when loading: