* Refactored out circular reference in Region.Environment <-> Framework.Data.Base

We REALLY need to get the db layer sorted soon...

2 files changed, 4 insertions, 25 deletions

diff --git a/OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs b/OpenSim/Framework/Data.MySQLMapper/MySQLDatabaseMapper.cs
index 8f65d70..da3b6a5 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs
+++ b/OpenSim/Framework/Data.MySQLMapper/MySQLDatabaseMapper.cs
@@ -27,10 +27,9 @@
 
 using System.Data.Common;
 using MySql.Data.MySqlClient;
- 
-namespace OpenSim.Framework.Data.MySQL
+
+namespace OpenSim.Framework.Data.MySQLMapper
 {
-    /*
     public class MySQLDatabaseMapper : OpenSimDatabaseConnector
     {
         public MySQLDatabaseMapper(string connectionString)
@@ -48,5 +47,5 @@ namespace OpenSim.Framework.Data.MySQL
         {
             return "?" + fieldName;
         }
-    }*/
-}
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Framework/Data/OpenSimDatabaseConnector.cs b/OpenSim/Framework/Data/OpenSimDatabaseConnector.cs
index 2bfd6f1..809fd1e 100644
--- a/OpenSim/Framework/Data/OpenSimDatabaseConnector.cs
+++ b/OpenSim/Framework/Data/OpenSimDatabaseConnector.cs
@@ -28,7 +28,6 @@
 using System.Data;
 using System.Data.Common;
 using libsecondlife;
-using MySql.Data.MySqlClient;
 
 using OpenSim.Framework.Data.Base;
 
@@ -55,23 +54,4 @@ namespace OpenSim.Framework.Data
             return new OpenSimDataReader(reader);
         }
     }
-
-    public class MySQLDatabaseMapper : OpenSimDatabaseConnector
-    {
-        public MySQLDatabaseMapper(string connectionString)
-            : base(connectionString)
-        {
-        }
-
-        public override DbConnection GetNewConnection()
-        {
-            MySqlConnection connection = new MySqlConnection(m_connectionString);
-            return connection;
-        }
-
-        public override string CreateParamName(string fieldName)
-        {
-            return "?" + fieldName;
-        }
-    }
 }