Fixed Parameterization

Author: clackner-gpa

Source/Applications/Wave Demo Apps/UpdateWAVMetaData/Program.cs

@@ -94,12 +94,12 @@ static int Main(string[] args)
                     if (Convert.ToInt32(connection.ExecuteScalar(database.ParameterizedQueryString("SELECT COUNT(*) FROM Device WHERE Acronym = {0}", "acronym"), acronym)) == 0)
                     {
                         parameterizedQuery = database.ParameterizedQueryString("INSERT INTO Device(NodeID, Acronym, Name, ProtocolID, FramesPerSecond, " +
-                            "MeasurementReportingInterval, ConnectionString, Enabled) VALUES({7}, {0}, {1}, {2}, {3}, {4}, {5}, {6})",
+                            "MeasurementReportingInterval, ConnectionString, Enabled) VALUES({0}, {1}, {2}, {3}, {4}, {5}, {6}, {7})",
                             "acronym", "name", "protocolID", "framesPerSecond", "measurementReportingInterval",
-                            "connectionString", "enabled");
+                            "connectionString", "enabled", "nodeID");
 
                         // Insert new device record
-                        connection.ExecuteNonQuery(parameterizedQuery, acronym, name, protocolID, sourceWave.SampleRate, 1000000, $"wavFileName={FilePath.GetAbsolutePath(sourceFileName)}; connectOnDemand=true; outputSourceIDs={acronym}; memoryCache={useMemoryCache}", database.Bool(true), nodeID);
+                        connection.ExecuteNonQuery(parameterizedQuery, acronym, name, protocolID, sourceWave.SampleRate, 1000000, $"wavFileName={FilePath.GetAbsolutePath(sourceFileName)}; connectOnDemand=true; outputSourceIDs={acronym}; memoryCache={useMemoryCache}", database.Bool(true), database.Guid(nodeID));
                         int deviceID = Convert.ToInt32(connection.ExecuteScalar(database.ParameterizedQueryString("SELECT ID FROM Device WHERE Acronym = {0}", "acronym"), acronym));
                         string pointTag;
                         int lastPhasorIndex = 0;

Source/Libraries/Adapters/MySqlAdapters/MySqlOutputAdapter.cs

@@ -177,11 +177,23 @@ protected override void ProcessMeasurements(IMeasurement[] measurements)
                 {
                     // Create the command string to insert the measurement as a record in the table.
                     IDbCommand command = m_connection.CreateCommand();
-                    command.Parameters.Add(measurement.ID);
-                    command.Parameters.Add((long)measurement.Timestamp);
-                    command.Parameters.Add(measurement.AdjustedValue);
+                    IDataParameter measurementIDParameter = command.CreateParameter();
+                    IDataParameter timeStampParameter = command.CreateParameter();
+                    IDataParameter valueParameter = command.CreateParameter();
 
-                    command.CommandText = "INSERT INTO Measurement VALUES ({0}, {1}, {2})";
+                    measurementIDParameter.Name = "@measurementID";
+                    timeStampParameter.Name = "@timeStamp";
+                    valueParameter.Name = "@adjustedValue";
+
+                    measurementIDParameter.Value = measurement.ID;
+                    timeStampParameter.Value = (long)measurement.Timestamp;
+                    valueParameter.Value = measurement.AdjustedValue;
+
+                    command.Parameters.Add(measurementIDParameter);
+                    command.Parameters.Add(timeStampParameter);
+                    command.Parameters.Add(valueParameter);
+
+                    command.CommandText = "INSERT INTO Measurement VALUES (@measurementID, @timeStamp, @adjustedValue)";
                     command.ExecuteNonQuery();
 
                 }

Source/Libraries/GSF.TimeSeries/Configuration/DatabaseConfigurationLoader.cs

@@ -330,7 +330,7 @@ public override void Augment(DataSet configuration)
 
                 try
                 {
-                    database.Connection.ExecuteNonQuery("DELETE FROM TrackedChange WHERE ID <= {0}",latestVersion);
+                    database.Connection.ExecuteNonQuery("DELETE FROM TrackedChange WHERE ID <= {0}", latestVersion);
                 }
                 catch (Exception ex)
                 {