test: print pg_dump output

Author: epoberezkin

src/Simplex/Messaging/Server/QueueStore/Postgres/server_schema.sql

@@ -1,9 +1,4 @@
---
--- PostgreSQL database dump
---
 
--- Dumped from database version 15.12 (Homebrew)
--- Dumped by pg_dump version 15.12 (Homebrew)
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;
@@ -16,16 +11,12 @@ SET xmloption = content;
 SET client_min_messages = warning;
 SET row_security = off;
 
---
--- Name: smp_server; Type: SCHEMA; Schema: -; Owner: -
---
 
 CREATE SCHEMA smp_server;
 
 
---
--- Name: migrations; Type: TABLE; Schema: smp_server; Owner: -
---
+SET default_table_access_method = heap;
+
 
 CREATE TABLE smp_server.migrations (
     name text NOT NULL,
@@ -34,9 +25,6 @@ CREATE TABLE smp_server.migrations (
 );
 
 
---
--- Name: msg_queues; Type: TABLE; Schema: smp_server; Owner: -
---
 
 CREATE TABLE smp_server.msg_queues (
     recipient_id bytea NOT NULL,
@@ -57,51 +45,30 @@ CREATE TABLE smp_server.msg_queues (
 );
 
 
---
--- Name: migrations migrations_pkey; Type: CONSTRAINT; Schema: smp_server; Owner: -
---
 
 ALTER TABLE ONLY smp_server.migrations
     ADD CONSTRAINT migrations_pkey PRIMARY KEY (name);
 
 
---
--- Name: msg_queues msg_queues_pkey; Type: CONSTRAINT; Schema: smp_server; Owner: -
---
 
 ALTER TABLE ONLY smp_server.msg_queues
     ADD CONSTRAINT msg_queues_pkey PRIMARY KEY (recipient_id);
 
 
---
--- Name: idx_msg_queues_link_id; Type: INDEX; Schema: smp_server; Owner: -
---
 
 CREATE UNIQUE INDEX idx_msg_queues_link_id ON smp_server.msg_queues USING btree (link_id);
 
 
---
--- Name: idx_msg_queues_notifier_id; Type: INDEX; Schema: smp_server; Owner: -
---
 
 CREATE UNIQUE INDEX idx_msg_queues_notifier_id ON smp_server.msg_queues USING btree (notifier_id);
 
 
---
--- Name: idx_msg_queues_sender_id; Type: INDEX; Schema: smp_server; Owner: -
---
 
 CREATE UNIQUE INDEX idx_msg_queues_sender_id ON smp_server.msg_queues USING btree (sender_id);
 
 
---
--- Name: idx_msg_queues_updated_at; Type: INDEX; Schema: smp_server; Owner: -
---
 
 CREATE INDEX idx_msg_queues_updated_at ON smp_server.msg_queues USING btree (deleted_at, updated_at);
 
 
---
--- PostgreSQL database dump complete
---
 

tests/ServerTests/SchemaDump.hs

@@ -3,6 +3,7 @@
 
 module ServerTests.SchemaDump where
 
+import Control.Concurrent (threadDelay)
 import Control.DeepSeq
 import Control.Monad (unless, void)
 import qualified Data.ByteString.Char8 as B
@@ -16,7 +17,8 @@ import Simplex.Messaging.Agent.Store.Shared (Migration (..), MigrationConfirmati
 import Simplex.Messaging.Server.QueueStore.Postgres.Migrations (serverMigrations)
 import Simplex.Messaging.Util (ifM)
 import System.Directory (doesFileExist, removeFile)
-import System.Process (readCreateProcess, shell)
+import System.Environment (lookupEnv)
+import System.Process (readCreateProcess, readCreateProcessWithExitCode, shell)
 import Test.Hspec
 
 testDBSchema :: B.ByteString
@@ -39,8 +41,8 @@ testServerDBOpts =
 
 serverSchemaDumpTest :: Spec
 serverSchemaDumpTest = do
-  it "verify and overwrite schema dump" testVerifySchemaDump
-  it "verify schema down migrations" testSchemaMigrations
+  fit "verify and overwrite schema dump" testVerifySchemaDump
+  fit "verify schema down migrations" testSchemaMigrations
 
 testVerifySchemaDump :: IO ()
 testVerifySchemaDump = do
@@ -80,10 +82,17 @@ skipComparisonForDownMigrations =
 
 getSchema :: FilePath -> IO String
 getSchema schemaPath = do
+  ci <- (Just "true" ==) <$> lookupEnv "CI"
   let cmd =
         ("pg_dump " <> B.unpack testServerDBConnstr <> " --schema " <> B.unpack testDBSchema)
-          <> " --schema-only --no-comments --no-owner --no-privileges --no-acl --no-subscriptions --no-tablespaces --no-table-access-method > "
+          <> " --schema-only --no-owner --no-privileges --no-acl --no-subscriptions --no-tablespaces > "
           <> schemaPath
-  void $ readCreateProcess (shell cmd) ""
+  (code, out, err) <- readCreateProcessWithExitCode (shell cmd) ""
+  print code
+  putStrLn $ "out: " <> out
+  putStrLn $ "err: " <> err
+  threadDelay 20000
+  let sed = (if ci then "sed -i" else "sed -i ''")
+  void $ readCreateProcess (shell $ sed <> " '/^--/d' " <> schemaPath) ""
   sch <- readFile schemaPath
   sch `deepseq` pure sch