From 2eef31f74d72555844433b7967c4018b804f4cd0 Mon Sep 17 00:00:00 2001 From: David Sparer Date: Tue, 26 Jul 2016 11:34:47 -0600 Subject: [PATCH] Renamed several database related properties to be more generic ("sql" -> "database") --- mRemoteV1/App/Runtime.cs | 12 ++++---- .../Config/Connections/ConnectionsLoader.cs | 28 +++++++++---------- .../Connections/SqlConnectionsLoader.cs | 18 ++++++------ 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/mRemoteV1/App/Runtime.cs b/mRemoteV1/App/Runtime.cs index 48d7dda2..189f2dfb 100644 --- a/mRemoteV1/App/Runtime.cs +++ b/mRemoteV1/App/Runtime.cs @@ -487,13 +487,13 @@ namespace mRemoteNG.App ConnectionTree.ResetTree(); connectionsLoader.RootTreeNode = Windows.treeForm.tvConnections.Nodes[0]; - connectionsLoader.UseSql = Settings.Default.UseSQLServer; - connectionsLoader.SqlHost = Settings.Default.SQLHost; - connectionsLoader.SqlDatabaseName = Settings.Default.SQLDatabaseName; - connectionsLoader.SqlUsername = Settings.Default.SQLUser; + connectionsLoader.UseDatabase = Settings.Default.UseSQLServer; + connectionsLoader.DatabaseHost = Settings.Default.SQLHost; + connectionsLoader.DatabaseName = Settings.Default.SQLDatabaseName; + connectionsLoader.DatabaseUsername = Settings.Default.SQLUser; var cryptographyProvider = new LegacyRijndaelCryptographyProvider(); - connectionsLoader.SqlPassword = cryptographyProvider.Decrypt(Convert.ToString(Settings.Default.SQLPass), GeneralAppInfo.EncryptionKey); - connectionsLoader.SqlUpdate = update; + connectionsLoader.DatabasePassword = cryptographyProvider.Decrypt(Convert.ToString(Settings.Default.SQLPass), GeneralAppInfo.EncryptionKey); + connectionsLoader.DatabaseUpdate = update; connectionsLoader.LoadConnections(false); if (Settings.Default.UseSQLServer) diff --git a/mRemoteV1/Config/Connections/ConnectionsLoader.cs b/mRemoteV1/Config/Connections/ConnectionsLoader.cs index 2db0aef9..cfa603bc 100644 --- a/mRemoteV1/Config/Connections/ConnectionsLoader.cs +++ b/mRemoteV1/Config/Connections/ConnectionsLoader.cs @@ -8,12 +8,12 @@ namespace mRemoteNG.Config.Connections { public class ConnectionsLoader { - public bool UseSql { get; set; } - public string SqlHost { get; set; } - public string SqlDatabaseName { get; set; } - public string SqlUsername { get; set; } - public string SqlPassword { get; set; } - public bool SqlUpdate { get; set; } + public bool UseDatabase { get; set; } + public string DatabaseHost { get; set; } + public string DatabaseName { get; set; } + public string DatabaseUsername { get; set; } + public string DatabasePassword { get; set; } + public bool DatabaseUpdate { get; set; } public string PreviousSelected { get; set; } public string ConnectionFileName { get; set; } public TreeNode RootTreeNode { get; set; } @@ -25,7 +25,7 @@ namespace mRemoteNG.Config.Connections public void LoadConnections(bool import) { - if (UseSql) + if (UseDatabase) { var sqlConnectionsLoader = new SqlConnectionsLoader() { @@ -35,11 +35,11 @@ namespace mRemoteNG.Config.Connections PreviousContainerList = PreviousContainerList, PreviousSelected = PreviousSelected, RootTreeNode = RootTreeNode, - SqlDatabaseName = SqlDatabaseName, - SqlHost = SqlHost, - SqlPassword = SqlPassword, - SqlUpdate = SqlUpdate, - SqlUsername = SqlUsername + DatabaseName = DatabaseName, + DatabaseHost = DatabaseHost, + DatabasePassword = DatabasePassword, + DatabaseUpdate = DatabaseUpdate, + DatabaseUsername = DatabaseUsername }; sqlConnectionsLoader.LoadFromSql(); } @@ -51,12 +51,12 @@ namespace mRemoteNG.Config.Connections ConnectionList = ConnectionList, ContainerList = ContainerList, RootTreeNode = RootTreeNode, - UseSql = UseSql + UseSql = UseDatabase }; xmlConnectionsLoader.LoadFromXml(import); } - frmMain.Default.AreWeUsingSqlServerForSavingConnections = UseSql; + frmMain.Default.AreWeUsingSqlServerForSavingConnections = UseDatabase; frmMain.Default.ConnectionsFileName = ConnectionFileName; if (!import) diff --git a/mRemoteV1/Config/Connections/SqlConnectionsLoader.cs b/mRemoteV1/Config/Connections/SqlConnectionsLoader.cs index 569a3500..6a7a6be7 100644 --- a/mRemoteV1/Config/Connections/SqlConnectionsLoader.cs +++ b/mRemoteV1/Config/Connections/SqlConnectionsLoader.cs @@ -33,11 +33,11 @@ namespace mRemoteNG.Config.Connections private SecureString _pW = GeneralAppInfo.EncryptionKey; - public string SqlHost { get; set; } - public string SqlDatabaseName { get; set; } - public string SqlUsername { get; set; } - public string SqlPassword { get; set; } - public bool SqlUpdate { get; set; } + public string DatabaseHost { get; set; } + public string DatabaseName { get; set; } + public string DatabaseUsername { get; set; } + public string DatabasePassword { get; set; } + public bool DatabaseUpdate { get; set; } public string PreviousSelected { get; set; } public TreeNode RootTreeNode { get; set; } public ConnectionList ConnectionList { get; set; } @@ -60,7 +60,7 @@ namespace mRemoteNG.Config.Connections try { Runtime.IsConnectionsFileLoaded = false; - _sqlConnection = !string.IsNullOrEmpty(SqlUsername) ? new SqlConnection("Data Source=" + SqlHost + ";Initial Catalog=" + SqlDatabaseName + ";User Id=" + SqlUsername + ";Password=" + SqlPassword) : new SqlConnection("Data Source=" + SqlHost + ";Initial Catalog=" + SqlDatabaseName + ";Integrated Security=True"); + _sqlConnection = !string.IsNullOrEmpty(DatabaseUsername) ? new SqlConnection("Data Source=" + DatabaseHost + ";Initial Catalog=" + DatabaseName + ";User Id=" + DatabaseUsername + ";Password=" + DatabasePassword) : new SqlConnection("Data Source=" + DatabaseHost + ";Initial Catalog=" + DatabaseName + ";Integrated Security=True"); _sqlConnection.Open(); _sqlQuery = new SqlCommand("SELECT * FROM tblRoot", _sqlConnection); @@ -179,7 +179,7 @@ namespace mRemoteNG.Config.Connections ConnectionList.Add(conI); tNode.Tag = conI; - if (SqlUpdate) + if (DatabaseUpdate) { var prevCon = PreviousConnectionList.FindByConstantID(conI.ConstantID); if (prevCon != null) @@ -230,7 +230,7 @@ namespace mRemoteNG.Config.Connections conI.IsContainer = true; contI.ConnectionInfo = conI; - if (SqlUpdate) + if (DatabaseUpdate) { var prevCont = PreviousContainerList.FindByConstantID(conI.ConstantID); if (prevCont != null) @@ -444,7 +444,7 @@ namespace mRemoteNG.Config.Connections connectionInfo.Inheritance.AutomaticResize = Convert.ToBoolean(_sqlDataReader["InheritAutomaticResize"]); } - if (SqlUpdate) + if (DatabaseUpdate) connectionInfo.PleaseConnect = Convert.ToBoolean(_sqlDataReader["Connected"]); return connectionInfo;