From ba2de258f420245d07c4d194f8f8a71abe299aff Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Tue, 25 Mar 2008 14:27:39 +0000
Subject: * Refactored out circular reference in Region.Environment <->
 Framework.Data.Base

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

---
 .../Framework/Data.MySQL/MySQLDatabaseMapper.cs    | 52 ----------------------
 .../Data.MySQLMapper/MySQLDatabaseMapper.cs        | 51 +++++++++++++++++++++
 OpenSim/Framework/Data/OpenSimDatabaseConnector.cs | 20 ---------
 3 files changed, 51 insertions(+), 72 deletions(-)
 delete mode 100644 OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs
 create mode 100644 OpenSim/Framework/Data.MySQLMapper/MySQLDatabaseMapper.cs

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs b/OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs
deleted file mode 100644
index 8f65d70..0000000
--- a/OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System.Data.Common;
-using MySql.Data.MySqlClient;
- 
-namespace OpenSim.Framework.Data.MySQL
-{
-    /*
-    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;
-        }
-    }*/
-}
diff --git a/OpenSim/Framework/Data.MySQLMapper/MySQLDatabaseMapper.cs b/OpenSim/Framework/Data.MySQLMapper/MySQLDatabaseMapper.cs
new file mode 100644
index 0000000..da3b6a5
--- /dev/null
+++ b/OpenSim/Framework/Data.MySQLMapper/MySQLDatabaseMapper.cs
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System.Data.Common;
+using MySql.Data.MySqlClient;
+
+namespace OpenSim.Framework.Data.MySQLMapper
+{
+    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;
+        }
+    }
+}
\ 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;
-        }
-    }
 }
-- 
cgit v1.1