Database accessor generation is now more deterministic and doesn't rely on generic type overloads

Author: C0nquistadore

src/Dibix.Dapper/DapperDatabaseAccessor.cs

@@ -27,12 +27,12 @@ public DapperDatabaseAccessor(DbConnection connection = null, IDbTransaction def
         #endregion
 
         #region Overrides
-        protected override int Execute(string commandText, CommandType commandType, int? commandTimeout, ParametersVisitor parameters)
+        protected override int Execute(string commandText, CommandType commandType, ParametersVisitor parameters, int? commandTimeout)
         {
             return base.Connection.Execute(commandText, CollectParameters(parameters), _defaultTransaction, commandTimeout ?? _defaultCommandTimeout, commandType);
         }
 
-        protected override Task<int> ExecuteAsync(string commandText, CommandType commandType, int? commandTimeout, ParametersVisitor parameters, CancellationToken cancellationToken)
+        protected override Task<int> ExecuteAsync(string commandText, CommandType commandType, ParametersVisitor parameters, int? commandTimeout, CancellationToken cancellationToken)
         {
             CommandDefinition command = new CommandDefinition(commandText, CollectParameters(parameters), _defaultTransaction, commandTimeout ?? _defaultCommandTimeout, commandType, cancellationToken: cancellationToken);
             return base.Connection.ExecuteAsync(command);
@@ -52,64 +52,10 @@ protected override Task<IEnumerable<T>> QueryManyAsync<T>(string commandText, Co
             return base.Connection.QueryAsync<T>(command);
         }
 
-        protected override IEnumerable<TReturn> QueryMany<TFirst, TSecond, TReturn>(string commandText, CommandType commandType, ParametersVisitor parameters, Func<TFirst, TSecond, TReturn> map, string splitOn)
+        protected override IEnumerable<TReturn> QueryMany<TReturn>(string commandText, CommandType commandType, ParametersVisitor parameters, Type[] types, Func<object[], TReturn> map, string splitOn)
         {
-            DecoratedTypeMap.Adapt<TFirst, TSecond>();
-            return base.Connection.Query(commandText, map, CollectParameters(parameters), _defaultTransaction, commandType: commandType, commandTimeout: _defaultCommandTimeout, splitOn: splitOn);
-        }
-
-        protected override IEnumerable<TReturn> QueryMany<TFirst, TSecond, TThird, TReturn>(string commandText, CommandType commandType, ParametersVisitor parameters, Func<TFirst, TSecond, TThird, TReturn> map, string splitOn)
-        {
-            DecoratedTypeMap.Adapt<TFirst, TSecond, TThird>();
-            return base.Connection.Query(commandText, map, CollectParameters(parameters), _defaultTransaction, commandType: commandType, commandTimeout: _defaultCommandTimeout, splitOn: splitOn);
-        }
-
-        protected override IEnumerable<TReturn> QueryMany<TFirst, TSecond, TThird, TFourth, TReturn>(string commandText, CommandType commandType, ParametersVisitor parameters, Func<TFirst, TSecond, TThird, TFourth, TReturn> map, string splitOn)
-        {
-            DecoratedTypeMap.Adapt<TFirst, TSecond, TThird, TFourth>();
-            return base.Connection.Query(commandText, map, CollectParameters(parameters), _defaultTransaction, commandType: commandType, commandTimeout: _defaultCommandTimeout, splitOn: splitOn);
-        }
-
-        protected override IEnumerable<TReturn> QueryMany<TFirst, TSecond, TThird, TFourth, TFifth, TReturn>(string commandText, CommandType commandType, ParametersVisitor parameters, Func<TFirst, TSecond, TThird, TFourth, TFifth, TReturn> map, string splitOn)
-        {
-            DecoratedTypeMap.Adapt<TFirst, TSecond, TThird, TFourth, TFifth>();
-            return base.Connection.Query(commandText, map, CollectParameters(parameters), _defaultTransaction, commandType: commandType, commandTimeout: _defaultCommandTimeout, splitOn: splitOn);
-        }
-
-        protected override IEnumerable<TReturn> QueryMany<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TReturn>(string commandText, CommandType commandType, ParametersVisitor parameters, Func<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TReturn> map, string splitOn)
-        {
-            DecoratedTypeMap.Adapt<TFirst, TSecond, TThird, TFourth, TFifth, TSixth>();
-            return base.Connection.Query(commandText, map, CollectParameters(parameters), _defaultTransaction, commandType: commandType, commandTimeout: _defaultCommandTimeout, splitOn: splitOn);
-        }
-
-        protected override IEnumerable<TReturn> QueryMany<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh, TReturn>(string commandText, CommandType commandType, ParametersVisitor parameters, Func<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh, TReturn> map, string splitOn)
-        {
-            DecoratedTypeMap.Adapt<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh>();
-            return base.Connection.Query(commandText, map, CollectParameters(parameters), _defaultTransaction, commandType: commandType, commandTimeout: _defaultCommandTimeout, splitOn: splitOn);
-        }
-
-        protected override IEnumerable<TReturn> QueryMany<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh, TEighth, TReturn>(string commandText, CommandType commandType, ParametersVisitor parameters, Func<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh, TEighth, TReturn> map, string splitOn)
-        {
-            DecoratedTypeMap.Adapt<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh, TEighth>();
-            Type[] types = { typeof(TFirst), typeof(TSecond), typeof(TThird), typeof(TFourth), typeof(TFifth), typeof(TSixth), typeof(TSeventh), typeof(TEighth) };
-            Func<object[], TReturn> mapWrapper = x => map((TFirst)x[0], (TSecond)x[1], (TThird)x[2], (TFourth)x[3], (TFifth)x[4], (TSixth)x[5], (TSeventh)x[6], (TEighth)x[7]);
-            return base.Connection.Query(commandText, types, mapWrapper, CollectParameters(parameters), _defaultTransaction, commandType: commandType, commandTimeout: _defaultCommandTimeout, splitOn: splitOn);
-        }
-
-        protected override IEnumerable<TReturn> QueryMany<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh, TEighth, TNinth, TReturn>(string commandText, CommandType commandType, ParametersVisitor parameters, Func<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh, TEighth, TNinth, TReturn> map, string splitOn)
-        {
-            DecoratedTypeMap.Adapt<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh, TEighth, TNinth>();
-            Type[] types = { typeof(TFirst), typeof(TSecond), typeof(TThird), typeof(TFourth), typeof(TFifth), typeof(TSixth), typeof(TSeventh), typeof(TEighth), typeof(TNinth) };
-            Func<object[], TReturn> mapWrapper = x => map((TFirst)x[0], (TSecond)x[1], (TThird)x[2], (TFourth)x[3], (TFifth)x[4], (TSixth)x[5], (TSeventh)x[6], (TEighth)x[7], (TNinth)x[8]);
-            return base.Connection.Query(commandText, types, mapWrapper, CollectParameters(parameters), _defaultTransaction, commandType: commandType, commandTimeout: _defaultCommandTimeout, splitOn: splitOn);
-        }
-
-        protected override IEnumerable<TReturn> QueryMany<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh, TEighth, TNinth, TTenth, TEleventh, TReturn>(string commandText, CommandType commandType, ParametersVisitor parameters, Func<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh, TEighth, TNinth, TTenth, TEleventh, TReturn> map, string splitOn)
-        {
-            DecoratedTypeMap.Adapt<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh, TEighth, TNinth, TTenth, TEleventh>();
-            Type[] types = { typeof(TFirst), typeof(TSecond), typeof(TThird), typeof(TFourth), typeof(TFifth), typeof(TSixth), typeof(TSeventh), typeof(TEighth), typeof(TNinth), typeof(TTenth), typeof(TEleventh) };
-            Func<object[], TReturn> mapWrapper = x => map((TFirst)x[0], (TSecond)x[1], (TThird)x[2], (TFourth)x[3], (TFifth)x[4], (TSixth)x[5], (TSeventh)x[6], (TEighth)x[7], (TNinth)x[8], (TTenth)x[9], (TEleventh)x[10]);
-            return base.Connection.Query(commandText, types, mapWrapper, CollectParameters(parameters), _defaultTransaction, commandType: commandType, commandTimeout: _defaultCommandTimeout, splitOn: splitOn);
+            DecoratedTypeMap.Adapt(types);
+            return base.Connection.Query(commandText, types, map, CollectParameters(parameters), _defaultTransaction, commandType: commandType, commandTimeout: _defaultCommandTimeout, splitOn: splitOn);
         }
 
         protected override T QuerySingle<T>(string commandText, CommandType commandType, ParametersVisitor parameters)

src/Dibix.Dapper/DapperGridResultReader.cs

@@ -14,104 +14,64 @@ internal sealed class DapperGridResultReader : MultipleResultReader, IMultipleRe
         #endregion
 
         #region Properties
-        public override bool IsConsumed => this._reader.IsConsumed;
+        public override bool IsConsumed => _reader.IsConsumed;
         #endregion
 
         #region Constructor
         public DapperGridResultReader(SqlMapper.GridReader reader, string commandText, CommandType commandType, ParametersVisitor parameters) : base(commandText, commandType, parameters, isSqlClient: reader.Command is SqlCommand)
         {
-            this._reader = reader;
+            _reader = reader;
         }
         #endregion
 
         #region IMultipleResultReader Members
         protected override IEnumerable<T> ReadMany<T>()
         {
             DecoratedTypeMap.Adapt<T>();
-            return this._reader.Read<T>();
+            return _reader.Read<T>();
         }
 
         protected override Task<IEnumerable<T>> ReadManyAsync<T>()
         {
             DecoratedTypeMap.Adapt<T>();
-            return this._reader.ReadAsync<T>();
+            return _reader.ReadAsync<T>();
         }
 
-        protected override IEnumerable<TReturn> ReadMany<TFirst, TSecond, TReturn>(Func<TFirst, TSecond, TReturn> map, string splitOn)
+        protected override IEnumerable<TReturn> ReadMany<TReturn>(Type[] types, Func<object[], TReturn> map, string splitOn)
         {
-            DecoratedTypeMap.Adapt<TFirst, TSecond>();
-            return this._reader.Read(map, splitOn);
-        }
-
-        protected override IEnumerable<TReturn> ReadMany<TFirst, TSecond, TThird, TReturn>(Func<TFirst, TSecond, TThird, TReturn> map, string splitOn)
-        {
-            DecoratedTypeMap.Adapt<TFirst, TSecond, TThird>();
-            return this._reader.Read(map, splitOn);
-        }
-
-        protected override IEnumerable<TReturn> ReadMany<TFirst, TSecond, TThird, TFourth, TReturn>(Func<TFirst, TSecond, TThird, TFourth, TReturn> map, string splitOn)
-        {
-            DecoratedTypeMap.Adapt<TFirst, TSecond, TThird, TFourth>();
-            return this._reader.Read(map, splitOn);
-        }
-
-        protected override IEnumerable<TReturn> ReadMany<TFirst, TSecond, TThird, TFourth, TFifth, TReturn>(Func<TFirst, TSecond, TThird, TFourth, TFifth, TReturn> map, string splitOn)
-        {
-            DecoratedTypeMap.Adapt<TFirst, TSecond, TThird, TFourth, TFifth>();
-            return this._reader.Read(map, splitOn);
-        }
-
-        protected override IEnumerable<TReturn> ReadMany<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TReturn>(Func<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TReturn> map, string splitOn)
-        {
-            DecoratedTypeMap.Adapt<TFirst, TSecond, TThird, TFourth, TFifth, TSixth>();
-            return this._reader.Read(map, splitOn);
-        }
-
-        protected override IEnumerable<TReturn> ReadMany<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh, TReturn>(Func<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh, TReturn> map, string splitOn)
-        {
-            DecoratedTypeMap.Adapt<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh>();
-            return this._reader.Read(map, splitOn);
-        }
-
-        protected override IEnumerable<TReturn> ReadMany<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh, TEighth, TNinth, TReturn>(Func<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh, TEighth, TNinth, TReturn> map, string splitOn)
-        {
-            DecoratedTypeMap.Adapt<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh, TEighth, TNinth>();
-            Type[] types = { typeof(TFirst), typeof(TSecond), typeof(TThird), typeof(TFourth), typeof(TFifth), typeof(TSixth), typeof(TSeventh), typeof(TEighth), typeof(TNinth) };
-            Func<object[], TReturn> mapWrapper = x => map((TFirst)x[0], (TSecond)x[1], (TThird)x[2], (TFourth)x[3], (TFifth)x[4], (TSixth)x[5], (TSeventh)x[6], (TEighth)x[7], (TNinth)x[8]);
-            return this._reader.Read(types, mapWrapper, splitOn);
-        }
-
-        protected override IEnumerable<TReturn> ReadMany<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh, TEighth, TNinth, TTenth, TReturn>(Func<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh, TEighth, TNinth, TTenth, TReturn> map, string splitOn)
-        {
-            DecoratedTypeMap.Adapt<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh, TEighth, TNinth, TTenth>();
-            Type[] types = { typeof(TFirst), typeof(TSecond), typeof(TThird), typeof(TFourth), typeof(TFifth), typeof(TSixth), typeof(TSeventh), typeof(TEighth), typeof(TNinth), typeof(TTenth) };
-            Func<object[], TReturn> mapWrapper = x => map((TFirst)x[0], (TSecond)x[1], (TThird)x[2], (TFourth)x[3], (TFifth)x[4], (TSixth)x[5], (TSeventh)x[6], (TEighth)x[7], (TNinth)x[8], (TTenth)x[9]);
-            return this._reader.Read(types, mapWrapper, splitOn);
+            DecoratedTypeMap.Adapt(types);
+            return _reader.Read(types, map, splitOn);
         }
 
         protected override T ReadSingle<T>()
         {
             DecoratedTypeMap.Adapt<T>();
-            return this._reader.ReadSingle<T>();
+            return _reader.ReadSingle<T>();
         }
 
         protected override Task<T> ReadSingleAsync<T>()
         {
             DecoratedTypeMap.Adapt<T>();
-            return this._reader.ReadSingleAsync<T>();
+            return _reader.ReadSingleAsync<T>();
         }
 
         protected override T ReadSingleOrDefault<T>()
         {
             DecoratedTypeMap.Adapt<T>();
-            return this._reader.ReadSingleOrDefault<T>();
+            return _reader.ReadSingleOrDefault<T>();
+        }
+
+        protected override Task<T> ReadSingleOrDefaultAsync<T>()
+        {
+            DecoratedTypeMap.Adapt<T>();
+            return _reader.ReadSingleOrDefaultAsync<T>();
         }
         #endregion
 
         #region IDisposable Members
         public override void Dispose()
         {
-            this._reader?.Dispose();
+            _reader?.Dispose();
         }
         #endregion
     }

src/Dibix.Dapper/DecoratedTypeMap.cs

@@ -20,18 +20,16 @@ private DecoratedTypeMap(SqlMapper.ITypeMap inner, Type type)
         #endregion
 
         #region Registration
-        public static void Adapt<T>() => Adapt(typeof(T));
-        public static void Adapt<TFirst, TSecond>() => Adapt(typeof(TFirst), typeof(TSecond));
-        public static void Adapt<TFirst, TSecond, TThird>() => Adapt(typeof(TFirst), typeof(TSecond), typeof(TThird));
-        public static void Adapt<TFirst, TSecond, TThird, TFourth>() => Adapt(typeof(TFirst), typeof(TSecond), typeof(TThird), typeof(TFourth));
-        public static void Adapt<TFirst, TSecond, TThird, TFourth, TFifth>() => Adapt(typeof(TFirst), typeof(TSecond), typeof(TThird), typeof(TFourth), typeof(TFifth));
-        public static void Adapt<TFirst, TSecond, TThird, TFourth, TFifth, TSixth>() => Adapt(typeof(TFirst), typeof(TSecond), typeof(TThird), typeof(TFourth), typeof(TFifth), typeof(TSixth));
-        public static void Adapt<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh>() => Adapt(typeof(TFirst), typeof(TSecond), typeof(TThird), typeof(TFourth), typeof(TFifth), typeof(TSixth), typeof(TSeventh));
-        public static void Adapt<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh, TEighth>() => Adapt(typeof(TFirst), typeof(TSecond), typeof(TThird), typeof(TFourth), typeof(TFifth), typeof(TSixth), typeof(TSeventh), typeof(TEighth));
-        public static void Adapt<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh, TEighth, TNinth>() => Adapt(typeof(TFirst), typeof(TSecond), typeof(TThird), typeof(TFourth), typeof(TFifth), typeof(TSixth), typeof(TSeventh), typeof(TEighth), typeof(TNinth));
-        public static void Adapt<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh, TEighth, TNinth, TTenth>() => Adapt(typeof(TFirst), typeof(TSecond), typeof(TThird), typeof(TFourth), typeof(TFifth), typeof(TSixth), typeof(TSeventh), typeof(TEighth), typeof(TNinth), typeof(TTenth));
-        public static void Adapt<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh, TEighth, TNinth, TTenth, TEleventh>() => Adapt(typeof(TFirst), typeof(TSecond), typeof(TThird), typeof(TFourth), typeof(TFifth), typeof(TSixth), typeof(TSeventh), typeof(TEighth), typeof(TNinth), typeof(TTenth), typeof(TEleventh));
-        private static void Adapt(params Type[] types)
+        public static void Adapt<T>() => AdaptCore(typeof(T));
+        public static void Adapt<TFirst, TSecond>() => AdaptCore(typeof(TFirst), typeof(TSecond));
+        public static void Adapt<TFirst, TSecond, TThird>() => AdaptCore(typeof(TFirst), typeof(TSecond), typeof(TThird));
+        public static void Adapt<TFirst, TSecond, TThird, TFourth>() => AdaptCore(typeof(TFirst), typeof(TSecond), typeof(TThird), typeof(TFourth));
+        public static void Adapt<TFirst, TSecond, TThird, TFourth, TFifth>() => AdaptCore(typeof(TFirst), typeof(TSecond), typeof(TThird), typeof(TFourth), typeof(TFifth));
+        public static void Adapt<TFirst, TSecond, TThird, TFourth, TFifth, TSixth>() => AdaptCore(typeof(TFirst), typeof(TSecond), typeof(TThird), typeof(TFourth), typeof(TFifth), typeof(TSixth));
+        public static void Adapt<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh>() => AdaptCore(typeof(TFirst), typeof(TSecond), typeof(TThird), typeof(TFourth), typeof(TFifth), typeof(TSixth), typeof(TSeventh));
+        public static void Adapt<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh, TEighth>() => AdaptCore(typeof(TFirst), typeof(TSecond), typeof(TThird), typeof(TFourth), typeof(TFifth), typeof(TSixth), typeof(TSeventh), typeof(TEighth));
+        public static void Adapt(Type[] types) => AdaptCore(types);
+        private static void AdaptCore(params Type[] types)
         {
             foreach (Type type in types)
                 Register(type);