Ugly workaround for mono-1.2.6 compile failure in TribalMedia code.

Future versions of mono should not need this.
Please revert if this makes you cry.

2 files changed, 75 insertions, 42 deletions

diff --git a/ThirdParty/TribalMedia/TribalMedia.Framework.Data/BaseTableMapper.cs b/ThirdParty/TribalMedia/TribalMedia.Framework.Data/BaseTableMapper.cs
index e4ea055..d69fcbb 100644
--- a/ThirdParty/TribalMedia/TribalMedia.Framework.Data/BaseTableMapper.cs
+++ b/ThirdParty/TribalMedia/TribalMedia.Framework.Data/BaseTableMapper.cs
@@ -123,50 +123,68 @@ namespace TribalMedia.Framework.Data
         {
         }
 
+        // HACK: This is a temporary function used by TryGetValue().
+        // Due to a bug in mono 1.2.6, delegate blocks cannot contain
+        // a using() block.  This has been fixed in SVN, so the next
+        // mono release should work.
+        private void TryGetConnectionValue(DbConnection connection, TPrimaryKey primaryKey, ref TRowMapper result, ref bool success)
+        {
+            using (
+                DbCommand command =
+                CreateSelectCommand(connection, KeyFieldMapper.FieldName, primaryKey))
+            {
+                using (IDataReader reader = command.ExecuteReader())
+                {
+                    if (reader.Read())
+                    {
+                        result = FromReader( CreateReader(reader));
+                        success = true;
+                    }
+                    else
+                    {
+                        success = false;
+                    }
+                }
+            }
+        }
+
         public bool TryGetValue(TPrimaryKey primaryKey, out TRowMapper value)
         {
             TRowMapper result = default(TRowMapper);
             bool success = false;
 
             WithConnection(delegate(DbConnection connection)
-                               {
-                                   using (
-                                       DbCommand command =
-                                           CreateSelectCommand(connection, KeyFieldMapper.FieldName, primaryKey))
-                                   {
-                                       using (IDataReader reader = command.ExecuteReader())
-                                       {
-                                           if (reader.Read())
-                                           {
-                                               result = FromReader( CreateReader(reader));
-                                               success = true;
-                                           }
-                                           else
-                                           {
-                                               success = false;
-                                           }
-                                       }
-                                   }
-                               });
+                           {
+                               TryGetConnectionValue(connection, primaryKey, ref result, ref success);
+                           });
 
             value = result;
 
             return success;
         }
 
+        // HACK: This is a temporary function used by Remove().
+        // Due to a bug in mono 1.2.6, delegate blocks cannot contain
+        // a using() block.  This has been fixed in SVN, so the next
+        // mono release should work.
+        protected virtual void TryDelete(DbConnection connection, TPrimaryKey id, ref int deleted)
+        {
+            using (
+                DbCommand command =
+                CreateDeleteCommand(connection, KeyFieldMapper.FieldName, id))
+            {
+                deleted = command.ExecuteNonQuery();
+            }
+        }
+
         public virtual bool Remove(TPrimaryKey id)
         {
             int deleted = 0;
 
             WithConnection(delegate(DbConnection connection)
-                               {
-                                   using (
-                                       DbCommand command =
-                                           CreateDeleteCommand(connection, KeyFieldMapper.FieldName, id))
-                                   {
-                                       deleted = command.ExecuteNonQuery();
-                                   }
-                               });
+                           {
+                               TryDelete(connection, id, ref deleted);
+                           });
 
             if (deleted == 1)
             {
@@ -178,7 +196,6 @@ namespace TribalMedia.Framework.Data
             }
         }
 
-
         public DbCommand CreateDeleteCommand(DbConnection connection, string fieldName, TPrimaryKey primaryKey)
         {
             string table = TableName;
@@ -196,17 +213,26 @@ namespace TribalMedia.Framework.Data
             return command;
         }
 
+        // HACK: This is a temporary function used by Update().
+        // Due to a bug in mono 1.2.6, delegate blocks cannot contain
+        // a using() block.  This has been fixed in SVN, so the next
+        // mono release should work.
+        protected void TryUpdate(DbConnection connection, TPrimaryKey primaryKey, TRowMapper value, ref int updated)
+        {
+            using (DbCommand command = CreateUpdateCommand(connection, value, primaryKey))
+            {
+                updated = command.ExecuteNonQuery();
+            }
+        }
+
         public virtual bool Update(TPrimaryKey primaryKey, TRowMapper value)
         {
             int updated = 0;
 
             WithConnection(delegate(DbConnection connection)
-                               {
-                                   using (DbCommand command = CreateUpdateCommand(connection, value, primaryKey))
-                                   {
-                                       updated = command.ExecuteNonQuery();
-                                   }
-                               });
+                           {
+                               TryUpdate(connection, primaryKey, value, ref updated);
+                           });
 
             if (updated == 1)
             {
@@ -218,17 +244,26 @@ namespace TribalMedia.Framework.Data
             }
         }
 
+        // HACK: This is a temporary function used by Add().
+        // Due to a bug in mono 1.2.6, delegate blocks cannot contain
+        // a using() block.  This has been fixed in SVN, so the next
+        // mono release should work.
+        protected void TryAdd(DbConnection connection, TRowMapper value, ref int added)
+        {
+            using (DbCommand command = CreateInsertCommand(connection, value))
+            {
+                added = command.ExecuteNonQuery();
+            }
+        }
+
         public virtual bool Add(TRowMapper value)
         {
             int added = 0;
 
             WithConnection(delegate(DbConnection connection)
-                               {
-                                   using (DbCommand command = CreateInsertCommand(connection, value))
-                                   {
-                                       added = command.ExecuteNonQuery();
-                                   }
-                               });
+                           {
+                               TryAdd(connection, value, ref added);
+                           });
 
             if (added == 1)
             {
diff --git a/prebuild.xml b/prebuild.xml
index 4135053..9a5c798 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -99,7 +99,6 @@
       </Files>
     </Project>
 
-<!--
     <Project name="TribalMedia.Framework.Data" path="ThirdParty/TribalMedia/TribalMedia.Framework.Data" type="Library">
       <Configuration name="Debug">
         <Options>
@@ -122,7 +121,6 @@
       </Files>
     </Project>
 
--->
     <Project name="OpenSim.Framework.Data" path="OpenSim/Framework/Data" type="Library">
       <Configuration name="Debug">
         <Options>