Skip to content

Commit 6deaf6b

Browse files
collins-selfcollins-self
committed
OutputStreamDevice
1 parent fd42477 commit 6deaf6b

File tree

5 files changed

+19
-19
lines changed

5 files changed

+19
-19
lines changed

‎Source/Libraries/GSF.PhasorProtocols/UI/DataModels/OutputStreamDevice.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -359,12 +359,12 @@ public static ObservableCollection<OutputStreamDevice> Load(AdoDataConnection da
359359
{
360360
string commaSeparatedKeys = keys.Select(key => key.ToString()).Aggregate((str1, str2) => $"{str1},{str2}");
361361

362-
string query = $"SELECT NodeID, AdapterID, ID, IDCode, Acronym, BpaAcronym, Name, PhasorDataFormat, FrequencyDataFormat, AnalogDataFormat, CoordinateFormat, LoadOrder, Enabled, Virtual FROM OutputStreamDeviceDetail WHERE ID IN ({commaSeparatedKeys})";
362+
string query = "SELECT NodeID, AdapterID, ID, IDCode, Acronym, BpaAcronym, Name, PhasorDataFormat, FrequencyDataFormat, AnalogDataFormat, CoordinateFormat, LoadOrder, Enabled, Virtual FROM OutputStreamDeviceDetail WHERE ID IN ({0})";
363363

364364
if (database.IsMySQL)
365-
query = $"SELECT NodeID, AdapterID, ID, IDCode, Acronym, BpaAcronym, Name, PhasorDataFormat, FrequencyDataFormat, AnalogDataFormat, CoordinateFormat, LoadOrder, Enabled, `Virtual` FROM OutputStreamDeviceDetail WHERE ID IN ({commaSeparatedKeys})";
365+
query = "SELECT NodeID, AdapterID, ID, IDCode, Acronym, BpaAcronym, Name, PhasorDataFormat, FrequencyDataFormat, AnalogDataFormat, CoordinateFormat, LoadOrder, Enabled, `Virtual` FROM OutputStreamDeviceDetail WHERE ID IN ({0})";
366366

367-
DataTable outputStreamDeviceTable = database.Connection.RetrieveData(database.AdapterType, query, DefaultTimeout);
367+
DataTable outputStreamDeviceTable = database.Connection.RetrieveData(database.AdapterType, query, DefaultTimeout, commaSeparatedKeys);
368368
outputStreamDeviceList = new OutputStreamDevice[outputStreamDeviceTable.Rows.Count];
369369

370370
foreach (DataRow row in outputStreamDeviceTable.Rows)
@@ -698,7 +698,7 @@ public static OutputStreamDevice GetOutputStreamDevice(AdoDataConnection databas
698698
try
699699
{
700700
createdConnection = CreateConnection(ref database);
701-
DataTable deviceTable = database.Connection.RetrieveData(database.AdapterType, $"SELECT * FROM OutputStreamDeviceDetail {whereClause}");
701+
DataTable deviceTable = database.Connection.RetrieveData(database.AdapterType, "SELECT * FROM OutputStreamDeviceDetail {0}", whereClause);
702702

703703
if (deviceTable.Rows.Count == 0)
704704
return null;
@@ -748,7 +748,7 @@ public static ObservableCollection<OutputStreamDevice> GetOutputStreamDevices(Ad
748748
createdConnection = CreateConnection(ref database);
749749

750750
ObservableCollection<OutputStreamDevice> outputStreamDeviceList = new();
751-
DataTable outputStreamDeviceTable = database.Connection.RetrieveData(database.AdapterType, $"SELECT * FROM OutputStreamDeviceDetail {whereClause}");
751+
DataTable outputStreamDeviceTable = database.Connection.RetrieveData(database.AdapterType, "SELECT * FROM OutputStreamDeviceDetail {0}", whereClause);
752752

753753
foreach (DataRow row in outputStreamDeviceTable.Rows)
754754
{

‎Source/Libraries/GSF.PhasorProtocols/UI/DataModels/OutputStreamDeviceAnalog.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ public static IList<int> LoadKeys(AdoDataConnection database, int outputStreamDe
220220
if (!string.IsNullOrEmpty(sortMember))
221221
sortClause = $"ORDER BY {sortMember} {sortDirection}";
222222

223-
DataTable outputStreamDeviceAnalogTable = database.Connection.RetrieveData(database.AdapterType, $"SELECT ID FROM OutputStreamDeviceAnalog WHERE OutputStreamDeviceID = {outputStreamDeviceID} {sortClause}");
223+
DataTable outputStreamDeviceAnalogTable = database.Connection.RetrieveData(database.AdapterType, "SELECT ID FROM OutputStreamDeviceAnalog WHERE OutputStreamDeviceID = {0} {1}", outputStreamDeviceID, sortClause);
224224

225225
foreach (DataRow row in outputStreamDeviceAnalogTable.Rows)
226226
outputStreamDeviceAnalogList.Add((row.ConvertField<int>("ID")));
@@ -253,8 +253,7 @@ public static ObservableCollection<OutputStreamDeviceAnalog> Load(AdoDataConnect
253253
if (keys is not null && keys.Count > 0)
254254
{
255255
string commaSeparatedKeys = keys.Select(key => $"{key}").Aggregate((str1, str2) => $"{str1},{str2}");
256-
string query = database.ParameterizedQueryString($"SELECT NodeID, OutputStreamDeviceID, ID, Label, Type, ScalingValue, LoadOrder FROM OutputStreamDeviceAnalog WHERE ID IN ({commaSeparatedKeys})");
257-
DataTable outputStreamDeviceAnalogTable = database.Connection.RetrieveData(database.AdapterType, query, DefaultTimeout);
256+
DataTable outputStreamDeviceAnalogTable = database.Connection.RetrieveData(database.AdapterType, "SELECT NodeID, OutputStreamDeviceID, ID, Label, Type, ScalingValue, LoadOrder FROM OutputStreamDeviceAnalog WHERE ID IN ({0})", DefaultTimeout, commaSeparatedKeys);
258257
outputStreamDeviceAnalogList = new OutputStreamDeviceAnalog[outputStreamDeviceAnalogTable.Rows.Count];
259258

260259
foreach (DataRow row in outputStreamDeviceAnalogTable.Rows)

‎Source/Libraries/GSF.PhasorProtocols/UI/DataModels/OutputStreamDeviceDigital.cs

+4-3
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ public static IList<int> LoadKeys(AdoDataConnection database, int outputStreamDe
232232
if (!string.IsNullOrEmpty(sortMember))
233233
sortClause = $"ORDER BY {sortMember} {sortDirection}";
234234

235-
DataTable outputStreamDeviceDigitalTable = database.Connection.RetrieveData(database.AdapterType, $"SELECT ID From OutputStreamDeviceDigital WHERE OutputStreamDeviceID = {outputStreamDeviceID} {sortClause}");
235+
DataTable outputStreamDeviceDigitalTable = database.Connection.RetrieveData(database.AdapterType, "SELECT ID From OutputStreamDeviceDigital WHERE OutputStreamDeviceID = {0} {1}", outputStreamDeviceID, sortClause);
236236

237237
foreach (DataRow row in outputStreamDeviceDigitalTable.Rows)
238238
{
@@ -272,9 +272,10 @@ public static ObservableCollection<OutputStreamDeviceDigital> Load(AdoDataConnec
272272
if (keys is not null && keys.Count > 0)
273273
{
274274
commaSeparatedKeys = keys.Select(key => $"{key}").Aggregate((str1, str2) => $"{str1},{str2}");
275-
query = database.ParameterizedQueryString($"SELECT NodeID, OutputStreamDeviceID, ID, Label, MaskValue, LoadOrder FROM OutputStreamDeviceDigital WHERE ID IN ({commaSeparatedKeys})");
276275

277-
outputStreamDeviceDigitalTable = database.Connection.RetrieveData(database.AdapterType, query, DefaultTimeout);
276+
outputStreamDeviceDigitalTable = database.Connection.RetrieveData(database.AdapterType,
277+
"SELECT NodeID, OutputStreamDeviceID, ID, Label, MaskValue, LoadOrder FROM OutputStreamDeviceDigital " +
278+
"WHERE ID IN ({0})", DefaultTimeout, commaSeparatedKeys);
278279
outputStreamDeviceDigitalList = new OutputStreamDeviceDigital[outputStreamDeviceDigitalTable.Rows.Count];
279280

280281
foreach (DataRow row in outputStreamDeviceDigitalTable.Rows)

‎Source/Libraries/GSF.PhasorProtocols/UI/DataModels/OutputStreamDevicePhasor.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ public static IList<int> LoadKeys(AdoDataConnection database, int outputStreamDe
243243
if (!string.IsNullOrEmpty(sortMember))
244244
sortClause = $"ORDER BY {sortMember} {sortDirection}";
245245

246-
DataTable OutputStreamDevicePhasorTable = database.Connection.RetrieveData(database.AdapterType, $"SELECT ID FROM OutputStreamDevicePhasor WHERE OutputStreamDeviceID = {outputStreamDeviceID} {sortClause}");
246+
DataTable OutputStreamDevicePhasorTable = database.Connection.RetrieveData(database.AdapterType, "SELECT ID FROM OutputStreamDevicePhasor WHERE OutputStreamDeviceID = {0} {1}", outputStreamDeviceID, sortClause);
247247

248248
foreach (DataRow row in OutputStreamDevicePhasorTable.Rows)
249249
outputStreamDevicePhasorList.Add((row.ConvertField<int>("ID")));
@@ -276,9 +276,8 @@ public static ObservableCollection<OutputStreamDevicePhasor> Load(AdoDataConnect
276276
if (keys is not null && keys.Count > 0)
277277
{
278278
string commaSeparatedKeys = keys.Select(key => $"{key}").Aggregate((str1, str2) => $"{str1},{str2}");
279-
string query = database.ParameterizedQueryString($"SELECT NodeID, OutputStreamDeviceID, ID, Label, Type, Phase, ScalingValue, LoadOrder FROM OutputStreamDevicePhasor WHERE ID IN ({commaSeparatedKeys})");
280279

281-
DataTable outputStreamDevicePhasorTable = database.Connection.RetrieveData(database.AdapterType, query);
280+
DataTable outputStreamDevicePhasorTable = database.Connection.RetrieveData(database.AdapterType, "SELECT NodeID, OutputStreamDeviceID, ID, Label, Type, Phase, ScalingValue, LoadOrder FROM OutputStreamDevicePhasor WHERE ID IN ({0})", commaSeparatedKeys);
282281
outputStreamDevicePhasorList = new OutputStreamDevicePhasor[outputStreamDevicePhasorTable.Rows.Count];
283282

284283
foreach (DataRow row in outputStreamDevicePhasorTable.Rows)

‎Source/Libraries/GSF.PhasorProtocols/UI/DataModels/OutputStreamMeasurement.cs

+6-5
Original file line numberDiff line numberDiff line change
@@ -218,10 +218,10 @@ public static IList<int> LoadKeys(AdoDataConnection database, int outputStreamID
218218

219219
string sortClause = string.Empty;
220220

221+
DataTable outputStreamMeasurementTable;
221222
if (!string.IsNullOrEmpty(sortMember))
222-
sortClause = $"ORDER BY {sortMember} {sortDirection}";
223-
224-
DataTable outputStreamMeasurementTable = database.Connection.RetrieveData(database.AdapterType, $"SELECT ID From OutputStreamMeasurementDetail where AdapterID = {outputStreamID} {sortClause}");
223+
outputStreamMeasurementTable = database.Connection.RetrieveData(database.AdapterType, "SELECT ID From OutputStreamMeasurementDetail where AdapterID = {0} ORDER BY {1} {2}", outputStreamID, sortMember, sortDirection);
224+
else outputStreamMeasurementTable = database.Connection.RetrieveData(database.AdapterType, "SELECT ID From OutputStreamMeasurementDetail where AdapterID = {0}", outputStreamID);
225225

226226
foreach (DataRow row in outputStreamMeasurementTable.Rows)
227227
{
@@ -261,9 +261,10 @@ public static ObservableCollection<OutputStreamMeasurement> Load(AdoDataConnecti
261261
if (keys is not null && keys.Count > 0)
262262
{
263263
commaSeparatedKeys = keys.Select(key => $"{key}").Aggregate((str1, str2) => $"{str1},{str2}");
264-
query = $"SELECT NodeID, AdapterID, ID, HistorianID, PointID, SignalReference, SourcePointTag, HistorianAcronym FROM OutputStreamMeasurementDetail WHERE ID IN ({commaSeparatedKeys})";
265264

266-
outputStreamMeasurementTable = database.Connection.RetrieveData(database.AdapterType, query, DefaultTimeout);
265+
outputStreamMeasurementTable = database.Connection.RetrieveData(database.AdapterType,
266+
"SELECT NodeID, AdapterID, ID, HistorianID, PointID, SignalReference, SourcePointTag, HistorianAcronym " +
267+
"FROM OutputStreamMeasurementDetail WHERE ID IN ({0})", DefaultTimeout, commaSeparatedKeys);
267268
outputStreamMeasurementList = new OutputStreamMeasurement[outputStreamMeasurementTable.Rows.Count];
268269

269270
foreach (DataRow row in outputStreamMeasurementTable.Rows)

0 commit comments

Comments
 (0)