Replace all dynamic references by the ExpandoObject type

Author: cedx

src/Sql/ConnectionExtensions.Async.cs

@@ -77,7 +77,7 @@ public static async Task<IDataReader> ExecuteReaderAsync(this IDbConnection conn
 	/// <param name="options">The command options.</param>
 	/// <param name="cancellationToken">The token to cancel the operation.</param>
 	/// <returns>The sequence of objects whose properties correspond to the columns.</returns>
-	public static async Task<IEnumerable<dynamic>> QueryAsync(this IDbConnection connection, string sql, ParameterCollection? parameters = null, CommandOptions? options = null, CancellationToken cancellationToken = default) =>
+	public static async Task<IEnumerable<ExpandoObject>> QueryAsync(this IDbConnection connection, string sql, ParameterCollection? parameters = null, CommandOptions? options = null, CancellationToken cancellationToken = default) =>
 		await QueryAsync<ExpandoObject>(connection, sql, parameters, options, cancellationToken);
 
 	/// <summary>
@@ -103,7 +103,7 @@ public static async Task<IEnumerable<dynamic>> QueryAsync(this IDbConnection con
 	/// <param name="cancellationToken">The token to cancel the operation.</param>
 	/// <returns>The first row.</returns>
 	/// <exception cref="InvalidOperationException">The result set is empty.</exception>
-	public static async Task<dynamic> QueryFirstAsync(this IDbConnection connection, string sql, ParameterCollection? parameters = null, CommandOptions? options = null, CancellationToken cancellationToken = default) =>
+	public static async Task<ExpandoObject> QueryFirstAsync(this IDbConnection connection, string sql, ParameterCollection? parameters = null, CommandOptions? options = null, CancellationToken cancellationToken = default) =>
 		await QueryFirstAsync<ExpandoObject>(connection, sql, parameters, options, cancellationToken);
 
 	/// <summary>
@@ -131,7 +131,7 @@ public static async Task<dynamic> QueryFirstAsync(this IDbConnection connection,
 	/// <param name="options">The command options.</param>
 	/// <param name="cancellationToken">The token to cancel the operation.</param>
 	/// <returns>The first row, or <see langword="null"/> if not found.</returns>
-	public static async Task<dynamic?> QueryFirstOrDefaultAsync(this IDbConnection connection, string sql, ParameterCollection? parameters = null, CommandOptions? options = null, CancellationToken cancellationToken = default) =>
+	public static async Task<ExpandoObject?> QueryFirstOrDefaultAsync(this IDbConnection connection, string sql, ParameterCollection? parameters = null, CommandOptions? options = null, CancellationToken cancellationToken = default) =>
 		await QueryFirstOrDefaultAsync<ExpandoObject>(connection, sql, parameters, options, cancellationToken);
 
 	/// <summary>
@@ -159,7 +159,7 @@ public static async Task<dynamic> QueryFirstAsync(this IDbConnection connection,
 	/// <param name="cancellationToken">The token to cancel the operation.</param>
 	/// <returns>The single row.</returns>
 	/// <exception cref="InvalidOperationException">The result set is empty or contains more than one record.</exception>
-	public static async Task<dynamic> QuerySingleAsync(this IDbConnection connection, string sql, ParameterCollection? parameters = null, CommandOptions? options = null, CancellationToken cancellationToken = default) =>
+	public static async Task<ExpandoObject> QuerySingleAsync(this IDbConnection connection, string sql, ParameterCollection? parameters = null, CommandOptions? options = null, CancellationToken cancellationToken = default) =>
 		await QuerySingleAsync<ExpandoObject>(connection, sql, parameters, options, cancellationToken);
 
 	/// <summary>
@@ -195,7 +195,7 @@ record = mapper.CreateInstance<T>(reader);
 	/// <param name="options">The command options.</param>
 	/// <param name="cancellationToken">The token to cancel the operation.</param>
 	/// <returns>The single row, or <see langword="null"/> if not found.</returns>
-	public static async Task<dynamic?> QuerySingleOrDefaultAsync(this IDbConnection connection, string sql, ParameterCollection? parameters = null, CommandOptions? options = null, CancellationToken cancellationToken = default) =>
+	public static async Task<ExpandoObject?> QuerySingleOrDefaultAsync(this IDbConnection connection, string sql, ParameterCollection? parameters = null, CommandOptions? options = null, CancellationToken cancellationToken = default) =>
 		await QuerySingleOrDefaultAsync<ExpandoObject>(connection, sql, parameters, options, cancellationToken);
 
 	/// <summary>

src/Sql/ConnectionExtensions.Sync.cs

@@ -71,7 +71,7 @@ public static IDataReader ExecuteReader(this IDbConnection connection, string sq
 	/// <param name="parameters">The parameters of the SQL query.</param>
 	/// <param name="options">The command options.</param>
 	/// <returns>The sequence of objects whose properties correspond to the columns.</returns>
-	public static IEnumerable<dynamic> Query(this IDbConnection connection, string sql, ParameterCollection? parameters = null, CommandOptions? options = null) =>
+	public static IEnumerable<ExpandoObject> Query(this IDbConnection connection, string sql, ParameterCollection? parameters = null, CommandOptions? options = null) =>
 		Query<ExpandoObject>(connection, sql, parameters, options);
 
 	/// <summary>
@@ -95,7 +95,7 @@ public static IEnumerable<dynamic> Query(this IDbConnection connection, string s
 	/// <param name="options">The command options.</param>
 	/// <returns>The first row.</returns>
 	/// <exception cref="InvalidOperationException">The result set is empty.</exception>
-	public static dynamic QueryFirst(this IDbConnection connection, string sql, ParameterCollection? parameters = null, CommandOptions? options = null) =>
+	public static ExpandoObject QueryFirst(this IDbConnection connection, string sql, ParameterCollection? parameters = null, CommandOptions? options = null) =>
 		QueryFirst<ExpandoObject>(connection, sql, parameters, options);
 
 	/// <summary>
@@ -121,7 +121,7 @@ public static dynamic QueryFirst(this IDbConnection connection, string sql, Para
 	/// <param name="parameters">The parameters of the SQL query.</param>
 	/// <param name="options">The command options.</param>
 	/// <returns>The first row, or <see langword="null"/> if not found.</returns>
-	public static dynamic? QueryFirstOrDefault(this IDbConnection connection, string sql, ParameterCollection? parameters = null, CommandOptions? options = null) =>
+	public static ExpandoObject? QueryFirstOrDefault(this IDbConnection connection, string sql, ParameterCollection? parameters = null, CommandOptions? options = null) =>
 		QueryFirstOrDefault<ExpandoObject>(connection, sql, parameters, options);
 
 	/// <summary>
@@ -147,7 +147,7 @@ public static dynamic QueryFirst(this IDbConnection connection, string sql, Para
 	/// <param name="options">The command options.</param>
 	/// <returns>The single row.</returns>
 	/// <exception cref="InvalidOperationException">The result set is empty or contains more than one record.</exception>
-	public static dynamic QuerySingle(this IDbConnection connection, string sql, ParameterCollection? parameters = null, CommandOptions? options = null) =>
+	public static ExpandoObject QuerySingle(this IDbConnection connection, string sql, ParameterCollection? parameters = null, CommandOptions? options = null) =>
 		QuerySingle<ExpandoObject>(connection, sql, parameters, options);
 
 	/// <summary>
@@ -181,7 +181,7 @@ record = mapper.CreateInstance<T>(reader);
 	/// <param name="parameters">The parameters of the SQL query.</param>
 	/// <param name="options">The command options.</param>
 	/// <returns>The single row, or <see langword="null"/> if not found.</returns>
-	public static dynamic? QuerySingleOrDefault(this IDbConnection connection, string sql, ParameterCollection? parameters = null, CommandOptions? options = null) =>
+	public static ExpandoObject? QuerySingleOrDefault(this IDbConnection connection, string sql, ParameterCollection? parameters = null, CommandOptions? options = null) =>
 		QuerySingleOrDefault<ExpandoObject>(connection, sql, parameters, options);
 
 	/// <summary>

src/Sql/Mapper.cs

@@ -21,7 +21,7 @@ public sealed class Mapper {
 	/// </summary>
 	/// <param name="record">A data record providing the properties to be set on the created object.</param>
 	/// <returns>The newly created object.</returns>
-	public dynamic CreateInstance(IDataRecord record) => CreateInstance<ExpandoObject>(record);
+	public ExpandoObject CreateInstance(IDataRecord record) => CreateInstance<ExpandoObject>(record);
 
 	/// <summary>
 	/// Creates a new object of a given type from the specified data record.
@@ -44,7 +44,7 @@ public sealed class Mapper {
 	/// </summary>
 	/// <param name="properties">A dictionary providing the properties to be set on the created object.</param>
 	/// <returns>The newly created object.</returns>
-	public dynamic CreateInstance(IDictionary<string, object?> properties) => CreateInstance<ExpandoObject>(properties);
+	public ExpandoObject CreateInstance(IDictionary<string, object?> properties) => CreateInstance<ExpandoObject>(properties);
 
 	/// <summary>
 	/// Creates a new object of a given type from the specified dictionary.
@@ -74,7 +74,7 @@ public sealed class Mapper {
 	/// </summary>
 	/// <param name="reader">A data reader providing the properties to be set on the created objects.</param>
 	/// <returns>An enumerable of newly created objects.</returns>
-	public IEnumerable<dynamic> CreateInstances(IDataReader reader) => CreateInstances<ExpandoObject>(reader);
+	public IEnumerable<ExpandoObject> CreateInstances(IDataReader reader) => CreateInstances<ExpandoObject>(reader);
 
 	/// <summary>
 	/// Creates new objects of a given type from the specified data reader.