Skip to content

Commit 18ba337

Browse files
committed
Fixes SqlServeer sql case sensitive. #1389
1 parent 0d8e935 commit 18ba337

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

src/DotNetCore.CAP.SqlServer/IMonitoringApi.SqlServer.cs

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -87,23 +87,19 @@ public async Task<PagedQueryResult<MessageDto>> GetMessagesAsync(MessageQueryDto
8787
{
8888
var tableName = queryDto.MessageType == MessageType.Publish ? _pubName : _recName;
8989
var where = string.Empty;
90-
if (!string.IsNullOrEmpty(queryDto.StatusName)) where += " and statusname=@StatusName";
90+
if (!string.IsNullOrEmpty(queryDto.StatusName)) where += " AND [StatusName]=@StatusName";
9191

92-
if (!string.IsNullOrEmpty(queryDto.Name)) where += " and name=@Name";
92+
if (!string.IsNullOrEmpty(queryDto.Name)) where += " AND [Name]=@Name";
9393

94-
if (!string.IsNullOrEmpty(queryDto.Group)) where += " and [group]=@Group";
94+
if (!string.IsNullOrEmpty(queryDto.Group)) where += " AND [Group]=@Group";
9595

96-
if (!string.IsNullOrEmpty(queryDto.Content)) where += " and content like @Content";
96+
if (!string.IsNullOrEmpty(queryDto.Content)) where += " AND [Content] LIKE @Content";
9797

9898
var sqlQuery2008 =
99-
$@"select * from
100-
(SELECT t.*, ROW_NUMBER() OVER(order by t.Added desc) AS row_number
101-
from {tableName} as t
102-
where 1=1 {where}) as tbl
103-
where tbl.row_number between @offset and @offset + @limit";
99+
$@"SELECT * FROM (SELECT p.*, ROW_NUMBER() OVER(ORDER BY p.Added DESC) AS RowNum FROM {tableName} as p WHERE 1=1 {where}) as tbl WHERE tbl.RowNum BETWEEN @Offset AND @Offset + @Limit";
104100

105101
var sqlQuery =
106-
$"select * from {tableName} where 1=1 {where} order by Added desc offset @Offset rows fetch next @Limit rows only";
102+
$"SELECT * FROM {tableName} WHERE 1=1 {where} ORDER BY Added DESC OFFSET @Offset ROWS FETCH NEXT @Limit ROWS ONLY";
107103

108104
object[] sqlParams =
109105
{
@@ -118,7 +114,7 @@ public async Task<PagedQueryResult<MessageDto>> GetMessagesAsync(MessageQueryDto
118114
var connection = new SqlConnection(_options.ConnectionString);
119115
await using var _ = connection.ConfigureAwait(false);
120116

121-
var count = await connection.ExecuteScalarAsync<int>($"select count(1) from {tableName} where 1=1 {where}",
117+
var count = await connection.ExecuteScalarAsync<int>($"SELECT COUNT(1) FROM {tableName} WHERE 1=1 {where}",
122118
new SqlParameter("@StatusName", queryDto.StatusName ?? string.Empty),
123119
new SqlParameter("@Group", queryDto.Group ?? string.Empty),
124120
new SqlParameter("@Name", queryDto.Name ?? string.Empty),

0 commit comments

Comments
 (0)