Check for null in all impls of SetDbValue

Author: mythz

src/ServiceStack.OrmLite.Oracle/OracleOrmLiteDialectProvider.cs

@@ -116,13 +116,7 @@ public override long InsertAndGetLastInsertId<T>(IDbCommand dbCmd)
 
         public override void SetDbValue(FieldDefinition fieldDef, IDataReader dataReader, int colIndex, object instance)
         {
-            if (fieldDef == null || fieldDef.SetValueFn == null || colIndex == NotFound) return;
-
-            if (dataReader.IsDBNull(colIndex))
-            {
-                fieldDef.SetValueFn(instance, null);
-                return;
-            }
+            if (HandledDbNullValue(fieldDef, dataReader, colIndex, instance)) return;
 
             object convertedValue;
             if (fieldDef.FieldType == typeof(DateTimeOffset))

src/ServiceStack.OrmLite.Sqlite/SqliteOrmLiteDialectProviderBase.cs

@@ -137,6 +137,8 @@ public override void SetParameter(FieldDefinition fieldDef, IDbDataParameter p)
 
         public override void SetDbValue(FieldDefinition fieldDef, IDataReader dataReader, int colIndex, object instance)
         {
+            if (HandledDbNullValue(fieldDef, dataReader, colIndex, instance)) return;
+
             var fieldType = Nullable.GetUnderlyingType(fieldDef.FieldType) ?? fieldDef.FieldType;
             if (fieldType == typeof(Guid))
             {

src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs

@@ -279,22 +279,9 @@ public virtual bool ShouldQuoteValue(Type fieldType)
         /// </summary>
         public virtual void SetDbValue(FieldDefinition fieldDef, IDataReader dataReader, int colIndex, object instance)
         {
-            if (fieldDef == null || fieldDef.SetValueFn == null || colIndex == NotFound) return;
-            if (dataReader.IsDBNull(colIndex))
-            {
-                if (fieldDef.IsNullable)
-                {
-                    fieldDef.SetValueFn(instance, null);
-                }
-                else
-                {
-                    fieldDef.SetValueFn(instance, fieldDef.FieldType.GetDefaultValue());
-                }
-                return;
-            }
+            if (HandledDbNullValue(fieldDef, dataReader, colIndex, instance)) return;
 
             object value;
-
             if (fieldDef.FieldType == typeof(Guid))
             {
                 value = dataReader.GetGuid(colIndex);
@@ -314,6 +301,24 @@ public virtual void SetDbValue(FieldDefinition fieldDef, IDataReader dataReader,
             }
         }
 
+        public static bool HandledDbNullValue(FieldDefinition fieldDef, IDataReader dataReader, int colIndex, object instance)
+        {
+            if (fieldDef == null || fieldDef.SetValueFn == null || colIndex == NotFound) return true;
+            if (dataReader.IsDBNull(colIndex))
+            {
+                if (fieldDef.IsNullable)
+                {
+                    fieldDef.SetValueFn(instance, null);
+                }
+                else
+                {
+                    fieldDef.SetValueFn(instance, fieldDef.FieldType.GetDefaultValue());
+                }
+                return true;
+            }
+            return false;
+        }
+
         public virtual object ConvertDbValue(object value, Type type)
         {
             if (value == null || value is DBNull) return null;