Merge branch 'master' into careminster-presence-refactor

1 files changed, 30 insertions, 2 deletions

diff --git a/OpenSim/Data/MSSQL/MSSQLMigration.cs b/OpenSim/Data/MSSQL/MSSQLMigration.cs
index cd395b8..1aa96c7 100644
--- a/OpenSim/Data/MSSQL/MSSQLMigration.cs
+++ b/OpenSim/Data/MSSQL/MSSQLMigration.cs
@@ -29,16 +29,19 @@ using System;
 using System.Data;
 using System.Data.Common;
 using System.Reflection;
+using System.Data.SqlClient;
 
 namespace OpenSim.Data.MSSQL
 {
     public class MSSQLMigration : Migration
     {
-        public MSSQLMigration(DbConnection conn, Assembly assem, string type) : base(conn, assem, type)
+        public MSSQLMigration(DbConnection conn, Assembly assem, string type)
+            : base(conn, assem, type)
         {
         }
 
-        public MSSQLMigration(DbConnection conn, Assembly assem, string subtype, string type) : base(conn, assem, subtype, type)
+        public MSSQLMigration(DbConnection conn, Assembly assem, string subtype, string type)
+            : base(conn, assem, subtype, type)
         {
         }
 
@@ -67,5 +70,30 @@ namespace OpenSim.Data.MSSQL
             }
             return version;
         }
+
+        protected override void ExecuteScript(DbConnection conn, string[] script)
+        {
+            if (!(conn is SqlConnection))
+            {
+                base.ExecuteScript(conn, script);
+                return;
+            }
+
+            foreach (string sql in script)
+            {
+                try
+                {
+                    using (SqlCommand cmd = new SqlCommand(sql, (SqlConnection)conn))
+                    {
+                        cmd.ExecuteNonQuery();
+                    }
+                }
+                catch (Exception ex)
+                {
+                    throw new Exception(sql);
+
+                }
+            }
+        }
     }
 }