Fixes for post-merge of recent PR #189 (#205)

* Fix PR merge error by restoring incorrectly merged code

* Fixed FetchNextJob() trigger not working if options.UseNativeDatabaseTransactions was in use (also fixes test)

Author: Plasma

src/Hangfire.PostgreSql/PostgreSqlJobQueue.cs

@@ -45,23 +45,20 @@ public PostgreSqlJobQueue(PostgreSqlStorage storage, PostgreSqlStorageOptions op
 			_storage = storage ?? throw new ArgumentNullException(nameof(storage));
 			SignalDequeue = new AutoResetEvent(false);
 		}
-        public PostgreSqlJobQueue(PostgreSqlStorage storage, PostgreSqlStorageOptions options)
-        {
-            _options = options ?? throw new ArgumentNullException(nameof(options));
-            _storage = storage ?? throw new ArgumentNullException(nameof(storage));
-        }
 
+		[NotNull]
+		public IFetchedJob Dequeue(string[] queues, CancellationToken cancellationToken)
+		{
+			if (_options.UseNativeDatabaseTransactions)
+				return Dequeue_Transaction(queues, cancellationToken);
 
-        [NotNull]
-        public IFetchedJob Dequeue(string[] queues, CancellationToken cancellationToken)
-        {
-            if (_options.UseNativeDatabaseTransactions)
-                return Dequeue_Transaction(queues, cancellationToken);
+			return Dequeue_UpdateCount(queues, cancellationToken);
+		}
 
-		/// <summary>
-		///		Signal the waiting Thread to lookup a new Job
-		/// </summary>
-		public void FetchNextJob()
+        /// <summary>
+        ///		Signal the waiting Thread to lookup a new Job
+        /// </summary>
+        public void FetchNextJob()
 		{
 			SignalDequeue.Set();
 		}
@@ -233,7 +230,13 @@ internal IFetchedJob Dequeue_UpdateCount(string[] queues, CancellationToken canc
                 {
                     if (currentQueryIndex == fetchConditions.Length - 1)
                     {
-                        cancellationToken.WaitHandle.WaitOne(_options.QueuePollInterval);
+	                    WaitHandle.WaitAny(new[]
+		                    {
+			                    cancellationToken.WaitHandle,
+			                    SignalDequeue
+		                    },
+		                    _options.QueuePollInterval);
+
                         cancellationToken.ThrowIfCancellationRequested();
                     }
                 }