Minor comments and code organizations.

mikependon · Mar 16, 2023 · 4ee230b · 4ee230b
1 parent b0f1b0b
commit 4ee230b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 23 deletions.
diff --git a/RepoDb.Core/RepoDb/Extensions/DbCommandExtension.cs b/RepoDb.Core/RepoDb/Extensions/DbCommandExtension.cs
@@ -844,21 +844,21 @@ private static void EnsureTableValueParameter(IDbDataParameter parameter)
             DbFieldCollection dbFields)
         {
             if (dbFields is null || dbFields.IsEmpty()) return null;
-            
+
             var fieldNameSpan = fieldName.AsSpan();
-            
+
             if (fieldNameSpan.IsEmpty || fieldNameSpan.IsWhiteSpace())
             {
                 return null;
             }
-            
+
             var index = fieldNameSpan.IndexOf("_In_".AsSpan(), StringComparison.OrdinalIgnoreCase);
 
             if (index >= 0)
             {
                 fieldNameSpan = fieldNameSpan.Slice(0, index);
             }
-            
+
             return dbFields.GetByName(fieldNameSpan.ToString());
         }
 
@@ -887,7 +887,7 @@ private static void EnsureTableValueParameter(IDbDataParameter parameter)
             }
             else
             {
-                return Convert.ChangeType(value, targetType);
+                return (value != DBNull.Value) ? Convert.ChangeType(value, targetType) : Activator.CreateInstance(targetType);
             }
         }
 

diff --git a/RepoDb.Core/RepoDb/Operations/DbConnection/Merge.cs b/RepoDb.Core/RepoDb/Operations/DbConnection/Merge.cs
@@ -721,7 +721,7 @@ public static partial class DbConnectionExtension
                         fields: GetQualifiedFields<TEntity>(fields, entity),
                         hints: hints,
                         commandTimeout: commandTimeout,
-                traceKey: traceKey,
+                        traceKey: traceKey,
                         transaction: transaction,
                         trace: trace,
                         statementBuilder: statementBuilder);
@@ -735,7 +735,7 @@ public static partial class DbConnectionExtension
                         fields: GetQualifiedFields<TEntity>(fields, entity),
                         hints: hints,
                         commandTimeout: commandTimeout,
-                traceKey: traceKey,
+                        traceKey: traceKey,
                         transaction: transaction,
                         trace: trace,
                         statementBuilder: statementBuilder);
@@ -752,7 +752,7 @@ public static partial class DbConnectionExtension
                         fields: GetQualifiedFields<TEntity>(fields, entity),
                         hints: hints,
                         commandTimeout: commandTimeout,
-                traceKey: traceKey,
+                        traceKey: traceKey,
                         transaction: transaction,
                         trace: trace,
                         statementBuilder: statementBuilder);
@@ -766,7 +766,7 @@ public static partial class DbConnectionExtension
                         fields: GetQualifiedFields<TEntity>(fields, entity),
                         hints: hints,
                         commandTimeout: commandTimeout,
-                traceKey: traceKey,
+                        traceKey: traceKey,
                         transaction: transaction,
                         trace: trace,
                         statementBuilder: statementBuilder);

diff --git a/RepoDb.MySql/RepoDb.MySql.IntegrationTests/appveyor.yml b/RepoDb.MySql/RepoDb.MySql.IntegrationTests/appveyor.yml
diff --git a/RepoDb.MySql/RepoDb.MySql/StatementBuilders/MySqlStatementBuilder.cs b/RepoDb.MySql/RepoDb.MySql/StatementBuilders/MySqlStatementBuilder.cs
@@ -610,7 +610,7 @@ public MySqlStatementBuilder()
         /// <param name="tableName">The name of the target table.</param>
         /// <param name="fields">The mapping list of <see cref="Field"/> objects to be used.</param>
         /// <param name="skip">The number of rows to skip.</param>
-        /// <param name="take">The number of rows per batch.</param>
+        /// <param name="take">The number of rows to take.</param>
         /// <param name="orderBy">The list of fields for ordering.</param>
         /// <param name="where">The query expression.</param>
         /// <param name="hints">The table hints to be used.</param>

diff --git a/....MySqlConnector/RepoDb.MySqlConnector/StatementBuilders/MySqlConnectorStatementBuilder.cs b/....MySqlConnector/RepoDb.MySqlConnector/StatementBuilders/MySqlConnectorStatementBuilder.cs
@@ -608,8 +608,8 @@ public MySqlConnectorStatementBuilder()
         /// </summary>
         /// <param name="tableName">The name of the target table.</param>
         /// <param name="fields">The list of fields to be queried.</param>
-        /// <param name="page">The page of the batch.</param>
-        /// <param name="rowsPerBatch">The number of rows per batch.</param>
+        /// <param name="skip">The number of rows to skip.</param>
+        /// <param name="take">The number of rows to take.</param>
         /// <param name="orderBy">The list of fields for ordering.</param>
         /// <param name="where">The query expression.</param>
         /// <param name="hints">The table hints to be used.</param>