From 46e5d8e669ca7c570b39acd315d957271bb2b53c Mon Sep 17 00:00:00 2001 From: Faryan Rezagholi Date: Tue, 9 Jun 2020 16:25:15 +0200 Subject: [PATCH] renamed SQL property "DomainName" to "Domain" for consistency reasons --- .../ConnectionSerializers/MsSql/DataTableDeserializer.cs | 2 +- .../ConnectionSerializers/MsSql/DataTableSerializer.cs | 6 +++--- mRemoteNG/Documentation/mssql_db_setup.sql | 2 +- mRemoteNG/Documentation/mysql_db_setup.sql | 2 +- .../Config/Serializers/DataTableSerializerTests.cs | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableDeserializer.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableDeserializer.cs index e22c5dc0..3abdc19d 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableDeserializer.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableDeserializer.cs @@ -85,7 +85,7 @@ namespace mRemoteNG.Config.Serializers.MsSql connectionInfo.Icon = (string)dataRow["Icon"]; connectionInfo.Panel = (string)dataRow["Panel"]; connectionInfo.Username = (string)dataRow["Username"]; - connectionInfo.Domain = (string)dataRow["DomainName"]; + connectionInfo.Domain = (string)dataRow["Domain"]; connectionInfo.Password = DecryptValue((string)dataRow["Password"]); connectionInfo.Hostname = (string)dataRow["Hostname"]; connectionInfo.VmId = (string)dataRow["VmId"]; diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableSerializer.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableSerializer.cs index 8a79a728..30909cc8 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableSerializer.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableSerializer.cs @@ -106,7 +106,7 @@ namespace mRemoteNG.Config.Serializers.MsSql dataTable.Columns.Add("Icon", typeof(string)); dataTable.Columns.Add("Panel", typeof(string)); dataTable.Columns.Add("Username", typeof(string)); - dataTable.Columns.Add("DomainName", typeof(string)); + dataTable.Columns.Add("Domain", typeof(string)); dataTable.Columns.Add("Password", typeof(string)); dataTable.Columns.Add("Hostname", typeof(string)); dataTable.Columns.Add("Port", typeof(int)); @@ -266,7 +266,7 @@ namespace mRemoteNG.Config.Serializers.MsSql dataRow["Icon"].Equals(connectionInfo.Icon) && dataRow["Panel"].Equals(connectionInfo.Panel) && dataRow["Username"].Equals(_saveFilter.SaveUsername ? connectionInfo.Username : "") && - dataRow["DomainName"].Equals(_saveFilter.SaveDomain ? connectionInfo.Domain : ""); + dataRow["Domain"].Equals(_saveFilter.SaveDomain ? connectionInfo.Domain : ""); isFieldNotChange = isFieldNotChange && dataRow["Hostname"].Equals(connectionInfo.Hostname); isFieldNotChange = isFieldNotChange && dataRow["VmId"].Equals(connectionInfo.VmId); @@ -514,7 +514,7 @@ namespace mRemoteNG.Config.Serializers.MsSql dataRow["Icon"] = connectionInfo.Icon; dataRow["Panel"] = connectionInfo.Panel; dataRow["Username"] = _saveFilter.SaveUsername ? connectionInfo.Username : ""; - dataRow["DomainName"] = _saveFilter.SaveDomain ? connectionInfo.Domain : ""; + dataRow["Domain"] = _saveFilter.SaveDomain ? connectionInfo.Domain : ""; dataRow["Password"] = _saveFilter.SavePassword ? _cryptographyProvider.Encrypt(connectionInfo.Password, _encryptionKey) : ""; diff --git a/mRemoteNG/Documentation/mssql_db_setup.sql b/mRemoteNG/Documentation/mssql_db_setup.sql index 93789c89..61cab7e4 100644 --- a/mRemoteNG/Documentation/mssql_db_setup.sql +++ b/mRemoteNG/Documentation/mssql_db_setup.sql @@ -34,7 +34,7 @@ CREATE TABLE [dbo].[tblCons] ( DisableMenuAnimations bit NOT NULL, DisplayThemes bit NOT NULL, DisplayWallpaper bit NOT NULL, - DomainName varchar(512), + Domain varchar(512), EnableDesktopComposition bit NOT NULL, EnableFontSmoothing bit NOT NULL, ExtApp varchar(256), diff --git a/mRemoteNG/Documentation/mysql_db_setup.sql b/mRemoteNG/Documentation/mysql_db_setup.sql index 65cb2876..a4295347 100644 --- a/mRemoteNG/Documentation/mysql_db_setup.sql +++ b/mRemoteNG/Documentation/mysql_db_setup.sql @@ -37,7 +37,7 @@ CREATE TABLE `tblCons` ( `DisableMenuAnimations` tinyint(1) NOT NULL, `DisplayThemes` tinyint(1) NOT NULL, `DisplayWallpaper` tinyint(1) NOT NULL, - `DomainName` varchar(512) DEFAULT NULL, + `Domain` varchar(512) DEFAULT NULL, `EnableDesktopComposition` tinyint(1) NOT NULL, `EnableFontSmoothing` tinyint(1) NOT NULL, `ExtApp` varchar(256) DEFAULT NULL, diff --git a/mRemoteNGTests/Config/Serializers/DataTableSerializerTests.cs b/mRemoteNGTests/Config/Serializers/DataTableSerializerTests.cs index a3ca2738..1888f296 100644 --- a/mRemoteNGTests/Config/Serializers/DataTableSerializerTests.cs +++ b/mRemoteNGTests/Config/Serializers/DataTableSerializerTests.cs @@ -56,7 +56,7 @@ namespace mRemoteNGTests.Config.Serializers var model = CreateConnectionTreeModel(); _saveFilter.SaveDomain = true; var dataTable = _dataTableSerializer.Serialize(model); - Assert.That(dataTable.Rows[0]["DomainName"], Is.Not.EqualTo("")); + Assert.That(dataTable.Rows[0]["Domain"], Is.Not.EqualTo("")); } [Test] @@ -94,7 +94,7 @@ namespace mRemoteNGTests.Config.Serializers var model = CreateConnectionTreeModel(); _saveFilter.SaveDomain = false; var dataTable = _dataTableSerializer.Serialize(model); - Assert.That(dataTable.Rows[0]["DomainName"], Is.EqualTo("")); + Assert.That(dataTable.Rows[0]["Domain"], Is.EqualTo("")); } [Test]