Merge branch 'unitests'

Signed-off-by: Melanie <melanie@t-data.com>

2 files changed, 81 insertions, 84 deletions

diff --git a/OpenSim/Data/MySQL/Resources/EstateStore.migrations b/OpenSim/Data/MySQL/Resources/EstateStore.migrations
new file mode 100644
index 0000000..df82a2e
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/EstateStore.migrations
@@ -0,0 +1,81 @@
+:VERSION 13
+
+# The estate migrations used to be in Region store
+# here they will do nothing (bad) if the tables are already there, 
+# just update the store version.
+
+BEGIN;
+
+CREATE TABLE IF NOT EXISTS `estate_managers` (
+  `EstateID` int(10) unsigned NOT NULL,
+  `uuid` char(36) NOT NULL,
+  KEY `EstateID` (`EstateID`)
+) ENGINE=InnoDB;
+
+CREATE TABLE IF NOT EXISTS `estate_groups` (
+  `EstateID` int(10) unsigned NOT NULL,
+  `uuid` char(36) NOT NULL,
+  KEY `EstateID` (`EstateID`)
+) ENGINE=InnoDB;
+
+CREATE TABLE IF NOT EXISTS `estate_users` (
+  `EstateID` int(10) unsigned NOT NULL,
+  `uuid` char(36) NOT NULL,
+  KEY `EstateID` (`EstateID`)
+) ENGINE=InnoDB;
+
+CREATE TABLE IF NOT EXISTS `estateban` (
+  `EstateID` int(10) unsigned NOT NULL,
+  `bannedUUID` varchar(36) NOT NULL,
+  `bannedIp` varchar(16) NOT NULL,
+  `bannedIpHostMask` varchar(16) NOT NULL,
+  `bannedNameMask` varchar(64) default NULL,
+  KEY `estateban_EstateID` (`EstateID`)
+) ENGINE=InnoDB;
+
+CREATE TABLE IF NOT EXISTS `estate_settings` (
+  `EstateID` int(10) unsigned NOT NULL auto_increment,
+  `EstateName` varchar(64) default NULL,
+  `AbuseEmailToEstateOwner` tinyint(4) NOT NULL,
+  `DenyAnonymous` tinyint(4) NOT NULL,
+  `ResetHomeOnTeleport` tinyint(4) NOT NULL,
+  `FixedSun` tinyint(4) NOT NULL,
+  `DenyTransacted` tinyint(4) NOT NULL,
+  `BlockDwell` tinyint(4) NOT NULL,
+  `DenyIdentified` tinyint(4) NOT NULL,
+  `AllowVoice` tinyint(4) NOT NULL,
+  `UseGlobalTime` tinyint(4) NOT NULL,
+  `PricePerMeter` int(11) NOT NULL,
+  `TaxFree` tinyint(4) NOT NULL,
+  `AllowDirectTeleport` tinyint(4) NOT NULL,
+  `RedirectGridX` int(11) NOT NULL,
+  `RedirectGridY` int(11) NOT NULL,
+  `ParentEstateID` int(10) unsigned NOT NULL,
+  `SunPosition` double NOT NULL,
+  `EstateSkipScripts` tinyint(4) NOT NULL,
+  `BillableFactor` float NOT NULL,
+  `PublicAccess` tinyint(4) NOT NULL,
+  `AbuseEmail` varchar(255) not null,
+  `EstateOwner` varchar(36) not null,
+  `DenyMinors` tinyint not null,
+  
+  PRIMARY KEY  (`EstateID`)
+) ENGINE=InnoDB AUTO_INCREMENT=100;
+
+CREATE TABLE IF NOT EXISTS `estate_map` (
+  `RegionID` char(36) NOT NULL default '00000000-0000-0000-0000-000000000000',
+  `EstateID` int(11) NOT NULL,
+  PRIMARY KEY  (`RegionID`),
+  KEY `EstateID` (`EstateID`)
+) ENGINE=InnoDB;
+
+COMMIT;
+
+:VERSION 32                     #--------------------- (moved from RegionStore migr, just in case)
+
+BEGIN;
+ALTER TABLE estate_settings AUTO_INCREMENT = 100;
+COMMIT;
+
+
+
diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
index baeeedd..d8a279d 100644
--- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
@@ -386,84 +386,6 @@ CREATE TABLE `regionsettings` (
   PRIMARY KEY  (`regionUUID`)
 ) ENGINE=InnoDB;
 
-CREATE TABLE `estate_managers` (
-  `EstateID` int(10) unsigned NOT NULL,
-  `uuid` char(36) NOT NULL,
-  KEY `EstateID` (`EstateID`)
-) ENGINE=InnoDB;
-
-CREATE TABLE `estate_groups` (
-  `EstateID` int(10) unsigned NOT NULL,
-  `uuid` char(36) NOT NULL,
-  KEY `EstateID` (`EstateID`)
-) ENGINE=InnoDB;
-
-CREATE TABLE `estate_users` (
-  `EstateID` int(10) unsigned NOT NULL,
-  `uuid` char(36) NOT NULL,
-  KEY `EstateID` (`EstateID`)
-) ENGINE=InnoDB;
-
-CREATE TABLE `estateban` (
-  `EstateID` int(10) unsigned NOT NULL,
-  `bannedUUID` varchar(36) NOT NULL,
-  `bannedIp` varchar(16) NOT NULL,
-  `bannedIpHostMask` varchar(16) NOT NULL,
-  `bannedNameMask` varchar(64) default NULL,
-  KEY `estateban_EstateID` (`EstateID`)
-) ENGINE=InnoDB;
-
-CREATE TABLE `estate_settings` (
-  `EstateID` int(10) unsigned NOT NULL auto_increment,
-  `EstateName` varchar(64) default NULL,
-  `AbuseEmailToEstateOwner` tinyint(4) NOT NULL,
-  `DenyAnonymous` tinyint(4) NOT NULL,
-  `ResetHomeOnTeleport` tinyint(4) NOT NULL,
-  `FixedSun` tinyint(4) NOT NULL,
-  `DenyTransacted` tinyint(4) NOT NULL,
-  `BlockDwell` tinyint(4) NOT NULL,
-  `DenyIdentified` tinyint(4) NOT NULL,
-  `AllowVoice` tinyint(4) NOT NULL,
-  `UseGlobalTime` tinyint(4) NOT NULL,
-  `PricePerMeter` int(11) NOT NULL,
-  `TaxFree` tinyint(4) NOT NULL,
-  `AllowDirectTeleport` tinyint(4) NOT NULL,
-  `RedirectGridX` int(11) NOT NULL,
-  `RedirectGridY` int(11) NOT NULL,
-  `ParentEstateID` int(10) unsigned NOT NULL,
-  `SunPosition` double NOT NULL,
-  `EstateSkipScripts` tinyint(4) NOT NULL,
-  `BillableFactor` float NOT NULL,
-  `PublicAccess` tinyint(4) NOT NULL,
-  PRIMARY KEY  (`EstateID`)
-) ENGINE=InnoDB AUTO_INCREMENT=100;
-
-CREATE TABLE `estate_map` (
-  `RegionID` char(36) NOT NULL default '00000000-0000-0000-0000-000000000000',
-  `EstateID` int(11) NOT NULL,
-  PRIMARY KEY  (`RegionID`),
-  KEY `EstateID` (`EstateID`)
-) ENGINE=InnoDB;
-
-commit;
-
-:VERSION 14                     #---------------------
-
-begin;
-
-alter table estate_settings add column AbuseEmail varchar(255) not null;
-
-alter table estate_settings add column EstateOwner varchar(36) not null;
-
-commit;
-
-
-:VERSION 15                     #---------------------
-
-begin;
-
-alter table estate_settings add column DenyMinors tinyint not null;
-
 commit;
 
 :VERSION 16                     #---------------------
@@ -795,12 +717,6 @@ ALTER TABLE regionsettings ADD COLUMN loaded_creation_datetime int unsigned NOT
 
 COMMIT;
 
-:VERSION 32                     #---------------------
-
-BEGIN;
-ALTER TABLE estate_settings AUTO_INCREMENT = 100;
-COMMIT;
-
 :VERSION 33                     #---------------------
 
 BEGIN;