Index: /branches/cname-collision/t/dns-unitbase.sql =================================================================== --- /branches/cname-collision/t/dns-unitbase.sql (revision 987) +++ /branches/cname-collision/t/dns-unitbase.sql (revision 988) @@ -658,4 +658,5 @@ 3 example.net 1 1 2025121800 D f ab 4 expiry1.test 1 1 2026011400 D t +5 expiry2.test 1 1 2026011502 D t \. @@ -665,5 +666,5 @@ -- -SELECT pg_catalog.setval('public.domains_domain_id_seq', 4, true); +SELECT pg_catalog.setval('public.domains_domain_id_seq', 5, true); @@ -765,4 +766,15 @@ 58 4 1 1 admin Initial User Added record 'active-after1.expiry1.test TXT not active yet', TTL 5400, valid after 2026-01-11 11:30 2026-01-07 18:12:57.491476-05 0 0 59 4 1 1 admin Initial User Added record 'active-after2.expiry1.test TXT I'm done waiting', TTL 5400, expires at 2025-12-31 14:00 2026-01-14 18:02:13.876839-05 0 0 +60 5 1 1 admin Initial User Added active domain expiry2.test 2026-01-15 12:08:59.951774-05 0 0 +61 5 1 1 admin Initial User [new expiry2.test] Added SOA record [contact ns1.example.com] [master hostmaster.expiry2.test] [refresh 10800] [retry 3600] [expire 604800] [minttl 5400], TTL 86400 2026-01-15 12:08:59.951774-05 0 60 +62 5 1 1 admin Initial User [new expiry2.test] Added record 'expiry2.test NS ns2.example.com', TTL 7200 2026-01-15 12:08:59.951774-05 0 60 +63 5 1 1 admin Initial User [new expiry2.test] Added record 'expiry2.test NS ns1.example.com', TTL 7200 2026-01-15 12:08:59.951774-05 0 60 +64 5 1 1 admin Initial User [new expiry2.test] Added record 'expiry2.test A 10.0.0.4', TTL 7200 2026-01-15 12:08:59.951774-05 0 60 +65 5 1 1 admin Initial User [new expiry2.test] Added record 'expiry2.test MX [distance 10] mx1.example.com', TTL 7200 2026-01-15 12:08:59.951774-05 0 60 +66 5 1 1 admin Initial User [new expiry2.test] Added record 'www.expiry2.test CNAME expiry2.test', TTL 10800 2026-01-15 12:08:59.951774-05 0 60 +67 5 1 1 admin Initial User [new expiry2.test] Added record 'expiry2.test TXT "v=spf1 a mx -all"', TTL 10800 2026-01-15 12:08:59.951774-05 0 60 +68 5 1 1 admin Initial User Added record 'expires-at1.expiry2.test TXT Hanging around', TTL 5400 2026-01-15 12:57:28.411931-05 0 0 +69 5 1 1 admin Initial User Added record 'expires-at2.expiry2.test TXT imma expire soon', TTL 5400, expires at 2026-01-15 18:00 2026-01-15 12:58:51.09629-05 0 0 +70 5 1 1 admin Initial User Added record 'expires-at3.expiry2.test TXT active after pending expiry', TTL 5400, expires at 2026-01-15 18:00 2026-01-15 13:21:31.833257-05 0 0 \. @@ -772,5 +784,5 @@ -- -SELECT pg_catalog.setval('public.log_log_id_seq', 59, true); +SELECT pg_catalog.setval('public.log_log_id_seq', 70, true); @@ -863,4 +875,14 @@ 4 49 active-after1.expiry1.test 16 not active yet 0 0 0 5400 \N 0 2026-01-11 11:30:00-05 f t \N 4 50 active-after2.expiry1.test 16 I'm done waiting 0 0 0 5400 \N 0 2025-12-31 14:00:00-05 f t \N +5 51 ns1.example.com:hostmaster.expiry2.test 6 10800:3600:604800:5400 0 0 0 86400 \N 0 1969-12-31 19:00:00-05 f f \N +5 52 expiry2.test 2 ns2.example.com 0 0 0 7200 \N 0 1969-12-31 19:00:00-05 f f \N +5 53 expiry2.test 2 ns1.example.com 0 0 0 7200 \N 0 1969-12-31 19:00:00-05 f f \N +5 54 expiry2.test 1 10.0.0.4 0 0 0 7200 \N 0 1969-12-31 19:00:00-05 f f \N +5 55 expiry2.test 15 mx1.example.com 10 0 0 7200 \N 0 1969-12-31 19:00:00-05 f f \N +5 56 www.expiry2.test 5 expiry2.test 0 0 0 10800 \N 0 1969-12-31 19:00:00-05 f f \N +5 57 expiry2.test 16 "v=spf1 a mx -all" 0 0 0 10800 \N 0 1969-12-31 19:00:00-05 f f \N +5 58 expires-at1.expiry2.test 16 Hanging around 0 0 0 5400 \N 0 1969-12-31 19:00:00-05 f f \N +5 59 expires-at2.expiry2.test 16 imma expire soon 0 0 0 5400 \N 0 2026-01-15 18:00:00-05 t t \N +5 60 expires-at3.expiry2.test 16 active after pending expiry 0 0 0 5400 \N 0 2026-01-15 18:00:00-05 f t \N \. @@ -870,5 +892,5 @@ -- -SELECT pg_catalog.setval('public.records_record_id_seq', 50, true); +SELECT pg_catalog.setval('public.records_record_id_seq', 60, true); Index: /branches/cname-collision/t/test-cname-timestamps.sql =================================================================== --- /branches/cname-collision/t/test-cname-timestamps.sql (revision 987) +++ /branches/cname-collision/t/test-cname-timestamps.sql (revision 988) @@ -7,2 +7,5 @@ UPDATE records SET stamp = date_trunc('day', now() + interval '5 day') + '11:30' WHERE record_id = 49; UPDATE records SET stamp = date_trunc('day', now() - interval '3 day') + '14:00' WHERE record_id = 50; + +UPDATE records SET stamp = date_trunc('day', now() + interval '4 day') + '11:30' WHERE record_id = 59; +UPDATE records SET stamp = date_trunc('day', now() + interval '4 day') + '11:30' WHERE record_id = 60;