CQ - All method overloads should be adjacent.

Author: abhinavminhas

QueryDB/DBContext.cs

@@ -103,91 +103,91 @@ public List<DataDictionary> FetchData(string selectSql, bool upperCaseKeys = fal
         }
 
         /// <summary>
-        /// Asynchronously executes and retrieves records for 'Select' queries from the database.
-        /// Converts column names to keys holding values, with multiple database rows returned into a list.
-        /// Note: Use aliases in query for similar column names.
+        /// Executes and retrieves records for 'Select' queries from the database.
         /// </summary>
+        /// <typeparam name="T">Object entity to return data mapped into.</typeparam>
         /// <param name="selectSql">'Select' query.</param>
-        /// <param name="upperCaseKeys">Boolean parameter to return dictionary keys in uppercase. Default - <c>false</c>.</param>
-        /// <returns>List of <see cref="DataDictionary"/> with column names as keys holding values into a list for multiple rows of data.</returns>
-        public async Task<List<DataDictionary>> FetchDataAsync(string selectSql, bool upperCaseKeys = false)
+        /// <param name="strict">Enables fetch data only for object type <typeparamref name="T"/> properties existing in database query result. Default - <c>false</c>.</param>
+        /// <returns>List of data rows mapped into object of type <typeparamref name="T"/>.</returns>
+        public List<T> FetchData<T>(string selectSql, bool strict = false) where T : new()
         {
-            var dataList = new List<DataDictionary>();
+            var dataList = new List<T>();
             if (Database.Equals(DB.MSSQL))
             {
                 using (var msSqlDBConnection = GetSqlServerConnection())
                 {
                     var _systemAdapter = new MSSQL.Adapter();
-                    dataList = await _systemAdapter.FetchDataAsync(selectSql, msSqlDBConnection.SqlConnection, upperCaseKeys);
+                    dataList = _systemAdapter.FetchData<T>(selectSql, msSqlDBConnection.SqlConnection, strict);
                 }
             }
             else if (Database.Equals(DB.MySQL))
             {
                 using (var mySqlDBConnection = GetMySqlConnection())
                 {
                     var _systemAdapter = new MySQL.Adapter();
-                    dataList = await _systemAdapter.FetchDataAsync(selectSql, mySqlDBConnection.MySqlConnection, upperCaseKeys);
+                    dataList = _systemAdapter.FetchData<T>(selectSql, mySqlDBConnection.MySqlConnection, strict);
                 }
             }
             else if (Database.Equals(DB.Oracle))
             {
                 using (var oracleDBConnection = GetOracleConnection())
                 {
                     var _systemAdapter = new Oracle.Adapter();
-                    dataList = await _systemAdapter.FetchDataAsync(selectSql, oracleDBConnection.OracleConnection, upperCaseKeys);
+                    dataList = _systemAdapter.FetchData<T>(selectSql, oracleDBConnection.OracleConnection, strict);
                 }
             }
             else if (Database.Equals(DB.PostgreSQL))
             {
                 using (var postgreSqlDBConnection = GetPostgreSqlConnection())
                 {
                     var _systemAdapter = new PostgreSQL.Adapter();
-                    dataList = await _systemAdapter.FetchDataAsync(selectSql, postgreSqlDBConnection.PostgreSQLConnection, upperCaseKeys);
+                    dataList = _systemAdapter.FetchData<T>(selectSql, postgreSqlDBConnection.PostgreSQLConnection, strict);
                 }
             }
             return dataList;
         }
 
         /// <summary>
-        /// Executes and retrieves records for 'Select' queries from the database.
+        /// Asynchronously executes and retrieves records for 'Select' queries from the database.
+        /// Converts column names to keys holding values, with multiple database rows returned into a list.
+        /// Note: Use aliases in query for similar column names.
         /// </summary>
-        /// <typeparam name="T">Object entity to return data mapped into.</typeparam>
         /// <param name="selectSql">'Select' query.</param>
-        /// <param name="strict">Enables fetch data only for object type <typeparamref name="T"/> properties existing in database query result. Default - <c>false</c>.</param>
-        /// <returns>List of data rows mapped into object of type <typeparamref name="T"/>.</returns>
-        public List<T> FetchData<T>(string selectSql, bool strict = false) where T : new()
+        /// <param name="upperCaseKeys">Boolean parameter to return dictionary keys in uppercase. Default - <c>false</c>.</param>
+        /// <returns>List of <see cref="DataDictionary"/> with column names as keys holding values into a list for multiple rows of data.</returns>
+        public async Task<List<DataDictionary>> FetchDataAsync(string selectSql, bool upperCaseKeys = false)
         {
-            var dataList = new List<T>();
+            var dataList = new List<DataDictionary>();
             if (Database.Equals(DB.MSSQL))
             {
                 using (var msSqlDBConnection = GetSqlServerConnection())
                 {
                     var _systemAdapter = new MSSQL.Adapter();
-                    dataList = _systemAdapter.FetchData<T>(selectSql, msSqlDBConnection.SqlConnection, strict);
+                    dataList = await _systemAdapter.FetchDataAsync(selectSql, msSqlDBConnection.SqlConnection, upperCaseKeys);
                 }
             }
             else if (Database.Equals(DB.MySQL))
             {
                 using (var mySqlDBConnection = GetMySqlConnection())
                 {
                     var _systemAdapter = new MySQL.Adapter();
-                    dataList = _systemAdapter.FetchData<T>(selectSql, mySqlDBConnection.MySqlConnection, strict);
+                    dataList = await _systemAdapter.FetchDataAsync(selectSql, mySqlDBConnection.MySqlConnection, upperCaseKeys);
                 }
             }
             else if (Database.Equals(DB.Oracle))
             {
                 using (var oracleDBConnection = GetOracleConnection())
                 {
                     var _systemAdapter = new Oracle.Adapter();
-                    dataList = _systemAdapter.FetchData<T>(selectSql, oracleDBConnection.OracleConnection, strict);
+                    dataList = await _systemAdapter.FetchDataAsync(selectSql, oracleDBConnection.OracleConnection, upperCaseKeys);
                 }
             }
             else if (Database.Equals(DB.PostgreSQL))
             {
                 using (var postgreSqlDBConnection = GetPostgreSqlConnection())
                 {
                     var _systemAdapter = new PostgreSQL.Adapter();
-                    dataList = _systemAdapter.FetchData<T>(selectSql, postgreSqlDBConnection.PostgreSQLConnection, strict);
+                    dataList = await _systemAdapter.FetchDataAsync(selectSql, postgreSqlDBConnection.PostgreSQLConnection, upperCaseKeys);
                 }
             }
             return dataList;

QueryDB/IDBContext.cs

@@ -17,14 +17,6 @@ interface IDBContext
         /// <returns>List of <see cref="DataDictionary"/> with column names as keys holding values into a list for multiple rows of data.</returns>
         List<DataDictionary> FetchData(string selectSql, bool upperCaseKeys = false);
 
-        /// <summary>
-        /// Asynchronously executes and retrieves records for 'Select' queries from the database.
-        /// </summary>
-        /// <param name="selectSql">'Select' query.</param>
-        /// <param name="upperCaseKeys">Boolean parameter to return dictionary keys in uppercase. Default - <c>false</c>.</param>
-        /// <returns>List of <see cref="DataDictionary"/> with column names as keys holding values into a list for multiple rows of data.</returns>
-        Task<List<DataDictionary>> FetchDataAsync(string selectSql, bool upperCaseKeys = false);
-
         /// <summary>
         /// Executes and retrieves records for 'Select' queries from the database.
         /// </summary>
@@ -34,6 +26,14 @@ interface IDBContext
         /// <returns>List of data rows mapped into object of type <typeparamref name="T"/>.</returns>
         List<T> FetchData<T>(string selectSql, bool strict = false) where T : new();
 
+        /// <summary>
+        /// Asynchronously executes and retrieves records for 'Select' queries from the database.
+        /// </summary>
+        /// <param name="selectSql">'Select' query.</param>
+        /// <param name="upperCaseKeys">Boolean parameter to return dictionary keys in uppercase. Default - <c>false</c>.</param>
+        /// <returns>List of <see cref="DataDictionary"/> with column names as keys holding values into a list for multiple rows of data.</returns>
+        Task<List<DataDictionary>> FetchDataAsync(string selectSql, bool upperCaseKeys = false);
+
         /// <summary>
         /// Asynchronously executes and retrieves records for 'Select' queries from the database.
         /// </summary>