Skip to content

Commit 4ee230b

Browse files
committed
Minor comments and code organizations.
1 parent b0f1b0b commit 4ee230b

File tree

5 files changed

+12
-23
lines changed

5 files changed

+12
-23
lines changed

RepoDb.Core/RepoDb/Extensions/DbCommandExtension.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -844,21 +844,21 @@ private static DbField GetDbField(string fieldName,
844844
DbFieldCollection dbFields)
845845
{
846846
if (dbFields is null || dbFields.IsEmpty()) return null;
847-
847+
848848
var fieldNameSpan = fieldName.AsSpan();
849-
849+
850850
if (fieldNameSpan.IsEmpty || fieldNameSpan.IsWhiteSpace())
851851
{
852852
return null;
853853
}
854-
854+
855855
var index = fieldNameSpan.IndexOf("_In_".AsSpan(), StringComparison.OrdinalIgnoreCase);
856856

857857
if (index >= 0)
858858
{
859859
fieldNameSpan = fieldNameSpan.Slice(0, index);
860860
}
861-
861+
862862
return dbFields.GetByName(fieldNameSpan.ToString());
863863
}
864864

@@ -887,7 +887,7 @@ private static object AutomaticConvert(object value,
887887
}
888888
else
889889
{
890-
return Convert.ChangeType(value, targetType);
890+
return (value != DBNull.Value) ? Convert.ChangeType(value, targetType) : Activator.CreateInstance(targetType);
891891
}
892892
}
893893

RepoDb.Core/RepoDb/Operations/DbConnection/Merge.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ internal static TResult MergeInternal<TEntity, TResult>(this IDbConnection conne
721721
fields: GetQualifiedFields<TEntity>(fields, entity),
722722
hints: hints,
723723
commandTimeout: commandTimeout,
724-
traceKey: traceKey,
724+
traceKey: traceKey,
725725
transaction: transaction,
726726
trace: trace,
727727
statementBuilder: statementBuilder);
@@ -735,7 +735,7 @@ internal static TResult MergeInternal<TEntity, TResult>(this IDbConnection conne
735735
fields: GetQualifiedFields<TEntity>(fields, entity),
736736
hints: hints,
737737
commandTimeout: commandTimeout,
738-
traceKey: traceKey,
738+
traceKey: traceKey,
739739
transaction: transaction,
740740
trace: trace,
741741
statementBuilder: statementBuilder);
@@ -752,7 +752,7 @@ internal static TResult MergeInternal<TEntity, TResult>(this IDbConnection conne
752752
fields: GetQualifiedFields<TEntity>(fields, entity),
753753
hints: hints,
754754
commandTimeout: commandTimeout,
755-
traceKey: traceKey,
755+
traceKey: traceKey,
756756
transaction: transaction,
757757
trace: trace,
758758
statementBuilder: statementBuilder);
@@ -766,7 +766,7 @@ internal static TResult MergeInternal<TEntity, TResult>(this IDbConnection conne
766766
fields: GetQualifiedFields<TEntity>(fields, entity),
767767
hints: hints,
768768
commandTimeout: commandTimeout,
769-
traceKey: traceKey,
769+
traceKey: traceKey,
770770
transaction: transaction,
771771
trace: trace,
772772
statementBuilder: statementBuilder);

RepoDb.MySql/RepoDb.MySql.IntegrationTests/appveyor.yml

Lines changed: 0 additions & 11 deletions
This file was deleted.

RepoDb.MySql/RepoDb.MySql/StatementBuilders/MySqlStatementBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ public override string CreateQuery(string tableName,
610610
/// <param name="tableName">The name of the target table.</param>
611611
/// <param name="fields">The mapping list of <see cref="Field"/> objects to be used.</param>
612612
/// <param name="skip">The number of rows to skip.</param>
613-
/// <param name="take">The number of rows per batch.</param>
613+
/// <param name="take">The number of rows to take.</param>
614614
/// <param name="orderBy">The list of fields for ordering.</param>
615615
/// <param name="where">The query expression.</param>
616616
/// <param name="hints">The table hints to be used.</param>

RepoDb.MySqlConnector/RepoDb.MySqlConnector/StatementBuilders/MySqlConnectorStatementBuilder.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -608,8 +608,8 @@ public override string CreateQuery(string tableName,
608608
/// </summary>
609609
/// <param name="tableName">The name of the target table.</param>
610610
/// <param name="fields">The list of fields to be queried.</param>
611-
/// <param name="page">The page of the batch.</param>
612-
/// <param name="rowsPerBatch">The number of rows per batch.</param>
611+
/// <param name="skip">The number of rows to skip.</param>
612+
/// <param name="take">The number of rows to take.</param>
613613
/// <param name="orderBy">The list of fields for ordering.</param>
614614
/// <param name="where">The query expression.</param>
615615
/// <param name="hints">The table hints to be used.</param>

0 commit comments

Comments
 (0)