From 667ebc8ea29ba93060eee2506f2875ab78ab6216 Mon Sep 17 00:00:00 2001
From: lbsa71 <lbsa71@hotmail.com>
Date: Wed, 2 Apr 2008 13:06:18 +0000
Subject: [PATCH] * Reworked Data Framework so that MSSQL works * Introduced
 uint as field type * Removed what should be superfluous Guid handling *
 Introduced stub MySQLDataReader if we need to fix the Guid handling anyway

---
 OpenSim/Framework/Data.Base/BaseDataReader.cs | 33 ++++++++++++-------
 .../Framework/Data.Base/BaseFieldMapper.cs    |  4 +++
 .../Data.MSSQLMapper/MSSQLDatabaseMapper.cs   | 13 ++++++++
 .../Data.MySQLMapper/MySQLDataReader.cs       | 15 +++++++++
 .../Data.MySQLMapper/MySQLDatabaseMapper.cs   |  7 ++++
 OpenSim/Framework/Data/OpenSimDataReader.cs   |  3 --
 6 files changed, 61 insertions(+), 14 deletions(-)
 create mode 100644 OpenSim/Framework/Data.MySQLMapper/MySQLDataReader.cs

diff --git a/OpenSim/Framework/Data.Base/BaseDataReader.cs b/OpenSim/Framework/Data.Base/BaseDataReader.cs
index cbaac55998..3baefcdf0c 100644
--- a/OpenSim/Framework/Data.Base/BaseDataReader.cs
+++ b/OpenSim/Framework/Data.Base/BaseDataReader.cs
@@ -31,7 +31,7 @@ using System.IO;
 
 namespace OpenSim.Framework.Data.Base
 {
-    public class BaseDataReader
+    public abstract class BaseDataReader
     {
         private readonly IDataReader m_source;
 
@@ -112,17 +112,28 @@ namespace OpenSim.Framework.Data.Base
             return m_source.Read();
         }
 
-        public Guid GetGuid(string name)
+        public virtual Guid GetGuid(string name)
         {
-            string guidString = GetString(name);
-            if (String.IsNullOrEmpty(guidString))
-            {
-                return Guid.Empty;
-            }
-            else
-            {
-                return new Guid(guidString);
-            }
+            return m_source.GetGuid(m_source.GetOrdinal(name));
+        }
+
+        public UInt32 GetUInt32(string name )
+        {
+            return (UInt32)GetInt32(name);
+        }
+
+        private Int32 GetInt32(string name)
+        {
+            int ordinal = m_source.GetOrdinal(name);
+            int int32 = m_source.GetInt32(ordinal);
+            return int32;            
+        }
+
+        public Int64 GetInt64(string  name)
+        {
+            int ordinal = m_source.GetOrdinal( name );
+            long int64 = m_source.GetInt64(ordinal);
+            return int64;
         }
     }
 }
diff --git a/OpenSim/Framework/Data.Base/BaseFieldMapper.cs b/OpenSim/Framework/Data.Base/BaseFieldMapper.cs
index ade9266c72..03c7bfbe82 100644
--- a/OpenSim/Framework/Data.Base/BaseFieldMapper.cs
+++ b/OpenSim/Framework/Data.Base/BaseFieldMapper.cs
@@ -108,6 +108,10 @@ namespace OpenSim.Framework.Data.Base
                 {
                     value = reader.GetUShort(m_fieldName);
                 }
+                else if (ValueType == typeof(uint))
+                {
+                    value = reader.GetUInt32(m_fieldName);
+                }
                 else if (ValueType == typeof(byte[]))
                 {
                     value = reader.GetBytes(m_fieldName);
diff --git a/OpenSim/Framework/Data.MSSQLMapper/MSSQLDatabaseMapper.cs b/OpenSim/Framework/Data.MSSQLMapper/MSSQLDatabaseMapper.cs
index c56b5a6741..81f9631258 100644
--- a/OpenSim/Framework/Data.MSSQLMapper/MSSQLDatabaseMapper.cs
+++ b/OpenSim/Framework/Data.MSSQLMapper/MSSQLDatabaseMapper.cs
@@ -25,6 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
 using System.Data.Common;
 using System.Data.SqlClient;
 using OpenSim.Framework.Data;
@@ -44,6 +45,18 @@ namespace OpenSim.Framework.Data.MSSQLMapper
             return connection;
         }
 
+        public override object ConvertToDbType(object value)
+        {
+            if( value is UInt32 )
+            {
+                UInt32 tmpVal = (UInt32) value;
+                Int64 result = Convert.ToInt64(tmpVal);
+                return result;
+            }
+
+            return base.ConvertToDbType(value);
+        }
+
         public override string CreateParamName(string fieldName)
         {
             return "@" + fieldName;
diff --git a/OpenSim/Framework/Data.MySQLMapper/MySQLDataReader.cs b/OpenSim/Framework/Data.MySQLMapper/MySQLDataReader.cs
new file mode 100644
index 0000000000..9fd50f6d0a
--- /dev/null
+++ b/OpenSim/Framework/Data.MySQLMapper/MySQLDataReader.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+using OpenSim.Framework.Data.Base;
+
+namespace OpenSim.Framework.Data.MySQLMapper
+{
+    public class MySQLDataReader : OpenSimDataReader
+    {
+        public MySQLDataReader(IDataReader source) : base(source)
+        {
+        }
+    }
+}
diff --git a/OpenSim/Framework/Data.MySQLMapper/MySQLDatabaseMapper.cs b/OpenSim/Framework/Data.MySQLMapper/MySQLDatabaseMapper.cs
index ae58f00e01..3f5b18ff00 100644
--- a/OpenSim/Framework/Data.MySQLMapper/MySQLDatabaseMapper.cs
+++ b/OpenSim/Framework/Data.MySQLMapper/MySQLDatabaseMapper.cs
@@ -25,9 +25,11 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System.Data;
 using System.Data.Common;
 using MySql.Data.MySqlClient;
 using OpenSim.Framework.Data;
+using OpenSim.Framework.Data.Base;
 
 namespace OpenSim.Framework.Data.MySQLMapper
 {
@@ -48,5 +50,10 @@ namespace OpenSim.Framework.Data.MySQLMapper
         {
             return "?" + fieldName;
         }
+
+        public override BaseDataReader CreateReader(IDataReader reader)
+        {
+            return new MySQLDataReader( reader );
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Framework/Data/OpenSimDataReader.cs b/OpenSim/Framework/Data/OpenSimDataReader.cs
index 08a14052e7..538af8f982 100644
--- a/OpenSim/Framework/Data/OpenSimDataReader.cs
+++ b/OpenSim/Framework/Data/OpenSimDataReader.cs
@@ -26,11 +26,8 @@
  */
 
 using System;
-using System.Collections.Generic;
 using System.Data;
-using System.Text;
 using libsecondlife;
-
 using OpenSim.Framework.Data.Base;
 
 namespace OpenSim.Framework.Data