CalculatedMeasurements

GridProtectionAlliance · Dec 17, 2024 · fd42477 · fd42477
1 parent 44d6753
commit fd42477
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/Source/Libraries/GSF.PhasorProtocols/UI/DataModels/CalculatedMeasurement.cs b/Source/Libraries/GSF.PhasorProtocols/UI/DataModels/CalculatedMeasurement.cs
@@ -490,7 +490,7 @@ public static IList<int> LoadKeys(AdoDataConnection database, string sortMember
                 if (!string.IsNullOrEmpty(sortMember))
                     sortClause = $"ORDER BY {sortMember} {sortDirection}";
 
-                DataTable calculatedMeasurementTable = database.Connection.RetrieveData(database.AdapterType, $"SELECT ID From CalculatedMeasurementDetail {sortClause}");
+                DataTable calculatedMeasurementTable = database.Connection.RetrieveData(database.AdapterType, "SELECT ID From CalculatedMeasurementDetail {0}", sortClause);
 
                 foreach (DataRow row in calculatedMeasurementTable.Rows)
                 {
@@ -531,12 +531,11 @@ public static ObservableCollection<CalculatedMeasurement> Load(AdoDataConnection
                 {
                     commaSeparatedKeys = keys.Select(key => key.ToString()).Aggregate((str1, str2) => $"{str1},{str2}");
 
-                    query = string.Format("SELECT NodeID, ID, Acronym, Name, AssemblyName, " +
+                    query = database.ParameterizedQueryString("SELECT NodeID, ID, Acronym, Name, AssemblyName, " +
                         "TypeName, ConnectionString, ConfigSection, InputMeasurements, OutputMeasurements, MinimumMeasurementsToUse, FramesPerSecond, LagTime, " +
                         "LeadTime, UseLocalClockAsRealTime, AllowSortsByArrival, LoadOrder, Enabled, IgnoreBadTimeStamps, TimeResolution, AllowPreemptivePublishing, " +
-                        "DownSamplingMethod, NodeName, PerformTimeReasonabilityCheck From CalculatedMeasurementDetail WHERE ID IN ({0}) AND NodeID = '{1}'", commaSeparatedKeys, database.CurrentNodeID());
-
-                    calculatedMeasurementTable = database.Connection.RetrieveData(database.AdapterType, query);
+                        "DownSamplingMethod, NodeName, PerformTimeReasonabilityCheck From CalculatedMeasurementDetail WHERE ID IN ({0}) AND NodeID = '{1}'", "commaSeparatedKeys", "database.CurrentNodeID()");
+                    calculatedMeasurementTable = database.Connection.RetrieveData(database.AdapterType, query, commaSeparatedKeys, database.CurrentNodeID());
                     calculatedMeasurementList = new CalculatedMeasurement[calculatedMeasurementTable.Rows.Count];
 
                     foreach (DataRow row in calculatedMeasurementTable.Rows)