Merge pull request #80 from igitur/move-default-settings-to-sqlite-file

Changes to stored settings / projects
OpenDBDiff · Apr 9, 2018 · c3b66e0 · c3b66e0
2 parents 0a6904a + 673f8a5
commit c3b66e0
Show file tree

Hide file tree

Showing 17 changed files with 738 additions and 712 deletions.
diff --git a/OpenDBDiff.Schema.SQLServer2005/Front/SQLServerProjectHandler.cs b/OpenDBDiff.Schema.SQLServer2005/Front/SQLServerProjectHandler.cs
@@ -20,11 +20,11 @@ public IFront CreateDestinationSelector()
         {
             this.DestinationControl = new SqlServerConnectFront
             {
-                ServerName = Properties.Settings.Default.SQLServerNameDestination,
-                UseWindowsAuthentication = Properties.Settings.Default.SQLServerUseWindowsAuthenticationDestination,
-                UserName = Properties.Settings.Default.SQLServerUserDestination,
+                ServerName = "(local)",
+                UseWindowsAuthentication = true,
+                UserName = "sa",
                 Password = "",
-                DatabaseName = Properties.Settings.Default.SQLServerDatabaseDestination
+                DatabaseName = ""
             };
 
             this.DestinationControl.Location = new Point(1, 1);
@@ -40,11 +40,11 @@ public IFront CreateSourceSelector()
         {
             this.SourceControl = new SqlServerConnectFront
             {
-                ServerName = Properties.Settings.Default.SQLServerNameOrigin,
-                UseWindowsAuthentication = Properties.Settings.Default.SQLServerUseWindowsAuthenticationOrigin,
-                UserName = Properties.Settings.Default.SQLServerUserOrigin,
+                ServerName = "(local)",
+                UseWindowsAuthentication = true,
+                UserName = "sa",
                 Password = "",
-                DatabaseName = Properties.Settings.Default.SQLServerDatabaseOrigin
+                DatabaseName = ""
             };
 
             SourceControl.Location = new Point(1, 1);

diff --git a/OpenDBDiff.Schema.SQLServer2005/Front/SqlServerConnectFront.cs b/OpenDBDiff.Schema.SQLServer2005/Front/SqlServerConnectFront.cs
@@ -148,30 +148,23 @@ public string ConnectionString
             }
             set
             {
-                if (!String.IsNullOrEmpty(value))
+                if (!String.IsNullOrWhiteSpace(value))
                 {
-                    string[] items = value.Split(';');
-                    for (int j = 0; j < items.Length; j++)
+                    var builder = new SqlConnectionStringBuilder(value);
+
+                    ServerName = builder.DataSource;
+                    UseWindowsAuthentication = builder.IntegratedSecurity;
+                    if (UseWindowsAuthentication)
                     {
-                        string[] item = items[j].Split('=');
-                        if (item[0].Equals("User Id", StringComparison.InvariantCultureIgnoreCase))
-                        {
-                            UserName = item[1];
-                            cboAuthentication.SelectedIndex = 1;
-                        }
-                        if (item[0].Equals("Password", StringComparison.InvariantCultureIgnoreCase))
-                            Password = item[1];
-                        if (item[0].Equals("Data Source", StringComparison.InvariantCultureIgnoreCase))
-                            ServerName = item[1];
-                        if (item[0].Equals("Initial Catalog", StringComparison.InvariantCultureIgnoreCase))
-                            DatabaseName = item[1];
-                        if (item[0].Equals("Integrated Security", StringComparison.InvariantCultureIgnoreCase))
-                        {
-                            cboAuthentication.SelectedIndex = 0;
-                            UserName = "";
-                            Password = "";
-                        }
+                        UserName = "";
+                        Password = "";
+                    }
+                    else
+                    {
+                        UserName = builder.UserID;
+                        Password = builder.Password;
                     }
+                    DatabaseName = builder.InitialCatalog;
                 }
                 else
                 {

diff --git a/OpenDBDiff.Schema.SQLServer2005/OpenDBDiff.Schema.SQLServer.csproj b/OpenDBDiff.Schema.SQLServer2005/OpenDBDiff.Schema.SQLServer.csproj
@@ -97,12 +97,6 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>Settings.settings</DependentUpon>
-    </Compile>
-    <Compile Include="Settings.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenDBDiff.Front\OpenDBDiff.Front.csproj">
@@ -122,12 +116,7 @@
     <None Include="..\.editorconfig">
       <Link>.editorconfig</Link>
     </None>
-    <None Include="app.config" />
     <None Include="OpenDBDiff.Schema.SQLServer.snk" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Front\AddItem.resx">

diff --git a/OpenDBDiff.Schema.SQLServer2005/Properties/Settings.Designer.cs b/OpenDBDiff.Schema.SQLServer2005/Properties/Settings.Designer.cs
diff --git a/OpenDBDiff.Schema.SQLServer2005/Properties/Settings.settings b/OpenDBDiff.Schema.SQLServer2005/Properties/Settings.settings
diff --git a/OpenDBDiff.Schema.SQLServer2005/Settings.cs b/OpenDBDiff.Schema.SQLServer2005/Settings.cs
diff --git a/OpenDBDiff.Schema.SQLServer2005/app.config b/OpenDBDiff.Schema.SQLServer2005/app.config