From 1c6cce4ceab56714ea09d8cb5d8e19a10cec7e04 Mon Sep 17 00:00:00 2001 From: Michael Dickson Date: Sun, 2 Jul 2023 22:27:37 -0400 Subject: [PATCH] Migrate from the Oracle Mysql connector to the more performance Pomello MySqlConnector dll. --- .gitattributes | 4 ++ .../OfflineIM/OpenSim.Addons.OfflineIM.csproj | 1 - .../Data/MySQL/MySQLAgentPreferencesData.cs | 1 - OpenSim/Data/MySQL/MySQLAssetData.cs | 3 +- OpenSim/Data/MySQL/MySQLAuthenticationData.cs | 2 +- OpenSim/Data/MySQL/MySQLAvatarData.cs | 2 +- OpenSim/Data/MySQL/MySQLEstateData.cs | 4 +- OpenSim/Data/MySQL/MySQLFSAssetData.cs | 3 +- OpenSim/Data/MySQL/MySQLFramework.cs | 7 +--- OpenSim/Data/MySQL/MySQLFriendsData.cs | 6 +-- .../Data/MySQL/MySQLGenericTableHandler.cs | 2 +- OpenSim/Data/MySQL/MySQLGridUserData.cs | 8 ---- OpenSim/Data/MySQL/MySQLGroupsData.cs | 7 +--- OpenSim/Data/MySQL/MySQLHGTravelData.cs | 8 +--- OpenSim/Data/MySQL/MySQLInventoryData.cs | 2 +- OpenSim/Data/MySQL/MySQLMigrations.cs | 39 ++++++++++++------- OpenSim/Data/MySQL/MySQLMuteListData.cs | 2 +- OpenSim/Data/MySQL/MySQLOfflineIMData.cs | 10 +---- OpenSim/Data/MySQL/MySQLPresenceData.cs | 8 +--- OpenSim/Data/MySQL/MySQLRegionData.cs | 4 +- OpenSim/Data/MySQL/MySQLSimulationData.cs | 2 +- OpenSim/Data/MySQL/MySQLUserAccountData.cs | 6 +-- OpenSim/Data/MySQL/MySQLUserAliasData.cs | 4 +- OpenSim/Data/MySQL/MySQLUserProfilesData.cs | 3 +- OpenSim/Data/MySQL/MySQLXAssetData.cs | 4 +- OpenSim/Data/MySQL/MySQLXInventoryData.cs | 2 +- OpenSim/Data/MySQL/OpenSim.Data.MySQL.csproj | 2 +- OpenSim/Data/OpenSim.Data.csproj | 1 + OpenSim/Data/Tests/AssetTests.cs | 6 +-- OpenSim/Data/Tests/EstateTests.cs | 8 +--- OpenSim/Data/Tests/InventoryTests.cs | 9 +---- OpenSim/Data/Tests/OpenSim.Data.Tests.csproj | 2 +- OpenSim/Data/Tests/RegionTests.cs | 5 +-- OpenSim/Framework/VersionInfo.cs | 2 +- .../OpenSim.Region.CoreModules.Tests.csproj | 2 + .../OpenSim.Region.CoreModules.csproj | 2 +- .../Gloebit/GloebitMoneyModule/Gloebit.csproj | 2 +- .../GloebitSubscriptionData.cs | 4 +- .../GloebitTransactionData.cs | 5 +-- .../GloebitMoneyModule/GloebitUserData.cs | 2 + .../MySQLMoneyManager.cs | 3 +- .../OpenSim.Data.MySQL.MoneyData.csproj | 2 +- .../MoneyDBService.cs | 32 +++++++-------- 43 files changed, 83 insertions(+), 150 deletions(-) diff --git a/.gitattributes b/.gitattributes index 70bb56362c..2b853a4865 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,7 @@ +# Set the default behavior, in case people don't have core.autocrlf set. +* text=auto + +# Denote all files that are truly binary and should not be modified. *.lsl binary *.dat binary *.bmp binary diff --git a/OpenSim/Addons/OfflineIM/OpenSim.Addons.OfflineIM.csproj b/OpenSim/Addons/OfflineIM/OpenSim.Addons.OfflineIM.csproj index ef71558442..1bb689306e 100644 --- a/OpenSim/Addons/OfflineIM/OpenSim.Addons.OfflineIM.csproj +++ b/OpenSim/Addons/OfflineIM/OpenSim.Addons.OfflineIM.csproj @@ -9,7 +9,6 @@ - diff --git a/OpenSim/Data/MySQL/MySQLAgentPreferencesData.cs b/OpenSim/Data/MySQL/MySQLAgentPreferencesData.cs index 17f13749e8..db5652f79d 100644 --- a/OpenSim/Data/MySQL/MySQLAgentPreferencesData.cs +++ b/OpenSim/Data/MySQL/MySQLAgentPreferencesData.cs @@ -31,7 +31,6 @@ using System.Collections.Generic; using System.Data; using OpenMetaverse; using OpenSim.Framework; -using MySql.Data.MySqlClient; namespace OpenSim.Data.MySQL { diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs index 8569c903a6..091b4b415a 100644 --- a/OpenSim/Data/MySQL/MySQLAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLAssetData.cs @@ -30,10 +30,9 @@ using System.Data; using System.Reflection; using System.Collections.Generic; using log4net; -using MySql.Data.MySqlClient; using OpenMetaverse; using OpenSim.Framework; -using OpenSim.Data; +using MySqlConnector; namespace OpenSim.Data.MySQL { diff --git a/OpenSim/Data/MySQL/MySQLAuthenticationData.cs b/OpenSim/Data/MySQL/MySQLAuthenticationData.cs index fef582e809..25ceee9e88 100644 --- a/OpenSim/Data/MySQL/MySQLAuthenticationData.cs +++ b/OpenSim/Data/MySQL/MySQLAuthenticationData.cs @@ -32,7 +32,7 @@ using System.Reflection; using System.Data; using OpenMetaverse; using OpenSim.Framework; -using MySql.Data.MySqlClient; +using MySqlConnector; namespace OpenSim.Data.MySQL { diff --git a/OpenSim/Data/MySQL/MySQLAvatarData.cs b/OpenSim/Data/MySQL/MySQLAvatarData.cs index 63e80209b4..32461fcf04 100644 --- a/OpenSim/Data/MySQL/MySQLAvatarData.cs +++ b/OpenSim/Data/MySQL/MySQLAvatarData.cs @@ -31,9 +31,9 @@ using System.Data; using System.Reflection; using System.Threading; using log4net; +using MySqlConnector; using OpenMetaverse; using OpenSim.Framework; -using MySql.Data.MySqlClient; namespace OpenSim.Data.MySQL { diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs index 1cb21e7210..74c3d5744e 100644 --- a/OpenSim/Data/MySQL/MySQLEstateData.cs +++ b/OpenSim/Data/MySQL/MySQLEstateData.cs @@ -30,11 +30,9 @@ using System.Collections.Generic; using System.Data; using System.Reflection; using log4net; -using MySql.Data.MySqlClient; +using MySqlConnector; using OpenMetaverse; using OpenSim.Framework; -using OpenSim.Region.Framework.Interfaces; -using OpenSim.Data; namespace OpenSim.Data.MySQL { diff --git a/OpenSim/Data/MySQL/MySQLFSAssetData.cs b/OpenSim/Data/MySQL/MySQLFSAssetData.cs index 6c486077d3..22872175fd 100644 --- a/OpenSim/Data/MySQL/MySQLFSAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLFSAssetData.cs @@ -30,10 +30,9 @@ using System.Reflection; using System.Collections.Generic; using System.Data; using OpenSim.Framework; -using OpenSim.Framework.Console; using log4net; -using MySql.Data.MySqlClient; using OpenMetaverse; +using MySqlConnector; namespace OpenSim.Data.MySQL { diff --git a/OpenSim/Data/MySQL/MySQLFramework.cs b/OpenSim/Data/MySQL/MySQLFramework.cs index 98106f0057..4cdbe2a532 100644 --- a/OpenSim/Data/MySQL/MySQLFramework.cs +++ b/OpenSim/Data/MySQL/MySQLFramework.cs @@ -25,13 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +using MySqlConnector; using System; -using System.Collections; -using System.Collections.Generic; -using System.Data; -using OpenMetaverse; -using OpenSim.Framework; -using MySql.Data.MySqlClient; namespace OpenSim.Data.MySQL { diff --git a/OpenSim/Data/MySQL/MySQLFriendsData.cs b/OpenSim/Data/MySQL/MySQLFriendsData.cs index 6ba9fbd33b..71633b91a5 100644 --- a/OpenSim/Data/MySQL/MySQLFriendsData.cs +++ b/OpenSim/Data/MySQL/MySQLFriendsData.cs @@ -26,12 +26,8 @@ */ using System; -using System.Collections; -using System.Collections.Generic; -using System.Data; +using MySqlConnector; using OpenMetaverse; -using OpenSim.Framework; -using MySql.Data.MySqlClient; namespace OpenSim.Data.MySQL { diff --git a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs index ce228b59a6..29b1b6aea3 100644 --- a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs +++ b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs @@ -30,7 +30,7 @@ using System.Collections.Generic; using System.Data; using System.Reflection; using System.Text; -using MySql.Data.MySqlClient; +using MySqlConnector; using OpenMetaverse; namespace OpenSim.Data.MySQL diff --git a/OpenSim/Data/MySQL/MySQLGridUserData.cs b/OpenSim/Data/MySQL/MySQLGridUserData.cs index 00560c11db..aeb480a72c 100644 --- a/OpenSim/Data/MySQL/MySQLGridUserData.cs +++ b/OpenSim/Data/MySQL/MySQLGridUserData.cs @@ -26,14 +26,6 @@ */ using System; -using System.Collections.Generic; -using System.Data; -using System.Reflection; -using System.Threading; -using log4net; -using OpenMetaverse; -using OpenSim.Framework; -using MySql.Data.MySqlClient; namespace OpenSim.Data.MySQL { diff --git a/OpenSim/Data/MySQL/MySQLGroupsData.cs b/OpenSim/Data/MySQL/MySQLGroupsData.cs index 77cb2f4db4..8965045e39 100644 --- a/OpenSim/Data/MySQL/MySQLGroupsData.cs +++ b/OpenSim/Data/MySQL/MySQLGroupsData.cs @@ -26,15 +26,10 @@ */ using System; -using System.Collections; -using System.Collections.Generic; using System.Reflection; - using OpenSim.Framework; -using OpenSim.Data.MySQL; - using OpenMetaverse; -using MySql.Data.MySqlClient; +using MySqlConnector; namespace OpenSim.Data.MySQL { diff --git a/OpenSim/Data/MySQL/MySQLHGTravelData.cs b/OpenSim/Data/MySQL/MySQLHGTravelData.cs index e81b880c95..d51f835611 100644 --- a/OpenSim/Data/MySQL/MySQLHGTravelData.cs +++ b/OpenSim/Data/MySQL/MySQLHGTravelData.cs @@ -26,14 +26,8 @@ */ using System; -using System.Collections.Generic; -using System.Data; -using System.Reflection; -using System.Threading; -using log4net; +using MySqlConnector; using OpenMetaverse; -using OpenSim.Framework; -using MySql.Data.MySqlClient; namespace OpenSim.Data.MySQL { diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs index c0895f5835..963fda91ac 100644 --- a/OpenSim/Data/MySQL/MySQLInventoryData.cs +++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs @@ -29,10 +29,10 @@ using System; using System.Collections.Generic; using System.Reflection; using log4net; -using MySql.Data.MySqlClient; using OpenMetaverse; using OpenSim.Framework; using OpenSim.Data; +using MySqlConnector; namespace OpenSim.Data.MySQL { diff --git a/OpenSim/Data/MySQL/MySQLMigrations.cs b/OpenSim/Data/MySQL/MySQLMigrations.cs index 2043dae052..917f42216b 100644 --- a/OpenSim/Data/MySQL/MySQLMigrations.cs +++ b/OpenSim/Data/MySQL/MySQLMigrations.cs @@ -25,15 +25,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +using MySqlConnector; using System; -using System.Collections.Generic; -using System.Data; using System.Data.Common; -using System.IO; using System.Reflection; -using System.Text.RegularExpressions; -using log4net; -using MySql.Data.MySqlClient; namespace OpenSim.Data.MySQL { @@ -65,19 +60,35 @@ namespace OpenSim.Data.MySQL base.ExecuteScript(conn, script); return; } - - MySqlScript scr = new MySqlScript((MySqlConnection)conn); + foreach (string sql in script) { - foreach (string sql in script) + try { - scr.Query = sql; - scr.Error += delegate(object sender, MySqlScriptErrorEventArgs args) + using (MySqlCommand cmd = new MySqlCommand(sql, (MySqlConnection)conn)) { - throw new Exception(sql); - }; - scr.Execute(); + cmd.ExecuteNonQuery(); + } + } + catch (Exception) + { + throw new Exception(sql); + } } + + // XXX Was + //MySqlScript scr = new MySqlScript((MySqlConnection)conn); + //{ + // foreach (string sql in script) + // { + // scr.Query = sql; + // scr.Error += delegate(object sender, MySqlScriptErrorEventArgs args) + // { + // throw new Exception(sql); + // }; + // scr.Execute(); + // } + //} } } } diff --git a/OpenSim/Data/MySQL/MySQLMuteListData.cs b/OpenSim/Data/MySQL/MySQLMuteListData.cs index a5935a32fa..c12df4f7fb 100644 --- a/OpenSim/Data/MySQL/MySQLMuteListData.cs +++ b/OpenSim/Data/MySQL/MySQLMuteListData.cs @@ -29,9 +29,9 @@ using System; using System.Collections; using System.Collections.Generic; using System.Data; +using MySqlConnector; using OpenMetaverse; using OpenSim.Framework; -using MySql.Data.MySqlClient; namespace OpenSim.Data.MySQL { diff --git a/OpenSim/Data/MySQL/MySQLOfflineIMData.cs b/OpenSim/Data/MySQL/MySQLOfflineIMData.cs index 7608858d2c..8894747771 100644 --- a/OpenSim/Data/MySQL/MySQLOfflineIMData.cs +++ b/OpenSim/Data/MySQL/MySQLOfflineIMData.cs @@ -25,16 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +using MySqlConnector; using System; -using System.Collections; -using System.Collections.Generic; -using System.Reflection; - -using OpenSim.Framework; -using OpenSim.Data.MySQL; - -using OpenMetaverse; -using MySql.Data.MySqlClient; namespace OpenSim.Data.MySQL { diff --git a/OpenSim/Data/MySQL/MySQLPresenceData.cs b/OpenSim/Data/MySQL/MySQLPresenceData.cs index cd11fb31e1..758aea4ed2 100644 --- a/OpenSim/Data/MySQL/MySQLPresenceData.cs +++ b/OpenSim/Data/MySQL/MySQLPresenceData.cs @@ -26,14 +26,8 @@ */ using System; -using System.Collections.Generic; -using System.Data; -using System.Reflection; -using System.Threading; -using log4net; +using MySqlConnector; using OpenMetaverse; -using OpenSim.Framework; -using MySql.Data.MySqlClient; namespace OpenSim.Data.MySQL { diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs index d10fba4173..45b1dce25b 100644 --- a/OpenSim/Data/MySQL/MySQLRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLRegionData.cs @@ -26,14 +26,12 @@ */ using System; -using System.Collections; using System.Collections.Generic; using System.Data; using System.Reflection; -using MySql.Data.MySqlClient; +using MySqlConnector; using OpenMetaverse; using OpenSim.Framework; -using OpenSim.Data; using RegionFlags = OpenSim.Framework.RegionFlags; namespace OpenSim.Data.MySQL diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs index b594a37148..54e846d226 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs @@ -32,7 +32,7 @@ using System.Drawing; using System.Reflection; using System.Text; using log4net; -using MySql.Data.MySqlClient; +using MySqlConnector; using OpenMetaverse; using OpenSim.Framework; using OpenSim.Region.Framework.Interfaces; diff --git a/OpenSim/Data/MySQL/MySQLUserAccountData.cs b/OpenSim/Data/MySQL/MySQLUserAccountData.cs index d5581317ad..734f50a735 100644 --- a/OpenSim/Data/MySQL/MySQLUserAccountData.cs +++ b/OpenSim/Data/MySQL/MySQLUserAccountData.cs @@ -26,12 +26,8 @@ */ using System; -using System.Collections; -using System.Collections.Generic; -using System.Data; +using MySqlConnector; using OpenMetaverse; -using OpenSim.Framework; -using MySql.Data.MySqlClient; namespace OpenSim.Data.MySQL { diff --git a/OpenSim/Data/MySQL/MySQLUserAliasData.cs b/OpenSim/Data/MySQL/MySQLUserAliasData.cs index b0255ee1e3..b3b1ba0c40 100644 --- a/OpenSim/Data/MySQL/MySQLUserAliasData.cs +++ b/OpenSim/Data/MySQL/MySQLUserAliasData.cs @@ -26,13 +26,11 @@ */ using System; +using System.Collections.Generic; using OpenMetaverse; using OpenSim.Framework; using OpenSim.Data; -using MySql.Data.MySqlClient; -using System.Collections.Generic; - namespace OpenSim.Data.MySQL { /// diff --git a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs index c545c7e008..3cbe5f4d4a 100644 --- a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs +++ b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs @@ -28,12 +28,11 @@ using System; using System.Data; using System.Reflection; -using OpenSim.Data; using OpenSim.Framework; -using MySql.Data.MySqlClient; using OpenMetaverse; using OpenMetaverse.StructuredData; using log4net; +using MySqlConnector; namespace OpenSim.Data.MySQL { diff --git a/OpenSim/Data/MySQL/MySQLXAssetData.cs b/OpenSim/Data/MySQL/MySQLXAssetData.cs index 0b69ca4f17..a90c2ab308 100644 --- a/OpenSim/Data/MySQL/MySQLXAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLXAssetData.cs @@ -32,12 +32,10 @@ using System.IO; using System.IO.Compression; using System.Reflection; using System.Security.Cryptography; -using System.Text; using log4net; -using MySql.Data.MySqlClient; +using MySqlConnector; using OpenMetaverse; using OpenSim.Framework; -using OpenSim.Data; namespace OpenSim.Data.MySQL { diff --git a/OpenSim/Data/MySQL/MySQLXInventoryData.cs b/OpenSim/Data/MySQL/MySQLXInventoryData.cs index 34106e663d..31879e819f 100644 --- a/OpenSim/Data/MySQL/MySQLXInventoryData.cs +++ b/OpenSim/Data/MySQL/MySQLXInventoryData.cs @@ -31,9 +31,9 @@ using System.Data; using System.Text; using System.Reflection; using log4net; -using MySql.Data.MySqlClient; using OpenMetaverse; using OpenSim.Framework; +using MySqlConnector; namespace OpenSim.Data.MySQL { diff --git a/OpenSim/Data/MySQL/OpenSim.Data.MySQL.csproj b/OpenSim/Data/MySQL/OpenSim.Data.MySQL.csproj index 462bb4d945..6c298076d0 100644 --- a/OpenSim/Data/MySQL/OpenSim.Data.MySQL.csproj +++ b/OpenSim/Data/MySQL/OpenSim.Data.MySQL.csproj @@ -52,7 +52,7 @@ - + diff --git a/OpenSim/Data/OpenSim.Data.csproj b/OpenSim/Data/OpenSim.Data.csproj index 8502f42123..9bc07d0f0c 100644 --- a/OpenSim/Data/OpenSim.Data.csproj +++ b/OpenSim/Data/OpenSim.Data.csproj @@ -130,6 +130,7 @@ + \ No newline at end of file diff --git a/OpenSim/Data/Tests/AssetTests.cs b/OpenSim/Data/Tests/AssetTests.cs index cb8df20e5a..cf1ef6ecff 100644 --- a/OpenSim/Data/Tests/AssetTests.cs +++ b/OpenSim/Data/Tests/AssetTests.cs @@ -25,23 +25,19 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; using System.Collections.Generic; -using log4net.Config; using NUnit.Framework; -using NUnit.Framework.Constraints; using OpenMetaverse; using OpenSim.Framework; using OpenSim.Tests.Common; using System.Data.Common; -using log4net; // DBMS-specific: -using MySql.Data.MySqlClient; using OpenSim.Data.MySQL; using System.Data.SQLite; using OpenSim.Data.SQLite; +using MySqlConnector; namespace OpenSim.Data.Tests { diff --git a/OpenSim/Data/Tests/EstateTests.cs b/OpenSim/Data/Tests/EstateTests.cs index 8e89dd5888..4bfdc64f1d 100644 --- a/OpenSim/Data/Tests/EstateTests.cs +++ b/OpenSim/Data/Tests/EstateTests.cs @@ -25,24 +25,18 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; -using log4net.Config; using NUnit.Framework; using OpenMetaverse; using OpenSim.Framework; -using OpenSim.Region.Framework.Interfaces; using OpenSim.Tests.Common; -using System.Text; -using log4net; -using System.Reflection; using System.Data.Common; // DBMS-specific: -using MySql.Data.MySqlClient; using OpenSim.Data.MySQL; using System.Data.SQLite; using OpenSim.Data.SQLite; +using MySqlConnector; namespace OpenSim.Data.Tests { diff --git a/OpenSim/Data/Tests/InventoryTests.cs b/OpenSim/Data/Tests/InventoryTests.cs index efe8920e05..dc99bf1a5a 100644 --- a/OpenSim/Data/Tests/InventoryTests.cs +++ b/OpenSim/Data/Tests/InventoryTests.cs @@ -25,22 +25,15 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; -using log4net.Config; using NUnit.Framework; using OpenMetaverse; using OpenSim.Framework; using OpenSim.Tests.Common; -using log4net; -using System.Reflection; using System.Data.Common; // DBMS-specific: -using MySql.Data.MySqlClient; using OpenSim.Data.MySQL; - -using System.Data.SQLite; -using OpenSim.Data.SQLite; +using MySqlConnector; namespace OpenSim.Data.Tests { diff --git a/OpenSim/Data/Tests/OpenSim.Data.Tests.csproj b/OpenSim/Data/Tests/OpenSim.Data.Tests.csproj index f892a1c999..c4c9e1110b 100644 --- a/OpenSim/Data/Tests/OpenSim.Data.Tests.csproj +++ b/OpenSim/Data/Tests/OpenSim.Data.Tests.csproj @@ -31,10 +31,10 @@ + - diff --git a/OpenSim/Data/Tests/RegionTests.cs b/OpenSim/Data/Tests/RegionTests.cs index afa5063fd5..75d644aa0a 100644 --- a/OpenSim/Data/Tests/RegionTests.cs +++ b/OpenSim/Data/Tests/RegionTests.cs @@ -29,24 +29,21 @@ using System; using System.Collections.Generic; using System.Drawing; using System.Text; -using log4net.Config; using NUnit.Framework; using OpenMetaverse; using OpenSim.Framework; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; using OpenSim.Tests.Common; -using log4net; -using System.Reflection; using System.Data.Common; using System.Threading; // DBMS-specific: -using MySql.Data.MySqlClient; using OpenSim.Data.MySQL; using System.Data.SQLite; using OpenSim.Data.SQLite; +using MySqlConnector; namespace OpenSim.Data.Tests { diff --git a/OpenSim/Framework/VersionInfo.cs b/OpenSim/Framework/VersionInfo.cs index d5a201ad6f..03dc412fd3 100644 --- a/OpenSim/Framework/VersionInfo.cs +++ b/OpenSim/Framework/VersionInfo.cs @@ -33,7 +33,7 @@ namespace OpenSim { public const string VersionNumber = "0.9.2.2"; public const string AssemblyVersionNumber = "0.9.2.2"; - public const string Release = "8510"; + public const string Release = "8584"; public const Flavour VERSION_FLAVOUR = Flavour.Dev; diff --git a/OpenSim/Region/CoreModules/OpenSim.Region.CoreModules.Tests.csproj b/OpenSim/Region/CoreModules/OpenSim.Region.CoreModules.Tests.csproj index aec7fe662e..6da238e98b 100644 --- a/OpenSim/Region/CoreModules/OpenSim.Region.CoreModules.Tests.csproj +++ b/OpenSim/Region/CoreModules/OpenSim.Region.CoreModules.Tests.csproj @@ -272,6 +272,8 @@ + + diff --git a/OpenSim/Region/CoreModules/OpenSim.Region.CoreModules.csproj b/OpenSim/Region/CoreModules/OpenSim.Region.CoreModules.csproj index 927255cf21..95eda71a89 100644 --- a/OpenSim/Region/CoreModules/OpenSim.Region.CoreModules.csproj +++ b/OpenSim/Region/CoreModules/OpenSim.Region.CoreModules.csproj @@ -106,7 +106,7 @@ - + diff --git a/addon-modules/Gloebit/GloebitMoneyModule/Gloebit.csproj b/addon-modules/Gloebit/GloebitMoneyModule/Gloebit.csproj index eaf112fb6d..3f1b5c5c7a 100644 --- a/addon-modules/Gloebit/GloebitMoneyModule/Gloebit.csproj +++ b/addon-modules/Gloebit/GloebitMoneyModule/Gloebit.csproj @@ -64,6 +64,6 @@ - + \ No newline at end of file diff --git a/addon-modules/Gloebit/GloebitMoneyModule/GloebitSubscriptionData.cs b/addon-modules/Gloebit/GloebitMoneyModule/GloebitSubscriptionData.cs index d8df071a86..9635303906 100644 --- a/addon-modules/Gloebit/GloebitMoneyModule/GloebitSubscriptionData.cs +++ b/addon-modules/Gloebit/GloebitMoneyModule/GloebitSubscriptionData.cs @@ -21,15 +21,13 @@ using System.Collections.Generic; using System.Data; using System.Reflection; using System.Text; -using MySql.Data.MySqlClient; -using Nini.Config; using OpenSim.Data.MySQL; using OpenSim.Data.PGSQL; using OpenSim.Data.SQLite; using Npgsql; using NpgsqlTypes; using OpenMetaverse; // Necessary for UUID type - +using MySqlConnector; namespace Gloebit.GloebitMoneyModule { diff --git a/addon-modules/Gloebit/GloebitMoneyModule/GloebitTransactionData.cs b/addon-modules/Gloebit/GloebitMoneyModule/GloebitTransactionData.cs index 91cbe0546a..f49aa237f9 100644 --- a/addon-modules/Gloebit/GloebitMoneyModule/GloebitTransactionData.cs +++ b/addon-modules/Gloebit/GloebitMoneyModule/GloebitTransactionData.cs @@ -18,13 +18,10 @@ using System; using System.Collections.Generic; -using System.Data; using System.Data.SqlTypes; using System.Reflection; -using System.Xml; using log4net; -using MySql.Data.MySqlClient; -using Nini.Config; +using MySqlConnector; using OpenSim.Data.MySQL; using OpenSim.Data.PGSQL; using OpenSim.Data.SQLite; diff --git a/addon-modules/Gloebit/GloebitMoneyModule/GloebitUserData.cs b/addon-modules/Gloebit/GloebitMoneyModule/GloebitUserData.cs index 5bedffe55f..9e40b0e864 100644 --- a/addon-modules/Gloebit/GloebitMoneyModule/GloebitUserData.cs +++ b/addon-modules/Gloebit/GloebitMoneyModule/GloebitUserData.cs @@ -18,6 +18,8 @@ using System; using Nini.Config; +using MySqlConnector; + using OpenSim.Data.MySQL; using OpenSim.Data.PGSQL; using OpenSim.Data.SQLite; diff --git a/addon-modules/OpenSim.Data.MySQL.MoneyData/OpenSim.Data.MySQL.MoneyData/MySQLMoneyManager.cs b/addon-modules/OpenSim.Data.MySQL.MoneyData/OpenSim.Data.MySQL.MoneyData/MySQLMoneyManager.cs index f3d89a8e85..f166b755fe 100644 --- a/addon-modules/OpenSim.Data.MySQL.MoneyData/OpenSim.Data.MySQL.MoneyData/MySQLMoneyManager.cs +++ b/addon-modules/OpenSim.Data.MySQL.MoneyData/OpenSim.Data.MySQL.MoneyData/MySQLMoneyManager.cs @@ -31,9 +31,8 @@ using System.Reflection; using System.Collections.Generic; using System.Text.RegularExpressions; using log4net; -using MySql.Data.MySqlClient; using OpenMetaverse; - +using MySqlConnector; namespace OpenSim.Data.MySQL.MoneyData { diff --git a/addon-modules/OpenSim.Data.MySQL.MoneyData/OpenSim.Data.MySQL.MoneyData/OpenSim.Data.MySQL.MoneyData.csproj b/addon-modules/OpenSim.Data.MySQL.MoneyData/OpenSim.Data.MySQL.MoneyData/OpenSim.Data.MySQL.MoneyData.csproj index fa11883e83..2285e1edf4 100644 --- a/addon-modules/OpenSim.Data.MySQL.MoneyData/OpenSim.Data.MySQL.MoneyData/OpenSim.Data.MySQL.MoneyData.csproj +++ b/addon-modules/OpenSim.Data.MySQL.MoneyData/OpenSim.Data.MySQL.MoneyData/OpenSim.Data.MySQL.MoneyData.csproj @@ -9,7 +9,7 @@ - + diff --git a/addon-modules/OpenSim.Server.MoneyServer/OpenSim.Server.MoneyServer/MoneyDBService.cs b/addon-modules/OpenSim.Server.MoneyServer/OpenSim.Server.MoneyServer/MoneyDBService.cs index 0f281dc797..aa7c2b2399 100644 --- a/addon-modules/OpenSim.Server.MoneyServer/OpenSim.Server.MoneyServer/MoneyDBService.cs +++ b/addon-modules/OpenSim.Server.MoneyServer/OpenSim.Server.MoneyServer/MoneyDBService.cs @@ -33,7 +33,7 @@ using OpenSim.Region.OptionalModules.Currency; using log4net; using System.Reflection; using OpenMetaverse; - +using MySqlConnector; namespace OpenSim.Server.MoneyServer { @@ -135,7 +135,7 @@ namespace OpenSim.Server.MoneyServer return dbm.Manager.getBalance(userID); } #pragma warning disable CS0168 // Variable ist deklariert, wird jedoch niemals verwendet - catch (MySql.Data.MySqlClient.MySqlException e) + catch (MySqlException e) { #pragma warning restore CS0168 // Variable ist deklariert, wird jedoch niemals verwendet dbm.Manager.Reconnect(); @@ -162,7 +162,7 @@ namespace OpenSim.Server.MoneyServer return dbm.Manager.withdrawMoney(transactionID, senderID, amount); } #pragma warning disable CS0168 // Variable ist deklariert, wird jedoch niemals verwendet - catch (MySql.Data.MySqlClient.MySqlException e) + catch (MySqlException e) { #pragma warning restore CS0168 // Variable ist deklariert, wird jedoch niemals verwendet dbm.Manager.Reconnect(); @@ -189,7 +189,7 @@ namespace OpenSim.Server.MoneyServer return dbm.Manager.giveMoney(transactionID, receiverID, amount); } #pragma warning disable CS0168 // Variable ist deklariert, wird jedoch niemals verwendet - catch (MySql.Data.MySqlClient.MySqlException e) + catch (MySqlException e) { #pragma warning restore CS0168 // Variable ist deklariert, wird jedoch niemals verwendet dbm.Manager.Reconnect(); @@ -219,10 +219,8 @@ namespace OpenSim.Server.MoneyServer { return dbm.Manager.setTotalSale(transaction.Receiver, transaction.ObjectUUID, transaction.Type, 1, transaction.Amount, time); } -#pragma warning disable CS0168 // Variable ist deklariert, wird jedoch niemals verwendet - catch (MySql.Data.MySqlClient.MySqlException e) + catch (MySqlException) { -#pragma warning restore CS0168 // Variable ist deklariert, wird jedoch niemals verwendet dbm.Manager.Reconnect(); return dbm.Manager.setTotalSale(transaction.Receiver, transaction.ObjectUUID, transaction.Type, 1, transaction.Amount, time); } @@ -247,7 +245,7 @@ namespace OpenSim.Server.MoneyServer return dbm.Manager.addTransaction(transaction); } #pragma warning disable CS0168 // Variable ist deklariert, wird jedoch niemals verwendet - catch (MySql.Data.MySqlClient.MySqlException e) + catch (MySqlException e) { #pragma warning restore CS0168 // Variable ist deklariert, wird jedoch niemals verwendet dbm.Manager.Reconnect(); @@ -293,7 +291,7 @@ namespace OpenSim.Server.MoneyServer ret = dbm.Manager.addUser(userID, 0, status, type); // make Balance Table } #pragma warning disable CS0168 // Variable ist deklariert, wird jedoch niemals verwendet - catch (MySql.Data.MySqlClient.MySqlException e) + catch (MySqlException e) { #pragma warning restore CS0168 // Variable ist deklariert, wird jedoch niemals verwendet dbm.Manager.Reconnect(); @@ -324,7 +322,7 @@ namespace OpenSim.Server.MoneyServer return dbm.Manager.updateTransactionStatus(transactionID, status, description); } #pragma warning disable CS0168 // Variable ist deklariert, wird jedoch niemals verwendet - catch (MySql.Data.MySqlClient.MySqlException e) + catch (MySqlException e) { #pragma warning restore CS0168 // Variable ist deklariert, wird jedoch niemals verwendet dbm.Manager.Reconnect(); @@ -351,7 +349,7 @@ namespace OpenSim.Server.MoneyServer return dbm.Manager.SetTransExpired(deadTime); } #pragma warning disable CS0168 // Variable ist deklariert, wird jedoch niemals verwendet - catch (MySql.Data.MySqlClient.MySqlException e) + catch (MySqlException e) { #pragma warning restore CS0168 // Variable ist deklariert, wird jedoch niemals verwendet dbm.Manager.Reconnect(); @@ -378,7 +376,7 @@ namespace OpenSim.Server.MoneyServer return dbm.Manager.ValidateTransfer(secureCode, transactionID); } #pragma warning disable CS0168 // Variable ist deklariert, wird jedoch niemals verwendet - catch (MySql.Data.MySqlClient.MySqlException e) + catch (MySqlException e) { #pragma warning restore CS0168 // Variable ist deklariert, wird jedoch niemals verwendet dbm.Manager.Reconnect(); @@ -405,7 +403,7 @@ namespace OpenSim.Server.MoneyServer return dbm.Manager.FetchTransaction(transactionID); } #pragma warning disable CS0168 // Variable ist deklariert, wird jedoch niemals verwendet - catch (MySql.Data.MySqlClient.MySqlException e) + catch (MySqlException e) { #pragma warning restore CS0168 // Variable ist deklariert, wird jedoch niemals verwendet dbm.Manager.Reconnect(); @@ -436,7 +434,7 @@ namespace OpenSim.Server.MoneyServer arrTransaction = dbm.Manager.FetchTransaction(userID, startTime, endTime, index, 1); } #pragma warning disable CS0168 // Variable ist deklariert, wird jedoch niemals verwendet - catch (MySql.Data.MySqlClient.MySqlException e) + catch (MySqlException e) { #pragma warning restore CS0168 // Variable ist deklariert, wird jedoch niemals verwendet dbm.Manager.Reconnect(); @@ -585,7 +583,7 @@ namespace OpenSim.Server.MoneyServer userInfo = dbm.Manager.fetchUserInfo(user.UserID); } #pragma warning disable CS0168 // Variable ist deklariert, wird jedoch niemals verwendet - catch (MySql.Data.MySqlClient.MySqlException e) + catch (MySqlException e) { #pragma warning restore CS0168 // Variable ist deklariert, wird jedoch niemals verwendet dbm.Manager.Reconnect(); @@ -636,7 +634,7 @@ namespace OpenSim.Server.MoneyServer return userInfo; } #pragma warning disable CS0168 // Variable ist deklariert, wird jedoch niemals verwendet - catch (MySql.Data.MySqlClient.MySqlException e) + catch (MySqlException e) { #pragma warning restore CS0168 // Variable ist deklariert, wird jedoch niemals verwendet dbm.Manager.Reconnect(); @@ -664,7 +662,7 @@ namespace OpenSim.Server.MoneyServer return dbm.Manager.getTransactionNum(userID, startTime, endTime); } #pragma warning disable CS0168 // Variable ist deklariert, wird jedoch niemals verwendet - catch (MySql.Data.MySqlClient.MySqlException e) + catch (MySqlException e) { #pragma warning restore CS0168 // Variable ist deklariert, wird jedoch niemals verwendet dbm.Manager.Reconnect();