Skip to content

Commit 8c96999

Browse files
committed
Cleanup Async signatures to be consistent
1 parent ab413ad commit 8c96999

2 files changed

Lines changed: 18 additions & 10 deletions

File tree

SQLitePCL.pretty.Orm/TableMapping.Delete.cs

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,20 +54,29 @@ public static IReadOnlyDictionary<long,T> DeleteAll<T>(this IDatabaseConnection
5454
.ToDictionary(kvp => kvp.Key, kvp => kvp.Value));
5555
}
5656

57-
public static Task<IReadOnlyDictionary<long,T>> DeleteAllAsync<T>(this IAsyncDatabaseConnection This, ITableMapping<T> tableMapping, IEnumerable<T> objects, CancellationToken ct)
57+
public static Task<IReadOnlyDictionary<long,T>> DeleteAllAsync<T>(this IAsyncDatabaseConnection This, ITableMapping<T> tableMapping, IEnumerable<long> primaryKeys, CancellationToken ct)
5858
{
59-
var primaryKeys = objects.Select(tableMapping.GetPrimaryKey);
6059
return This.Use((db,_) => db.DeleteAll<T>(tableMapping, primaryKeys), ct);
6160
}
6261

62+
public static Task<IReadOnlyDictionary<long,T>> DeleteAllAsync<T>(this IAsyncDatabaseConnection This, ITableMapping<T> tableMapping, IEnumerable<long> primaryKeys)
63+
{
64+
return This.DeleteAllAsync(tableMapping, primaryKeys, CancellationToken.None);
65+
}
66+
6367
public static void DeleteAllRows<T>(this IDatabaseConnection This, ITableMapping<T> tableMapping)
6468
{
6569
This.DeleteAll(tableMapping.TableName);
6670
}
6771

72+
public static Task DeleteAllRowsAsync<T>(this IAsyncDatabaseConnection This, ITableMapping<T> tableMapping, CancellationToken ct)
73+
{
74+
return This.Use((db, _) => db.DeleteAllRows(tableMapping), ct);
75+
}
76+
6877
public static Task DeleteAllRowsAsync<T>(this IAsyncDatabaseConnection This, ITableMapping<T> tableMapping)
6978
{
70-
return This.Use(db => db.DeleteAllRows(tableMapping));
79+
return This.DeleteAllRowsAsync(tableMapping, CancellationToken.None);
7180
}
7281
}
7382
}

SQLitePCL.pretty.Orm/TableMapping.cs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -112,22 +112,21 @@ private static string PrimaryKeyColumn(this ITableMapping This)
112112
return primaryKeyColumn.GetValue(This, mapping =>
113113
// Intentionally throw if the column doesn't have a primary key
114114
mapping.Columns.Where(x => x.Value.Metadata.IsPrimaryKeyPart).Select(x => x.Key).First());
115-
}
116-
117-
private static long GetPrimaryKey<T>(this ITableMapping<T> This, T obj)
118-
{
119-
var primaryKeyPropery = This.Columns[This.PrimaryKeyColumn()].Property;
120-
return (long) primaryKeyPropery.GetValue(obj);
121115
}
122116

123117
public static void DropTable<T>(this IDatabaseConnection This, ITableMapping<T> tableMapping)
124118
{
125119
This.DropTable(tableMapping.TableName);
126120
}
127121

122+
public static Task DropTableAsync<T>(this IAsyncDatabaseConnection This, ITableMapping<T> tableMapping, CancellationToken ct)
123+
{
124+
return This.Use((db, _) => db.DropTable(tableMapping), ct);
125+
}
126+
128127
public static Task DropTableAsync<T>(this IAsyncDatabaseConnection This, ITableMapping<T> tableMapping)
129128
{
130-
return This.Use(db => db.DropTable(tableMapping));
129+
return This.DropTableAsync(tableMapping, CancellationToken.None);
131130
}
132131

133132
public static ITableMapping<T> Create<T>()

0 commit comments

Comments
 (0)