From 61765fc33dfa741f5f6564a76d782bcf62f76db7 Mon Sep 17 00:00:00 2001
From: Greg Edwards <edwardsgreg@gmail.com>
Date: Mon, 4 May 2015 19:56:17 -0400
Subject: [PATCH] Replaced DatabaseExtender.Coalesce with
 DatabaseExtender.Cast. It's cleaner that way.

---
 VeekunImport/Program.cs          |  6 +++---
 library/Data/DatabaseExtender.cs | 15 +++------------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/VeekunImport/Program.cs b/VeekunImport/Program.cs
index 5ef55f0f..331aeeeb 100644
--- a/VeekunImport/Program.cs
+++ b/VeekunImport/Program.cs
@@ -297,9 +297,9 @@ namespace VeekunImport
                     int id = Convert.ToInt32(rdMoves["id"]);
                     int type_id = Convert.ToInt32(rdMoves["type_id"]);
                     int damage_class_id = Convert.ToInt32(rdMoves["damage_class_id"]);
-                    short power = DatabaseExtender.Coalesce(rdMoves["power"], (short)0);
-                    short pp = DatabaseExtender.Coalesce(rdMoves["pp"], (short)0);
-                    short accuracy = DatabaseExtender.Coalesce(rdMoves["accuracy"], (short)0);
+                    short power = DatabaseExtender.Cast<short ?>(rdMoves["power"]) ?? 0;
+                    short pp = DatabaseExtender.Cast<short?>(rdMoves["pp"]) ?? 0;
+                    short accuracy = DatabaseExtender.Cast<short?>(rdMoves["accuracy"]) ?? 0;
                     short priority = Convert.ToInt16(rdMoves["priority"]);
                     int target_id = Convert.ToInt32(rdMoves["target_id"]);
 
diff --git a/library/Data/DatabaseExtender.cs b/library/Data/DatabaseExtender.cs
index c540dd61..91453c27 100644
--- a/library/Data/DatabaseExtender.cs
+++ b/library/Data/DatabaseExtender.cs
@@ -492,19 +492,10 @@ namespace PkmnFoundations.Data
         }
         #endregion
 
-        /// <summary>
-        /// Coalesces nulls and DBNulls down to a default value
-        /// </summary>
-        /// <typeparam name="T">Return type</typeparam>
-        /// <param name="value"></param>
-        /// <param name="_default"></param>
-        /// <returns></returns>
-        /// <exception cref="System.InvalidCastException">value is neither null, DBNull, nor of type T</exception>
-        public static T Coalesce<T>(object value, T _default)
+        public static T Cast<T>(object value)
         {
-            if (value == null) return _default;
-            if (value is DBNull) return _default;
-            return (T)value; // allow InvalidCastException to escape
+            if (value is DBNull) return default(T);
+            return (T)value;
         }
     }
 }
\ No newline at end of file