Add GetConverterBestMatch to IOrmLiteDialectProvider

ServiceStack · Nov 24, 2015 · 6f2f69e · 6f2f69e
1 parent fd88e79
commit 6f2f69e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/src/ServiceStack.OrmLite/IOrmLiteDialectProvider.cs b/src/ServiceStack.OrmLite/IOrmLiteDialectProvider.cs
@@ -26,7 +26,15 @@ public interface IOrmLiteDialectProvider
 
         IOrmLiteExecFilter ExecFilter { get; set; }
 
-        IOrmLiteConverter GetConverter(Type forType);
+        /// <summary>
+        /// Gets the explicit Converter registered for a specific type
+        /// </summary>
+        IOrmLiteConverter GetConverter(Type type);
+
+        /// <summary>
+        /// Return best matching converter, falling back to Enum, Value or Ref Type Converters
+        /// </summary>
+        IOrmLiteConverter GetConverterBestMatch(Type type);
 
         string ParamString { get; set; }
 

diff --git a/src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs b/src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs
@@ -149,13 +149,13 @@ public string GetColumnTypeDefinition(Type columnType, int? fieldLength, int? sc
         [Obsolete("Use GetConverter().DbType")]
         public virtual DbType GetColumnDbType(Type columnType)
         {
-            var converter = GetConverterForType(columnType);
+            var converter = GetConverterBestMatch(columnType);
             return converter.DbType;
         }
 
         public virtual void InitDbParam(IDbDataParameter dbParam, Type columnType)
         {
-            var converter = GetConverterForType(columnType);
+            var converter = GetConverterBestMatch(columnType);
             converter.InitDbParam(dbParam, columnType);
         }
 
@@ -270,20 +270,18 @@ public IOrmLiteConverter GetConverter(Type type)
                 : null;
         }
 
-        public IOrmLiteConverter GetConverterForType(Type type)
+        public IOrmLiteConverter GetConverterBestMatch(Type type)
         {
-            var converter = type.IsEnum
-                ? EnumConverter
-                : GetConverter(type);
+            var converter = GetConverter(type);
+            if (converter != null)
+                return converter;
 
-            if (converter == null)
-            {
-                converter = type.IsValueType
-                    ? (IOrmLiteConverter)ValueTypeConverter
-                    : ReferenceTypeConverter;
-            }
+            if (type.IsEnum)
+                return EnumConverter;
 
-            return converter;
+            return type.IsValueType
+                ? (IOrmLiteConverter)ValueTypeConverter
+                : ReferenceTypeConverter;
         }
 
         public virtual bool ShouldQuoteValue(Type fieldType)