fixing the last todo

src/NServiceBus.Transport.PostgreSql.AcceptanceTests/NServiceBusAcceptanceTest.cs

@@ -36,7 +36,6 @@ public void SetUp()
 
                 var fullTestName = testName + "#" + endpointBuilder;
 
-                //TODO: shorten the .delayed to get additional symbols for the queue name
                 // Max length for table name is 63. We need to reserve space for the:
                 // - ".delayed" - suffix (8)
                 // - "_Seq_seq" suffix for auto-created sequence backing up the Seq column (8)

src/NServiceBus.Transport.PostgreSql/PostgreSqlConstants.cs

@@ -45,9 +45,9 @@ THEN 0
 ";
 
     public string MoveDueDelayedMessageText { get; set; } = @"
-WITH message as (DELETE FROM {0} WHERE seq in (SELECT seq from {0} WHERE {0}.Due < now() AT TIME ZONE 'UTC' LIMIT @BatchSize) 
-RETURNING headers, body)
-INSERT into {1} (id, correlationid, replytoaddress, expires, headers, body) SELECT gen_random_uuid(), NULL, NULL, NULL, headers, body FROM message;
+WITH message as (DELETE FROM {0} WHERE id in (SELECT id from {0} WHERE {0}.Due < now() AT TIME ZONE 'UTC' LIMIT @BatchSize) 
+RETURNING id, headers, body)
+INSERT into {1} (id, correlationid, replytoaddress, expires, headers, body) SELECT id, NULL, NULL, NULL, headers, body FROM message;
 
 SELECT now() AT TIME ZONE 'UTC' as UtcNow, Due as NextDue
 FROM {0} 
@@ -111,10 +111,10 @@ Seq serial NOT NULL
 
     public string CreateDelayedMessageStoreText { get; set; } = @"
 CREATE TABLE IF NOT EXISTS {0} (
+    Id uuid NOT NULL DEFAULT gen_random_uuid(), 
     Headers text NOT NULL,
     Body bytea,
-    Due timestamptz NOT NULL,
-    Seq bigint not null generated always as identity
+    Due timestamptz NOT NULL
 );";
 
     //HINT: https://stackoverflow.com/questions/1766046/postgresql-create-table-if-not-exists

src/NServiceBus.Transport.PostgreSql/PostgreSqlTransportInfrastructure.cs

@@ -18,8 +18,9 @@
 
 class PostgreSqlTransportInfrastructure : TransportInfrastructure
 {
-    //The PostgreSQL limit is 63 but we need to reserve space for "_Seq_seq" suffix used in the
-    //auto-created sequence and that is 8 bytes less
+    //The limit is 55=63-max(8,8). 63 is the built-in PostgreSQL limit and we also need to reserve space for:
+    //  - "_Seq_seq" suffix (8 bytes) used in the auto-created sequence for the main queue table
+    //  - ".delayed" suffix (8 bytes) that is used in the delayed messages table
     const int TableQueueNameLimit = 55;
     readonly PostgreSqlTransport transport;
     readonly HostSettings hostSettings;