Skip to content

Commit 589d303

Browse files
ritchiecarrollritchiecarroll
authored
Merge branch 'master' into OHTansferTool
2 parents a6f7562 + e40eaaf commit 589d303

56 files changed

Lines changed: 328 additions & 120 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Build/Scripts/openHistorian.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.8.489.0
1+
2.8.490.0

‎Source/Applications/openHistorian/WixFolderGen/Properties/AssemblyInfo.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@
3030
//
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
33-
// [assembly: AssemblyVersion("2.8.489.0")]
34-
[assembly: AssemblyVersion("2.8.489.0")]
35-
[assembly: AssemblyFileVersion("2.8.489.0")]
33+
// [assembly: AssemblyVersion("2.8.490.0")]
34+
[assembly: AssemblyVersion("2.8.490.0")]
35+
[assembly: AssemblyFileVersion("2.8.490.0")]

‎Source/Applications/openHistorian/openHistorian/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@
2525

2626
// Assembly identity attributes.
2727

28-
[assembly: AssemblyVersion("2.8.489.0")]
29-
[assembly: AssemblyFileVersion("2.8.489.0")]
28+
[assembly: AssemblyVersion("2.8.490.0")]
29+
[assembly: AssemblyFileVersion("2.8.490.0")]

‎Source/Applications/openHistorian/openHistorianConsole/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
// Assembly identity attributes.
55

6-
[assembly: AssemblyVersion("2.8.489.0")]
6+
[assembly: AssemblyVersion("2.8.490.0")]
77

88
// Informational attributes.
99

‎Source/Applications/openHistorian/openHistorianShell/Properties/AssemblyInfo.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@
3131
//
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
34-
// [assembly: AssemblyVersion("2.8.489.0")]
35-
[assembly: AssemblyVersion("2.8.489.0")]
36-
[assembly: AssemblyFileVersion("2.8.489.0")]
34+
// [assembly: AssemblyVersion("2.8.490.0")]
35+
[assembly: AssemblyVersion("2.8.490.0")]
36+
[assembly: AssemblyFileVersion("2.8.490.0")]

‎Source/Applications/openHistorianManager/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,5 @@
5656
// You can specify all the values or you can default the Build and Revision Numbers
5757
// by using the '*' as shown below:
5858

59-
[assembly: AssemblyVersion("2.8.489.0")]
60-
[assembly: AssemblyFileVersion("2.8.489.0")]
59+
[assembly: AssemblyVersion("2.8.490.0")]
60+
[assembly: AssemblyFileVersion("2.8.490.0")]

‎Source/Data/MySQL/InitialDataSet.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,4 +299,6 @@ INSERT INTO AlarmState (State, Color) VALUES ('Bad Time', 'purple');
299299
INSERT INTO AlarmState (State, Color) VALUES ('Out of Service', 'grey');
300300
INSERT INTO AlarmState (State, Color) VALUES ('Acknowledged', 'rosybrown');
301301
INSERT INTO Protocol(Acronym, Name, Type, Category, AssemblyName, TypeName, LoadOrder) VALUES('COMTRADE', 'COMTRADE Import', 'Measurement', 'Imported', 'TestingAdapters.dll', 'TestingAdapters.VirtualInputAdapter', 15);
302+
INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('NodeCompressionSetting', 'CompressionSettings', 'Defines information about measurement compression settings', 19, 1);
303+
INSERT INTO Protocol(Acronym, Name, Type, Category, AssemblyName, TypeName, LoadOrder) VALUES('COMTRADE', 'COMTRADE Import', 'Measurement', 'Imported', 'TestingAdapters.dll', 'TestingAdapters.VirtualInputAdapter', 15);
302304
INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('NodeCompressionSetting', 'CompressionSettings', 'Defines information about measurement compression settings', 19, 1);

‎Source/Data/MySQL/openHistorian.sql‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1902,3 +1902,38 @@ CREATE TABLE EventMarker(
19021902
);
19031903

19041904
ALTER TABLE EventMarker ADD CONSTRAINT FK_EventMarker_EventMarker FOREIGN KEY(ParentID) REFERENCES EventMarker (ID);
1905+
1906+
-- *******************************************************************************************
1907+
-- IMPORTANT NOTE: When making updates to this schema, please increment the version number!
1908+
-- *******************************************************************************************
1909+
CREATE VIEW LocalSchemaVersion AS
1910+
SELECT 2 AS VersionNumber;
1911+
1912+
CREATE TABLE CompressionSetting(
1913+
PointID INT NOT NULL,
1914+
CompressionMinTime BIGINT NOT NULL DEFAULT 0,
1915+
CompressionMaxTime BIGINT NOT NULL DEFAULT 0,
1916+
CompressionLimit DOUBLE NOT NULL DEFAULT 0.0,
1917+
CONSTRAINT PK_CompressionSetting PRIMARY KEY (PointID ASC)
1918+
);
1919+
1920+
CREATE VIEW NodeCompressionSetting AS
1921+
SELECT
1922+
Node.ID AS NodeID,
1923+
CompressionSetting.PointID,
1924+
CompressionSetting.CompressionMinTime,
1925+
CompressionSetting.CompressionMaxTime,
1926+
CompressionSetting.CompressionLimit
1927+
FROM CompressionSetting CROSS JOIN Node;
1928+
1929+
CREATE TABLE EventMarker(
1930+
ID INT AUTO_INCREMENT NOT NULL,
1931+
ParentID INT NULL,
1932+
Source VARCHAR(200) NULL,
1933+
StartTime DATETIME NULL,
1934+
StopTime DATETIME NULL,
1935+
Notes TEXT NULL,
1936+
CONSTRAINT PK_EventMarker PRIMARY KEY (ID ASC)
1937+
);
1938+
1939+
ALTER TABLE EventMarker ADD CONSTRAINT FK_EventMarker_EventMarker FOREIGN KEY(ParentID) REFERENCES EventMarker (ID);

‎Source/Data/Oracle/InitialDataSet.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,4 +297,6 @@ INSERT INTO AlarmState (State, Color) VALUES ('Bad Time', 'purple');
297297
INSERT INTO AlarmState (State, Color) VALUES ('Out of Service', 'grey');
298298
INSERT INTO AlarmState (State, Color) VALUES ('Acknowledged', 'rosybrown');
299299
INSERT INTO Protocol(Acronym, Name, Type, Category, AssemblyName, TypeName, LoadOrder) VALUES('COMTRADE', 'COMTRADE Import', 'Measurement', 'Imported', 'TestingAdapters.dll', 'TestingAdapters.VirtualInputAdapter', 15);
300+
INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('NodeCompressionSetting', 'CompressionSettings', 'Defines information about measurement compression settings', 19, 1);
301+
INSERT INTO Protocol(Acronym, Name, Type, Category, AssemblyName, TypeName, LoadOrder) VALUES('COMTRADE', 'COMTRADE Import', 'Measurement', 'Imported', 'TestingAdapters.dll', 'TestingAdapters.VirtualInputAdapter', 15);
300302
INSERT INTO ConfigurationEntity(SourceName, RuntimeName, Description, LoadOrder, Enabled) VALUES('NodeCompressionSetting', 'CompressionSettings', 'Defines information about measurement compression settings', 19, 1);

‎Source/Data/Oracle/openHistorian.sql‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2860,3 +2860,49 @@ CREATE TRIGGER AI_EventMarker BEFORE INSERT ON EventMarker
28602860
END;
28612861

28622862
ALTER TABLE EventMarker ADD CONSTRAINT FK_EventMarker_EventMarker FOREIGN KEY(ParentID) REFERENCES EventMarker (ID);
2863+
2864+
-- *******************************************************************************************
2865+
-- IMPORTANT NOTE: When making updates to this schema, please increment the version number!
2866+
-- *******************************************************************************************
2867+
CREATE VIEW LocalSchemaVersion AS
2868+
SELECT 2 AS VersionNumber
2869+
FROM dual;
2870+
2871+
CREATE TABLE CompressionSetting(
2872+
PointID NUMBER NOT NULL,
2873+
CompressionMinTime NUMBER(19, 0) DEFAULT 0 NOT NULL,
2874+
CompressionMaxTime NUMBER(19, 0) DEFAULT 0 NOT NULL,
2875+
CompressionLimit NUMBER(9, 6) DEFAULT 0.0 NOT NULL
2876+
);
2877+
2878+
CREATE UNIQUE INDEX IX_CompressionSetting_PointID ON CompressionSetting (PointID ASC) TABLESPACE openHistorian_INDEX;
2879+
2880+
CREATE VIEW NodeCompressionSetting AS
2881+
SELECT
2882+
Node.ID AS NodeID,
2883+
CompressionSetting.PointID,
2884+
CompressionSetting.CompressionMinTime,
2885+
CompressionSetting.CompressionMaxTime,
2886+
CompressionSetting.CompressionLimit
2887+
FROM CompressionSetting CROSS JOIN Node;
2888+
2889+
CREATE TABLE EventMarker(
2890+
ID NUMBER NOT NULL,
2891+
ParentID NUMBER NULL,
2892+
Source VARCHAR2(200) NULL,
2893+
StartTime DATE NULL,
2894+
StopTime DATE NULL,
2895+
Notes VARCHAR2(4000) NULL
2896+
);
2897+
2898+
CREATE UNIQUE INDEX IX_EventMarker_ID ON EventMarker (ID ASC) TABLESPACE openHistorian_INDEX;
2899+
2900+
ALTER TABLE EventMarker ADD CONSTRAINT PK_EventMarker PRIMARY KEY (ID);
2901+
2902+
CREATE SEQUENCE SEQ_EventMarker START WITH 1 INCREMENT BY 1;
2903+
2904+
CREATE TRIGGER AI_EventMarker BEFORE INSERT ON EventMarker
2905+
FOR EACH ROW BEGIN SELECT SEQ_EventMarker.nextval INTO :NEW.ID FROM dual;
2906+
END;
2907+
2908+
ALTER TABLE EventMarker ADD CONSTRAINT FK_EventMarker_EventMarker FOREIGN KEY(ParentID) REFERENCES EventMarker (ID);

0 commit comments

Comments
 (0)