Skip to content

Fix local build errors #334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 2, 2022
Merged

Fix local build errors #334

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfcba91
Fix local build errors
Charles-Gagnon Sep 2, 2022
eedbf49
Update comments
Charles-Gagnon Sep 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/SqlAsyncCollector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ private static void GenerateDataQueryForMerge(TableInformation table, IEnumerabl
{
// SQL Server allows 900 bytes per primary key, so use that as a baseline
var combinedPrimaryKey = new StringBuilder(900 * table.PrimaryKeys.Count());
// Look up primary key of T. Because we're going in the same order of fields every time,
// Look up primary key of T. Because we're going in the same order of properties every time,
// we can assume that if two rows with the same primary key are in the list, they will collide
foreach (PropertyInfo primaryKey in table.PrimaryKeys)
{
Expand Down Expand Up @@ -351,7 +351,7 @@ public class TableInformation
{
private const string ISO_8061_DATETIME_FORMAT = "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fff";

public IEnumerable<MemberInfo> PrimaryKeys { get; }
public IEnumerable<PropertyInfo> PrimaryKeys { get; }

/// <summary>
/// All of the columns, along with their data types, for SQL to use to turn JSON into a table
Expand Down Expand Up @@ -385,7 +385,7 @@ public class TableInformation
/// </summary>
public JsonSerializerSettings JsonSerializerSettings { get; }

public TableInformation(IEnumerable<MemberInfo> primaryKeys, IDictionary<string, string> columns, StringComparer comparer, string query, bool hasIdentityColumnPrimaryKeys)
public TableInformation(IEnumerable<PropertyInfo> primaryKeys, IDictionary<string, string> columns, StringComparer comparer, string query, bool hasIdentityColumnPrimaryKeys)
{
this.PrimaryKeys = primaryKeys;
this.Columns = columns;
Expand Down Expand Up @@ -622,9 +622,9 @@ public static async Task<TableInformation> RetrieveTableInformationAsync(SqlConn
throw ex;
}

// Match SQL Primary Key column names to POCO field/property objects. Ensure none are missing.
// Match SQL Primary Key column names to POCO property objects. Ensure none are missing.
StringComparison comparison = caseSensitive ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase;
IEnumerable<MemberInfo> primaryKeyFields = typeof(T).GetMembers().Where(f => primaryKeys.Any(k => string.Equals(k.Name, f.Name, comparison)));
IEnumerable<PropertyInfo> primaryKeyProperties = typeof(T).GetProperties().Where(f => primaryKeys.Any(k => string.Equals(k.Name, f.Name, comparison)));
IEnumerable<string> primaryKeysFromObject = columnNames.Where(f => primaryKeys.Any(k => string.Equals(k.Name, f, comparison)));
IEnumerable<PrimaryKey> missingPrimaryKeysFromItem = primaryKeys
.Where(k => !primaryKeysFromObject.Contains(k.Name, comparer));
Expand Down Expand Up @@ -654,8 +654,8 @@ public static async Task<TableInformation> RetrieveTableInformationAsync(SqlConn
sqlConnProps.Add(TelemetryPropertyName.QueryType, usingInsertQuery ? "insert" : "merge");
sqlConnProps.Add(TelemetryPropertyName.HasIdentityColumn, hasIdentityColumnPrimaryKeys.ToString());
TelemetryInstance.TrackDuration(TelemetryEventName.GetTableInfoEnd, tableInfoSw.ElapsedMilliseconds, sqlConnProps, durations);
logger.LogDebugWithThreadId($"END RetrieveTableInformationAsync Duration={tableInfoSw.ElapsedMilliseconds}ms DB and Table: {sqlConnection.Database}.{fullName}. Primary keys: [{string.Join(",", primaryKeyFields.Select(pk => pk.Name))}]. SQL Column and Definitions: [{string.Join(",", columnDefinitionsFromSQL)}]");
return new TableInformation(primaryKeyFields, columnDefinitionsFromSQL, comparer, query, hasIdentityColumnPrimaryKeys);
logger.LogDebugWithThreadId($"END RetrieveTableInformationAsync Duration={tableInfoSw.ElapsedMilliseconds}ms DB and Table: {sqlConnection.Database}.{fullName}. Primary keys: [{string.Join(",", primaryKeyProperties.Select(pk => pk.Name))}]. SQL Column and Definitions: [{string.Join(",", columnDefinitionsFromSQL)}]");
return new TableInformation(primaryKeyProperties, columnDefinitionsFromSQL, comparer, query, hasIdentityColumnPrimaryKeys);
}
}

Expand Down