GSF.Core: Fixed type conversions for Guids and Enums in AdoDataConnection.ExecuteScalar<T>().

StephenCWills committed 10 years ago

Commit c021a4c1 parent 1ac4ccb3 files · +19 −8Browse files

Unified · Split

3 files

 //******************************************************************************************************
 using System;
+using GSF;
 using GSF.Data;
 using GSF.TimeSeries.UI;
                         measurement.SignalTypeID, measurement.SignalReference, measurement.Adder, measurement.Multiplier, measurement.Description.ToNotNull(),
                         database.Bool(measurement.Enabled), CommonFunctions.CurrentUser, database.UtcNow, CommonFunctions.CurrentUser, database.UtcNow);
-                    measurement.SignalID = Guid.Parse(database.ExecuteScalar<object>(Guid.Empty, "SELECT SignalID FROM Measurement WHERE PointTag={0}", measurement.PointTag).ToString());
+                    measurement.SignalID = database.ExecuteScalar<Guid>("SELECT SignalID FROM Measurement WHERE PointTag={0}", measurement.PointTag);
 				}
 				else
 				{

@@ -684,7 +684,21 @@ namespace GSF.Data · 683 unmodified lines
684		684
685	// Nullable types cannot be used in type conversion, but we can use Nullable.GetUnderlyingType()	685	// Nullable types cannot be used in type conversion, but we can use Nullable.GetUnderlyingType()
686	// to determine whether the type is nullable and convert to the underlying type instead	686	// to determine whether the type is nullable and convert to the underlying type instead
687	return (T)Convert.ChangeType(value, Nullable.GetUnderlyingType(type) ?? type);	687	type = Nullable.GetUnderlyingType(type) ?? type;
		688
		689	// Handle Guids
		690	if (type == typeof(Guid))
		691	return (T)(object)System.Guid.Parse(value.ToString());
		692
		693	// Handle string types that may have a converter function (e.g., Enums)
		694	if (value.GetType() == typeof(string))
		695	return value.ToString().ConvertToType<T>(type);
		696
		697	// Handle native types
		698	if (typeof(IConvertible).IsAssignableFrom(value.GetType()))
		699	return (T)Convert.ChangeType(value, type);
		700
		701	return (T)value;
688	}	702	}
689		703
690	/// <summary>	704	/// <summary>

             try
             {
                 // Handle booleans as a special case to allow numeric entries as well as true/false
-                if (type.IsAssignableFrom(typeof(bool)))
+                if (type == typeof(bool))
-                    return (T)((object)value.ParseBoolean());
+                    return (T)(object)value.ParseBoolean();
-                // This is faster for native types than using type converter...
-                if (type.IsAssignableFrom(typeof(IConvertible)))
-                    return (T)Convert.ChangeType(value, type, culture);
                 // Handle objects that have type converters (e.g., Enum, Color, Point, etc.)
                 TypeConverter converter = TypeDescriptor.GetConverter(type);

Keyboard shortcuts