MERGE!

1 files changed, 1 insertions, 28 deletions

diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Templates/ObservablesContextCodeFile.cshtml b/Software/Visual_Studio/Tango.CodeGeneration/Templates/ObservablesContextCodeFile.cshtml
index 2094c0999..d2494c1bd 100644
--- a/Software/Visual_Studio/Tango.CodeGeneration/Templates/ObservablesContextCodeFile.cshtml
+++ b/Software/Visual_Studio/Tango.CodeGeneration/Templates/ObservablesContextCodeFile.cshtml
@@ -8,7 +8,7 @@ using Tango.Settings;
 
 namespace Tango.Integration.Observables
 {
-    public class ObservablesContext : DbContext
+    public partial class ObservablesContext : DbContext
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="ObservablesContext" /> class.
@@ -20,33 +20,6 @@ namespace Tango.Integration.Observables
 
         }
 
-        /// <summary>
-        /// Composes the connection string.
-        ///</summary>
-        /// <param name="source">The source.</param>
-        /// <param name="isFile">if set to <c>true</c> [is file].</param>
-        /// <returns></returns>
-        private static String ComposeConnectionString(String source, bool isFile)
-        {
-            if (!isFile)
-            {
-                return String.Format("Data Source={0};Initial Catalog=Tango;Integrated Security=true", source);
-            }
-            else
-            {
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Creates a default remote database context by the address specified in <see cref="SettingsManager.Default.DataBase.SQLServerAddress" />.
-        /// </summary>
-        /// <returns></returns>
-        public static ObservablesContext CreateDefault()
-        {
-            return new ObservablesContext(SettingsManager.Default.DataBase.SQLServerAddress, false);
-        }
-
         @foreach (var prop in Model.Properties)
         {
             <div>