Use SQL system catalog views to check for the presence of a Recoverab…

…le column. This removes the need for SELECT permissions to send a message to a queue table. Co-authored-by: Marc Wils <marc@marcwils.be.eu.org>
Particular · Oct 17, 2024 · 8a73690 · 8a73690
1 parent c6b5359
commit 8a73690
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 8 deletions.
diff --git a/...er.AcceptanceTests/NativeTimeouts/When_configured_to_purge_expired_messages_at_startup.cs b/...er.AcceptanceTests/NativeTimeouts/When_configured_to_purge_expired_messages_at_startup.cs
@@ -1,4 +1,4 @@
-namespace NServiceBus.Transport.SqlServer.AcceptanceTests.NativeTimeouts
+namespace NServiceBus.Transport.SqlServer.AcceptanceTests.NativeTimeouts
 {
     using System;
     using System.Collections.Generic;

diff --git a/src/NServiceBus.Transport.SqlServer.IntegrationTests/When_checking_schema.cs b/src/NServiceBus.Transport.SqlServer.IntegrationTests/When_checking_schema.cs
@@ -1,4 +1,4 @@
-namespace NServiceBus.Transport.SqlServer.IntegrationTests
+namespace NServiceBus.Transport.SqlServer.IntegrationTests
 {
     using System;
     using System.Threading;

diff --git a/src/NServiceBus.Transport.SqlServer.IntegrationTests/When_dispatching_messages.cs b/src/NServiceBus.Transport.SqlServer.IntegrationTests/When_dispatching_messages.cs
@@ -1,4 +1,4 @@
-namespace NServiceBus.Transport.SqlServer.IntegrationTests
+namespace NServiceBus.Transport.SqlServer.IntegrationTests
 {
     using System;
     using System.Collections.Generic;

diff --git a/src/NServiceBus.Transport.SqlServer.IntegrationTests/When_message_receive_takes_long.cs b/src/NServiceBus.Transport.SqlServer.IntegrationTests/When_message_receive_takes_long.cs
@@ -1,4 +1,4 @@
-namespace NServiceBus.Transport.SqlServer.IntegrationTests
+namespace NServiceBus.Transport.SqlServer.IntegrationTests
 {
     using System;
     using System.Collections.Generic;

diff --git a/src/NServiceBus.Transport.SqlServer.IntegrationTests/When_receiving_messages.cs b/src/NServiceBus.Transport.SqlServer.IntegrationTests/When_receiving_messages.cs
@@ -1,4 +1,4 @@
-namespace NServiceBus.Transport.SqlServer.IntegrationTests
+namespace NServiceBus.Transport.SqlServer.IntegrationTests
 {
     using System;
     using System.Linq;

diff --git a/src/NServiceBus.Transport.SqlServer.IntegrationTests/When_recoverable_column_is_removed.cs b/src/NServiceBus.Transport.SqlServer.IntegrationTests/When_recoverable_column_is_removed.cs
@@ -1,4 +1,4 @@
-namespace NServiceBus.Transport.SqlServer.IntegrationTests
+namespace NServiceBus.Transport.SqlServer.IntegrationTests
 {
     using System;
     using System.Collections.Generic;

diff --git a/src/NServiceBus.Transport.SqlServer.IntegrationTests/When_using_ttbr.cs b/src/NServiceBus.Transport.SqlServer.IntegrationTests/When_using_ttbr.cs
@@ -1,4 +1,4 @@
-namespace NServiceBus.Transport.SqlServer.IntegrationTests
+namespace NServiceBus.Transport.SqlServer.IntegrationTests
 {
     using System;
     using System.Collections.Generic;

diff --git a/src/NServiceBus.Transport.SqlServer/Queuing/SqlConstants.cs b/src/NServiceBus.Transport.SqlServer/Queuing/SqlConstants.cs
@@ -48,7 +48,11 @@ THEN DATEADD(ms, @TimeToBeReceivedMs, GETUTCDATE()) END,
 IF (@NOCOUNT = 'ON') SET NOCOUNT ON;
 IF (@NOCOUNT = 'OFF') SET NOCOUNT OFF;";
 
-        public static readonly string CheckIfTableHasRecoverableText = "SELECT TOP (0) * FROM {0} WITH (NOLOCK);";
+        public static string CheckIfTableHasRecoverableText { get; set; } = @"
+SELECT COUNT(*)
+FROM {0}.sys.columns c
+WHERE c.object_id = OBJECT_ID(N'{1}')
+    AND c.name = 'Recoverable'";
 
         public static readonly string StoreDelayedMessageText =
 @"