Sql fix

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

@@ -48,24 +48,9 @@ static int Main(string[] args)
             Guid nodeID = systemSettings["NodeID"].ValueAs<Guid>();
             bool useMemoryCache = systemSettings["UseMemoryCache"].ValueAsBoolean(false);
             string connectionString = systemSettings["ConnectionString"].Value;
-            string nodeIDQueryString = null;
             string parameterizedQuery;
             int protocolID, signalTypePMID, signalTypePAID;
 
-            // Define guid with query string delimiters according to database needs
-            Dictionary<string, string> settings = connectionString.ParseKeyValuePairs();
-            string setting;
-
-            if (settings.TryGetValue("Provider", out setting))
-            {
-                // Check if provider is for Access since it uses braces as Guid delimiters
-                if (setting.StartsWith("Microsoft.Jet.OLEDB", StringComparison.OrdinalIgnoreCase))
-                    nodeIDQueryString = "{" + nodeID + "}";
-            }
-
-            if (string.IsNullOrWhiteSpace(nodeIDQueryString))
-                nodeIDQueryString = "'" + nodeID + "'";
-
             using (AdoDataConnection database = new AdoDataConnection("systemSettings"))
             {
                 IDbConnection connection = database.Connection;
@@ -109,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(" + nodeIDQueryString + ", {0}, {1}, {2}, {3}, {4}, {5}, {6})",
+                            "MeasurementReportingInterval, ConnectionString, Enabled) VALUES({7}, {0}, {1}, {2}, {3}, {4}, {5}, {6})",
                             "acronym", "name", "protocolID", "framesPerSecond", "measurementReportingInterval",
                             "connectionString", "enabled");
 
                         // 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));
+                        connection.ExecuteNonQuery(parameterizedQuery, acronym, name, protocolID, sourceWave.SampleRate, 1000000, $"wavFileName={FilePath.GetAbsolutePath(sourceFileName)}; connectOnDemand=true; outputSourceIDs={acronym}; memoryCache={useMemoryCache}", database.Bool(true), 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

@@ -176,17 +176,12 @@ protected override void ProcessMeasurements(IMeasurement[] measurements)
                 foreach (IMeasurement measurement in measurements)
                 {
                     // Create the command string to insert the measurement as a record in the table.
-                    StringBuilder commandString = new StringBuilder("INSERT INTO Measurement VALUES ('");
                     IDbCommand command = m_connection.CreateCommand();
+                    command.Parameters.Add(measurement.ID);
+                    command.Parameters.Add((long)measurement.Timestamp);
+                    command.Parameters.Add(measurement.AdjustedValue);
 
-                    commandString.Append(measurement.ID);
-                    commandString.Append("','");
-                    commandString.Append((long)measurement.Timestamp);
-                    commandString.Append("',");
-                    commandString.Append(measurement.AdjustedValue);
-                    commandString.Append(')');
-
-                    command.CommandText = commandString.ToString();
+                    command.CommandText = "INSERT INTO Measurement VALUES ({0}, {1}, {2})";
                     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 <= {latestVersion}");
+                    database.Connection.ExecuteNonQuery("DELETE FROM TrackedChange WHERE ID <= {0}",latestVersion);
                 }
                 catch (Exception ex)
                 {

Source/Libraries/GSF.TimeSeries/Transport/DataSubscriber.cs

@@ -3456,23 +3456,23 @@ protected virtual void SynchronizeMetadata()
                             command.Transaction = transaction;
 
                         // Query the actual record ID based on the known run-time ID for this subscriber device
-                        object sourceID = command.ExecuteScalar($"SELECT SourceID FROM Runtime WHERE ID = {ID} AND SourceTable='Device'", MetadataSynchronizationTimeout);
+                        object sourceID = command.ExecuteScalar("SELECT SourceID FROM Runtime WHERE ID = {0} AND SourceTable='Device'", MetadataSynchronizationTimeout, ID);
 
                         if (sourceID is null || sourceID == DBNull.Value)
                             return;
 
                         int parentID = Convert.ToInt32(sourceID);
 
                         // Validate that the subscriber device is marked as a concentrator (we are about to associate children devices with it)
-                        if (!command.ExecuteScalar($"SELECT IsConcentrator FROM Device WHERE ID = {parentID}", MetadataSynchronizationTimeout).ToString().ParseBoolean())
-                            command.ExecuteNonQuery($"UPDATE Device SET IsConcentrator = 1 WHERE ID = {parentID}", MetadataSynchronizationTimeout);
+                        if (!command.ExecuteScalar("SELECT IsConcentrator FROM Device WHERE ID = {0}", MetadataSynchronizationTimeout, parentID).ToString().ParseBoolean())
+                            command.ExecuteNonQuery("UPDATE Device SET IsConcentrator = 1 WHERE ID = {0}", MetadataSynchronizationTimeout, parentID);
 
                         // Get any historian associated with the subscriber device
-                        object historianID = command.ExecuteScalar($"SELECT HistorianID FROM Device WHERE ID = {parentID}", MetadataSynchronizationTimeout);
+                        object historianID = command.ExecuteScalar("SELECT HistorianID FROM Device WHERE ID = {0}", MetadataSynchronizationTimeout, parentID);
 
                         // Determine the active node ID - we cache this since this value won't change for the lifetime of this class
                         if (m_nodeID == Guid.Empty)
-                            m_nodeID = Guid.Parse(command.ExecuteScalar($"SELECT NodeID FROM IaonInputAdapter WHERE ID = {(int)ID}", MetadataSynchronizationTimeout).ToString());
+                            m_nodeID = Guid.Parse(command.ExecuteScalar("SELECT NodeID FROM IaonInputAdapter WHERE ID = {0}", MetadataSynchronizationTimeout, ID).ToString());
 
                         // Determine the protocol record auto-inc ID value for the gateway transport protocol (GEP) - this value is also cached since it shouldn't change for the lifetime of this class
                         if (m_gatewayProtocolID == 0)