History

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

StephenCWills committed 8 years ago

Commit 4ff56a01 parent b308b3223 files · +1077 −149Browse files

Showing the changes to Source/Libraries/GSF.TimeSeries/Data/MySQL/GSFSchema.sql (1 of 23 files). Show all

Unified · Split

Source/Libraries/GSF.TimeSeries/Data/MySQL/GSFSchema.sql+51−2
@@ -38,7 +38,7 @@ USE GSFSchema; · 37 unmodified lines
3838 -- IMPORTANT NOTE: When making updates to this schema, please increment the version number!
3939 -- *******************************************************************************************
4040 CREATE VIEW SchemaVersion AS
41−SELECT 6 AS VersionNumber;
41+SELECT 7 AS VersionNumber;
4242
4343 CREATE TABLE ErrorLog(
4444 ID INT AUTO_INCREMENT NOT NULL,
@@ -503,6 +503,22 @@ CREATE TABLE CustomInputAdapter( · 458 unmodified lines
503503 CONSTRAINT PK_CustomInputAdapter PRIMARY KEY (ID ASC)
504504 );
505505
506+CREATE TABLE CustomFilterAdapter(
507+ NodeID NCHAR(36) NOT NULL,
508+ ID INT AUTO_INCREMENT NOT NULL,
509+ AdapterName VARCHAR(200) NOT NULL,
510+ AssemblyName TEXT NOT NULL,
511+ TypeName TEXT NOT NULL,
512+ ConnectionString TEXT NULL,
513+ LoadOrder INT NOT NULL DEFAULT 0,
514+ Enabled TINYINT NOT NULL DEFAULT 0,
515+ CreatedOn DATETIME NULL,
516+ CreatedBy VARCHAR(200) NULL,
517+ UpdatedOn DATETIME NULL,
518+ UpdatedBy VARCHAR(200) NULL,
519+ CONSTRAINT PK_CustomFilterAdapter PRIMARY KEY (ID ASC)
520+);
521+
506522 CREATE TABLE OutputStream(
507523 NodeID NCHAR(36) NOT NULL,
508524 ID INT AUTO_INCREMENT NOT NULL,
@@ -835,6 +851,8 @@ ALTER TABLE Historian ADD CONSTRAINT FK_Historian_Node FOREIGN KEY(NodeID) REFER · 326 unmodified lines
835851
836852 ALTER TABLE CustomInputAdapter ADD CONSTRAINT FK_CustomInputAdapter_Node FOREIGN KEY(NodeID) REFERENCES Node (ID) ON DELETE CASCADE ON UPDATE CASCADE;
837853
854+ALTER TABLE CustomFilterAdapter ADD CONSTRAINT FK_CustomFilterAdapter_Node FOREIGN KEY(NodeID) REFERENCES Node (ID) ON DELETE CASCADE ON UPDATE CASCADE;
855+
838856 ALTER TABLE OutputStream ADD CONSTRAINT FK_OutputStream_Node FOREIGN KEY(NodeID) REFERENCES Node (ID) ON DELETE CASCADE ON UPDATE CASCADE;
839857
840858 ALTER TABLE PowerCalculation ADD CONSTRAINT FK_PowerCalculation_Measurement1 FOREIGN KEY(ApparentPowerOutputSignalID) REFERENCES Measurement (SignalID) ON DELETE CASCADE ON UPDATE CASCADE;
@@ -958,6 +976,15 @@ FROM CustomInputAdapter LEFT OUTER JOIN · 117 unmodified lines
958976 WHERE (CustomInputAdapter.Enabled <> 0)
959977 ORDER BY CustomInputAdapter.LoadOrder;
960978
979+CREATE VIEW RuntimeCustomFilterAdapter
980+AS
981+SELECT CustomFilterAdapter.NodeID, Runtime.ID, CustomFilterAdapter.AdapterName,
982+ TRIM(CustomFilterAdapter.AssemblyName) AS AssemblyName, TRIM(CustomFilterAdapter.TypeName) AS TypeName, CustomFilterAdapter.ConnectionString
983+FROM CustomFilterAdapter LEFT OUTER JOIN
984+ Runtime ON CustomFilterAdapter.ID = Runtime.SourceID AND Runtime.SourceTable = N'CustomFilterAdapter'
985+WHERE (CustomFilterAdapter.Enabled <> 0)
986+ORDER BY CustomFilterAdapter.LoadOrder;
987+
961988 CREATE VIEW RuntimeOutputStreamDevice
962989 AS
963990 SELECT OutputStreamDevice.NodeID, Runtime.ID AS ParentID, OutputStreamDevice.ID, OutputStreamDevice.IDCode, OutputStreamDevice.Acronym,
@@ -1095,6 +1122,11 @@ FROM RuntimeCalculatedMeasurement · 131 unmodified lines
10951122 UNION
10961123 SELECT NodeID, ID, AdapterName, AssemblyName, TypeName, ConnectionString
10971124 FROM RuntimeCustomActionAdapter;
1125+
1126+CREATE VIEW IaonFilterAdapter
1127+AS
1128+SELECT NodeID, ID, AdapterName, AssemblyName, TypeName, ConnectionString
1129+FROM RuntimeCustomFilterAdapter;
10981130
10991131 CREATE VIEW MeasurementDetail
11001132 AS
@@ -1202,6 +1234,11 @@ SELECT CA.NodeID, CA.ID, CA.AdapterName, CA.AssemblyName, CA.TypeName, COALESCE( · 101 unmodified lines
12021234 CA.Enabled, N.Name AS NodeName
12031235 FROM CustomOutputAdapter AS CA INNER JOIN Node AS N ON CA.NodeID = N.ID;
12041236
1237+CREATE VIEW CustomFilterAdapterDetail AS
1238+SELECT CA.NodeID, CA.ID, CA.AdapterName, CA.AssemblyName, CA.TypeName, COALESCE(CA.ConnectionString, '') AS ConnectionString, CA.LoadOrder,
1239+ CA.Enabled, N.Name AS NodeName
1240+FROM CustomFilterAdapter AS CA INNER JOIN Node AS N ON CA.NodeID = N.ID;
1241+
12051242 CREATE VIEW IaonTreeView AS
12061243 SELECT 'Action Adapters' AS AdapterType, NodeID, ID, AdapterName, AssemblyName, TypeName, COALESCE(ConnectionString, '') AS ConnectionString
12071244 FROM IaonActionAdapter
@@ -1210,7 +1247,10 @@ SELECT 'Input Adapters' AS AdapterType, NodeID, ID, AdapterName, AssemblyName, T · 2 unmodified lines
12101247 FROM IaonInputAdapter
12111248 UNION ALL
12121249 SELECT 'Output Adapters' AS AdapterType, NodeID, ID, AdapterName, AssemblyName, TypeName, COALESCE(ConnectionString, '') AS ConnectionString
1213−FROM IaonOutputAdapter;
1250+FROM IaonOutputAdapter
1251+UNION ALL
1252+SELECT 'Filter Adapters' AS AdapterType, NodeID, ID, AdapterName, AssemblyName, TypeName, COALESCE(ConnectionString, '') AS ConnectionString
1253+FROM IaonFilterAdapter;
12141254
12151255 CREATE VIEW OtherDeviceDetail AS
12161256 SELECT OD.ID, OD.Acronym, COALESCE(OD.Name, '') AS Name, OD.IsConcentrator, OD.CompanyID, OD.VendorDeviceID, OD.Longitude, OD.Latitude,
@@ -1360,6 +1400,12 @@ FOR EACH ROW INSERT INTO Runtime (SourceID, SourceTable) VALUES(NEW.ID, N'Custom · 143 unmodified lines
13601400 CREATE TRIGGER CustomOutputAdapter_RuntimeSync_Delete BEFORE DELETE ON CustomOutputAdapter
13611401 FOR EACH ROW DELETE FROM Runtime WHERE SourceID = OLD.ID AND SourceTable = N'CustomOutputAdapter';
13621402
1403+CREATE TRIGGER CustomFilterAdapter_RuntimeSync_Insert AFTER INSERT ON CustomFilterAdapter
1404+FOR EACH ROW INSERT INTO Runtime (SourceID, SourceTable) VALUES(NEW.ID, N'CustomFilterAdapter');
1405+
1406+CREATE TRIGGER CustomFilterAdapter_RuntimeSync_Delete BEFORE DELETE ON CustomFilterAdapter
1407+FOR EACH ROW DELETE FROM Runtime WHERE SourceID = OLD.ID AND SourceTable = N'CustomFilterAdapter';
1408+
13631409 DELIMITER $$
13641410 CREATE TRIGGER Device_RuntimeSync_Insert AFTER INSERT ON Device FOR EACH ROW
13651411 BEGIN
@@ -1421,6 +1467,9 @@ FOR EACH ROW SET NEW.CreatedBy = COALESCE(NEW.CreatedBy, USER()), NEW.CreatedOn · 55 unmodified lines
14211467 CREATE TRIGGER CustomOutputAdapter_InsertDefault BEFORE INSERT ON CustomOutputAdapter
14221468 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());
14231469
1470+CREATE TRIGGER CustomFilterAdapter_InsertDefault BEFORE INSERT ON CustomFilterAdapter
1471+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());
1472+
14241473 CREATE TRIGGER Device_InsertDefault BEFORE INSERT ON Device
14251474 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());
14261475

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t