Skip to content

Commit 502f7c2

Browse files
PJMODOSPJMODOS
committed
Reduce verbosity of DDL commands
This makes tests work on both master older versions of postgres properly as default verbosity of some commands has changed in master.
1 parent cfe2e2a commit 502f7c2

22 files changed

+48
-482
lines changed

‎expected/add_table.out

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -341,43 +341,16 @@ BEGIN
341341
END LOOP;
342342
END;
343343
$$;
344+
\set VERBOSITY terse
344345
SELECT pglogical.replicate_ddl_command($$
345346
DROP TABLE public.test_publicschema CASCADE;
346347
DROP TABLE public.test_nosync CASCADE;
347348
DROP SCHEMA "strange.schema-IS" CASCADE;
348349
$$);
349350
NOTICE: drop cascades to 2 other objects
350-
DETAIL: table public.test_publicschema in replication set repset_test
351-
table public.test_publicschema in replication set default
352-
CONTEXT: during execution of queued SQL statement:
353-
DROP TABLE public.test_publicschema CASCADE;
354-
DROP TABLE public.test_nosync CASCADE;
355-
DROP SCHEMA "strange.schema-IS" CASCADE;
356-
357351
NOTICE: drop cascades to 2 other objects
358-
DETAIL: table public.test_nosync in replication set repset_test
359-
table public.test_nosync in replication set default
360-
CONTEXT: during execution of queued SQL statement:
361-
DROP TABLE public.test_publicschema CASCADE;
362-
DROP TABLE public.test_nosync CASCADE;
363-
DROP SCHEMA "strange.schema-IS" CASCADE;
364-
365352
NOTICE: drop cascades to 2 other objects
366-
DETAIL: drop cascades to table "strange.schema-IS".test_strangeschema
367-
drop cascades to table "strange.schema-IS".test_diff_repset
368-
CONTEXT: during execution of queued SQL statement:
369-
DROP TABLE public.test_publicschema CASCADE;
370-
DROP TABLE public.test_nosync CASCADE;
371-
DROP SCHEMA "strange.schema-IS" CASCADE;
372-
373353
NOTICE: drop cascades to 2 other objects
374-
DETAIL: table strange.schema-IS.test_strangeschema in replication set default
375-
table strange.schema-IS.test_diff_repset in replication set repset_test
376-
CONTEXT: during execution of queued SQL statement:
377-
DROP TABLE public.test_publicschema CASCADE;
378-
DROP TABLE public.test_nosync CASCADE;
379-
DROP SCHEMA "strange.schema-IS" CASCADE;
380-
381354
replicate_ddl_command
382355
-----------------------
383356
t

‎expected/basic.out

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -186,14 +186,11 @@ SELECT id, other, data, something FROM basic_dml ORDER BY id;
186186
(4 rows)
187187

188188
\c :provider_dsn
189+
\set VERBOSITY terse
189190
SELECT pglogical.replicate_ddl_command($$
190191
DROP TABLE public.basic_dml CASCADE;
191192
$$);
192193
NOTICE: drop cascades to 1 other object
193-
DETAIL: table public.basic_dml in replication set default
194-
CONTEXT: during execution of queued SQL statement:
195-
DROP TABLE public.basic_dml CASCADE;
196-
197194
replicate_ddl_command
198195
-----------------------
199196
t

‎expected/bidirectional.out

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,11 @@ SELECT id, other, data, something FROM basic_dml ORDER BY id;
9898
(5 rows)
9999

100100
\c :provider_dsn
101+
\set VERBOSITY terse
101102
SELECT pglogical.replicate_ddl_command($$
102103
DROP TABLE public.basic_dml CASCADE;
103104
$$);
104105
NOTICE: drop cascades to 1 other object
105-
DETAIL: table public.basic_dml in replication set default
106-
CONTEXT: during execution of queued SQL statement:
107-
DROP TABLE public.basic_dml CASCADE;
108-
109106
replicate_ddl_command
110107
-----------------------
111108
t

‎expected/extended.out

Lines changed: 1 addition & 286 deletions
Original file line numberDiff line numberDiff line change
@@ -1382,6 +1382,7 @@ SELECT a, b, c FROM tst_range_array ORDER BY a;
13821382
(1 row)
13831383

13841384
\c :provider_dsn
1385+
\set VERBOSITY terse
13851386
SELECT pglogical.replicate_ddl_command($$
13861387
DROP TABLE public.tst_one_array CASCADE;
13871388
DROP TABLE public.tst_arrays CASCADE;
@@ -1404,304 +1405,18 @@ SELECT pglogical.replicate_ddl_command($$
14041405
DROP TYPE public.tst_enum_t;
14051406
$$);
14061407
NOTICE: drop cascades to 1 other object
1407-
DETAIL: table public.tst_one_array in replication set default
1408-
CONTEXT: during execution of queued SQL statement:
1409-
DROP TABLE public.tst_one_array CASCADE;
1410-
DROP TABLE public.tst_arrays CASCADE;
1411-
DROP TABLE public.tst_one_enum CASCADE;
1412-
DROP TABLE public.tst_enums CASCADE;
1413-
DROP TABLE public.tst_one_comp CASCADE;
1414-
DROP TABLE public.tst_comps CASCADE;
1415-
DROP TABLE public.tst_comp_enum CASCADE;
1416-
DROP TABLE public.tst_comp_enum_array CASCADE;
1417-
DROP TABLE public.tst_comp_one_enum_array CASCADE;
1418-
DROP TABLE public.tst_comp_enum_what CASCADE;
1419-
DROP TABLE public.tst_comp_mix_array CASCADE;
1420-
DROP TABLE public.tst_range CASCADE;
1421-
DROP TABLE public.tst_range_array CASCADE;
1422-
1423-
DROP TYPE public.tst_comp_mix_t;
1424-
DROP TYPE public.tst_comp_enum_array_t;
1425-
DROP TYPE public.tst_comp_enum_t;
1426-
DROP TYPE public.tst_comp_basic_t;
1427-
DROP TYPE public.tst_enum_t;
1428-
14291408
NOTICE: drop cascades to 1 other object
1430-
DETAIL: table public.tst_arrays in replication set default
1431-
CONTEXT: during execution of queued SQL statement:
1432-
DROP TABLE public.tst_one_array CASCADE;
1433-
DROP TABLE public.tst_arrays CASCADE;
1434-
DROP TABLE public.tst_one_enum CASCADE;
1435-
DROP TABLE public.tst_enums CASCADE;
1436-
DROP TABLE public.tst_one_comp CASCADE;
1437-
DROP TABLE public.tst_comps CASCADE;
1438-
DROP TABLE public.tst_comp_enum CASCADE;
1439-
DROP TABLE public.tst_comp_enum_array CASCADE;
1440-
DROP TABLE public.tst_comp_one_enum_array CASCADE;
1441-
DROP TABLE public.tst_comp_enum_what CASCADE;
1442-
DROP TABLE public.tst_comp_mix_array CASCADE;
1443-
DROP TABLE public.tst_range CASCADE;
1444-
DROP TABLE public.tst_range_array CASCADE;
1445-
1446-
DROP TYPE public.tst_comp_mix_t;
1447-
DROP TYPE public.tst_comp_enum_array_t;
1448-
DROP TYPE public.tst_comp_enum_t;
1449-
DROP TYPE public.tst_comp_basic_t;
1450-
DROP TYPE public.tst_enum_t;
1451-
14521409
NOTICE: drop cascades to 1 other object
1453-
DETAIL: table public.tst_one_enum in replication set default
1454-
CONTEXT: during execution of queued SQL statement:
1455-
DROP TABLE public.tst_one_array CASCADE;
1456-
DROP TABLE public.tst_arrays CASCADE;
1457-
DROP TABLE public.tst_one_enum CASCADE;
1458-
DROP TABLE public.tst_enums CASCADE;
1459-
DROP TABLE public.tst_one_comp CASCADE;
1460-
DROP TABLE public.tst_comps CASCADE;
1461-
DROP TABLE public.tst_comp_enum CASCADE;
1462-
DROP TABLE public.tst_comp_enum_array CASCADE;
1463-
DROP TABLE public.tst_comp_one_enum_array CASCADE;
1464-
DROP TABLE public.tst_comp_enum_what CASCADE;
1465-
DROP TABLE public.tst_comp_mix_array CASCADE;
1466-
DROP TABLE public.tst_range CASCADE;
1467-
DROP TABLE public.tst_range_array CASCADE;
1468-
1469-
DROP TYPE public.tst_comp_mix_t;
1470-
DROP TYPE public.tst_comp_enum_array_t;
1471-
DROP TYPE public.tst_comp_enum_t;
1472-
DROP TYPE public.tst_comp_basic_t;
1473-
DROP TYPE public.tst_enum_t;
1474-
14751410
NOTICE: drop cascades to 1 other object
1476-
DETAIL: table public.tst_enums in replication set default
1477-
CONTEXT: during execution of queued SQL statement:
1478-
DROP TABLE public.tst_one_array CASCADE;
1479-
DROP TABLE public.tst_arrays CASCADE;
1480-
DROP TABLE public.tst_one_enum CASCADE;
1481-
DROP TABLE public.tst_enums CASCADE;
1482-
DROP TABLE public.tst_one_comp CASCADE;
1483-
DROP TABLE public.tst_comps CASCADE;
1484-
DROP TABLE public.tst_comp_enum CASCADE;
1485-
DROP TABLE public.tst_comp_enum_array CASCADE;
1486-
DROP TABLE public.tst_comp_one_enum_array CASCADE;
1487-
DROP TABLE public.tst_comp_enum_what CASCADE;
1488-
DROP TABLE public.tst_comp_mix_array CASCADE;
1489-
DROP TABLE public.tst_range CASCADE;
1490-
DROP TABLE public.tst_range_array CASCADE;
1491-
1492-
DROP TYPE public.tst_comp_mix_t;
1493-
DROP TYPE public.tst_comp_enum_array_t;
1494-
DROP TYPE public.tst_comp_enum_t;
1495-
DROP TYPE public.tst_comp_basic_t;
1496-
DROP TYPE public.tst_enum_t;
1497-
14981411
NOTICE: drop cascades to 1 other object
1499-
DETAIL: table public.tst_one_comp in replication set default
1500-
CONTEXT: during execution of queued SQL statement:
1501-
DROP TABLE public.tst_one_array CASCADE;
1502-
DROP TABLE public.tst_arrays CASCADE;
1503-
DROP TABLE public.tst_one_enum CASCADE;
1504-
DROP TABLE public.tst_enums CASCADE;
1505-
DROP TABLE public.tst_one_comp CASCADE;
1506-
DROP TABLE public.tst_comps CASCADE;
1507-
DROP TABLE public.tst_comp_enum CASCADE;
1508-
DROP TABLE public.tst_comp_enum_array CASCADE;
1509-
DROP TABLE public.tst_comp_one_enum_array CASCADE;
1510-
DROP TABLE public.tst_comp_enum_what CASCADE;
1511-
DROP TABLE public.tst_comp_mix_array CASCADE;
1512-
DROP TABLE public.tst_range CASCADE;
1513-
DROP TABLE public.tst_range_array CASCADE;
1514-
1515-
DROP TYPE public.tst_comp_mix_t;
1516-
DROP TYPE public.tst_comp_enum_array_t;
1517-
DROP TYPE public.tst_comp_enum_t;
1518-
DROP TYPE public.tst_comp_basic_t;
1519-
DROP TYPE public.tst_enum_t;
1520-
15211412
NOTICE: drop cascades to 1 other object
1522-
DETAIL: table public.tst_comps in replication set default
1523-
CONTEXT: during execution of queued SQL statement:
1524-
DROP TABLE public.tst_one_array CASCADE;
1525-
DROP TABLE public.tst_arrays CASCADE;
1526-
DROP TABLE public.tst_one_enum CASCADE;
1527-
DROP TABLE public.tst_enums CASCADE;
1528-
DROP TABLE public.tst_one_comp CASCADE;
1529-
DROP TABLE public.tst_comps CASCADE;
1530-
DROP TABLE public.tst_comp_enum CASCADE;
1531-
DROP TABLE public.tst_comp_enum_array CASCADE;
1532-
DROP TABLE public.tst_comp_one_enum_array CASCADE;
1533-
DROP TABLE public.tst_comp_enum_what CASCADE;
1534-
DROP TABLE public.tst_comp_mix_array CASCADE;
1535-
DROP TABLE public.tst_range CASCADE;
1536-
DROP TABLE public.tst_range_array CASCADE;
1537-
1538-
DROP TYPE public.tst_comp_mix_t;
1539-
DROP TYPE public.tst_comp_enum_array_t;
1540-
DROP TYPE public.tst_comp_enum_t;
1541-
DROP TYPE public.tst_comp_basic_t;
1542-
DROP TYPE public.tst_enum_t;
1543-
15441413
NOTICE: drop cascades to 1 other object
1545-
DETAIL: table public.tst_comp_enum in replication set default
1546-
CONTEXT: during execution of queued SQL statement:
1547-
DROP TABLE public.tst_one_array CASCADE;
1548-
DROP TABLE public.tst_arrays CASCADE;
1549-
DROP TABLE public.tst_one_enum CASCADE;
1550-
DROP TABLE public.tst_enums CASCADE;
1551-
DROP TABLE public.tst_one_comp CASCADE;
1552-
DROP TABLE public.tst_comps CASCADE;
1553-
DROP TABLE public.tst_comp_enum CASCADE;
1554-
DROP TABLE public.tst_comp_enum_array CASCADE;
1555-
DROP TABLE public.tst_comp_one_enum_array CASCADE;
1556-
DROP TABLE public.tst_comp_enum_what CASCADE;
1557-
DROP TABLE public.tst_comp_mix_array CASCADE;
1558-
DROP TABLE public.tst_range CASCADE;
1559-
DROP TABLE public.tst_range_array CASCADE;
1560-
1561-
DROP TYPE public.tst_comp_mix_t;
1562-
DROP TYPE public.tst_comp_enum_array_t;
1563-
DROP TYPE public.tst_comp_enum_t;
1564-
DROP TYPE public.tst_comp_basic_t;
1565-
DROP TYPE public.tst_enum_t;
1566-
15671414
NOTICE: drop cascades to 1 other object
1568-
DETAIL: table public.tst_comp_enum_array in replication set default
1569-
CONTEXT: during execution of queued SQL statement:
1570-
DROP TABLE public.tst_one_array CASCADE;
1571-
DROP TABLE public.tst_arrays CASCADE;
1572-
DROP TABLE public.tst_one_enum CASCADE;
1573-
DROP TABLE public.tst_enums CASCADE;
1574-
DROP TABLE public.tst_one_comp CASCADE;
1575-
DROP TABLE public.tst_comps CASCADE;
1576-
DROP TABLE public.tst_comp_enum CASCADE;
1577-
DROP TABLE public.tst_comp_enum_array CASCADE;
1578-
DROP TABLE public.tst_comp_one_enum_array CASCADE;
1579-
DROP TABLE public.tst_comp_enum_what CASCADE;
1580-
DROP TABLE public.tst_comp_mix_array CASCADE;
1581-
DROP TABLE public.tst_range CASCADE;
1582-
DROP TABLE public.tst_range_array CASCADE;
1583-
1584-
DROP TYPE public.tst_comp_mix_t;
1585-
DROP TYPE public.tst_comp_enum_array_t;
1586-
DROP TYPE public.tst_comp_enum_t;
1587-
DROP TYPE public.tst_comp_basic_t;
1588-
DROP TYPE public.tst_enum_t;
1589-
15901415
NOTICE: drop cascades to 1 other object
1591-
DETAIL: table public.tst_comp_one_enum_array in replication set default
1592-
CONTEXT: during execution of queued SQL statement:
1593-
DROP TABLE public.tst_one_array CASCADE;
1594-
DROP TABLE public.tst_arrays CASCADE;
1595-
DROP TABLE public.tst_one_enum CASCADE;
1596-
DROP TABLE public.tst_enums CASCADE;
1597-
DROP TABLE public.tst_one_comp CASCADE;
1598-
DROP TABLE public.tst_comps CASCADE;
1599-
DROP TABLE public.tst_comp_enum CASCADE;
1600-
DROP TABLE public.tst_comp_enum_array CASCADE;
1601-
DROP TABLE public.tst_comp_one_enum_array CASCADE;
1602-
DROP TABLE public.tst_comp_enum_what CASCADE;
1603-
DROP TABLE public.tst_comp_mix_array CASCADE;
1604-
DROP TABLE public.tst_range CASCADE;
1605-
DROP TABLE public.tst_range_array CASCADE;
1606-
1607-
DROP TYPE public.tst_comp_mix_t;
1608-
DROP TYPE public.tst_comp_enum_array_t;
1609-
DROP TYPE public.tst_comp_enum_t;
1610-
DROP TYPE public.tst_comp_basic_t;
1611-
DROP TYPE public.tst_enum_t;
1612-
16131416
NOTICE: drop cascades to 1 other object
1614-
DETAIL: table public.tst_comp_enum_what in replication set default
1615-
CONTEXT: during execution of queued SQL statement:
1616-
DROP TABLE public.tst_one_array CASCADE;
1617-
DROP TABLE public.tst_arrays CASCADE;
1618-
DROP TABLE public.tst_one_enum CASCADE;
1619-
DROP TABLE public.tst_enums CASCADE;
1620-
DROP TABLE public.tst_one_comp CASCADE;
1621-
DROP TABLE public.tst_comps CASCADE;
1622-
DROP TABLE public.tst_comp_enum CASCADE;
1623-
DROP TABLE public.tst_comp_enum_array CASCADE;
1624-
DROP TABLE public.tst_comp_one_enum_array CASCADE;
1625-
DROP TABLE public.tst_comp_enum_what CASCADE;
1626-
DROP TABLE public.tst_comp_mix_array CASCADE;
1627-
DROP TABLE public.tst_range CASCADE;
1628-
DROP TABLE public.tst_range_array CASCADE;
1629-
1630-
DROP TYPE public.tst_comp_mix_t;
1631-
DROP TYPE public.tst_comp_enum_array_t;
1632-
DROP TYPE public.tst_comp_enum_t;
1633-
DROP TYPE public.tst_comp_basic_t;
1634-
DROP TYPE public.tst_enum_t;
1635-
16361417
NOTICE: drop cascades to 1 other object
1637-
DETAIL: table public.tst_comp_mix_array in replication set default
1638-
CONTEXT: during execution of queued SQL statement:
1639-
DROP TABLE public.tst_one_array CASCADE;
1640-
DROP TABLE public.tst_arrays CASCADE;
1641-
DROP TABLE public.tst_one_enum CASCADE;
1642-
DROP TABLE public.tst_enums CASCADE;
1643-
DROP TABLE public.tst_one_comp CASCADE;
1644-
DROP TABLE public.tst_comps CASCADE;
1645-
DROP TABLE public.tst_comp_enum CASCADE;
1646-
DROP TABLE public.tst_comp_enum_array CASCADE;
1647-
DROP TABLE public.tst_comp_one_enum_array CASCADE;
1648-
DROP TABLE public.tst_comp_enum_what CASCADE;
1649-
DROP TABLE public.tst_comp_mix_array CASCADE;
1650-
DROP TABLE public.tst_range CASCADE;
1651-
DROP TABLE public.tst_range_array CASCADE;
1652-
1653-
DROP TYPE public.tst_comp_mix_t;
1654-
DROP TYPE public.tst_comp_enum_array_t;
1655-
DROP TYPE public.tst_comp_enum_t;
1656-
DROP TYPE public.tst_comp_basic_t;
1657-
DROP TYPE public.tst_enum_t;
1658-
16591418
NOTICE: drop cascades to 1 other object
1660-
DETAIL: table public.tst_range in replication set default
1661-
CONTEXT: during execution of queued SQL statement:
1662-
DROP TABLE public.tst_one_array CASCADE;
1663-
DROP TABLE public.tst_arrays CASCADE;
1664-
DROP TABLE public.tst_one_enum CASCADE;
1665-
DROP TABLE public.tst_enums CASCADE;
1666-
DROP TABLE public.tst_one_comp CASCADE;
1667-
DROP TABLE public.tst_comps CASCADE;
1668-
DROP TABLE public.tst_comp_enum CASCADE;
1669-
DROP TABLE public.tst_comp_enum_array CASCADE;
1670-
DROP TABLE public.tst_comp_one_enum_array CASCADE;
1671-
DROP TABLE public.tst_comp_enum_what CASCADE;
1672-
DROP TABLE public.tst_comp_mix_array CASCADE;
1673-
DROP TABLE public.tst_range CASCADE;
1674-
DROP TABLE public.tst_range_array CASCADE;
1675-
1676-
DROP TYPE public.tst_comp_mix_t;
1677-
DROP TYPE public.tst_comp_enum_array_t;
1678-
DROP TYPE public.tst_comp_enum_t;
1679-
DROP TYPE public.tst_comp_basic_t;
1680-
DROP TYPE public.tst_enum_t;
1681-
16821419
NOTICE: drop cascades to 1 other object
1683-
DETAIL: table public.tst_range_array in replication set default
1684-
CONTEXT: during execution of queued SQL statement:
1685-
DROP TABLE public.tst_one_array CASCADE;
1686-
DROP TABLE public.tst_arrays CASCADE;
1687-
DROP TABLE public.tst_one_enum CASCADE;
1688-
DROP TABLE public.tst_enums CASCADE;
1689-
DROP TABLE public.tst_one_comp CASCADE;
1690-
DROP TABLE public.tst_comps CASCADE;
1691-
DROP TABLE public.tst_comp_enum CASCADE;
1692-
DROP TABLE public.tst_comp_enum_array CASCADE;
1693-
DROP TABLE public.tst_comp_one_enum_array CASCADE;
1694-
DROP TABLE public.tst_comp_enum_what CASCADE;
1695-
DROP TABLE public.tst_comp_mix_array CASCADE;
1696-
DROP TABLE public.tst_range CASCADE;
1697-
DROP TABLE public.tst_range_array CASCADE;
1698-
1699-
DROP TYPE public.tst_comp_mix_t;
1700-
DROP TYPE public.tst_comp_enum_array_t;
1701-
DROP TYPE public.tst_comp_enum_t;
1702-
DROP TYPE public.tst_comp_basic_t;
1703-
DROP TYPE public.tst_enum_t;
1704-
17051420
replicate_ddl_command
17061421
-----------------------
17071422
t

0 commit comments

Comments
 (0)