Merge pull request #25 from RapidScada/develop

Merge Develop to Master
RapidScada · Oct 31, 2016 · 3f9d0b1 · 3f9d0b1
2 parents 7c00900 + 621fe41
commit 3f9d0b1
Show file tree

Hide file tree

Showing 784 changed files with 38,013 additions and 5,115 deletions.
diff --git a/.gitignore b/.gitignore
@@ -195,4 +195,7 @@ FakesAssemblies/
 # Visual Studio 6 workspace options file
 *.opt
 
-*.bak
+*.bak
+
+# Unignore the configuration database files
+!Base/data/*.sdf
diff --git a/Base/data/ScadaBase_4.1_en.sdf b/Base/data/ScadaBase_4.1_en.sdf
diff --git a/Base/data/ScadaBase_4.1_ru.sdf b/Base/data/ScadaBase_4.1_ru.sdf
diff --git a/Base/data/ScadaBase_4.2_en.sdf b/Base/data/ScadaBase_4.2_en.sdf
diff --git a/Base/data/ScadaBase_4.2_ru.sdf b/Base/data/ScadaBase_4.2_ru.sdf
diff --git a/Base/model/scada_3.0.erwin b/Base/model/scada_3.0.erwin
diff --git a/Base/model/scada_4.0.erwin b/Base/model/scada_4.0.erwin
diff --git a/Base/model/scada_4.1.erwin b/Base/model/scada_4.1.erwin
diff --git a/Base/model/scada_4.1_logical.png b/Base/model/scada_4.1_logical.png
diff --git a/Base/model/scada_4.1_physical.png b/Base/model/scada_4.1_physical.png
diff --git a/Base/model/scada_4.2_physical.png b/Base/model/scada_4.2_physical.png
diff --git a/Base/sql/convert_3.0_to_4.0.sql b/Base/sql/convert_3.0_to_4.0.sql
@@ -0,0 +1,8 @@
+-- Convert the configuration database from v3.0 to v4.0
+CREATE TABLE Formula
+( 
+	Name                 nvarchar(50)  NOT NULL ,
+	Source               nvarchar(1000)  NOT NULL ,
+	Descr                nvarchar(100)  NULL ,
+	CONSTRAINT PK_Formula PRIMARY KEY (Name)
+)
diff --git a/Base/sql/convert_4.1_to_4.2.sql b/Base/sql/convert_4.1_to_4.2.sql
@@ -0,0 +1,3 @@
+-- Script Date: 25.10.2016 12:05  - ErikEJ.SqlCeScripting version 3.5.2.58
+ALTER TABLE [KP] ALTER COLUMN [CallNum] nvarchar(50) NULL ;
+GO