Initial update to OpenSim 0.8.2.1 source code.

1 files changed, 13 insertions, 10 deletions

diff --git a/OpenSim/Data/MSSQL/MSSQLMigration.cs b/OpenSim/Data/PGSQL/PGSQLMigration.cs
index c2fecef..709fde0 100644
--- a/OpenSim/Data/MSSQL/MSSQLMigration.cs
+++ b/OpenSim/Data/PGSQL/PGSQLMigration.cs
@@ -25,22 +25,22 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using Npgsql;
 using System;
 using System.Data;
 using System.Data.Common;
 using System.Reflection;
-using System.Data.SqlClient;
 
-namespace OpenSim.Data.MSSQL
+namespace OpenSim.Data.PGSQL
 {
-    public class MSSQLMigration : Migration
+    public class PGSQLMigration : Migration
     {
-        public MSSQLMigration(DbConnection conn, Assembly assem, string type)
+        public PGSQLMigration(NpgsqlConnection conn, Assembly assem, string type)
             : base(conn, assem, type)
         {
         }
 
-        public MSSQLMigration(DbConnection conn, Assembly assem, string subtype, string type)
+        public PGSQLMigration(NpgsqlConnection conn, Assembly assem, string subtype, string type)
             : base(conn, assem, subtype, type)
         {
         }
@@ -48,12 +48,15 @@ namespace OpenSim.Data.MSSQL
         protected override int FindVersion(DbConnection conn, string type)
         {
             int version = 0;
-            using (DbCommand cmd = conn.CreateCommand())
+            NpgsqlConnection lcConn = (NpgsqlConnection)conn;
+
+            using (NpgsqlCommand cmd = lcConn.CreateCommand())
             {
                 try
                 {
-                    cmd.CommandText = "select top 1 version from migrations where name = '" + type + "' order by version desc"; //Must be 
-                    using (IDataReader reader = cmd.ExecuteReader())
+                    cmd.CommandText = "select version from migrations where name = '" + type + "' " + 
+                                      " order by version desc limit 1"; //Must be 
+                    using (NpgsqlDataReader reader = cmd.ExecuteReader())
                     {
                         if (reader.Read())
                         {
@@ -73,7 +76,7 @@ namespace OpenSim.Data.MSSQL
 
         protected override void ExecuteScript(DbConnection conn, string[] script)
         {
-            if (!(conn is SqlConnection))
+            if (!(conn is NpgsqlConnection))
             {
                 base.ExecuteScript(conn, script);
                 return;
@@ -83,7 +86,7 @@ namespace OpenSim.Data.MSSQL
             {
                 try
                 {
-                    using (SqlCommand cmd = new SqlCommand(sql, (SqlConnection)conn))
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(sql, (NpgsqlConnection)conn))
                     {
                         cmd.ExecuteNonQuery();
                     }