sigrid/gsf · Ink

Source/Libraries/Adapters/TestingAdapters/SetFlagsFilterAdapter.cs+103−0

@@ -0,0 +1,103 @@
	1	//******************************************************************************************************
	2	// SetFlagsFilterAdapter.cs - Gbtc
	3	//
	4	// Copyright © 2017, Grid Protection Alliance. All Rights Reserved.
	5	//
	6	// Licensed to the Grid Protection Alliance (GPA) under one or more contributor license agreements. See
	7	// the NOTICE file distributed with this work for additional information regarding copyright ownership.
	8	// The GPA licenses this file to you under the MIT License (MIT), the "License"; you may
	9	// not use this file except in compliance with the License. You may obtain a copy of the License at:
	10	//
	11	// http://opensource.org/licenses/MIT
	12	//
	13	// Unless agreed to in writing, the subject software distributed under the License is distributed on an
	14	// "AS-IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. Refer to the
	15	// License for the specific language governing permissions and limitations.
	16	//
	17	// Code Modification History:
	18	// ----------------------------------------------------------------------------------------------------
	19	// 11/17/2017 - Stephen C. Wills
	20	// Generated original version of source code.
	21	//
	22	//******************************************************************************************************
	23
	24	using System;
	25	using System.Collections.Generic;
	26	using System.ComponentModel;
	27	using GSF.TimeSeries;
	28	using GSF.TimeSeries.Adapters;
	29
	30	namespace TestingAdapters
	31	{
	32	/// <summary>
	33	/// Forces a set of flags to be turned on for a set of inputs.
	34	/// </summary>
	35	[Description("Set Flags: Forces a set of flags to be turned on for a set of inputs.")]
	36	public class SetFlagsFilterAdapter : FilterAdapterBase
	37	{
	38	#region [ Members ]
	39
	40	// Constants
	41
	42	/// <summary>
	43	/// Default value for the <see cref="Flags"/> property.
	44	/// </summary>
	45	public const MeasurementStateFlags DefaultFlags = MeasurementStateFlags.Normal;
	46
	47	#endregion
	48
	49	#region [ Properties ]
	50
	51	/// <summary>
	52	/// Gets or sets the set of flags to be forced on.
	53	/// </summary>
	54	[ConnectionStringParameter,
	55	DefaultValue(DefaultFlags),
	56	Description("Defines the set of flags to be forced on.")]
	57	public MeasurementStateFlags Flags { get; set; }
	58
	59	/// <summary>
	60	/// Gets the flag indicating if this adapter supports temporal processing (it doesn't).
	61	/// </summary>
	62	public override bool SupportsTemporalProcessing
	63	{
	64	get
	65	{
	66	return false;
	67	}
	68	}
	69
	70	#endregion
	71
	72	#region [ Methods ]
	73
	74	/// <summary>
	75	/// Initializes the adapter's settings.
	76	/// </summary>
	77	public override void Initialize()
	78	{
	79	base.Initialize();
	80
	81	Dictionary<string, string> settings = Settings;
	82	string setting;
	83	MeasurementStateFlags flags;
	84
	85	if (settings.TryGetValue(nameof(Flags), out setting) && Enum.TryParse(setting, out flags))
	86	Flags = flags;
	87	else
	88	Flags = DefaultFlags;
	89	}
	90
	91	/// <summary>
	92	/// Processes the measurements to apply the flags.
	93	/// </summary>
	94	/// <param name="measurements">The set of measurements to which to apply the flags.</param>
	95	protected override void ProcessMeasurements(IEnumerable<IMeasurement> measurements)
	96	{
	97	foreach (IMeasurement measurement in measurements)
	98	measurement.StateFlags \|= Flags;
	99	}
	100
	101	#endregion
	102	}
	103	}

Source/Libraries/Adapters/TestingAdapters/TestingAdapters.csproj+1−0

@@ -60,6 +60,7 @@ · 59 unmodified lines
60	<Compile Include="Properties\AssemblyInfo.cs" />	60	<Compile Include="Properties\AssemblyInfo.cs" />
61	<Compile Include="RandomValueInputAdapter.cs" />	61	<Compile Include="RandomValueInputAdapter.cs" />
62	<Compile Include="SampleActionAdapter.cs" />	62	<Compile Include="SampleActionAdapter.cs" />
		63	<Compile Include="SetFlagsFilterAdapter.cs" />
63	<Compile Include="VirtualActionAdapter.cs" />	64	<Compile Include="VirtualActionAdapter.cs" />
64	<Compile Include="VirtualInputAdapter.cs" />	65	<Compile Include="VirtualInputAdapter.cs" />
65	<Compile Include="VirtualOutputAdapter.cs" />	66	<Compile Include="VirtualOutputAdapter.cs" />

Source/Libraries/GSF.TimeSeries/Adapters/FilterAdapterBase.cs+146−0

@@ -0,0 +1,146 @@
	1	//******************************************************************************************************
	2	// FilterAdapterBase.cs - Gbtc
	3	//
	4	// Copyright © 2017, Grid Protection Alliance. All Rights Reserved.
	5	//
	6	// Licensed to the Grid Protection Alliance (GPA) under one or more contributor license agreements. See
	7	// the NOTICE file distributed with this work for additional information regarding copyright ownership.
	8	// The GPA licenses this file to you under the MIT License (MIT), the "License"; you may
	9	// not use this file except in compliance with the License. You may obtain a copy of the License at:
	10	//
	11	// http://opensource.org/licenses/MIT
	12	//
	13	// Unless agreed to in writing, the subject software distributed under the License is distributed on an
	14	// "AS-IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. Refer to the
	15	// License for the specific language governing permissions and limitations.
	16	//
	17	// Code Modification History:
	18	// ----------------------------------------------------------------------------------------------------
	19	// 11/10/2017 - Stephen C. Wills
	20	// Generated original version of source code.
	21	//
	22	//******************************************************************************************************
	23
	24	using System.Collections.Generic;
	25	using System.ComponentModel;
	26	using System.Linq;
	27
	28	namespace GSF.TimeSeries.Adapters
	29	{
	30	/// <summary>
	31	/// Base class for the <see cref="IFilterAdapter"/> interface.
	32	/// </summary>
	33	public abstract class FilterAdapterBase : AdapterBase, IFilterAdapter
	34	{
	35	#region [ Members ]
	36
	37	// Fields
	38	private HashSet<MeasurementKey> m_inputMeasurementKeys;
	39
	40	#endregion
	41
	42	#region [ Constructors ]
	43
	44	/// <summary>
	45	/// Creates a new instance of the <see cref="FilterAdapterBase"/> class.
	46	/// </summary>
	47	public FilterAdapterBase()
	48	{
	49	m_inputMeasurementKeys = new HashSet<MeasurementKey>();
	50	}
	51
	52	#endregion
	53
	54	#region [ Properties ]
	55
	56	/// <summary>
	57	/// Gets or sets primary keys of input measurements the <see cref="AdapterBase"/> expects, if any.
	58	/// </summary>
	59	/// <remarks>
	60	/// If your adapter needs to receive all measurements, you must explicitly set InputMeasurementKeys to null.
	61	/// </remarks>
	62	[ConnectionStringParameter,
	63	DefaultValue(null),
	64	Description("Defines primary keys of input measurements the adapter expects; can be one of a filter expression, measurement key, point tag or Guid."),
	65	CustomConfigurationEditor("GSF.TimeSeries.UI.WPF.dll", "GSF.TimeSeries.UI.Editors.MeasurementEditor")]
	66	public override MeasurementKey[] InputMeasurementKeys
	67	{
	68	get
	69	{
	70	return base.InputMeasurementKeys;
	71	}
	72	set
	73	{
	74	base.InputMeasurementKeys = value;
	75
	76	if (!m_inputMeasurementKeys.SetEquals(value))
	77	m_inputMeasurementKeys = new HashSet<MeasurementKey>(value);
	78	}
	79	}
	80
	81	/// <summary>
	82	/// Gets or sets output measurements that the <see cref="AdapterBase"/> will produce, if any.
	83	/// </summary>
	84	[EditorBrowsable(EditorBrowsableState.Never)]
	85	public override IMeasurement[] OutputMeasurements
	86	{
	87	get
	88	{
	89	return base.OutputMeasurements;
	90	}
	91	set
	92	{
	93	base.OutputMeasurements = value;
	94	}
	95	}
	96
	97	/// <summary>
	98	/// Gets or sets the values that determines the order in which filter adapters are executed.
	99	/// </summary>
	100	public virtual int ExecutionOrder { get; set; }
	101
	102	#endregion
	103
	104	#region [ Methods ]
	105
	106	/// <summary>
	107	/// Handler for new measurements that have not yet been routed.
	108	/// </summary>
	109	/// <param name="measurements">Measurements that have not yet been routed.</param>
	110	public virtual void HandleNewMeasurements(ICollection<IMeasurement> measurements)
	111	{
	112	ProcessMeasurements(measurements.Where(measurement => IsInputMeasurement(measurement.Key)));
	113	IncrementProcessedMeasurements(measurements.Count);
	114	}
	115
	116	/// <summary>
	117	/// Determines if the given measurement key represents
	118	/// a signal that is bound for this filter adapter.
	119	/// </summary>
	120	/// <param name="key">The key that identifies the signal.</param>
	121	/// <returns>True if measurements for the given signal are bound for this filter adapter.</returns>
	122	public virtual bool IsInputMeasurement(MeasurementKey key)
	123	{
	124	HashSet<MeasurementKey> inputMeasurementKeys = m_inputMeasurementKeys;
	125	return inputMeasurementKeys.Contains(key);
	126	}
	127
	128	/// <summary>
	129	/// Gets a short one-line status of this <see cref="AdapterBase"/>.
	130	/// </summary>
	131	/// <param name="maxLength">Maximum number of available characters for display.</param>
	132	/// <returns>A short one-line summary of the current status of this <see cref="AdapterBase"/>.</returns>
	133	public override string GetShortStatus(int maxLength)
	134	{
	135	return $"{ProcessedMeasurements} measurements processed so far...".CenterText(maxLength);
	136	}
	137
	138	/// <summary>
	139	/// Processes the new measurements before they have been routed to other adapters.
	140	/// </summary>
	141	/// <param name="measurements">The new measurements that have not yet been routed.</param>
	142	protected abstract void ProcessMeasurements(IEnumerable<IMeasurement> measurements);
	143
	144	#endregion
	145	}
	146	}

Source/Libraries/GSF.TimeSeries/Adapters/FilterAdapterCollection.cs+159−0

@@ -0,0 +1,159 @@
	1	//******************************************************************************************************
	2	// FilterAdapterCollection.cs - Gbtc
	3	//
	4	// Copyright © 2017, Grid Protection Alliance. All Rights Reserved.
	5	//
	6	// Licensed to the Grid Protection Alliance (GPA) under one or more contributor license agreements. See
	7	// the NOTICE file distributed with this work for additional information regarding copyright ownership.
	8	// The GPA licenses this file to you under the MIT License (MIT), the "License"; you may
	9	// not use this file except in compliance with the License. You may obtain a copy of the License at:
	10	//
	11	// http://opensource.org/licenses/MIT
	12	//
	13	// Unless agreed to in writing, the subject software distributed under the License is distributed on an
	14	// "AS-IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. Refer to the
	15	// License for the specific language governing permissions and limitations.
	16	//
	17	// Code Modification History:
	18	// ----------------------------------------------------------------------------------------------------
	19	// 11/10/2017 - Stephen C. Wills
	20	// Generated original version of source code.
	21	//
	22	//******************************************************************************************************
	23
	24	using System;
	25	using System.Collections.Generic;
	26	using System.Collections.ObjectModel;
	27	using System.Data;
	28	using System.Linq;
	29	using GSF.Data;
	30
	31	namespace GSF.TimeSeries.Adapters
	32	{
	33	/// <summary>
	34	/// Represents a collection of <see cref="IFilterAdapter"/> implementations.
	35	/// </summary>
	36	public class FilterAdapterCollection : AdapterCollectionBase<IFilterAdapter>, IFilterAdapter
	37	{
	38	#region [ Members ]
	39
	40	// Fields
	41	private List<IFilterAdapter> m_sortedFilterAdapters;
	42
	43	#endregion
	44
	45	#region [ Constructors ]
	46
	47	/// <summary>
	48	/// Creates a new instance of the <see cref="FilterAdapterCollection"/>.
	49	/// </summary>
	50	public FilterAdapterCollection()
	51	{
	52	base.Name = "Filter Adapter Collection";
	53	base.DataMember = "FilterAdapters";
	54	base.MonitorTimerEnabled = true;
	55	}
	56
	57	#endregion
	58
	59	#region [ Properties ]
	60
	61	/// <summary>
	62	/// Gets or sets the values that determines the order in which filter adapters are executed.
	63	/// </summary>
	64	public int ExecutionOrder { get; set; }
	65
	66	#endregion
	67
	68	#region [ Methods ]
	69
	70	/// <summary>
	71	/// Handler for new measurements that have not yet been routed.
	72	/// </summary>
	73	/// <param name="measurements">Measurements that have not yet been routed.</param>
	74	public void HandleNewMeasurements(ICollection<IMeasurement> measurements)
	75	{
	76	List<IFilterAdapter> sortedFilterAdapters = m_sortedFilterAdapters;
	77
	78	if ((object)sortedFilterAdapters == null)
	79	{
	80	lock (this)
	81	{
	82	// Because we entered a lock, some time may have passed since
	83	// the first time we checked for null so we should check again
	84	sortedFilterAdapters = m_sortedFilterAdapters;
	85
	86	if ((object)sortedFilterAdapters == null)
	87	{
	88	sortedFilterAdapters = this
	89	.Cast<IFilterAdapter>()
	90	.OrderBy(adapter => adapter.ExecutionOrder)
	91	.ToList();
	92
	93	m_sortedFilterAdapters = sortedFilterAdapters;
	94	}
	95	}
	96	}
	97
	98	foreach (IFilterAdapter adapter in sortedFilterAdapters)
	99	{
	100	if (adapter.Enabled)
	101	adapter.HandleNewMeasurements(measurements);
	102	}
	103	}
	104
	105	/// <summary>
	106	/// Attempts to create an <see cref="IAdapter"/> from the specified <see cref="DataRow"/>.
	107	/// </summary>
	108	/// <param name="adapterRow"><see cref="DataRow"/> containing item information to initialize.</param>
	109	/// <param name="adapter">Initialized adapter if successful; otherwise null.</param>
	110	/// <returns><c>true</c> if item was successfully initialized; otherwise <c>false</c>.</returns>
	111	/// <remarks>
	112	/// See <see cref="AdapterCollectionBase{T}.DataSource"/> property for expected <see cref="DataRow"/> column names.
	113	/// </remarks>
	114	/// <exception cref="NullReferenceException"><paramref name="adapterRow"/> is null.</exception>
	115	public override bool TryCreateAdapter(DataRow adapterRow, out IFilterAdapter adapter)
	116	{
	117	bool success = base.TryCreateAdapter(adapterRow, out adapter);
	118
	119	if (success && adapterRow.Table.Columns.Contains("LoadOrder"))
	120	adapter.ExecutionOrder = adapterRow.ConvertField<int>("LoadOrder");
	121
	122	return success;
	123	}
	124
	125	/// <summary>
	126	/// Inserts an element into the <see cref="Collection{T}"/> the specified index.
	127	/// </summary>
	128	/// <param name="index">The zero-based index at which item should be inserted.</param>
	129	/// <param name="item">The <see cref="IAdapter"/> implementation to insert.</param>
	130	protected override void InsertItem(int index, IFilterAdapter item)
	131	{
	132	base.InsertItem(index, item);
	133	m_sortedFilterAdapters = null;
	134	}
	135
	136	/// <summary>
	137	/// Assigns a new element to the <see cref="Collection{T}"/> at the specified index.
	138	/// </summary>
	139	/// <param name="index">The zero-based index for which item should be assigned.</param>
	140	/// <param name="item">The <see cref="IAdapter"/> implementation to assign.</param>
	141	protected override void SetItem(int index, IFilterAdapter item)
	142	{
	143	base.SetItem(index, item);
	144	m_sortedFilterAdapters = null;
	145	}
	146
	147	/// <summary>
	148	/// Removes the element at the specified index of the <see cref="Collection{T}"/>.
	149	/// </summary>
	150	/// <param name="index">The zero-based index of the element to remove.</param>
	151	protected override void RemoveItem(int index)
	152	{
	153	base.RemoveItem(index);
	154	m_sortedFilterAdapters = null;
	155	}
	156
	157	#endregion
	158	}
	159	}

Source/Libraries/GSF.TimeSeries/Adapters/IFilterAdapter.cs+45−0

@@ -0,0 +1,45 @@
	1	//******************************************************************************************************
	2	// IFilterAdapter.cs - Gbtc
	3	//
	4	// Copyright © 2017, Grid Protection Alliance. All Rights Reserved.
	5	//
	6	// Licensed to the Grid Protection Alliance (GPA) under one or more contributor license agreements. See
	7	// the NOTICE file distributed with this work for additional information regarding copyright ownership.
	8	// The GPA licenses this file to you under the MIT License (MIT), the "License"; you may
	9	// not use this file except in compliance with the License. You may obtain a copy of the License at:
	10	//
	11	// http://opensource.org/licenses/MIT
	12	//
	13	// Unless agreed to in writing, the subject software distributed under the License is distributed on an
	14	// "AS-IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. Refer to the
	15	// License for the specific language governing permissions and limitations.
	16	//
	17	// Code Modification History:
	18	// ----------------------------------------------------------------------------------------------------
	19	// 11/10/2017 - Stephen C. Wills
	20	// Generated original version of source code.
	21	//
	22	//******************************************************************************************************
	23
	24	using System.Collections.Generic;
	25
	26	namespace GSF.TimeSeries.Adapters
	27	{
	28	/// <summary>
	29	/// Represents a module that processes input measurements on
	30	/// the way by before routing the measurements to other adapters.
	31	/// </summary>
	32	public interface IFilterAdapter : IAdapter
	33	{
	34	/// <summary>
	35	/// Gets or sets the values that determines the order in which filter adapters are executed.
	36	/// </summary>
	37	int ExecutionOrder { get; set; }
	38
	39	/// <summary>
	40	/// Handler for new measurements that have not yet been routed.
	41	/// </summary>
	42	/// <param name="measurements">Measurements that have not yet been routed.</param>
	43	void HandleNewMeasurements(ICollection<IMeasurement> measurements);
	44	}
	45	}

Source/Libraries/GSF.TimeSeries/Adapters/IaonSession.cs+52−6

 using GSF.Collections;
 using GSF.Configuration;
 using GSF.Diagnostics;
+using System.Collections.Generic;
 // ReSharper disable InconsistentlySynchronizedField
 namespace GSF.TimeSeries.Adapters
         private Guid m_nodeID;
         private RoutingTables m_routingTables;
         private AllAdaptersCollection m_allAdapters;
+        private FilterAdapterCollection m_filterAdapters;
         private InputAdapterCollection m_inputAdapters;
         private ActionAdapterCollection m_actionAdapters;
         private OutputAdapterCollection m_outputAdapters;
             m_allAdapters.ConfigurationChanged += ConfigurationChangedHandler;
             m_allAdapters.Disposed += DisposedHandler;
+            // Create filter adapters collection
+            m_filterAdapters = new FilterAdapterCollection();
             // Create input adapters collection
             m_inputAdapters = new InputAdapterCollection();
+            m_inputAdapters.NewMeasurements += NewMeasurementsHandler;
             m_inputAdapters.ProcessingComplete += ProcessingCompleteHandler;
             // Create action adapters collection
             m_actionAdapters = new ActionAdapterCollection();
+            m_actionAdapters.NewMeasurements += NewMeasurementsHandler;
             m_actionAdapters.UnpublishedSamples += UnpublishedSamplesHandler;
             m_actionAdapters.RequestTemporalSupport += RequestTemporalSupportHandler;
             m_routingTables.ActionAdapters = m_actionAdapters;
             m_routingTables.OutputAdapters = m_outputAdapters;
-            // We group these adapters such that they are initialized in the following order: output, input, action. This
+            // We group these adapters such that they are initialized in the following order: output, filter, input, action.
-            // is done so that the archival capabilities will be setup before we start receiving input and the input data
+            // This is done so that the archival capabilities will be setup before we start receiving input and the input
-            // will be flowing before any actions get established for the input - at least generally.
+            // data will be flowing before any actions get established for the input - at least generally.
             m_allAdapters.Add(m_outputAdapters);
+            m_allAdapters.Add(m_filterAdapters);
             m_allAdapters.Add(m_inputAdapters);
             m_allAdapters.Add(m_actionAdapters);
             }
         }
+        /// <summary>
+        /// Gets the filter adapter collection for this <see cref="IaonSession"/>.
+        /// </summary>
+        public virtual FilterAdapterCollection FilterAdapters
+        {
+            get
+            {
+                return m_filterAdapters;
+            }
+        }
         /// <summary>
         /// Gets the input adapter collection for this <see cref="IaonSession"/>.
         /// </summary>
             {
                 StringBuilder status = new StringBuilder();
+                status.AppendLine();
+                status.AppendLine(">> Filter Adapters:");
+                status.AppendLine();
+                if (m_filterAdapters != null)
+                    status.AppendLine(m_filterAdapters.Status);
                 status.AppendLine();
                 status.AppendLine(">> Input Adapters:");
                 status.AppendLine();
                     {
                         DataSet dataSource = DataSource;
+                        // Dispose filter adapters collection
+                        if ((object)m_filterAdapters != null)
+                        {
+                            m_filterAdapters.Stop();
+                            m_filterAdapters.Dispose();
+                        }
+                        m_filterAdapters = null;
                         // Dispose input adapters collection
-                        if (m_inputAdapters != null)
+                        if ((object)m_inputAdapters != null)
                         {
                             m_inputAdapters.Stop();
+                            m_inputAdapters.NewMeasurements -= NewMeasurementsHandler;
                             m_inputAdapters.ProcessingComplete -= ProcessingCompleteHandler;
                             m_inputAdapters.Dispose();
                         }
                         m_inputAdapters = null;
                         // Dispose action adapters collection
-                        if (m_actionAdapters != null)
+                        if ((object)m_actionAdapters != null)
                         {
                             m_actionAdapters.Stop();
+                            m_actionAdapters.NewMeasurements -= NewMeasurementsHandler;
                             m_actionAdapters.UnpublishedSamples -= UnpublishedSamplesHandler;
                             m_actionAdapters.RequestTemporalSupport -= RequestTemporalSupportHandler;
                             m_actionAdapters.Dispose();
                         m_actionAdapters = null;
                         // Dispose output adapters collection
-                        if (m_outputAdapters != null)
+                        if ((object)m_outputAdapters != null)
                         {
                             m_outputAdapters.Stop();
                             m_outputAdapters.UnprocessedMeasurements -= UnprocessedMeasurementsHandler;
             OnUnprocessedMeasurements(sender, e.Argument);
         }
+        /// <summary>
+        /// Event handler for new measurement notifications from input adapters and action adapters.
+        /// </summary>
+        /// <param name="sender">Event source reference to the adapter that is reporting new measurements.</param>
+        /// <param name="e">Event arguments for event that contains references to the new measurements.</param>
+        public virtual void NewMeasurementsHandler(object sender, EventArgs<ICollection<IMeasurement>> e)
+        {
+            m_filterAdapters.HandleNewMeasurements(e.Argument);
+        }
         /// <summary>
         /// Event handler for processing complete notifications from input adapters.
         /// </summary>

Source/Libraries/GSF.TimeSeries/Data/MySQL/GSFSchema.sql+51−2

 -- IMPORTANT NOTE: When making updates to this schema, please increment the version number!
 -- *******************************************************************************************
 CREATE VIEW SchemaVersion AS
-SELECT 6 AS VersionNumber;
+SELECT 7 AS VersionNumber;
 CREATE TABLE ErrorLog(
     ID INT AUTO_INCREMENT NOT NULL,
     CONSTRAINT PK_CustomInputAdapter PRIMARY KEY (ID ASC)
 );
+CREATE TABLE CustomFilterAdapter(
+    NodeID NCHAR(36) NOT NULL,
+    ID INT AUTO_INCREMENT NOT NULL,
+    AdapterName VARCHAR(200) NOT NULL,
+    AssemblyName TEXT NOT NULL,
+    TypeName TEXT NOT NULL,
+    ConnectionString TEXT NULL,
+    LoadOrder INT NOT NULL DEFAULT 0,
+    Enabled TINYINT NOT NULL DEFAULT 0,
+    CreatedOn DATETIME NULL,
+    CreatedBy VARCHAR(200) NULL,
+    UpdatedOn DATETIME NULL,
+    UpdatedBy VARCHAR(200) NULL,
+    CONSTRAINT PK_CustomFilterAdapter PRIMARY KEY (ID ASC)
+);
 CREATE TABLE OutputStream(
     NodeID NCHAR(36) NOT NULL,
     ID INT AUTO_INCREMENT NOT NULL,
 ALTER TABLE CustomInputAdapter ADD CONSTRAINT FK_CustomInputAdapter_Node FOREIGN KEY(NodeID) REFERENCES Node (ID) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE CustomFilterAdapter ADD CONSTRAINT FK_CustomFilterAdapter_Node FOREIGN KEY(NodeID) REFERENCES Node (ID) ON DELETE CASCADE ON UPDATE CASCADE;
 ALTER TABLE OutputStream ADD CONSTRAINT FK_OutputStream_Node FOREIGN KEY(NodeID) REFERENCES Node (ID) ON DELETE CASCADE ON UPDATE CASCADE;
 ALTER TABLE PowerCalculation ADD CONSTRAINT FK_PowerCalculation_Measurement1 FOREIGN KEY(ApparentPowerOutputSignalID) REFERENCES Measurement (SignalID) ON DELETE CASCADE ON UPDATE CASCADE;
 WHERE (CustomInputAdapter.Enabled <> 0)
 ORDER BY CustomInputAdapter.LoadOrder;
+CREATE VIEW RuntimeCustomFilterAdapter
+AS
+SELECT CustomFilterAdapter.NodeID, Runtime.ID, CustomFilterAdapter.AdapterName,
+    TRIM(CustomFilterAdapter.AssemblyName) AS AssemblyName, TRIM(CustomFilterAdapter.TypeName) AS TypeName, CustomFilterAdapter.ConnectionString
+FROM CustomFilterAdapter LEFT OUTER JOIN
+    Runtime ON CustomFilterAdapter.ID = Runtime.SourceID AND Runtime.SourceTable = N'CustomFilterAdapter'
+WHERE (CustomFilterAdapter.Enabled <> 0)
+ORDER BY CustomFilterAdapter.LoadOrder;
 CREATE VIEW RuntimeOutputStreamDevice
 AS
 SELECT OutputStreamDevice.NodeID, Runtime.ID AS ParentID, OutputStreamDevice.ID, OutputStreamDevice.IDCode, OutputStreamDevice.Acronym,
 UNION
 SELECT NodeID, ID, AdapterName, AssemblyName, TypeName, ConnectionString
 FROM RuntimeCustomActionAdapter;
+CREATE VIEW IaonFilterAdapter
+AS
+SELECT NodeID, ID, AdapterName, AssemblyName, TypeName, ConnectionString
+FROM RuntimeCustomFilterAdapter;
 CREATE VIEW MeasurementDetail
 AS
     CA.Enabled, N.Name AS NodeName
 FROM CustomOutputAdapter AS CA INNER JOIN Node AS N ON CA.NodeID = N.ID;
+CREATE VIEW CustomFilterAdapterDetail AS
+SELECT CA.NodeID, CA.ID, CA.AdapterName, CA.AssemblyName, CA.TypeName, COALESCE(CA.ConnectionString, '') AS ConnectionString, CA.LoadOrder,
+    CA.Enabled, N.Name AS NodeName
+FROM CustomFilterAdapter AS CA INNER JOIN Node AS N ON CA.NodeID = N.ID;
 CREATE VIEW IaonTreeView AS
 SELECT 'Action Adapters' AS AdapterType, NodeID, ID, AdapterName, AssemblyName, TypeName, COALESCE(ConnectionString, '') AS ConnectionString
 FROM IaonActionAdapter
 FROM IaonInputAdapter
 UNION ALL
 SELECT 'Output Adapters' AS AdapterType, NodeID, ID, AdapterName, AssemblyName, TypeName, COALESCE(ConnectionString, '') AS ConnectionString
-FROM IaonOutputAdapter;
+FROM IaonOutputAdapter
+UNION ALL
+SELECT 'Filter Adapters' AS AdapterType, NodeID, ID, AdapterName, AssemblyName, TypeName, COALESCE(ConnectionString, '') AS ConnectionString
+FROM IaonFilterAdapter;
 CREATE VIEW OtherDeviceDetail AS
 SELECT OD.ID, OD.Acronym, COALESCE(OD.Name, '') AS Name, OD.IsConcentrator, OD.CompanyID, OD.VendorDeviceID, OD.Longitude, OD.Latitude,
 CREATE TRIGGER CustomOutputAdapter_RuntimeSync_Delete BEFORE DELETE ON CustomOutputAdapter
 FOR EACH ROW DELETE FROM Runtime WHERE SourceID = OLD.ID AND SourceTable = N'CustomOutputAdapter';
+CREATE TRIGGER CustomFilterAdapter_RuntimeSync_Insert AFTER INSERT ON CustomFilterAdapter
+FOR EACH ROW INSERT INTO Runtime (SourceID, SourceTable) VALUES(NEW.ID, N'CustomFilterAdapter');
+CREATE TRIGGER CustomFilterAdapter_RuntimeSync_Delete BEFORE DELETE ON CustomFilterAdapter
+FOR EACH ROW DELETE FROM Runtime WHERE SourceID = OLD.ID AND SourceTable = N'CustomFilterAdapter';
 DELIMITER $$
 CREATE TRIGGER Device_RuntimeSync_Insert AFTER INSERT ON Device FOR EACH ROW
 BEGIN
 CREATE TRIGGER CustomOutputAdapter_InsertDefault BEFORE INSERT ON CustomOutputAdapter
 FOR EACH ROW SET NEW.CreatedBy = COALESCE(NEW.CreatedBy, USER()), NEW.CreatedOn = COALESCE(NEW.CreatedOn, UTC_TIMESTAMP()), NEW.UpdatedBy = COALESCE(NEW.UpdatedBy, USER()), NEW.UpdatedOn = COALESCE(NEW.UpdatedOn, UTC_TIMESTAMP());
+CREATE TRIGGER CustomFilterAdapter_InsertDefault BEFORE INSERT ON CustomFilterAdapter
+FOR EACH ROW SET NEW.CreatedBy = COALESCE(NEW.CreatedBy, USER()), NEW.CreatedOn = COALESCE(NEW.CreatedOn, UTC_TIMESTAMP()), NEW.UpdatedBy = COALESCE(NEW.UpdatedBy, USER()), NEW.UpdatedOn = COALESCE(NEW.UpdatedOn, UTC_TIMESTAMP());
 CREATE TRIGGER Device_InsertDefault BEFORE INSERT ON Device
 FOR EACH ROW SET NEW.UniqueID = COALESCE(NEW.UniqueID, UUID()), NEW.CreatedBy = COALESCE(NEW.CreatedBy, USER()), NEW.CreatedOn = COALESCE(NEW.CreatedOn, UTC_TIMESTAMP()), NEW.UpdatedBy = COALESCE(NEW.UpdatedBy, USER()), NEW.UpdatedOn = COALESCE(NEW.UpdatedOn, UTC_TIMESTAMP());

Source/Libraries/GSF.TimeSeries/Data/MySQL/InitialDataSet.sql+28−27

Source/Libraries/GSF.TimeSeries/Data/Oracle/GSFSchema.sql+81−2

@@ -38,7 +38,7 @@ · 37 unmodified lines
38	-- IMPORTANT NOTE: When making updates to this schema, please increment the version number!	38	-- IMPORTANT NOTE: When making updates to this schema, please increment the version number!
39	-- *******************************************************************************************	39	-- *******************************************************************************************
40	CREATE VIEW SchemaVersion AS	40	CREATE VIEW SchemaVersion AS
41	SELECT 6 AS VersionNumber	41	SELECT 7 AS VersionNumber
42	FROM dual;	42	FROM dual;
43		43
44	CREATE TABLE ErrorLog(	44	CREATE TABLE ErrorLog(
@@ -755,6 +755,32 @@ CREATE TRIGGER AI_CustomInputAdapter BEFORE INSERT ON CustomInputAdapter · 710 unmodified lines
755	END;	755	END;
756	/	756	/
757		757
		758	CREATE TABLE CustomFilterAdapter(
		759	NodeID VARCHAR2(36) NOT NULL,
		760	ID NUMBER NOT NULL,
		761	AdapterName VARCHAR2(200) NOT NULL,
		762	AssemblyName VARCHAR2(4000) NOT NULL,
		763	TypeName VARCHAR2(4000) NOT NULL,
		764	ConnectionString VARCHAR2(4000) NULL,
		765	LoadOrder NUMBER DEFAULT 0 NOT NULL,
		766	Enabled NUMBER DEFAULT 0 NOT NULL,
		767	CreatedOn DATE NOT NULL,
		768	CreatedBy VARCHAR2(200) NOT NULL,
		769	UpdatedOn DATE NOT NULL,
		770	UpdatedBy VARCHAR2(200) NOT NULL
		771	);
		772
		773	CREATE UNIQUE INDEX IX_CustomFilterAdapter ON CustomFilterAdapter (ID ASC) TABLESPACE GSFSchema_INDEX;
		774
		775	ALTER TABLE CustomFilterAdapter ADD CONSTRAINT PK_CustomFilterAdapter PRIMARY KEY (ID);
		776
		777	CREATE SEQUENCE SEQ_CustomFilterAdapter START WITH 1 INCREMENT BY 1;
		778
		779	CREATE TRIGGER AI_CustomFilterAdapter BEFORE INSERT ON CustomFilterAdapter
		780	FOR EACH ROW BEGIN SELECT SEQ_CustomFilterAdapter.nextval INTO :NEW.ID FROM dual;
		781	END;
		782	/
		783
758	CREATE TABLE OutputStream(	784	CREATE TABLE OutputStream(
759	NodeID VARCHAR2(36) NOT NULL,	785	NodeID VARCHAR2(36) NOT NULL,
760	ID NUMBER NOT NULL,	786	ID NUMBER NOT NULL,
@@ -1180,6 +1206,8 @@ ALTER TABLE Historian ADD CONSTRAINT FK_Historian_Node FOREIGN KEY(NodeID) REFER · 419 unmodified lines
1180		1206
1181	ALTER TABLE CustomInputAdapter ADD CONSTRAINT FK_CustomInputAdapter_Node FOREIGN KEY(NodeID) REFERENCES Node (ID) ON DELETE CASCADE;	1207	ALTER TABLE CustomInputAdapter ADD CONSTRAINT FK_CustomInputAdapter_Node FOREIGN KEY(NodeID) REFERENCES Node (ID) ON DELETE CASCADE;
1182		1208
		1209	ALTER TABLE CustomFilterAdapter ADD CONSTRAINT FK_CustomFilterAdapter_Node FOREIGN KEY(NodeID) REFERENCES Node (ID) ON DELETE CASCADE;
		1210
1183	ALTER TABLE OutputStream ADD CONSTRAINT FK_OutputStream_Node FOREIGN KEY(NodeID) REFERENCES Node (ID) ON DELETE CASCADE;	1211	ALTER TABLE OutputStream ADD CONSTRAINT FK_OutputStream_Node FOREIGN KEY(NodeID) REFERENCES Node (ID) ON DELETE CASCADE;
1184		1212
1185	ALTER TABLE PowerCalculation ADD CONSTRAINT FK_PowerCalculation_Measurement1 FOREIGN KEY(ApparentPowerOutputSignalID) REFERENCES Measurement (SignalID) ON DELETE CASCADE;	1213	ALTER TABLE PowerCalculation ADD CONSTRAINT FK_PowerCalculation_Measurement1 FOREIGN KEY(ApparentPowerOutputSignalID) REFERENCES Measurement (SignalID) ON DELETE CASCADE;
@@ -1333,6 +1361,15 @@ FROM CustomInputAdapter LEFT OUTER JOIN · 147 unmodified lines
1333	WHERE (CustomInputAdapter.Enabled <> 0)	1361	WHERE (CustomInputAdapter.Enabled <> 0)
1334	ORDER BY CustomInputAdapter.LoadOrder;	1362	ORDER BY CustomInputAdapter.LoadOrder;
1335		1363
		1364	CREATE VIEW RuntimeCustomFilterAdapter
		1365	AS
		1366	SELECT CustomFilterAdapter.NodeID, Runtime.ID, CustomFilterAdapter.AdapterName,
		1367	TRIM(CustomFilterAdapter.AssemblyName) AS AssemblyName, TRIM(CustomFilterAdapter.TypeName) AS TypeName, CustomFilterAdapter.ConnectionString
		1368	FROM CustomFilterAdapter LEFT OUTER JOIN
		1369	Runtime ON CustomFilterAdapter.ID = Runtime.SourceID AND Runtime.SourceTable = 'CustomFilterAdapter'
		1370	WHERE (CustomFilterAdapter.Enabled <> 0)
		1371	ORDER BY CustomFilterAdapter.LoadOrder;
		1372
1336	CREATE VIEW RuntimeOutputStreamDevice	1373	CREATE VIEW RuntimeOutputStreamDevice
1337	AS	1374	AS
1338	SELECT OutputStreamDevice.NodeID, Runtime.ID AS ParentID, OutputStreamDevice.ID, OutputStreamDevice.IDCode, OutputStreamDevice.Acronym,	1375	SELECT OutputStreamDevice.NodeID, Runtime.ID AS ParentID, OutputStreamDevice.ID, OutputStreamDevice.IDCode, OutputStreamDevice.Acronym,
@@ -1471,6 +1508,11 @@ FROM RuntimeCalculatedMeasurement · 132 unmodified lines
1471	UNION ALL	1508	UNION ALL
1472	SELECT NodeID, ID, AdapterName, AssemblyName, TypeName, ConnectionString	1509	SELECT NodeID, ID, AdapterName, AssemblyName, TypeName, ConnectionString
1473	FROM RuntimeCustomActionAdapter;	1510	FROM RuntimeCustomActionAdapter;
		1511
		1512	CREATE VIEW IaonFilterAdapter
		1513	AS
		1514	SELECT NodeID, ID, AdapterName, AssemblyName, TypeName, ConnectionString
		1515	FROM RuntimeCustomFilterAdapter;
1474		1516
1475	CREATE VIEW MeasurementDetail	1517	CREATE VIEW MeasurementDetail
1476	AS	1518	AS
@@ -1582,6 +1624,11 @@ SELECT CA.NodeID, CA.ID, CA.AdapterName, CA.AssemblyName, CA.TypeName, CA.Connec · 105 unmodified lines
1582	CA.Enabled, N.Name AS NodeName	1624	CA.Enabled, N.Name AS NodeName
1583	FROM CustomOutputAdapter CA INNER JOIN Node N ON CA.NodeID = N.ID;	1625	FROM CustomOutputAdapter CA INNER JOIN Node N ON CA.NodeID = N.ID;
1584		1626
		1627	CREATE VIEW CustomFilterAdapterDetail AS
		1628	SELECT CA.NodeID, CA.ID, CA.AdapterName, CA.AssemblyName, CA.TypeName, CA.ConnectionString AS ConnectionString, CA.LoadOrder,
		1629	CA.Enabled, N.Name AS NodeName
		1630	FROM CustomFilterAdapter CA INNER JOIN Node N ON CA.NodeID = N.ID;
		1631
1585	CREATE VIEW IaonTreeView AS	1632	CREATE VIEW IaonTreeView AS
1586	SELECT 'Action Adapters' AS AdapterType, NodeID, ID, AdapterName, AssemblyName, TypeName, ConnectionString AS ConnectionString	1633	SELECT 'Action Adapters' AS AdapterType, NodeID, ID, AdapterName, AssemblyName, TypeName, ConnectionString AS ConnectionString
1587	FROM IaonActionAdapter	1634	FROM IaonActionAdapter
@@ -1590,7 +1637,10 @@ SELECT 'Input Adapters' AS AdapterType, NodeID, ID, AdapterName, AssemblyName, T · 2 unmodified lines
1590	FROM IaonInputAdapter	1637	FROM IaonInputAdapter
1591	UNION ALL	1638	UNION ALL
1592	SELECT 'Output Adapters' AS AdapterType, NodeID, ID, AdapterName, AssemblyName, TypeName, ConnectionString AS ConnectionString	1639	SELECT 'Output Adapters' AS AdapterType, NodeID, ID, AdapterName, AssemblyName, TypeName, ConnectionString AS ConnectionString
1593	FROM IaonOutputAdapter;	1640	FROM IaonOutputAdapter
		1641	UNION ALL
		1642	SELECT 'Filter Adapters' AS AdapterType, NodeID, ID, AdapterName, AssemblyName, TypeName, ConnectionString AS ConnectionString
		1643	FROM IaonFilterAdapter;
1594		1644
1595	CREATE VIEW OtherDeviceDetail AS	1645	CREATE VIEW OtherDeviceDetail AS
1596	SELECT OD.ID, OD.Acronym, COALESCE(OD.Name, '') AS Name, OD.IsConcentrator, OD.CompanyID, OD.VendorDeviceID, OD.Longitude, OD.Latitude,	1646	SELECT OD.ID, OD.Acronym, COALESCE(OD.Name, '') AS Name, OD.IsConcentrator, OD.CompanyID, OD.VendorDeviceID, OD.Longitude, OD.Latitude,
@@ -1800,6 +1850,16 @@ CREATE TRIGGER CustOutAdaptr_RuntimeSync_Del BEFORE DELETE ON CustomOutputAdapte · 203 unmodified lines
1800	END;	1850	END;
1801	/	1851	/
1802		1852
		1853	CREATE TRIGGER CustFtrAdaptr_RuntimeSync_Insrt AFTER INSERT ON CustomFilterAdapter
		1854	FOR EACH ROW BEGIN INSERT INTO Runtime (SourceID, SourceTable) VALUES(:NEW.ID, 'CustomFilterAdapter');
		1855	END;
		1856	/
		1857
		1858	CREATE TRIGGER CustFtrAdaptr_RuntimeSync_Del BEFORE DELETE ON CustomFilterAdapter
		1859	FOR EACH ROW BEGIN DELETE FROM Runtime WHERE SourceID = :OLD.ID AND SourceTable = 'CustomFilterAdapter';
		1860	END;
		1861	/
		1862
1803	CREATE TRIGGER Device_RuntimeSync_Insert AFTER INSERT ON Device	1863	CREATE TRIGGER Device_RuntimeSync_Insert AFTER INSERT ON Device
1804	FOR EACH ROW BEGIN INSERT INTO Runtime (SourceID, SourceTable) VALUES(:NEW.ID, 'Device');	1864	FOR EACH ROW BEGIN INSERT INTO Runtime (SourceID, SourceTable) VALUES(:NEW.ID, 'Device');
1805	END;	1865	END;
@@ -2015,6 +2075,25 @@ CREATE TRIGGER CustomOutAdapter_InsertDefault BEFORE INSERT ON CustomOutputAdapt · 209 unmodified lines
2015	END;	2075	END;
2016	/	2076	/
2017		2077
		2078	CREATE TRIGGER CustFtrAdapter_InsertDefault BEFORE INSERT ON CustomFilterAdapter FOR EACH ROW BEGIN
		2079	IF :NEW.CreatedBy IS NULL THEN
		2080	SELECT USER INTO :NEW.CreatedBy FROM dual;
		2081	END IF;
		2082
		2083	IF :NEW.CreatedOn IS NULL THEN
		2084	SELECT SYSDATE INTO :NEW.CreatedOn FROM dual;
		2085	END IF;
		2086
		2087	IF :NEW.UpdatedBy IS NULL THEN
		2088	SELECT USER INTO :NEW.UpdatedBy FROM dual;
		2089	END IF;
		2090
		2091	IF :NEW.UpdatedOn IS NULL THEN
		2092	SELECT SYSDATE INTO :NEW.UpdatedOn FROM dual;
		2093	END IF;
		2094	END;
		2095	/
		2096
2018	CREATE TRIGGER Device_InsertDefault BEFORE INSERT ON Device FOR EACH ROW BEGIN	2097	CREATE TRIGGER Device_InsertDefault BEFORE INSERT ON Device FOR EACH ROW BEGIN
2019	IF :NEW.UniqueID IS NULL THEN	2098	IF :NEW.UniqueID IS NULL THEN
2020	SELECT NEW_GUID() INTO :NEW.UniqueID FROM dual;	2099	SELECT NEW_GUID() INTO :NEW.UniqueID FROM dual;

Source/Libraries/GSF.TimeSeries/Data/Oracle/InitialDataSet.sql+28−27

Source/Libraries/GSF.TimeSeries/Data/PostgreSQL/GSFSchema.sql+64−2

@@ -36,7 +36,7 @@ · 35 unmodified lines
36	-- IMPORTANT NOTE: When making updates to this schema, please increment the version number!	36	-- IMPORTANT NOTE: When making updates to this schema, please increment the version number!
37	-- *******************************************************************************************	37	-- *******************************************************************************************
38	CREATE VIEW SchemaVersion AS	38	CREATE VIEW SchemaVersion AS
39	SELECT 6 AS VersionNumber;	39	SELECT 7 AS VersionNumber;
40		40
41	CREATE EXTENSION "uuid-ossp";	41	CREATE EXTENSION "uuid-ossp";
42		42
@@ -555,6 +555,22 @@ CREATE TABLE CustomInputAdapter( · 512 unmodified lines
555	CONSTRAINT FK_CustomInputAdapter_Node FOREIGN KEY(NodeID) REFERENCES node (ID) ON DELETE CASCADE ON UPDATE CASCADE	555	CONSTRAINT FK_CustomInputAdapter_Node FOREIGN KEY(NodeID) REFERENCES node (ID) ON DELETE CASCADE ON UPDATE CASCADE
556	);	556	);
557		557
		558	CREATE TABLE CustomFilterAdapter(
		559	NodeID NCHAR(36) NOT NULL,
		560	ID SERIAL NOT NULL PRIMARY KEY,
		561	AdapterName VARCHAR(200) NOT NULL,
		562	AssemblyName TEXT NOT NULL,
		563	TypeName TEXT NOT NULL,
		564	ConnectionString TEXT NULL,
		565	LoadOrder INTEGER NOT NULL DEFAULT 0,
		566	Enabled SMALLINT NOT NULL DEFAULT 0,
		567	CreatedOn TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
		568	CreatedBy VARCHAR(200) NOT NULL DEFAULT '',
		569	UpdatedOn TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
		570	UpdatedBy VARCHAR(200) NOT NULL DEFAULT '',
		571	CONSTRAINT FK_CustomFilterAdapter_Node FOREIGN KEY(NodeID) REFERENCES node (ID) ON DELETE CASCADE ON UPDATE CASCADE
		572	);
		573
558	CREATE TABLE PowerCalculation(	574	CREATE TABLE PowerCalculation(
559	NodeID NCHAR(36) NULL,	575	NodeID NCHAR(36) NULL,
560	ID SERIAL NOT NULL PRIMARY KEY,	576	ID SERIAL NOT NULL PRIMARY KEY,
@@ -871,6 +887,15 @@ FROM CustomInputAdapter LEFT OUTER JOIN · 310 unmodified lines
871	WHERE (CustomInputAdapter.Enabled <> 0)	887	WHERE (CustomInputAdapter.Enabled <> 0)
872	ORDER BY CustomInputAdapter.LoadOrder;	888	ORDER BY CustomInputAdapter.LoadOrder;
873		889
		890	CREATE VIEW RuntimeCustomFilterAdapter
		891	AS
		892	SELECT CustomFilterAdapter.NodeID, Runtime.ID, CustomFilterAdapter.AdapterName,
		893	TRIM(CustomFilterAdapter.AssemblyName) AS AssemblyName, TRIM(CustomFilterAdapter.TypeName) AS TypeName, CustomFilterAdapter.ConnectionString
		894	FROM CustomFilterAdapter LEFT OUTER JOIN
		895	Runtime ON CustomFilterAdapter.ID = Runtime.SourceID AND Runtime.SourceTable = 'CustomFilterAdapter'
		896	WHERE (CustomFilterAdapter.Enabled <> 0)
		897	ORDER BY CustomFilterAdapter.LoadOrder;
		898
874	CREATE VIEW RuntimeOutputStreamDevice	899	CREATE VIEW RuntimeOutputStreamDevice
875	AS	900	AS
876	SELECT OutputStreamDevice.NodeID, Runtime.ID AS ParentID, OutputStreamDevice.ID, OutputStreamDevice.IDCode, OutputStreamDevice.Acronym,	901	SELECT OutputStreamDevice.NodeID, Runtime.ID AS ParentID, OutputStreamDevice.ID, OutputStreamDevice.IDCode, OutputStreamDevice.Acronym,
@@ -1013,6 +1038,11 @@ FROM RuntimeCalculatedMeasurement · 136 unmodified lines
1013	UNION	1038	UNION
1014	SELECT NodeID, ID, AdapterName, AssemblyName, TypeName, ConnectionString	1039	SELECT NodeID, ID, AdapterName, AssemblyName, TypeName, ConnectionString
1015	FROM RuntimeCustomActionAdapter;	1040	FROM RuntimeCustomActionAdapter;
		1041
		1042	CREATE VIEW IaonFilterAdapter
		1043	AS
		1044	SELECT NodeID, ID, AdapterName, AssemblyName, TypeName, ConnectionString
		1045	FROM RuntimeCustomFilterAdapter;
1016		1046
1017	CREATE VIEW MeasurementDetail	1047	CREATE VIEW MeasurementDetail
1018	AS	1048	AS
@@ -1124,6 +1154,11 @@ SELECT CA.NodeID, CA.ID, CA.AdapterName, CA.AssemblyName, CA.TypeName, COALE · 105 unmodified lines
1124	CA.Enabled, N.Name AS NodeName	1154	CA.Enabled, N.Name AS NodeName
1125	FROM CustomOutputAdapter AS CA INNER JOIN Node AS N ON CA.NodeID = N.ID;	1155	FROM CustomOutputAdapter AS CA INNER JOIN Node AS N ON CA.NodeID = N.ID;
1126		1156
		1157	CREATE VIEW CustomFilterAdapterDetail AS
		1158	SELECT CA.NodeID, CA.ID, CA.AdapterName, CA.AssemblyName, CA.TypeName, COALESCE(CA.ConnectionString, '') AS ConnectionString, CA.LoadOrder,
		1159	CA.Enabled, N.Name AS NodeName
		1160	FROM CustomFilterAdapter AS CA INNER JOIN Node AS N ON CA.NodeID = N.ID;
		1161
1127	CREATE VIEW IaonTreeView AS	1162	CREATE VIEW IaonTreeView AS
1128	SELECT 'Action Adapters' AS AdapterType, NodeID, ID, AdapterName, AssemblyName, TypeName, COALESCE(ConnectionString, '') AS ConnectionString	1163	SELECT 'Action Adapters' AS AdapterType, NodeID, ID, AdapterName, AssemblyName, TypeName, COALESCE(ConnectionString, '') AS ConnectionString
1129	FROM IaonActionAdapter	1164	FROM IaonActionAdapter
@@ -1132,7 +1167,10 @@ SELECT 'Input Adapters' AS AdapterType, NodeID, ID, AdapterName, AssemblyNam · 2 unmodified lines
1132	FROM IaonInputAdapter	1167	FROM IaonInputAdapter
1133	UNION ALL	1168	UNION ALL
1134	SELECT 'Output Adapters' AS AdapterType, NodeID, ID, AdapterName, AssemblyName, TypeName, COALESCE(ConnectionString, '') AS ConnectionString	1169	SELECT 'Output Adapters' AS AdapterType, NodeID, ID, AdapterName, AssemblyName, TypeName, COALESCE(ConnectionString, '') AS ConnectionString
1135	FROM IaonOutputAdapter;	1170	FROM IaonOutputAdapter
		1171	UNION ALL
		1172	SELECT 'Filter Adapters' AS AdapterType, NodeID, ID, AdapterName, AssemblyName, TypeName, COALESCE(ConnectionString, '') AS ConnectionString
		1173	FROM IaonFilterAdapter;
1136		1174
1137	CREATE VIEW OtherDeviceDetail AS	1175	CREATE VIEW OtherDeviceDetail AS
1138	SELECT OD.ID, OD.Acronym, COALESCE(OD.Name, '') AS Name, OD.IsConcentrator, OD.CompanyID, OD.VendorDeviceID, OD.Longitude, OD.Latitude,	1176	SELECT OD.ID, OD.Acronym, COALESCE(OD.Name, '') AS Name, OD.IsConcentrator, OD.CompanyID, OD.VendorDeviceID, OD.Longitude, OD.Latitude,
@@ -1332,6 +1370,30 @@ $CustomOutputAdapter_RuntimeSync_DeleteFn$ LANGUAGE plpgsql; · 193 unmodified lines
1332	CREATE TRIGGER CustomOutputAdapter_RuntimeSync_Delete BEFORE DELETE ON CustomOutputAdapter	1370	CREATE TRIGGER CustomOutputAdapter_RuntimeSync_Delete BEFORE DELETE ON CustomOutputAdapter
1333	FOR EACH ROW EXECUTE PROCEDURE CustomOutputAdapter_RuntimeSync_DeleteFn();	1371	FOR EACH ROW EXECUTE PROCEDURE CustomOutputAdapter_RuntimeSync_DeleteFn();
1334		1372
		1373	-- CustomFilterAdapter_RuntimeSync_Insert --
		1374	CREATE FUNCTION CustomFilterAdapter_RuntimeSync_InsertFn() RETURNS TRIGGER
		1375	AS $CustomFilterAdapter_RuntimeSync_InsertFn$
		1376	BEGIN
		1377	INSERT INTO Runtime (SourceID, SourceTable) VALUES(NEW.ID, 'CustomFilterAdapter');
		1378	RETURN NEW;
		1379	END;
		1380	$CustomFilterAdapter_RuntimeSync_InsertFn$ LANGUAGE plpgsql;
		1381
		1382	CREATE TRIGGER CustomFilterAdapter_RuntimeSync_Insert AFTER INSERT ON CustomFilterAdapter
		1383	FOR EACH ROW EXECUTE PROCEDURE CustomFilterAdapter_RuntimeSync_InsertFn();
		1384
		1385	-- CustomFilterAdapter_RuntimeSync_Delete --
		1386	CREATE FUNCTION CustomFilterAdapter_RuntimeSync_DeleteFn() RETURNS TRIGGER
		1387	AS $CustomFilterAdapter_RuntimeSync_DeleteFn$
		1388	BEGIN
		1389	DELETE FROM Runtime WHERE SourceID = OLD.ID AND SourceTable = 'CustomFilterAdapter';
		1390	RETURN OLD;
		1391	END;
		1392	$CustomFilterAdapter_RuntimeSync_DeleteFn$ LANGUAGE plpgsql;
		1393
		1394	CREATE TRIGGER CustomFilterAdapter_RuntimeSync_Delete BEFORE DELETE ON CustomFilterAdapter
		1395	FOR EACH ROW EXECUTE PROCEDURE CustomFilterAdapter_RuntimeSync_DeleteFn();
		1396
1335	-- Device_RuntimeSync_Insert --	1397	-- Device_RuntimeSync_Insert --
1336	CREATE FUNCTION Device_RuntimeSync_InsertFn() RETURNS TRIGGER	1398	CREATE FUNCTION Device_RuntimeSync_InsertFn() RETURNS TRIGGER
1337	AS $Device_RuntimeSync_InsertFn$	1399	AS $Device_RuntimeSync_InsertFn$

Source/Libraries/GSF.TimeSeries/Data/PostgreSQL/InitialDataSet.sql+28−27

Source/Libraries/GSF.TimeSeries/Data/SQL Server/GSFSchema.sql+96−1

@@ -116,7 +116,7 @@ GO · 115 unmodified lines
116	-- IMPORTANT NOTE: When making updates to this schema, please increment the version number!	116	-- IMPORTANT NOTE: When making updates to this schema, please increment the version number!
117	-- *******************************************************************************************	117	-- *******************************************************************************************
118	CREATE VIEW [dbo].[SchemaVersion] AS	118	CREATE VIEW [dbo].[SchemaVersion] AS
119	SELECT 6 AS VersionNumber	119	SELECT 7 AS VersionNumber
120	GO	120	GO
121		121
122	SET ANSI_NULLS ON	122	SET ANSI_NULLS ON
@@ -1015,6 +1015,63 @@ BEGIN · 892 unmodified lines
1015	END	1015	END
1016		1016
1017		1017
		1018	GO
		1019	SET ANSI_NULLS ON
		1020	GO
		1021	SET QUOTED_IDENTIFIER ON
		1022	GO
		1023	CREATE TABLE [dbo].[CustomFilterAdapter](
		1024	[NodeID] [uniqueidentifier] NOT NULL,
		1025	[ID] [int] IDENTITY(1,1) NOT NULL,
		1026	[AdapterName] [varchar](200) NOT NULL,
		1027	[AssemblyName] [varchar](max) NOT NULL,
		1028	[TypeName] [varchar](max) NOT NULL,
		1029	[ConnectionString] [varchar](max) NULL,
		1030	[LoadOrder] [int] NOT NULL CONSTRAINT [DF_CustomFilterAdapter_LoadOrder] DEFAULT ((0)),
		1031	[Enabled] [bit] NOT NULL CONSTRAINT [DF_CustomFilterAdapter_Enabled] DEFAULT ((0)),
		1032	[CreatedOn] [datetime] NOT NULL CONSTRAINT [DF_CustomFilterAdapter_CreatedOn] DEFAULT (getutcdate()),
		1033	[CreatedBy] [varchar](200) NOT NULL CONSTRAINT [DF_CustomFilterAdapter_CreatedBy] DEFAULT (suser_name()),
		1034	[UpdatedOn] [datetime] NOT NULL CONSTRAINT [DF_CustomFilterAdapter_UpdatedOn] DEFAULT (getutcdate()),
		1035	[UpdatedBy] [varchar](200) NOT NULL CONSTRAINT [DF_CustomFilterAdapter_UpdatedBy] DEFAULT (suser_name()),
		1036	CONSTRAINT [PK_CustomFilterAdapter] PRIMARY KEY CLUSTERED
		1037	(
		1038	[ID] ASC
		1039	)WITH (IGNORE_DUP_KEY = OFF) ON [PRIMARY]
		1040	) ON [PRIMARY]
		1041
		1042	GO
		1043
		1044	SET ANSI_NULLS ON
		1045	GO
		1046
		1047	SET QUOTED_IDENTIFIER ON
		1048	GO
		1049
		1050	CREATE TRIGGER [dbo].[CustomFilterAdapter_RuntimeSync]
		1051	ON [dbo].[CustomFilterAdapter]
		1052	AFTER INSERT, DELETE
		1053	AS
		1054	BEGIN
		1055	-- SET NOCOUNT ON added to prevent extra result sets from
		1056	-- interfering with SELECT statements.
		1057	SET NOCOUNT ON;
		1058
		1059	-- If a new record has been added
		1060	IF EXISTS(SELECT * FROM INSERTED)
		1061	BEGIN
		1062	INSERT INTO Runtime (SourceID, SourceTable)
		1063	SELECT ID, 'CustomFilterAdapter' FROM INSERTED
		1064	END
		1065
		1066	-- If a record has been deleted
		1067	IF EXISTS(SELECT * FROM DELETED)
		1068	BEGIN
		1069	DELETE FROM Runtime WHERE SourceID IN (SELECT ID FROM DELETED) AND SourceTable = 'CustomFilterAdapter'
		1070	END
		1071
		1072	END
		1073
		1074
1018	GO	1075	GO
1019	SET ANSI_NULLS ON	1076	SET ANSI_NULLS ON
1020	GO	1077	GO
@@ -1955,6 +2012,20 @@ FROM dbo.CustomInputAdapter WITH (NOLOCK) LEFT OUTER JOIN · 934 unmodified lines
1955	WHERE (dbo.CustomInputAdapter.Enabled <> 0)	2012	WHERE (dbo.CustomInputAdapter.Enabled <> 0)
1956	ORDER BY dbo.CustomInputAdapter.LoadOrder	2013	ORDER BY dbo.CustomInputAdapter.LoadOrder
1957		2014
		2015	GO
		2016	SET ANSI_NULLS ON
		2017	GO
		2018	SET QUOTED_IDENTIFIER ON
		2019	GO
		2020	CREATE VIEW [dbo].[RuntimeCustomFilterAdapter]
		2021	AS
		2022	SELECT TOP (100) PERCENT dbo.CustomFilterAdapter.NodeID, dbo.Runtime.ID, dbo.CustomFilterAdapter.AdapterName,
		2023	LTRIM(RTRIM(dbo.CustomFilterAdapter.AssemblyName)) AS AssemblyName, LTRIM(RTRIM(dbo.CustomFilterAdapter.TypeName)) AS TypeName, dbo.CustomFilterAdapter.ConnectionString
		2024	FROM dbo.CustomFilterAdapter WITH (NOLOCK) LEFT OUTER JOIN
		2025	dbo.Runtime WITH (NOLOCK) ON dbo.CustomFilterAdapter.ID = dbo.Runtime.SourceID AND dbo.Runtime.SourceTable = N'CustomFilterAdapter'
		2026	WHERE (dbo.CustomFilterAdapter.Enabled <> 0)
		2027	ORDER BY dbo.CustomFilterAdapter.LoadOrder
		2028
1958	GO	2029	GO
1959	SET ANSI_NULLS ON	2030	SET ANSI_NULLS ON
1960	GO	2031	GO
@@ -2167,6 +2238,16 @@ UNION · 206 unmodified lines
2167	SELECT NodeID, ID, AdapterName, AssemblyName, TypeName, ConnectionString	2238	SELECT NodeID, ID, AdapterName, AssemblyName, TypeName, ConnectionString
2168	FROM dbo.RuntimeCustomActionAdapter WITH (NOLOCK)	2239	FROM dbo.RuntimeCustomActionAdapter WITH (NOLOCK)
2169		2240
		2241	GO
		2242	SET ANSI_NULLS ON
		2243	GO
		2244	SET QUOTED_IDENTIFIER ON
		2245	GO
		2246	CREATE VIEW [dbo].[IaonFilterAdapter]
		2247	AS
		2248	SELECT NodeID, ID, AdapterName, AssemblyName, TypeName, ConnectionString
		2249	FROM dbo.RuntimeCustomFilterAdapter WITH (NOLOCK)
		2250
2170	GO	2251	GO
2171	CREATE VIEW [dbo].[HistorianMetadata]	2252	CREATE VIEW [dbo].[HistorianMetadata]
2172	AS	2253	AS
@@ -2316,6 +2397,12 @@ SELECT CA.NodeID, CA.ID, CA.AdapterName, CA.AssemblyName, CA.TypeName, ISNUL · 143 unmodified lines
2316	FROM dbo.CustomOutputAdapter AS CA WITH (NOLOCK) INNER JOIN	2397	FROM dbo.CustomOutputAdapter AS CA WITH (NOLOCK) INNER JOIN
2317	dbo.Node AS N WITH (NOLOCK) ON CA.NodeID = N.ID	2398	dbo.Node AS N WITH (NOLOCK) ON CA.NodeID = N.ID
2318	GO	2399	GO
		2400	CREATE VIEW [dbo].[CustomFilterAdapterDetail] AS
		2401	SELECT CA.NodeID, CA.ID, CA.AdapterName, CA.AssemblyName, CA.TypeName, ISNULL(CA.ConnectionString, '') AS ConnectionString, CA.LoadOrder,
		2402	CA.Enabled, N.Name AS NodeName
		2403	FROM dbo.CustomFilterAdapter AS CA WITH (NOLOCK) INNER JOIN
		2404	dbo.Node AS N WITH (NOLOCK) ON CA.NodeID = N.ID
		2405	GO
2319	CREATE VIEW [dbo].[IaonTreeView] AS	2406	CREATE VIEW [dbo].[IaonTreeView] AS
2320	SELECT 'Action Adapters' AS AdapterType, NodeID, ID, AdapterName, AssemblyName, TypeName, ISNULL(ConnectionString, '') AS ConnectionString	2407	SELECT 'Action Adapters' AS AdapterType, NodeID, ID, AdapterName, AssemblyName, TypeName, ISNULL(ConnectionString, '') AS ConnectionString
2321	FROM dbo.IaonActionAdapter WITH (NOLOCK)	2408	FROM dbo.IaonActionAdapter WITH (NOLOCK)
@@ -2325,6 +2412,9 @@ FROM dbo.IaonInputAdapter WITH (NOLOCK) · 3 unmodified lines
2325	UNION ALL	2412	UNION ALL
2326	SELECT 'Output Adapters' AS AdapterType, NodeID, ID, AdapterName, AssemblyName, TypeName, ISNULL(ConnectionString, '') AS ConnectionString	2413	SELECT 'Output Adapters' AS AdapterType, NodeID, ID, AdapterName, AssemblyName, TypeName, ISNULL(ConnectionString, '') AS ConnectionString
2327	FROM dbo.IaonOutputAdapter WITH (NOLOCK)	2414	FROM dbo.IaonOutputAdapter WITH (NOLOCK)
		2415	UNION ALL
		2416	SELECT 'Filter Adapters' AS AdapterType, NodeID, ID, AdapterName, AssemblyName, TypeName, ISNULL(ConnectionString, '') AS ConnectionString
		2417	FROM dbo.IaonFilterAdapter WITH (NOLOCK)
2328	GO	2418	GO
2329	CREATE VIEW [dbo].[OtherDeviceDetail] AS	2419	CREATE VIEW [dbo].[OtherDeviceDetail] AS
2330	SELECT OD.ID, OD.Acronym, ISNULL(OD.Name, '') AS Name, OD.IsConcentrator, OD.CompanyID, OD.VendorDeviceID, OD.Longitude, OD.Latitude,	2420	SELECT OD.ID, OD.Acronym, ISNULL(OD.Name, '') AS Name, OD.IsConcentrator, OD.CompanyID, OD.VendorDeviceID, OD.Longitude, OD.Latitude,
@@ -2539,6 +2629,11 @@ REFERENCES [dbo].[Node] ([ID]) · 208 unmodified lines
2539	ON UPDATE CASCADE	2629	ON UPDATE CASCADE
2540	ON DELETE CASCADE	2630	ON DELETE CASCADE
2541	GO	2631	GO
		2632	ALTER TABLE [dbo].[CustomFilterAdapter] WITH CHECK ADD CONSTRAINT [FK_CustomFilterAdapter_Node] FOREIGN KEY([NodeID])
		2633	REFERENCES [dbo].[Node] ([ID])
		2634	ON UPDATE CASCADE
		2635	ON DELETE CASCADE
		2636	GO
2542	ALTER TABLE [dbo].[OutputStream] WITH CHECK ADD CONSTRAINT [FK_OutputStream_Node] FOREIGN KEY([NodeID])	2637	ALTER TABLE [dbo].[OutputStream] WITH CHECK ADD CONSTRAINT [FK_OutputStream_Node] FOREIGN KEY([NodeID])
2543	REFERENCES [dbo].[Node] ([ID])	2638	REFERENCES [dbo].[Node] ([ID])
2544	ON UPDATE CASCADE	2639	ON UPDATE CASCADE

Source/Libraries/GSF.TimeSeries/Data/SQL Server/InitialDataSet.sql+29−26

 INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('DUKE', 'DUK', 'Duke Power', 39)
 GO
 INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('ME', 'ME', 'Central Maine Power Company', 40)
 GO
 INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('UI', 'UI', 'United Illuminating Company', 41)
 GO
 INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('NH', 'NH', 'Public Service Company of New Hampshire', 42)
 GO
 INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('VE', 'VE', 'Vermont Electric Company', 43)
 GO
 INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('CX', 'CX', 'Northeast Utilities Services Company', 44)
 GO
 INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('NE', 'NE', 'National Grid USA', 45)
 GO
 INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('BE', 'BE', 'NSTAR Electric', 46)
 GO
 INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('BH', 'BH', 'Bangor Hydro-Electric Company', 47)
 GO
 INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('SDGE', 'SDGE', 'San Diego Gas & Electric', 48)
 GO
-INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('IaonInputAdapter', 'InputAdapters', 'Defines IInputAdapter definitions for a PDC node', 1, 1)
+INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('IaonFilterAdapter', 'FilterAdapters', 'Defines IFilterAdapter definitions for a PDC node', 1, 1)
 GO
-INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('IaonActionAdapter', 'ActionAdapters', 'Defines IActionAdapter definitions for a PDC node', 2, 1)
+INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('IaonInputAdapter', 'InputAdapters', 'Defines IInputAdapter definitions for a PDC node', 2, 1)
 GO
-INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('IaonOutputAdapter', 'OutputAdapters', 'Defines IOutputAdapter definitions for a PDC node', 3, 1)
+INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('IaonActionAdapter', 'ActionAdapters', 'Defines IActionAdapter definitions for a PDC node', 3, 1)
 GO
-INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('ActiveMeasurement', 'ActiveMeasurements', 'Defines active system measurements for a PDC node', 4, 1)
+INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('IaonOutputAdapter', 'OutputAdapters', 'Defines IOutputAdapter definitions for a PDC node', 4, 1)
 GO
-INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('RuntimeInputStreamDevice', 'InputStreamDevices', 'Defines input stream devices associated with a concentrator', 5, 1)
+INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('ActiveMeasurement', 'ActiveMeasurements', 'Defines active system measurements for a PDC node', 5, 1)
 GO
-INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('RuntimeOutputStreamDevice', 'OutputStreamDevices', 'Defines output stream devices defined for a concentrator', 6, 1)
+INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('RuntimeInputStreamDevice', 'InputStreamDevices', 'Defines input stream devices associated with a concentrator', 6, 1)
 GO
-INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('RuntimeOutputStreamMeasurement', 'OutputStreamMeasurements', 'Defines the measurements in an output stream', 7, 1)
+INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('RuntimeOutputStreamDevice', 'OutputStreamDevices', 'Defines output stream devices defined for a concentrator', 7, 1)
 GO
-INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('OutputStreamDevicePhasor', 'OutputStreamDevicePhasors', 'Defines phasors for output stream devices', 8, 1)
+INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('RuntimeOutputStreamMeasurement', 'OutputStreamMeasurements', 'Defines the measurements in an output stream', 8, 1)
 GO
-INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('OutputStreamDeviceAnalog', 'OutputStreamDeviceAnalogs', 'Defines analog values for output stream devices', 9, 1)
+INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('OutputStreamDevicePhasor', 'OutputStreamDevicePhasors', 'Defines phasors for output stream devices', 9, 1)
 GO
-INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('OutputStreamDeviceDigital', 'OutputStreamDeviceDigitals', 'Defines digital values for output stream devices', 10, 1)
+INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('OutputStreamDeviceAnalog', 'OutputStreamDeviceAnalogs', 'Defines analog values for output stream devices', 10, 1)
 GO
-INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('RuntimeStatistic', 'Statistics', 'Defines statistics that are monitored for devices and output streams', 11, 1)
+INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('OutputStreamDeviceDigital', 'OutputStreamDeviceDigitals', 'Defines digital values for output stream devices', 11, 1)
 GO
-INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('Subscriber', 'Subscribers', 'Defines subscribers that can request streaming points from a Gateway node', 12, 1)
+INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('RuntimeStatistic', 'Statistics', 'Defines statistics that are monitored for devices and output streams', 12, 1)
 GO
-INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('SubscriberMeasurement', 'SubscriberMeasurements', 'Defines measurements associated with a Gateway subscriber', 13, 1)
+INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('Subscriber', 'Subscribers', 'Defines subscribers that can request streaming points from a Gateway node', 13, 1)
 GO
-INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('SubscriberMeasurementGroup', 'SubscriberMeasurementGroups', 'Defines measurement groups associated with a Gateway subscriber', 14, 1)
+INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('SubscriberMeasurement', 'SubscriberMeasurements', 'Defines measurements associated with a Gateway subscriber', 14, 1)
 GO
-INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('MeasurementGroup', 'MeasurementGroups', 'Defines a group of measurements', 15, 1)
+INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('SubscriberMeasurementGroup', 'SubscriberMeasurementGroups', 'Defines measurement groups associated with a Gateway subscriber', 15, 1)
 GO
-INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('MeasurementGroupMeasurement', 'MeasurementGroupMeasurements', 'Defines the measurements in a measurement group', 16, 1)
+INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('MeasurementGroup', 'MeasurementGroups', 'Defines a group of measurements', 16, 1)
 GO
-INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('Alarm', 'Alarms', 'Defines alarms that monitor the values of measurements', 17, 1)
+INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('MeasurementGroupMeasurement', 'MeasurementGroupMeasurements', 'Defines the measurements in a measurement group', 17, 1)
 GO
-INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('NodeInfo', 'NodeInfo', 'Defines information about the nodes in the database', 18, 1)
+INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('Alarm', 'Alarms', 'Defines alarms that monitor the values of measurements', 18, 1)
+GO
+INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('NodeInfo', 'NodeInfo', 'Defines information about the nodes in the database', 19, 1)
 GO
 INSERT INTO DataOperation(Description, AssemblyName, TypeName, MethodName, Arguments, LoadOrder, Enabled) VALUES('Time Series Startup Operations', 'GSF.TimeSeries.dll', 'GSF.TimeSeries.TimeSeriesStartupOperations', 'PerformTimeSeriesStartupOperations', '', 0, 1)

Source/Libraries/GSF.TimeSeries/Data/SQLite/GSFSchema.sql+53−2

@@ -33,7 +33,7 @@ PRAGMA foreign_keys = ON; · 32 unmodified lines
33	-- IMPORTANT NOTE: When making updates to this schema, please increment the version number!	33	-- IMPORTANT NOTE: When making updates to this schema, please increment the version number!
34	-- *******************************************************************************************	34	-- *******************************************************************************************
35	CREATE VIEW SchemaVersion AS	35	CREATE VIEW SchemaVersion AS
36	SELECT 6 AS VersionNumber;	36	SELECT 7 AS VersionNumber;
37		37
38	CREATE TABLE ErrorLog(	38	CREATE TABLE ErrorLog(
39	ID INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,	39	ID INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
@@ -507,6 +507,22 @@ CREATE TABLE CustomInputAdapter( · 467 unmodified lines
507	CONSTRAINT FK_CustomInputAdapter_Node FOREIGN KEY(NodeID) REFERENCES node (ID) ON DELETE CASCADE ON UPDATE CASCADE	507	CONSTRAINT FK_CustomInputAdapter_Node FOREIGN KEY(NodeID) REFERENCES node (ID) ON DELETE CASCADE ON UPDATE CASCADE
508	);	508	);
509		509
		510	CREATE TABLE CustomFilterAdapter(
		511	NodeID NCHAR(36) NOT NULL,
		512	ID INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
		513	AdapterName VARCHAR(200) NOT NULL,
		514	AssemblyName TEXT NOT NULL,
		515	TypeName TEXT NOT NULL,
		516	ConnectionString TEXT NULL,
		517	LoadOrder INTEGER NOT NULL DEFAULT 0,
		518	Enabled BOOLEAN NOT NULL DEFAULT 0,
		519	CreatedOn DATETIME NOT NULL DEFAULT '',
		520	CreatedBy VARCHAR(200) NOT NULL DEFAULT '',
		521	UpdatedOn DATETIME NOT NULL DEFAULT '',
		522	UpdatedBy VARCHAR(200) NOT NULL DEFAULT '',
		523	CONSTRAINT FK_CustomFilterAdapter_Node FOREIGN KEY(NodeID) REFERENCES node (ID) ON DELETE CASCADE ON UPDATE CASCADE
		524	);
		525
510	CREATE TABLE OutputStream(	526	CREATE TABLE OutputStream(
511	NodeID NCHAR(36) NOT NULL,	527	NodeID NCHAR(36) NOT NULL,
512	ID INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,	528	ID INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
@@ -862,6 +878,15 @@ FROM CustomInputAdapter LEFT OUTER JOIN · 349 unmodified lines
862	WHERE (CustomInputAdapter.Enabled <> 0)	878	WHERE (CustomInputAdapter.Enabled <> 0)
863	ORDER BY CustomInputAdapter.LoadOrder;	879	ORDER BY CustomInputAdapter.LoadOrder;
864		880
		881	CREATE VIEW RuntimeCustomFilterAdapter
		882	AS
		883	SELECT CustomFilterAdapter.NodeID, Runtime.ID, CustomFilterAdapter.AdapterName,
		884	TRIM(CustomFilterAdapter.AssemblyName) AS AssemblyName, TRIM(CustomFilterAdapter.TypeName) AS TypeName, CustomFilterAdapter.ConnectionString
		885	FROM CustomFilterAdapter LEFT OUTER JOIN
		886	Runtime ON CustomFilterAdapter.ID = Runtime.SourceID AND Runtime.SourceTable = 'CustomFilterAdapter'
		887	WHERE (CustomFilterAdapter.Enabled <> 0)
		888	ORDER BY CustomFilterAdapter.LoadOrder;
		889
865	CREATE VIEW RuntimeOutputStreamDevice	890	CREATE VIEW RuntimeOutputStreamDevice
866	AS	891	AS
867	SELECT OutputStreamDevice.NodeID, Runtime.ID AS ParentID, OutputStreamDevice.ID, OutputStreamDevice.IDCode, OutputStreamDevice.Acronym,	892	SELECT OutputStreamDevice.NodeID, Runtime.ID AS ParentID, OutputStreamDevice.ID, OutputStreamDevice.IDCode, OutputStreamDevice.Acronym,
@@ -1004,6 +1029,11 @@ FROM RuntimeCalculatedMeasurement · 136 unmodified lines
1004	UNION	1029	UNION
1005	SELECT NodeID, ID, AdapterName, AssemblyName, TypeName, ConnectionString	1030	SELECT NodeID, ID, AdapterName, AssemblyName, TypeName, ConnectionString
1006	FROM RuntimeCustomActionAdapter;	1031	FROM RuntimeCustomActionAdapter;
		1032
		1033	CREATE VIEW IaonFilterAdapter
		1034	AS
		1035	SELECT NodeID, ID, AdapterName, AssemblyName, TypeName, ConnectionString
		1036	FROM RuntimeCustomFilterAdapter;
1007		1037
1008	CREATE VIEW MeasurementDetail	1038	CREATE VIEW MeasurementDetail
1009	AS	1039	AS
@@ -1115,6 +1145,11 @@ SELECT CA.NodeID, CA.ID, CA.AdapterName, CA.AssemblyName, CA.TypeName, COALE · 105 unmodified lines
1115	CA.Enabled, N.Name AS NodeName	1145	CA.Enabled, N.Name AS NodeName
1116	FROM CustomOutputAdapter AS CA INNER JOIN Node AS N ON CA.NodeID = N.ID;	1146	FROM CustomOutputAdapter AS CA INNER JOIN Node AS N ON CA.NodeID = N.ID;
1117		1147
		1148	CREATE VIEW CustomFilterAdapterDetail AS
		1149	SELECT CA.NodeID, CA.ID, CA.AdapterName, CA.AssemblyName, CA.TypeName, COALESCE(CA.ConnectionString, '') AS ConnectionString, CA.LoadOrder,
		1150	CA.Enabled, N.Name AS NodeName
		1151	FROM CustomFilterAdapter AS CA INNER JOIN Node AS N ON CA.NodeID = N.ID;
		1152
1118	CREATE VIEW IaonTreeView AS	1153	CREATE VIEW IaonTreeView AS
1119	SELECT 'Action Adapters' AS AdapterType, NodeID, ID, AdapterName, AssemblyName, TypeName, COALESCE(ConnectionString, '') AS ConnectionString	1154	SELECT 'Action Adapters' AS AdapterType, NodeID, ID, AdapterName, AssemblyName, TypeName, COALESCE(ConnectionString, '') AS ConnectionString
1120	FROM IaonActionAdapter	1155	FROM IaonActionAdapter
@@ -1123,7 +1158,10 @@ SELECT 'Input Adapters' AS AdapterType, NodeID, ID, AdapterName, AssemblyNam · 2 unmodified lines
1123	FROM IaonInputAdapter	1158	FROM IaonInputAdapter
1124	UNION ALL	1159	UNION ALL
1125	SELECT 'Output Adapters' AS AdapterType, NodeID, ID, AdapterName, AssemblyName, TypeName, COALESCE(ConnectionString, '') AS ConnectionString	1160	SELECT 'Output Adapters' AS AdapterType, NodeID, ID, AdapterName, AssemblyName, TypeName, COALESCE(ConnectionString, '') AS ConnectionString
1126	FROM IaonOutputAdapter;	1161	FROM IaonOutputAdapter
		1162	UNION ALL
		1163	SELECT 'Filter Adapters' AS AdapterType, NodeID, ID, AdapterName, AssemblyName, TypeName, COALESCE(ConnectionString, '') AS ConnectionString
		1164	FROM IaonFilterAdapter;
1127		1165
1128	CREATE VIEW OtherDeviceDetail AS	1166	CREATE VIEW OtherDeviceDetail AS
1129	SELECT OD.ID, OD.Acronym, COALESCE(OD.Name, '') AS Name, OD.IsConcentrator, OD.CompanyID, OD.VendorDeviceID, OD.Longitude, OD.Latitude,	1167	SELECT OD.ID, OD.Acronym, COALESCE(OD.Name, '') AS Name, OD.IsConcentrator, OD.CompanyID, OD.VendorDeviceID, OD.Longitude, OD.Latitude,
@@ -1279,6 +1317,12 @@ FOR EACH ROW BEGIN INSERT INTO Runtime (SourceID, SourceTable) VALUES(NEW.ID, 'C · 149 unmodified lines
1279	CREATE TRIGGER CustomOutputAdapter_RuntimeSync_Delete BEFORE DELETE ON CustomOutputAdapter	1317	CREATE TRIGGER CustomOutputAdapter_RuntimeSync_Delete BEFORE DELETE ON CustomOutputAdapter
1280	FOR EACH ROW BEGIN DELETE FROM Runtime WHERE SourceID = OLD.ID AND SourceTable = 'CustomOutputAdapter'; END;	1318	FOR EACH ROW BEGIN DELETE FROM Runtime WHERE SourceID = OLD.ID AND SourceTable = 'CustomOutputAdapter'; END;
1281		1319
		1320	CREATE TRIGGER CustomFilterAdapter_RuntimeSync_Insert AFTER INSERT ON CustomFilterAdapter
		1321	FOR EACH ROW BEGIN INSERT INTO Runtime (SourceID, SourceTable) VALUES(NEW.ID, 'CustomFilterAdapter'); END;
		1322
		1323	CREATE TRIGGER CustomFilterAdapter_RuntimeSync_Delete BEFORE DELETE ON CustomFilterAdapter
		1324	FOR EACH ROW BEGIN DELETE FROM Runtime WHERE SourceID = OLD.ID AND SourceTable = 'CustomFilterAdapter'; END;
		1325
1282	CREATE TRIGGER Device_RuntimeSync_Insert AFTER INSERT ON Device	1326	CREATE TRIGGER Device_RuntimeSync_Insert AFTER INSERT ON Device
1283	FOR EACH ROW BEGIN INSERT INTO Runtime (SourceID, SourceTable) VALUES(NEW.ID, 'Device'); END;	1327	FOR EACH ROW BEGIN INSERT INTO Runtime (SourceID, SourceTable) VALUES(NEW.ID, 'Device'); END;
1284		1328
@@ -1366,6 +1410,13 @@ BEGIN · 81 unmodified lines
1366	UPDATE CustomOutputAdapter SET UpdatedOn = strftime('%Y-%m-%d %H:%M:%f') WHERE ROWID = NEW.ROWID AND UpdatedOn = '';	1410	UPDATE CustomOutputAdapter SET UpdatedOn = strftime('%Y-%m-%d %H:%M:%f') WHERE ROWID = NEW.ROWID AND UpdatedOn = '';
1367	END;	1411	END;
1368		1412
		1413	CREATE TRIGGER CustomFilterAdapter_InsertDefault AFTER INSERT ON CustomFilterAdapter
		1414	FOR EACH ROW
		1415	BEGIN
		1416	UPDATE CustomFilterAdapter SET CreatedOn = strftime('%Y-%m-%d %H:%M:%f') WHERE ROWID = NEW.ROWID AND CreatedOn = '';
		1417	UPDATE CustomFilterAdapter SET UpdatedOn = strftime('%Y-%m-%d %H:%M:%f') WHERE ROWID = NEW.ROWID AND UpdatedOn = '';
		1418	END;
		1419
1369	CREATE TRIGGER Device_InsertDefault AFTER INSERT ON Device	1420	CREATE TRIGGER Device_InsertDefault AFTER INSERT ON Device
1370	FOR EACH ROW	1421	FOR EACH ROW
1371	BEGIN	1422	BEGIN

Source/Libraries/GSF.TimeSeries/Data/SQLite/InitialDataSet.sql+28−27

Source/Libraries/GSF.TimeSeries/GSF.TimeSeries.csproj+3−0

   <ItemGroup>
     <Compile Include="Adapters\ConnectionStringParameterAttribute.cs" />
     <Compile Include="Adapters\CustomConfigurationEditorAttribute.cs" />
+    <Compile Include="Adapters\FilterAdapterBase.cs" />
+    <Compile Include="Adapters\FilterAdapterCollection.cs" />
     <Compile Include="Adapters\IaonSession.cs" />
+    <Compile Include="Adapters\IFilterAdapter.cs" />
     <Compile Include="Adapters\IOptimizedRoutingConsumer.cs" />
     <Compile Include="Adapters\IRouteMappingTables.cs" />
     <Compile Include="Adapters\RoutingPassthroughMethod.cs" />

Source/Libraries/GSF.TimeSeries/ServiceHostBase.cs+3−0

@@ -1649,6 +1649,9 @@ namespace GSF.TimeSeries · 1648 unmodified lines
1649	if (requestInfo.Request.Arguments.Exists("O"))	1649	if (requestInfo.Request.Arguments.Exists("O"))
1650	return m_iaonSession.OutputAdapters;	1650	return m_iaonSession.OutputAdapters;
1651		1651
		1652	if (requestInfo.Request.Arguments.Exists("F"))
		1653	return m_iaonSession.FilterAdapters;
		1654
1652	return m_iaonSession.InputAdapters;	1655	return m_iaonSession.InputAdapters;
1653	}	1656	}
1654		1657

Source/Libraries/GSF.TimeSeries/UI/DataModels/Adapter.cs+17−0

         /// </remarks>
         Action,
         /// <summary>
+        /// Filter Adapter.
+        /// </summary>
+        /// <remarks>
+        /// Use this option to modify incoming data before routing to other adapters.
+        /// </remarks>
+        Filter,
+        /// <summary>
         /// Input Adapter.
         /// </summary>
         /// <remarks>
                 if (adapterType == AdapterType.Action)
                     viewName = "CustomActionAdapterDetail";
+                else if (adapterType == AdapterType.Filter)
+                    viewName = "CustomFilterAdapterDetail";
                 else if (adapterType == AdapterType.Input)
                     viewName = "CustomInputAdapterDetail";
                 else
                 if (adapterType == AdapterType.Action)
                     viewName = "CustomActionAdapterDetail";
+                else if (adapterType == AdapterType.Filter)
+                    viewName = "CustomFilterAdapterDetail";
                 else if (adapterType == AdapterType.Input)
                     viewName = "CustomInputAdapterDetail";
                 else
                 if (adapterType == AdapterType.Action)
                     tableName = "CustomActionAdapter";
+                else if (adapterType == AdapterType.Filter)
+                    tableName = "CustomFilterAdapter";
                 else if (adapterType == AdapterType.Input)
                     tableName = "CustomInputAdapter";
                 else
                 if (adapter.Type == AdapterType.Action)
                     tableName = "CustomActionAdapter";
+                else if (adapter.Type == AdapterType.Filter)
+                    tableName = "CustomFilterAdapter";
                 else if (adapter.Type == AdapterType.Input)
                     tableName = "CustomInputAdapter";
                 else
                 if (adapterType == AdapterType.Action)
                     tableName = "CustomActionAdapter";
+                else if (adapterType == AdapterType.Filter)
+                    tableName = "CustomFilterAdapter";
                 else if (adapterType == AdapterType.Input)
                     tableName = "CustomInputAdapter";
                 else

Source/Libraries/GSF.TimeSeries/UI/WPF/GSF.TimeSeries.UI.WPF.csproj+7−0

       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
     </Compile>
+    <Compile Include="UserControls\CustomFilterAdapterUserControl.xaml.cs">
+      <DependentUpon>CustomFilterAdapterUserControl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="UserControls\DeviceStatusUserControl.xaml.cs">
       <DependentUpon>DeviceStatusUserControl.xaml</DependentUpon>
     </Compile>
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="UserControls\CustomFilterAdapterUserControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="UserControls\DeviceStatusUserControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

Source/Libraries/GSF.TimeSeries/UI/WPF/UserControls/CustomFilterAdapterUserControl.xaml+8−0

@@ -0,0 +1,8 @@
	1	<UserControl x:Class="GSF.TimeSeries.UI.UserControls.CustomFilterAdapterUserControl"
	2	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
	3	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
	4	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
	5	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
	6	>
	7
	8	</UserControl>

Source/Libraries/GSF.TimeSeries/UI/WPF/UserControls/CustomFilterAdapterUserControl.xaml.cs+43−0

@@ -0,0 +1,43 @@
	1	//******************************************************************************************************
	2	// CustomFilterAdapterUserControl.xaml.cs - Gbtc
	3	//
	4	// Copyright © 2017, Grid Protection Alliance. All Rights Reserved.
	5	//
	6	// Licensed to the Grid Protection Alliance (GPA) under one or more contributor license agreements. See
	7	// the NOTICE file distributed with this work for additional information regarding copyright ownership.
	8	// The GPA licenses this file to you under the MIT License (MIT), the "License"; you may
	9	// not use this file except in compliance with the License. You may obtain a copy of the License at:
	10	//
	11	// http://opensource.org/licenses/MIT
	12	//
	13	// Unless agreed to in writing, the subject software distributed under the License is distributed on an
	14	// "AS-IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. Refer to the
	15	// License for the specific language governing permissions and limitations.
	16	//
	17	// Code Modification History:
	18	// ----------------------------------------------------------------------------------------------------
	19	// 11/17/2017 - Stephen C. Wills
	20	// Generated original version of source code.
	21	//
	22	//******************************************************************************************************
	23
	24	using System.Windows.Controls;
	25	using GSF.TimeSeries.UI.DataModels;
	26
	27	namespace GSF.TimeSeries.UI.UserControls
	28	{
	29	/// <summary>
	30	/// Interaction logic for CustomFilterAdapterUserControl.xaml
	31	/// </summary>
	32	public partial class CustomFilterAdapterUserControl : UserControl
	33	{
	34	/// <summary>
	35	/// Creates an instance of <see cref="CustomFilterAdapterUserControl"/> class.
	36	/// </summary>
	37	public CustomFilterAdapterUserControl()
	38	{
	39	InitializeComponent();
	40	this.AddChild(new AdapterUserControl(AdapterType.Filter));
	41	}
	42	}
	43	}

Source/Libraries/GSF.TimeSeries/UI/WPF/ViewModels/Adapters.cs+4−0

                 {
                     if (m_adapterType == AdapterType.Action)
                         RuntimeID = CommonFunctions.GetRuntimeID("CustomActionAdapter", CurrentItem.ID);
+                    else if (m_adapterType == AdapterType.Filter)
+                        RuntimeID = CommonFunctions.GetRuntimeID("CustomFilterAdapter", CurrentItem.ID);
                     else if (m_adapterType == AdapterType.Input)
                         RuntimeID = CommonFunctions.GetRuntimeID("CustomInputAdapter", CurrentItem.ID);
                     else
         {
             switch (type)
             {
+                case AdapterType.Filter:
+                    return typeof(IFilterAdapter);
                 case AdapterType.Input:
                     return typeof(IInputAdapter);
                 case AdapterType.Action:

GSF.TimeSeries: Added filter adapters to modify measurement properties before routing.

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code

@@ -39,33 +39,34 @@ INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('HEC', 'HEC', ' · 38 unmodified lines
39	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('OGE', 'OGE', 'Oklahoma Gas & Electric', 37);	39	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('OGE', 'OGE', 'Oklahoma Gas & Electric', 37);
40	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('ITC', 'ITC', 'International Transmission Company', 38);	40	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('ITC', 'ITC', 'International Transmission Company', 38);
41	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('DUKE', 'DUK', 'Duke Power', 39);	41	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('DUKE', 'DUK', 'Duke Power', 39);
42	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('ME', 'ME', 'Central Maine Power Company', 40);	42	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('ME', 'ME', 'Central Maine Power Company', 40);
43	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('UI', 'UI', 'United Illuminating Company', 41);	43	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('UI', 'UI', 'United Illuminating Company', 41);
44	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('NH', 'NH', 'Public Service Company of New Hampshire', 42);	44	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('NH', 'NH', 'Public Service Company of New Hampshire', 42);
45	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('VE', 'VE', 'Vermont Electric Company', 43);	45	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('VE', 'VE', 'Vermont Electric Company', 43);
46	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('CX', 'CX', 'Northeast Utilities Services Company', 44);	46	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('CX', 'CX', 'Northeast Utilities Services Company', 44);
47	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('NE', 'NE', 'National Grid USA', 45);	47	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('NE', 'NE', 'National Grid USA', 45);
48	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('BE', 'BE', 'NSTAR Electric', 46);	48	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('BE', 'BE', 'NSTAR Electric', 46);
49	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('BH', 'BH', 'Bangor Hydro-Electric Company', 47);	49	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('BH', 'BH', 'Bangor Hydro-Electric Company', 47);
50	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('SDGE', 'SDGE', 'San Diego Gas & Electric', 48);	50	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('SDGE', 'SDGE', 'San Diego Gas & Electric', 48);
51	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('IaonInputAdapter', 'InputAdapters', 'Defines IInputAdapter definitions for a PDC node', 1, 1);	51	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('IaonFilterAdapter', 'FilterAdapters', 'Defines IFilterAdapter definitions for a PDC node', 1, 1);
52	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('IaonActionAdapter', 'ActionAdapters', 'Defines IActionAdapter definitions for a PDC node', 2, 1);	52	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('IaonInputAdapter', 'InputAdapters', 'Defines IInputAdapter definitions for a PDC node', 2, 1);
53	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('IaonOutputAdapter', 'OutputAdapters', 'Defines IOutputAdapter definitions for a PDC node', 3, 1);	53	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('IaonActionAdapter', 'ActionAdapters', 'Defines IActionAdapter definitions for a PDC node', 3, 1);
54	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('ActiveMeasurement', 'ActiveMeasurements', 'Defines active system measurements for a PDC node', 4, 1);	54	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('IaonOutputAdapter', 'OutputAdapters', 'Defines IOutputAdapter definitions for a PDC node', 4, 1);
55	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('RuntimeInputStreamDevice', 'InputStreamDevices', 'Defines input stream devices associated with a concentrator', 5, 1);	55	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('ActiveMeasurement', 'ActiveMeasurements', 'Defines active system measurements for a PDC node', 5, 1);
56	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('RuntimeOutputStreamDevice', 'OutputStreamDevices', 'Defines output stream devices defined for a concentrator', 6, 1);	56	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('RuntimeInputStreamDevice', 'InputStreamDevices', 'Defines input stream devices associated with a concentrator', 6, 1);
57	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('RuntimeOutputStreamMeasurement', 'OutputStreamMeasurements', 'Defines output stream measurements for an output stream', 7, 1);	57	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('RuntimeOutputStreamDevice', 'OutputStreamDevices', 'Defines output stream devices defined for a concentrator', 7, 1);
58	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('OutputStreamDevicePhasor', 'OutputStreamDevicePhasors', 'Defines phasors for output stream devices', 8, 1);	58	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('RuntimeOutputStreamMeasurement', 'OutputStreamMeasurements', 'Defines output stream measurements for an output stream', 8, 1);
59	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('OutputStreamDeviceAnalog', 'OutputStreamDeviceAnalogs', 'Defines analog values for output stream devices', 9, 1);	59	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('OutputStreamDevicePhasor', 'OutputStreamDevicePhasors', 'Defines phasors for output stream devices', 9, 1);
60	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('OutputStreamDeviceDigital', 'OutputStreamDeviceDigitals', 'Defines digital values for output stream devices', 10, 1);	60	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('OutputStreamDeviceAnalog', 'OutputStreamDeviceAnalogs', 'Defines analog values for output stream devices', 10, 1);
61	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('RuntimeStatistic', 'Statistics', 'Defines statistics that are monitored for devices and output streams', 11, 1);	61	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('OutputStreamDeviceDigital', 'OutputStreamDeviceDigitals', 'Defines digital values for output stream devices', 11, 1);
62	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('Subscriber', 'Subscribers', 'Defines subscribers that can request streaming points from a Gateway node', 12, 1);	62	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('RuntimeStatistic', 'Statistics', 'Defines statistics that are monitored for devices and output streams', 12, 1);
63	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('SubscriberMeasurement', 'SubscriberMeasurements', 'Defines measurements associated with a Gateway subscriber', 13, 1);	63	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('Subscriber', 'Subscribers', 'Defines subscribers that can request streaming points from a Gateway node', 13, 1);
64	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('SubscriberMeasurementGroup', 'SubscriberMeasurementGroups', 'Defines measurement groups associated with a Gateway subscriber', 14, 1);	64	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('SubscriberMeasurement', 'SubscriberMeasurements', 'Defines measurements associated with a Gateway subscriber', 14, 1);
65	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('MeasurementGroup', 'MeasurementGroups', 'Defines a group of measurements', 15, 1);	65	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('SubscriberMeasurementGroup', 'SubscriberMeasurementGroups', 'Defines measurement groups associated with a Gateway subscriber', 15, 1);
66	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('MeasurementGroupMeasurement', 'MeasurementGroupMeasurements', 'Defines the measurements in a measurement group', 16, 1);	66	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('MeasurementGroup', 'MeasurementGroups', 'Defines a group of measurements', 16, 1);
67	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('Alarm', 'Alarms', 'Defines alarms that monitor the values of measurements', 17, 1);	67	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('MeasurementGroupMeasurement', 'MeasurementGroupMeasurements', 'Defines the measurements in a measurement group', 17, 1);
68	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('NodeInfo', 'NodeInfo', 'Defines information about the nodes in the database', 18, 1);	68	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('Alarm', 'Alarms', 'Defines alarms that monitor the values of measurements', 18, 1);
		69	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('NodeInfo', 'NodeInfo', 'Defines information about the nodes in the database', 19, 1);
69	INSERT INTO DataOperation(Description, AssemblyName, TypeName, MethodName, Arguments, LoadOrder, Enabled) VALUES('Time Series Startup Operations', 'GSF.TimeSeries.dll', 'GSF.TimeSeries.TimeSeriesStartupOperations', 'PerformTimeSeriesStartupOperations', '', 0, 1);	70	INSERT INTO DataOperation(Description, AssemblyName, TypeName, MethodName, Arguments, LoadOrder, Enabled) VALUES('Time Series Startup Operations', 'GSF.TimeSeries.dll', 'GSF.TimeSeries.TimeSeriesStartupOperations', 'PerformTimeSeriesStartupOperations', '', 0, 1);
70	INSERT INTO DataOperation(Description, AssemblyName, TypeName, MethodName, Arguments, LoadOrder, Enabled) VALUES('Phasor Data Source Validation', 'PhasorProtocolAdapters.dll', 'PhasorProtocolAdapters.CommonPhasorServices', 'PhasorDataSourceValidation', '', 1, 1);	71	INSERT INTO DataOperation(Description, AssemblyName, TypeName, MethodName, Arguments, LoadOrder, Enabled) VALUES('Phasor Data Source Validation', 'PhasorProtocolAdapters.dll', 'PhasorProtocolAdapters.CommonPhasorServices', 'PhasorDataSourceValidation', '', 1, 1);
71	INSERT INTO DataOperation(Description, AssemblyName, TypeName, MethodName, Arguments, LoadOrder, Enabled) VALUES('Optimize Local Historian Settings', 'HistorianAdapters.dll', 'HistorianAdapters.LocalOutputAdapter', 'OptimizeLocalHistorianSettings', '', 2, 1);	72	INSERT INTO DataOperation(Description, AssemblyName, TypeName, MethodName, Arguments, LoadOrder, Enabled) VALUES('Optimize Local Historian Settings', 'HistorianAdapters.dll', 'HistorianAdapters.LocalOutputAdapter', 'OptimizeLocalHistorianSettings', '', 2, 1);

@@ -37,33 +37,34 @@ INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('HEC', 'HEC', ' · 36 unmodified lines
37	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('OGE', 'OGE', 'Oklahoma Gas &' \|\| ' Electric', 37);	37	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('OGE', 'OGE', 'Oklahoma Gas &' \|\| ' Electric', 37);
38	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('ITC', 'ITC', 'International Transmission Company', 38);	38	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('ITC', 'ITC', 'International Transmission Company', 38);
39	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('DUKE', 'DUK', 'Duke Power', 39);	39	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('DUKE', 'DUK', 'Duke Power', 39);
40	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('ME', 'ME', 'Central Maine Power Company', 40);	40	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('ME', 'ME', 'Central Maine Power Company', 40);
41	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('UI', 'UI', 'United Illuminating Company', 41);	41	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('UI', 'UI', 'United Illuminating Company', 41);
42	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('NH', 'NH', 'Public Service Company of New Hampshire', 42);	42	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('NH', 'NH', 'Public Service Company of New Hampshire', 42);
43	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('VE', 'VE', 'Vermont Electric Company', 43);	43	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('VE', 'VE', 'Vermont Electric Company', 43);
44	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('CX', 'CX', 'Northeast Utilities Services Company', 44);	44	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('CX', 'CX', 'Northeast Utilities Services Company', 44);
45	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('NE', 'NE', 'National Grid USA', 45);	45	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('NE', 'NE', 'National Grid USA', 45);
46	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('BE', 'BE', 'NSTAR Electric', 46);	46	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('BE', 'BE', 'NSTAR Electric', 46);
47	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('BH', 'BH', 'Bangor Hydro-Electric Company', 47);	47	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('BH', 'BH', 'Bangor Hydro-Electric Company', 47);
48	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('SDGE', 'SDGE', 'San Diego Gas & Electric', 48);	48	INSERT INTO Company(Acronym, MapAcronym, Name, LoadOrder) VALUES('SDGE', 'SDGE', 'San Diego Gas & Electric', 48);
49	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('IaonInputAdapter', 'InputAdapters', 'Defines IInputAdapter definitions for a PDC node', 1, 1);	49	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('IaonFilterAdapter', 'FilterAdapters', 'Defines IFilterAdapter definitions for a PDC node', 1, 1);
50	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('IaonActionAdapter', 'ActionAdapters', 'Defines IActionAdapter definitions for a PDC node', 2, 1);	50	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('IaonInputAdapter', 'InputAdapters', 'Defines IInputAdapter definitions for a PDC node', 2, 1);
51	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('IaonOutputAdapter', 'OutputAdapters', 'Defines IOutputAdapter definitions for a PDC node', 3, 1);	51	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('IaonActionAdapter', 'ActionAdapters', 'Defines IActionAdapter definitions for a PDC node', 3, 1);
52	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('ActiveMeasurement', 'ActiveMeasurements', 'Defines active system measurements for a PDC node', 4, 1);	52	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('IaonOutputAdapter', 'OutputAdapters', 'Defines IOutputAdapter definitions for a PDC node', 4, 1);
53	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('RuntimeInputStreamDevice', 'InputStreamDevices', 'Defines input stream devices associated with a concentrator', 5, 1);	53	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('ActiveMeasurement', 'ActiveMeasurements', 'Defines active system measurements for a PDC node', 5, 1);
54	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('RuntimeOutputStreamDevice', 'OutputStreamDevices', 'Defines output stream devices defined for a concentrator', 6, 1);	54	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('RuntimeInputStreamDevice', 'InputStreamDevices', 'Defines input stream devices associated with a concentrator', 6, 1);
55	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('RuntimeOutputStreamMeasurement', 'OutputStreamMeasurements', 'Defines output stream measurements for an output stream', 7, 1);	55	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('RuntimeOutputStreamDevice', 'OutputStreamDevices', 'Defines output stream devices defined for a concentrator', 7, 1);
56	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('OutputStreamDevicePhasor', 'OutputStreamDevicePhasors', 'Defines phasors for output stream devices', 8, 1);	56	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('RuntimeOutputStreamMeasurement', 'OutputStreamMeasurements', 'Defines output stream measurements for an output stream', 8, 1);
57	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('OutputStreamDeviceAnalog', 'OutputStreamDeviceAnalogs', 'Defines analog values for output stream devices', 9, 1);	57	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('OutputStreamDevicePhasor', 'OutputStreamDevicePhasors', 'Defines phasors for output stream devices', 9, 1);
58	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('OutputStreamDeviceDigital', 'OutputStreamDeviceDigitals', 'Defines digital values for output stream devices', 10, 1);	58	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('OutputStreamDeviceAnalog', 'OutputStreamDeviceAnalogs', 'Defines analog values for output stream devices', 10, 1);
59	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('RuntimeStatistic', 'Statistics', 'Defines statistics that are monitored for devices and output streams', 11, 1);	59	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('OutputStreamDeviceDigital', 'OutputStreamDeviceDigitals', 'Defines digital values for output stream devices', 11, 1);
60	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('Subscriber', 'Subscribers', 'Defines subscribers that can request streaming points from a Gateway node', 12, 1);	60	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('RuntimeStatistic', 'Statistics', 'Defines statistics that are monitored for devices and output streams', 12, 1);
61	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('SubscriberMeasurement', 'SubscriberMeasurements', 'Defines measurements associated with a Gateway subscriber', 13, 1);	61	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('Subscriber', 'Subscribers', 'Defines subscribers that can request streaming points from a Gateway node', 13, 1);
62	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('SubscriberMeasurementGroup', 'SubscriberMeasurementGroups', 'Defines measurement groups associated with a Gateway subscriber', 14, 1);	62	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('SubscriberMeasurement', 'SubscriberMeasurements', 'Defines measurements associated with a Gateway subscriber', 14, 1);
63	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('MeasurementGroup', 'MeasurementGroups', 'Defines a group of measurements', 15, 1);	63	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('SubscriberMeasurementGroup', 'SubscriberMeasurementGroups', 'Defines measurement groups associated with a Gateway subscriber', 15, 1);
64	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('MeasurementGroupMeasurement', 'MeasurementGroupMeasurements', 'Defines the measurements in a measurement group', 16, 1);	64	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('MeasurementGroup', 'MeasurementGroups', 'Defines a group of measurements', 16, 1);
65	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('Alarm', 'Alarms', 'Defines alarms that monitor the values of measurements', 17, 1);	65	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('MeasurementGroupMeasurement', 'MeasurementGroupMeasurements', 'Defines the measurements in a measurement group', 17, 1);
66	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('NodeInfo', 'NodeInfo', 'Defines information about the nodes in the database', 18, 1);	66	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('Alarm', 'Alarms', 'Defines alarms that monitor the values of measurements', 18, 1);
		67	INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('NodeInfo', 'NodeInfo', 'Defines information about the nodes in the database', 19, 1);
67	INSERT INTO DataOperation(Description, AssemblyName, TypeName, MethodName, Arguments, LoadOrder, Enabled) VALUES('Time Series Startup Operations', 'GSF.TimeSeries.dll', 'GSF.TimeSeries.TimeSeriesStartupOperations', 'PerformTimeSeriesStartupOperations', '', 0, 1);	68	INSERT INTO DataOperation(Description, AssemblyName, TypeName, MethodName, Arguments, LoadOrder, Enabled) VALUES('Time Series Startup Operations', 'GSF.TimeSeries.dll', 'GSF.TimeSeries.TimeSeriesStartupOperations', 'PerformTimeSeriesStartupOperations', '', 0, 1);
68	INSERT INTO DataOperation(Description, AssemblyName, TypeName, MethodName, Arguments, LoadOrder, Enabled) VALUES('Phasor Data Source Validation', 'PhasorProtocolAdapters.dll', 'PhasorProtocolAdapters.CommonPhasorServices', 'PhasorDataSourceValidation', '', 1, 1);	69	INSERT INTO DataOperation(Description, AssemblyName, TypeName, MethodName, Arguments, LoadOrder, Enabled) VALUES('Phasor Data Source Validation', 'PhasorProtocolAdapters.dll', 'PhasorProtocolAdapters.CommonPhasorServices', 'PhasorDataSourceValidation', '', 1, 1);
69	INSERT INTO DataOperation(Description, AssemblyName, TypeName, MethodName, Arguments, LoadOrder, Enabled) VALUES('Optimize Local Historian Settings', 'HistorianAdapters.dll', 'HistorianAdapters.LocalOutputAdapter', 'OptimizeLocalHistorianSettings', '', 2, 1);	70	INSERT INTO DataOperation(Description, AssemblyName, TypeName, MethodName, Arguments, LoadOrder, Enabled) VALUES('Optimize Local Historian Settings', 'HistorianAdapters.dll', 'HistorianAdapters.LocalOutputAdapter', 'OptimizeLocalHistorianSettings', '', 2, 1);