Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-17 14:07:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2523 from zeze0556/v1.77.3-dev

Browse Source 
fixed mysql error
This commit is contained in:
Dimitrij
2023-11-20 09:27:46 +00:00
committed by GitHub
parent b0109c2581 24fa97da4c
commit 5b2a46ed91
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mRemoteNG/App/Info/ConnectionsFileInfo.cs
View File

@@ -9,6 +9,6 @@ namespace mRemoteNG.App.Info
public static readonly string DefaultConnectionsPath = SettingsFileInfo.SettingsPath;
public static readonly string DefaultConnectionsFile = "confCons.xml";
public static readonly string DefaultConnectionsFileNew = "confConsNew.xml";
public static readonly Version ConnectionFileVersion = new Version(2, 8);
public static readonly Version ConnectionFileVersion = new Version(3, 0);
}
}

3
mRemoteNG/Config/Serializers/ConnectionSerializers/Sql/DataTableSerializer.cs
View File

@@ -628,6 +628,7 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Sql
dataRow["VNCSmartSizeMode"] = connectionInfo.VNCSmartSizeMode;
dataRow["VNCViewOnly"] = connectionInfo.VNCViewOnly; // TODO: this column can eventually be removed. we now save this property locally
dataRow["VmId"] = connectionInfo.VmId;
dataRow["UserViaAPI"] = connectionInfo.UserViaAPI;
if (_saveFilter.SaveInheritance)
{
@@ -706,6 +707,7 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Sql
dataRow["InheritVNCSmartSizeMode"] = connectionInfo.Inheritance.VNCSmartSizeMode;
dataRow["InheritVNCViewOnly"] = connectionInfo.Inheritance.VNCViewOnly;
dataRow["InheritVmId"] = connectionInfo.Inheritance.VmId;
dataRow["UserViaAPI"] = connectionInfo.UserViaAPI;
dataRow["InheritCacheBitmaps"] = connectionInfo.Inheritance.CacheBitmaps;
}
else
@@ -782,6 +784,7 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Sql
dataRow["InheritVNCSmartSizeMode"] = false;
dataRow["InheritVNCViewOnly"] = false;
dataRow["InheritCacheBitmaps"] = false;
dataRow["UserViaAPI"] = "";
}
if (isNewRow) _dataTable.Rows.Add(dataRow);

3
mRemoteNG/Config/Serializers/ConnectionSerializers/Sql/SqlDatabaseMetaDataRetriever.cs
View File

@@ -118,7 +118,8 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Sql
try
{
// ANSI SQL way. Works in PostgreSQL, MSSQL, MySQL.
var cmd = databaseConnector.DbCommand("select case when exists((select * from information_schema.tables where table_name = '" + tableName + "')) then 1 else 0 end");
var database_name = Properties.OptionsDBsPage.Default.SQLDatabaseName;
var cmd = databaseConnector.DbCommand("select case when exists((select * from information_schema.tables where table_name = '" + tableName + "' and table_schema='"+ database_name + "')) then 1 else 0 end");
var cmdResult = Convert.ToInt16(cmd.ExecuteScalar());
exists = (cmdResult == 1);
}