diff options
| author | Teravus Ovares (Dan Olivares) | 2009-08-18 11:09:43 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-08-18 11:09:43 -0400 |
| commit | 311b51a1843f43daa7796a46961b65fe702e1b85 (patch) | |
| tree | 756554b330c8bdd970f319c3af0327efb9017673 /OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs | |
| parent | * Some Physics Scene Changes to prepare for larger regions (diff) | |
| parent | Fixes mantis #4020 (http://opensimulator.org/mantis/view.php?id=4020) (diff) | |
| download | opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.zip opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.tar.gz opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.tar.bz2 opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.tar.xz | |
*remove conflicts
Diffstat (limited to 'OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs')
| -rw-r--r-- | OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs index 23c1ec5..a3a32dc 100644 --- a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs +++ b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs | |||
| @@ -53,6 +53,7 @@ namespace OpenSim.Data.MySQL.Tests | |||
| 53 | try | 53 | try |
| 54 | { | 54 | { |
| 55 | database = new MySQLManager(connect); | 55 | database = new MySQLManager(connect); |
| 56 | DropTables(); | ||
| 56 | db = new MySQLInventoryData(); | 57 | db = new MySQLInventoryData(); |
| 57 | db.Initialise(connect); | 58 | db.Initialise(connect); |
| 58 | } | 59 | } |
| @@ -72,10 +73,15 @@ namespace OpenSim.Data.MySQL.Tests | |||
| 72 | } | 73 | } |
| 73 | if (database != null) | 74 | if (database != null) |
| 74 | { | 75 | { |
| 75 | database.ExecuteSql("drop table inventoryitems"); | 76 | DropTables(); |
| 76 | database.ExecuteSql("drop table inventoryfolders"); | ||
| 77 | database.ExecuteSql("drop table migrations"); | ||
| 78 | } | 77 | } |
| 79 | } | 78 | } |
| 79 | |||
| 80 | private void DropTables() | ||
| 81 | { | ||
| 82 | database.ExecuteSql("drop table IF EXISTS inventoryitems"); | ||
| 83 | database.ExecuteSql("drop table IF EXISTS inventoryfolders"); | ||
| 84 | database.ExecuteSql("drop table IF EXISTS migrations"); | ||
| 85 | } | ||
| 80 | } | 86 | } |
| 81 | } | 87 | } |