Add new db.KeyValuePairs/KeyValuePairsAsync APIs

Author: mythz

src/ServiceStack.OrmLite/Async/OrmLiteReadCommandExtensionsAsync.cs

@@ -305,6 +305,26 @@ internal static Task<Dictionary<K, V>> DictionaryAsync<K, V>(this IDataReader re
             }, map, token);
         }
 
+        internal static Task<List<KeyValuePair<K, V>>> KeyValuePairsAsync<K, V>(this IDbCommand dbCmd, string sql, object anonType, CancellationToken token)
+        {
+            if (anonType != null) 
+                dbCmd.SetParameters(anonType.ToObjectDictionary(), excludeDefaults: false, sql:ref sql);
+
+            return dbCmd.KeyValuePairsAsync<K, V>(sql, token);
+        }
+
+        internal static Task<List<KeyValuePair<K, V>>> KeyValuePairsAsync<K, V>(this IDataReader reader, IOrmLiteDialectProvider dialectProvider, CancellationToken token)
+        {
+            var to = new List<KeyValuePair<K, V>>();
+
+            return dialectProvider.ReaderEach(reader, () =>
+            {
+                var key = (K)dialectProvider.FromDbValue(reader, 0, typeof(K));
+                var value = (V)dialectProvider.FromDbValue(reader, 1, typeof(V));
+                to.Add(new KeyValuePair<K, V>(key, value));
+            }, to, token);
+        }
+
         internal static async Task<bool> ExistsAsync<T>(this IDbCommand dbCmd, object anonType, CancellationToken token)
         {
             string sql = null;

src/ServiceStack.OrmLite/Async/OrmLiteResultsFilterExtensionsAsync.cs

@@ -286,6 +286,26 @@ internal static async Task<Dictionary<K, V>> DictionaryAsync<K, V>(this IDbComma
             }
         }
 
+        internal static Task<List<KeyValuePair<K, V>>> KeyValuePairsAsync<K, V>(this IDbCommand dbCmd, string sql, IEnumerable<IDbDataParameter> sqlParams, CancellationToken token)
+        {
+            return dbCmd.SetParameters(sqlParams).KeyValuePairsAsync<K, V>(sql, token);
+        }
+
+        internal static async Task<List<KeyValuePair<K, V>>> KeyValuePairsAsync<K, V>(this IDbCommand dbCmd, string sql, CancellationToken token)
+        {
+            if (sql != null)
+                dbCmd.CommandText = sql;
+
+            if (OrmLiteConfig.ResultsFilter != null)
+                return OrmLiteConfig.ResultsFilter.GetKeyValuePairs<K, V>(dbCmd);
+
+            var dialectProvider = dbCmd.GetDialectProvider();
+            using (var reader = await dbCmd.ExecReaderAsync(dbCmd.CommandText, token))
+            {
+                return await reader.KeyValuePairsAsync<K, V>(dialectProvider, token);
+            }
+        }
+
         internal static Task<Dictionary<K, List<V>>> LookupAsync<K, V>(this IDbCommand dbCmd, string sql, IEnumerable<IDbDataParameter> sqlParams, CancellationToken token)
         {
             return dbCmd.SetParameters(sqlParams).LookupAsync<K, V>(sql, token);

src/ServiceStack.OrmLite/OrmLiteReadApi.cs

@@ -355,6 +355,24 @@ public static Dictionary<K, V> Dictionary<K, V>(this IDbConnection dbConn, strin
             return dbConn.Exec(dbCmd => dbCmd.Dictionary<K, V>(sql, anonType));
         }
 
+        /// <summary>
+        /// Returns a list KeyValuePairs from the first 2 columns: Column 1 (Keys), Column 2 (Values) using an SqlExpression. E.g:
+        /// <para>db.KeyValuePairs&lt;int, string&gt;(db.From&lt;Person&gt;().Select(x => new { x.Id, x.LastName }).Where(x => x.Age < 50))</para>
+        /// </summary>
+        public static List<KeyValuePair<K, V>> KeyValuePairs<K, V>(this IDbConnection dbConn, ISqlExpression query)
+        {
+            return dbConn.Exec(dbCmd => dbCmd.KeyValuePairs<K, V>(query));
+        }
+
+        /// <summary>
+        /// Returns a list of KeyValuePairs from the first 2 columns: Column 1 (Keys), Column 2 (Values) using sql. E.g:
+        /// <para>db.KeyValuePairs&lt;int, string&gt;("SELECT Id, LastName FROM Person WHERE Age &lt; @age", new { age = 50 })</para>
+        /// </summary>
+        public static List<KeyValuePair<K, V>> KeyValuePairs<K, V>(this IDbConnection dbConn, string sql, object anonType = null)
+        {
+            return dbConn.Exec(dbCmd => dbCmd.KeyValuePairs<K, V>(sql, anonType));
+        }
+
         /// <summary>
         /// Returns true if the Query returns any records that match the LINQ expression, E.g:
         /// <para>db.Exists&lt;Person&gt;(x =&gt; x.Age &lt; 50)</para>

src/ServiceStack.OrmLite/OrmLiteReadApiAsync.cs

@@ -837,6 +837,28 @@ internal static Dictionary<K, V> Dictionary<K, V>(this IDataReader reader, IOrmL
             return map;
         }
 
+        internal static List<KeyValuePair<K, V>> KeyValuePairs<K, V>(this IDbCommand dbCmd, string sql, object anonType = null)
+        {
+            if (anonType != null) SetParameters(dbCmd, anonType.ToObjectDictionary(), excludeDefaults: false, sql:ref sql);
+
+            return dbCmd.KeyValuePairs<K, V>(sql);
+        }
+
+        internal static List<KeyValuePair<K, V>> KeyValuePairs<K, V>(this IDataReader reader, IOrmLiteDialectProvider dialectProvider)
+        {
+            var to = new List<KeyValuePair<K, V>>();
+
+            while (reader.Read())
+            {
+                var key = (K)dialectProvider.FromDbValue(reader, 0, typeof(K));
+                var value = (V)dialectProvider.FromDbValue(reader, 1, typeof(V));
+
+                to.Add(new KeyValuePair<K,V>(key, value));
+            }
+
+            return to;
+        }
+
         internal static bool Exists<T>(this IDbCommand dbCmd, object anonType)
         {
             string sql = null;

src/ServiceStack.OrmLite/OrmLiteReadCommandExtensions.cs

@@ -33,6 +33,8 @@ public interface IOrmLiteResultsFilter
         HashSet<T> GetColumnDistinct<T>(IDbCommand dbCmd);
 
         Dictionary<K, V> GetDictionary<K, V>(IDbCommand dbCmd);
+        
+        List<KeyValuePair<K, V>> GetKeyValuePairs<K, V>(IDbCommand dbCmd);
 
         Dictionary<K, List<V>> GetLookup<K, V>(IDbCommand dbCmd);
 
@@ -272,6 +274,8 @@ public Dictionary<K, V> GetDictionary<K, V>(IDbCommand dbCmd)
             return to;
         }
 
+        public List<KeyValuePair<K, V>> GetKeyValuePairs<K, V>(IDbCommand dbCmd) => GetDictionary<K, V>(dbCmd).ToList();
+
         public Dictionary<K, List<V>> GetLookup<K, V>(IDbCommand dbCmd)
         {
             Filter(dbCmd);
@@ -284,8 +288,7 @@ public Dictionary<K, List<V>> GetLookup<K, V>(IDbCommand dbCmd)
             {
                 var key = (K)entry.Key;
 
-                List<V> list;
-                if (!to.TryGetValue(key, out list))
+                if (!to.TryGetValue(key, out var list))
                 {
                     to[key] = list = new List<V>();
                 }

src/ServiceStack.OrmLite/OrmLiteResultsFilter.cs

@@ -322,6 +322,33 @@ internal static Dictionary<K, V> Dictionary<K, V>(this IDbCommand dbCmd, ISqlExp
             }
         }
 
+        internal static List<KeyValuePair<K, V>> KeyValuePairs<K, V>(this IDbCommand dbCmd, string sql = null)
+        {
+            if (sql != null)
+                dbCmd.CommandText = sql;
+
+            if (OrmLiteConfig.ResultsFilter != null)
+                return OrmLiteConfig.ResultsFilter.GetKeyValuePairs<K, V>(dbCmd);
+
+            using (var reader = dbCmd.ExecReader(dbCmd.CommandText))
+            {
+                return reader.KeyValuePairs<K, V>(dbCmd.GetDialectProvider());
+            }
+        }
+
+        internal static List<KeyValuePair<K, V>> KeyValuePairs<K, V>(this IDbCommand dbCmd, ISqlExpression expression)
+        {
+            dbCmd.PopulateWith(expression);
+
+            if (OrmLiteConfig.ResultsFilter != null)
+                return OrmLiteConfig.ResultsFilter.GetKeyValuePairs<K,V>(dbCmd);
+
+            using (var reader = dbCmd.ExecReader(dbCmd.CommandText))
+            {
+                return reader.KeyValuePairs<K, V>(dbCmd.GetDialectProvider());
+            }
+        }
+
         internal static Dictionary<K, List<V>> Lookup<K, V>(this IDbCommand dbCmd, string sql, IEnumerable<IDbDataParameter> sqlParams)
         {
             return dbCmd.SetParameters(sqlParams).Lookup<K, V>(sql);

src/ServiceStack.OrmLite/OrmLiteResultsFilterExtensions.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Linq;
+using System.Net;
 using System.Threading.Tasks;
 using NUnit.Framework;
 using ServiceStack.DataAnnotations;
@@ -134,8 +135,7 @@ public void Does_InsertIntoSelect_LRARichiesta()
         {            
             using (var db = OpenDbConnection())
             {
-                db.DropAndCreateTable<LRARichiesta>();
-                db.DropAndCreateTable<LRARisultato>();
+                RecreateLRARichiesta(db);
 
                 long numeroRichieste = db.Count<LRARichiesta>();
 
@@ -158,13 +158,33 @@ public void Does_InsertIntoSelect_LRARichiesta()
             }
         }
 
+        private static void RecreateLRARichiesta(IDbConnection db)
+        {
+            db.DropTable<LRAAnalisi>();
+            db.DropTable<LRAContenitore>();
+            db.DropTable<LRARichiesta>();
+            db.DropTable<LRARisultato>();
+            db.DropTable<LRDLaboratorio>();
+            db.DropTable<LRAPaziente>();
+            db.DropTable<LRDReparto>();
+            db.DropTable<LRDPriorita>();
+
+            db.CreateTable<LRDLaboratorio>();
+            db.CreateTable<LRAPaziente>();
+            db.CreateTable<LRDReparto>();
+            db.CreateTable<LRDPriorita>();
+            db.CreateTable<LRARisultato>();
+            db.CreateTable<LRARichiesta>();
+            db.CreateTable<LRAContenitore>();
+            db.CreateTable<LRAAnalisi>();
+        }
+
         [Test]
         public async Task Does_InsertIntoSelect_LRARichiesta_Async()
         {            
             using (var db = OpenDbConnection())
             {
-                db.DropAndCreateTable<LRARichiesta>();
-                db.DropAndCreateTable<LRARisultato>();
+                RecreateLRARichiesta(db);
 
                 long numeroRichieste = await db.CountAsync<LRARichiesta>();