From e0160e56409720045b09b250fd40424fea4fd42a Mon Sep 17 00:00:00 2001
From: Sean Dague <sean@dague.net>
Date: Wed, 22 Apr 2009 19:23:38 +0000
Subject: [PATCH] add if exists to the drop table

---
 OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs | 30 ++++++++++-----------
 OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs | 30 ++++++++++-----------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs b/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs
index 8659aa2658..148d910a0f 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs
@@ -83,21 +83,21 @@ namespace OpenSim.Data.MySQL.Tests
             // if a new table is added, it has to be dropped here
             if (manager != null)
             {
-                manager.ExecuteSql("drop table migrations");
-                manager.ExecuteSql("drop table prims");
-                manager.ExecuteSql("drop table primshapes");
-                manager.ExecuteSql("drop table primitems");
-                manager.ExecuteSql("drop table terrain");
-                manager.ExecuteSql("drop table land");
-                manager.ExecuteSql("drop table landaccesslist");
-                manager.ExecuteSql("drop table regionban");
-                manager.ExecuteSql("drop table regionsettings");
-                manager.ExecuteSql("drop table estate_managers");
-                manager.ExecuteSql("drop table estate_groups");
-                manager.ExecuteSql("drop table estate_users");
-                manager.ExecuteSql("drop table estateban");
-                manager.ExecuteSql("drop table estate_settings");
-                manager.ExecuteSql("drop table estate_map");
+                manager.ExecuteSql("drop table if exists migrations");
+                manager.ExecuteSql("drop table if exists prims");
+                manager.ExecuteSql("drop table if exists primshapes");
+                manager.ExecuteSql("drop table if exists primitems");
+                manager.ExecuteSql("drop table if exists terrain");
+                manager.ExecuteSql("drop table if exists land");
+                manager.ExecuteSql("drop table if exists landaccesslist");
+                manager.ExecuteSql("drop table if exists regionban");
+                manager.ExecuteSql("drop table if exists regionsettings");
+                manager.ExecuteSql("drop table if exists estate_managers");
+                manager.ExecuteSql("drop table if exists estate_groups");
+                manager.ExecuteSql("drop table if exists estate_users");
+                manager.ExecuteSql("drop table if exists estateban");
+                manager.ExecuteSql("drop table if exists estate_settings");
+                manager.ExecuteSql("drop table if exists estate_map");
             }
         }
     }
diff --git a/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs b/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
index e3f9413be8..b8fac69167 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
@@ -80,21 +80,21 @@ namespace OpenSim.Data.MySQL.Tests
         {
             if (manager != null)
             {
-                manager.ExecuteSql("drop table migrations");
-                manager.ExecuteSql("drop table prims");
-                manager.ExecuteSql("drop table primshapes");
-                manager.ExecuteSql("drop table primitems");
-                manager.ExecuteSql("drop table terrain");
-                manager.ExecuteSql("drop table land");
-                manager.ExecuteSql("drop table landaccesslist");
-                manager.ExecuteSql("drop table regionban");
-                manager.ExecuteSql("drop table regionsettings");
-                manager.ExecuteSql("drop table estate_managers");
-                manager.ExecuteSql("drop table estate_groups");
-                manager.ExecuteSql("drop table estate_users");
-                manager.ExecuteSql("drop table estateban");
-                manager.ExecuteSql("drop table estate_settings");
-                manager.ExecuteSql("drop table estate_map");
+                manager.ExecuteSql("drop table if exists migrations");
+                manager.ExecuteSql("drop table if exists prims");
+                manager.ExecuteSql("drop table if exists primshapes");
+                manager.ExecuteSql("drop table if exists primitems");
+                manager.ExecuteSql("drop table if exists terrain");
+                manager.ExecuteSql("drop table if exists land");
+                manager.ExecuteSql("drop table if exists landaccesslist");
+                manager.ExecuteSql("drop table if exists regionban");
+                manager.ExecuteSql("drop table if exists regionsettings");
+                manager.ExecuteSql("drop table if exists estate_managers");
+                manager.ExecuteSql("drop table if exists estate_groups");
+                manager.ExecuteSql("drop table if exists estate_users");
+                manager.ExecuteSql("drop table if exists estateban");
+                manager.ExecuteSql("drop table if exists estate_settings");
+                manager.ExecuteSql("drop table if exists estate_map");
             }
         }
     }