reduce schema dump

Author: epoberezkin

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

@@ -17,36 +17,28 @@ SET client_min_messages = warning;
 SET row_security = off;
 
 --
--- Name: smp_server_schema; Type: SCHEMA; Schema: -; Owner: test_server_user
+-- Name: smp_server; Type: SCHEMA; Schema: -; Owner: -
 --
 
-CREATE SCHEMA smp_server_schema;
+CREATE SCHEMA smp_server;
 
 
-ALTER SCHEMA smp_server_schema OWNER TO test_server_user;
-
-SET default_tablespace = '';
-
-SET default_table_access_method = heap;
-
 --
--- Name: migrations; Type: TABLE; Schema: smp_server_schema; Owner: test_server_user
+-- Name: migrations; Type: TABLE; Schema: smp_server; Owner: -
 --
 
-CREATE TABLE smp_server_schema.migrations (
+CREATE TABLE smp_server.migrations (
     name text NOT NULL,
     ts timestamp without time zone NOT NULL,
     down text
 );
 
 
-ALTER TABLE smp_server_schema.migrations OWNER TO test_server_user;
-
 --
--- Name: msg_queues; Type: TABLE; Schema: smp_server_schema; Owner: test_server_user
+-- Name: msg_queues; Type: TABLE; Schema: smp_server; Owner: -
 --
 
-CREATE TABLE smp_server_schema.msg_queues (
+CREATE TABLE smp_server.msg_queues (
     recipient_id bytea NOT NULL,
     recipient_keys bytea NOT NULL,
     rcv_dh_secret bytea NOT NULL,
@@ -65,50 +57,48 @@ CREATE TABLE smp_server_schema.msg_queues (
 );
 
 
-ALTER TABLE smp_server_schema.msg_queues OWNER TO test_server_user;
-
 --
--- Name: migrations migrations_pkey; Type: CONSTRAINT; Schema: smp_server_schema; Owner: test_server_user
+-- Name: migrations migrations_pkey; Type: CONSTRAINT; Schema: smp_server; Owner: -
 --
 
-ALTER TABLE ONLY smp_server_schema.migrations
+ALTER TABLE ONLY smp_server.migrations
     ADD CONSTRAINT migrations_pkey PRIMARY KEY (name);
 
 
 --
--- Name: msg_queues msg_queues_pkey; Type: CONSTRAINT; Schema: smp_server_schema; Owner: test_server_user
+-- Name: msg_queues msg_queues_pkey; Type: CONSTRAINT; Schema: smp_server; Owner: -
 --
 
-ALTER TABLE ONLY smp_server_schema.msg_queues
+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_schema; Owner: test_server_user
+-- Name: idx_msg_queues_link_id; Type: INDEX; Schema: smp_server; Owner: -
 --
 
-CREATE UNIQUE INDEX idx_msg_queues_link_id ON smp_server_schema.msg_queues USING btree (link_id);
+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_schema; Owner: test_server_user
+-- Name: idx_msg_queues_notifier_id; Type: INDEX; Schema: smp_server; Owner: -
 --
 
-CREATE UNIQUE INDEX idx_msg_queues_notifier_id ON smp_server_schema.msg_queues USING btree (notifier_id);
+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_schema; Owner: test_server_user
+-- Name: idx_msg_queues_sender_id; Type: INDEX; Schema: smp_server; Owner: -
 --
 
-CREATE UNIQUE INDEX idx_msg_queues_sender_id ON smp_server_schema.msg_queues USING btree (sender_id);
+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_schema; Owner: test_server_user
+-- Name: idx_msg_queues_updated_at; Type: INDEX; Schema: smp_server; Owner: -
 --
 
-CREATE INDEX idx_msg_queues_updated_at ON smp_server_schema.msg_queues USING btree (deleted_at, updated_at);
+CREATE INDEX idx_msg_queues_updated_at ON smp_server.msg_queues USING btree (deleted_at, updated_at);
 
 
 --

tests/ServerTests/SchemaDump.hs

@@ -20,7 +20,7 @@ import System.Process (readCreateProcess, shell)
 import Test.Hspec
 
 testDBSchema :: B.ByteString
-testDBSchema = "smp_server_schema"
+testDBSchema = "smp_server"
 
 serverSchemaPath :: FilePath
 serverSchemaPath = "src/Simplex/Messaging/Server/QueueStore/Postgres/server_schema.sql"
@@ -80,7 +80,10 @@ skipComparisonForDownMigrations =
 
 getSchema :: FilePath -> IO String
 getSchema schemaPath = do
-    -- pg_dump postgresql://smp@/smp_server_store -n smp_server --schema-only
-  void $ readCreateProcess (shell $ "pg_dump " <> B.unpack testServerDBConnstr <> " -n " <> B.unpack testDBSchema <> " --schema-only > " <> schemaPath) ""
+  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 > "
+          <> schemaPath
+  void $ readCreateProcess (shell cmd) ""
   sch <- readFile schemaPath
   sch `deepseq` pure sch

tests/Test.hs

@@ -87,7 +87,7 @@ main = do
           describe "Agent core tests" agentCoreTests
 #if defined(dbServerPostgres)
         around_ (postgressBracket testServerDBConnectInfo) $
-          fdescribe "Server schema dump" serverSchemaDumpTest
+          describe "Server schema dump" serverSchemaDumpTest
         aroundAll_ (postgressBracket testServerDBConnectInfo) $
           describe "SMP server via TLS, postgres+jornal message store" $
               before (pure (transport @TLS, ASType SQSPostgres SMSJournal)) serverTests