Fix date file format bug when retrying query from database. #1143

dotnetcore · Jun 4, 2022 · 432500f · 432500f
1 parent aceb505
commit 432500f
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 12 deletions.
diff --git a/src/DotNetCore.CAP.MySql/IDataStorage.MySql.cs b/src/DotNetCore.CAP.MySql/IDataStorage.MySql.cs
@@ -184,10 +184,17 @@ private void StoreReceivedMessage(object[] sqlParams)
 
         private async Task<IEnumerable<MediumMessage>> GetMessagesOfNeedRetryAsync(string tableName)
         {
-            var fourMinAgo = DateTime.Now.AddMinutes(-4).ToString("O");
+            var fourMinAgo = DateTime.Now.AddMinutes(-4);
             var sql =
-                $"SELECT `Id`,`Content`,`Retries`,`Added` FROM `{tableName}` WHERE `Retries`<{_capOptions.Value.FailedRetryCount} " +
-                $"AND `Version`='{_capOptions.Value.Version}' AND `Added`<'{fourMinAgo}' AND (`StatusName` = '{StatusName.Failed}' OR `StatusName` = '{StatusName.Scheduled}') LIMIT 200;";
+                $"SELECT `Id`,`Content`,`Retries`,`Added` FROM `{tableName}` WHERE `Retries`<@Retries " +
+                $"AND `Version`=@Version AND `Added`<@Added AND (`StatusName` = '{StatusName.Failed}' OR `StatusName` = '{StatusName.Scheduled}') LIMIT 200;";
+
+            object[] sqlParams =
+            {
+                new MySqlParameter("@Retries", _capOptions.Value.FailedRetryCount),
+                new MySqlParameter("@Version", _capOptions.Value.Version),
+                new MySqlParameter("@Added", fourMinAgo)
+            };
 
             await using var connection = new MySqlConnection(_options.Value.ConnectionString);
             var result = connection.ExecuteReader(sql, reader =>
@@ -205,7 +212,7 @@ private async Task<IEnumerable<MediumMessage>> GetMessagesOfNeedRetryAsync(strin
                 }
 
                 return messages;
-            });
+            }, sqlParams);
 
             return result;
         }

diff --git a/src/DotNetCore.CAP.PostgreSql/IDataStorage.PostgreSql.cs b/src/DotNetCore.CAP.PostgreSql/IDataStorage.PostgreSql.cs
@@ -185,10 +185,17 @@ private void StoreReceivedMessage(object[] sqlParams)
 
         private async Task<IEnumerable<MediumMessage>> GetMessagesOfNeedRetryAsync(string tableName)
         {
-            var fourMinAgo = DateTime.Now.AddMinutes(-4).ToString("O");
+            var fourMinAgo = DateTime.Now.AddMinutes(-4);
             var sql =
-                $"SELECT \"Id\",\"Content\",\"Retries\",\"Added\" FROM {tableName} WHERE \"Retries\"<{_capOptions.Value.FailedRetryCount} " +
-                $"AND \"Version\"='{_capOptions.Value.Version}' AND \"Added\"<'{fourMinAgo}' AND (\"StatusName\"='{StatusName.Failed}' OR \"StatusName\"='{StatusName.Scheduled}') LIMIT 200;";
+                $"SELECT \"Id\",\"Content\",\"Retries\",\"Added\" FROM {tableName} WHERE \"Retries\"<@Retries " +
+                $"AND \"Version\"=@Version AND \"Added\"<@Added AND (\"StatusName\"='{StatusName.Failed}' OR \"StatusName\"='{StatusName.Scheduled}') LIMIT 200;";
+
+            object[] sqlParams =
+            {
+                new NpgsqlParameter("@Retries", _capOptions.Value.FailedRetryCount),
+                new NpgsqlParameter("@Version", _capOptions.Value.Version),
+                new NpgsqlParameter("@Added", fourMinAgo)
+            };
 
             await using var connection = new NpgsqlConnection(_options.Value.ConnectionString);
             var result = connection.ExecuteReader(sql, reader =>
@@ -206,7 +213,7 @@ private async Task<IEnumerable<MediumMessage>> GetMessagesOfNeedRetryAsync(strin
                 }
 
                 return messages;
-            });
+            }, sqlParams);
 
             return result;
         }

diff --git a/src/DotNetCore.CAP.SqlServer/IDataStorage.SqlServer.cs b/src/DotNetCore.CAP.SqlServer/IDataStorage.SqlServer.cs
@@ -184,10 +184,17 @@ private void StoreReceivedMessage(object[] sqlParams)
 
         private async Task<IEnumerable<MediumMessage>> GetMessagesOfNeedRetryAsync(string tableName)
         {
-            var fourMinAgo = DateTime.Now.AddMinutes(-4).ToString("O");
+            var fourMinAgo = DateTime.Now.AddMinutes(-4);
             var sql =
-                $"SELECT TOP (200) Id, Content, Retries, Added FROM {tableName} WITH (readpast) WHERE Retries<{_capOptions.Value.FailedRetryCount} " +
-                $"AND Version='{_capOptions.Value.Version}' AND Added<'{fourMinAgo}' AND (StatusName = '{StatusName.Failed}' OR StatusName = '{StatusName.Scheduled}')";
+                $"SELECT TOP (200) Id, Content, Retries, Added FROM {tableName} WITH (readpast) WHERE Retries<@Retries " +
+                $"AND Version=@Version AND Added<@Added AND (StatusName = '{StatusName.Failed}' OR StatusName = '{StatusName.Scheduled}')";
+
+            object[] sqlParams =
+            {
+                new SqlParameter("@Retries", _capOptions.Value.FailedRetryCount),
+                new SqlParameter("@Version", _capOptions.Value.Version),
+                new SqlParameter("@Added", fourMinAgo)
+            };
 
             List<MediumMessage> result;
             await using (var connection = new SqlConnection(_options.Value.ConnectionString))
@@ -207,7 +214,7 @@ await using (var connection = new SqlConnection(_options.Value.ConnectionString)
                     }
 
                     return messages;
-                });
+                }, sqlParams);
             }
 
             return result;