Skip to content

Commit d4000b3

Browse files
ChaosEngineChaosEngine
committed
table columns names refactorings
1 parent 57979c7 commit d4000b3

File tree

2 files changed

+44
-43
lines changed

2 files changed

+44
-43
lines changed

‎src/Pomelo.Extensions.Caching.MySql/MySqlQueries.cs‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@ internal class MySqlQueries
1313

1414
private const string UpdateCacheItemFormat =
1515
"UPDATE {0} " +
16-
"SET ExpiresAtTime = " +
16+
"SET " + Columns.Names.ExpiresAtTime + " = " +
1717
"(CASE " +
18-
"WHEN TIME_TO_SEC(TIMEDIFF(AbsoluteExpiration, @UtcNow)) <= SlidingExpirationInSeconds " +
19-
"THEN AbsoluteExpiration " +
18+
"WHEN TIME_TO_SEC(TIMEDIFF(" + Columns.Names.AbsoluteExpiration + ", @UtcNow)) <= " + Columns.Names.SlidingExpirationInSeconds + " " +
19+
"THEN " + Columns.Names.AbsoluteExpiration + " " +
2020
"ELSE " +
21-
"DATE_ADD(@UtcNow, INTERVAL SlidingExpirationInSeconds SECOND) " +
21+
"DATE_ADD(@UtcNow, INTERVAL " + Columns.Names.SlidingExpirationInSeconds + " SECOND) " +
2222
"END) " +
23-
"WHERE Id = @Id " +
24-
"AND @UtcNow <= ExpiresAtTime " +
25-
"AND SlidingExpirationInSeconds IS NOT NULL " +
26-
"AND (AbsoluteExpiration IS NULL OR AbsoluteExpiration <> ExpiresAtTime);";
23+
"WHERE " + Columns.Names.CacheItemId + " = @Id " +
24+
"AND @UtcNow <= " + Columns.Names.ExpiresAtTime + " " +
25+
"AND " + Columns.Names.SlidingExpirationInSeconds + " IS NOT NULL " +
26+
"AND (" + Columns.Names.AbsoluteExpiration + " IS NULL OR " + Columns.Names.AbsoluteExpiration + " <> " + Columns.Names.ExpiresAtTime + ");";
2727

2828
private const string GetCacheItemFormat =
29-
"SELECT Id, ExpiresAtTime, SlidingExpirationInSeconds, AbsoluteExpiration, Value " +
30-
"FROM {0} WHERE Id = @Id AND @UtcNow <= ExpiresAtTime;";
29+
"SELECT Id, " + Columns.Names.ExpiresAtTime + ", " + Columns.Names.SlidingExpirationInSeconds + ", " + Columns.Names.AbsoluteExpiration + ", " + Columns.Names.CacheItemValue + " " +
30+
"FROM {0} WHERE " + Columns.Names.CacheItemId + " = @Id AND @UtcNow <= " + Columns.Names.ExpiresAtTime + ";";
3131

3232
private const string SetCacheItemFormat =
3333
"SET @ExpiresAtTime = " +
@@ -37,17 +37,18 @@ internal class MySqlQueries
3737
"ELSE " +
3838
"DATE_ADD(@UtcNow, INTERVAL @SlidingExpirationInSeconds SECOND) " +
3939
"END);" +
40-
"INSERT INTO {0} " +
41-
"(Id, Value, ExpiresAtTime, SlidingExpirationInSeconds, AbsoluteExpiration) " +
40+
"INSERT INTO {0} (" + Columns.Names.CacheItemId + ", " + Columns.Names.CacheItemValue + ", " +
41+
Columns.Names.ExpiresAtTime + ", " + Columns.Names.SlidingExpirationInSeconds + ", " +
42+
Columns.Names.AbsoluteExpiration + ") " +
4243
"VALUES (@Id, @Value, @ExpiresAtTime, @SlidingExpirationInSeconds, @AbsoluteExpiration)" +
4344
" ON DUPLICATE KEY " +
44-
"UPDATE Value = @Value, ExpiresAtTime = @ExpiresAtTime," +
45-
"SlidingExpirationInSeconds = @SlidingExpirationInSeconds, AbsoluteExpiration = @AbsoluteExpiration " +
45+
"UPDATE " + Columns.Names.CacheItemValue + " = @Value, " + Columns.Names.ExpiresAtTime + " = @ExpiresAtTime," +
46+
Columns.Names.SlidingExpirationInSeconds + " = @SlidingExpirationInSeconds, " + Columns.Names.AbsoluteExpiration + " = @AbsoluteExpiration " +
4647
";";
4748

48-
private const string DeleteCacheItemFormat = "DELETE FROM {0} WHERE Id = @Id";
49+
private const string DeleteCacheItemFormat = "DELETE FROM {0} WHERE " + Columns.Names.CacheItemId + " = @Id";
4950

50-
public const string DeleteExpiredCacheItemsFormat = "DELETE FROM {0} WHERE @UtcNow > ExpiresAtTime";
51+
public const string DeleteExpiredCacheItemsFormat = "DELETE FROM {0} WHERE @UtcNow > " + Columns.Names.ExpiresAtTime;
5152

5253
public MySqlQueries(string schemaName, string tableName)
5354
{

‎test/Pomelo.Extensions.Caching.MySql.Tests/MySqlCacheWithDatabaseTest.cs‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ await sqlServerCache.SetAsync(
239239
// Assert
240240
Assert.Null(value);
241241
}
242-
242+
243243
[IgnoreWhenNoSqlSetupFact]
244244
public async Task DoesNotThrowException_WhenOnlyAbsoluteExpirationSupplied_AbsoluteExpirationRelativeToNow()
245245
{
@@ -360,24 +360,24 @@ await AssertGetCacheItemFromDatabaseAsync(
360360
absoluteExpiration: absoluteExpiration,
361361
expectedExpirationTime: absoluteExpiration);
362362
}
363-
364-
[IgnoreWhenNoSqlSetupFact]
365-
public async Task SetCacheItem_Uses_DefaultSlidingExpiration_If_NoSlidingOrAbsoluteExpirationSupplied()
366-
{
367-
// Arrange
368-
var key = Guid.NewGuid().ToString();
369-
var sqlServerCache = GetCache();
370-
var expectedValue = Encoding.UTF8.GetBytes("Hello, World!");
371-
372-
await sqlServerCache.SetAsync(
373-
key,
374-
expectedValue,
375-
new DistributedCacheEntryOptions());
376-
377-
var cacheItem = await GetCacheItemFromDatabaseAsync(key);
378-
Assert.NotNull(cacheItem);
379-
Assert.Equal(cacheItem.SlidingExpirationInSeconds, _databaseOptionsFixture.Options.Value.DefaultSlidingExpiration);
380-
}
363+
364+
[IgnoreWhenNoSqlSetupFact]
365+
public async Task SetCacheItem_Uses_DefaultSlidingExpiration_If_NoSlidingOrAbsoluteExpirationSupplied()
366+
{
367+
// Arrange
368+
var key = Guid.NewGuid().ToString();
369+
var sqlServerCache = GetCache();
370+
var expectedValue = Encoding.UTF8.GetBytes("Hello, World!");
371+
372+
await sqlServerCache.SetAsync(
373+
key,
374+
expectedValue,
375+
new DistributedCacheEntryOptions());
376+
377+
var cacheItem = await GetCacheItemFromDatabaseAsync(key);
378+
Assert.NotNull(cacheItem);
379+
Assert.Equal(cacheItem.SlidingExpirationInSeconds, _databaseOptionsFixture.Options.Value.DefaultSlidingExpiration);
380+
}
381381

382382
[IgnoreWhenNoSqlSetupFact]
383383
public async Task ExtendsExpirationTime_ForSlidingExpiration()
@@ -711,7 +711,7 @@ public async Task Profiling(int threadCount, int outerLoop, int innerLoop)
711711
{
712712
}
713713

714-
await cache.SetAsync(key, value , options);
714+
await cache.SetAsync(key, value, options);
715715
}
716716
}
717717
});
@@ -732,7 +732,7 @@ public async Task IsDuplicateKeyException()
732732
var expectedValue = Encoding.UTF8.GetBytes("MyValue");
733733

734734
await cache.SetAsync(key, expectedValue, options);
735-
735+
736736
CacheItemInfo value = new CacheItemInfo
737737
{
738738
Id = key,
@@ -751,7 +751,7 @@ public async Task IsDuplicateKeyException()
751751

752752
await cache.SetAsync(key, expectedValue, options);
753753
}
754-
754+
755755
[IgnoreWhenNoSqlSetupFact]
756756
public async Task DeleteExpiredCacheItems()
757757
{
@@ -778,8 +778,8 @@ await sqlServerCache.SetAsync(
778778
cacheItemInfo = await sqlServerCache.GetAsync(key);
779779
Assert.Null(cacheItemInfo);
780780
}
781-
782-
781+
782+
783783
private MySqlCache GetCache(ISystemClock testClock = null)
784784
{
785785
var options = _databaseOptionsFixture.Options.Value;
@@ -812,8 +812,8 @@ private async Task<CacheItemInfo> GetCacheItemFromDatabaseAsync(string key)
812812
using (var connection = new MySqlConnection(_databaseOptionsFixture.Options.Value.ReadConnectionString))
813813
{
814814
var command = new MySqlCommand(
815-
"SELECT Id, Value, ExpiresAtTime, SlidingExpirationInSeconds, AbsoluteExpiration " +
816-
$"FROM {_databaseOptionsFixture.Options.Value.TableName} WHERE Id = @Id",
815+
"SELECT " + Columns.Names.CacheItemId + ", " + Columns.Names.CacheItemValue + ", " + Columns.Names.ExpiresAtTime + ", " + Columns.Names.SlidingExpirationInSeconds + ", " + Columns.Names.AbsoluteExpiration + " " +
816+
$"FROM {_databaseOptionsFixture.Options.Value.TableName} WHERE " + Columns.Names.CacheItemId + " = @Id",
817817
connection);
818818
command.Parameters.AddWithValue("Id", key);
819819

@@ -859,7 +859,7 @@ private async Task<CacheItemInfo> GetCacheItemFromDatabaseAsync(string key)
859859
{
860860
var command = new MySqlCommand(
861861
$"INSERT INTO {_databaseOptionsFixture.Options.Value.TableName} " +
862-
"(Id, Value, ExpiresAtTime, SlidingExpirationInSeconds, AbsoluteExpiration) " +
862+
"(" + Columns.Names.CacheItemId + ", " + Columns.Names.CacheItemValue + ", " + Columns.Names.ExpiresAtTime + ", " + Columns.Names.SlidingExpirationInSeconds + ", " + Columns.Names.AbsoluteExpiration + ") " +
863863
"VALUES (@Id, @Value, @ExpiresAtTime, @SlidingExpirationInSeconds, @AbsoluteExpiration)",
864864
connection);
865865
command.Parameters.AddWithValue("Id", value.Id);

0 commit comments

Comments
 (0)