From fdce1be3db287bed901332b90ba57165e201d3fc Mon Sep 17 00:00:00 2001 From: John Hurliman Date: Mon, 19 Oct 2009 16:52:27 -0700 Subject: * Removed OpenSim.Data.NHibernate * Replaced calls to ThreadPool.QueueUserWorkItem() with ThreadPool.UnsafeQueueUserWorkItem() since OpenSim does not use Code Access Security sandboxing --- .../Resources/SQLiteDialect/001_AssetStore.sql | 10 -- .../Resources/SQLiteDialect/001_EstateStore.sql | 71 --------- .../Resources/SQLiteDialect/001_GridStore.sql | 35 ----- .../Resources/SQLiteDialect/001_InventoryStore.sql | 39 ----- .../Resources/SQLiteDialect/001_RegionStore.sql | 168 --------------------- .../Resources/SQLiteDialect/001_UserStore.sql | 104 ------------- 6 files changed, 427 deletions(-) delete mode 100644 OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_AssetStore.sql delete mode 100644 OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_EstateStore.sql delete mode 100644 OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_GridStore.sql delete mode 100644 OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_InventoryStore.sql delete mode 100644 OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_RegionStore.sql delete mode 100644 OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_UserStore.sql (limited to 'OpenSim/Data/NHibernate/Resources/SQLiteDialect') diff --git a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_AssetStore.sql b/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_AssetStore.sql deleted file mode 100644 index aedf764..0000000 --- a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_AssetStore.sql +++ /dev/null @@ -1,10 +0,0 @@ -CREATE TABLE Assets ( - ID VARCHAR(36) NOT NULL, - Type SMALLINT DEFAULT NULL, - Name VARCHAR(64) DEFAULT NULL, - Description VARCHAR(64) DEFAULT NULL, - Local BIT DEFAULT NULL, - Temporary BIT DEFAULT NULL, - Data BLOB, - PRIMARY KEY (ID) -); diff --git a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_EstateStore.sql b/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_EstateStore.sql deleted file mode 100644 index afe702f..0000000 --- a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_EstateStore.sql +++ /dev/null @@ -1,71 +0,0 @@ -CREATE TABLE EstateSettings ( - EstateID INT NOT NULL, - ParentEstateID INT DEFAULT NULL, - EstateOwnerID VARCHAR(36) DEFAULT NULL, - Name VARCHAR(64) DEFAULT NULL, - RedirectGridX INT DEFAULT NULL, - RedirectGridY INT DEFAULT NULL, - BillableFactor DOUBLE DEFAULT NULL, - PricePerMeter INT DEFAULT NULL, - SunPosition DOUBLE DEFAULT NULL, - - UseGlobalTime BIT DEFAULT NULL, - FixedSun BIT DEFAULT NULL, - AllowVoice BIT DEFAULT NULL, - AllowDirectTeleport BIT DEFAULT NULL, - ResetHomeOnTeleport BIT DEFAULT NULL, - PublicAccess BIT DEFAULT NULL, - DenyAnonymous BIT DEFAULT NULL, - DenyIdentified BIT DEFAULT NULL, - DenyTransacted BIT DEFAULT NULL, - DenyMinors BIT DEFAULT NULL, - BlockDwell BIT DEFAULT NULL, - EstateSkipScripts BIT DEFAULT NULL, - TaxFree BIT DEFAULT NULL, - AbuseEmailToEstateOwner BIT DEFAULT NULL, - - AbuseEmail VARCHAR(255) DEFAULT NULL, - - PRIMARY KEY (EstateID) -); - -CREATE TABLE EstateRegionLink ( - EstateRegionLinkID VARCHAR(36) NOT NULL, - EstateID INT DEFAULT NULL, - RegionID VARCHAR(36) DEFAULT NULL, - PRIMARY KEY (EstateRegionLinkID) -); - -CREATE INDEX EstateRegionLinkEstateIDIndex ON EstateRegionLink (EstateID); -CREATE INDEX EstateRegionLinkERegionIDIndex ON EstateRegionLink (RegionID); - -CREATE TABLE EstateManagers ( - EstateID INT NOT NULL, - ManagerID VARCHAR(36) NOT NULL, - ArrayIndex INT NOT NULL, - PRIMARY KEY (EstateID,ArrayIndex) -); - -CREATE TABLE EstateUsers ( - EstateID INT NOT NULL, - UserID VARCHAR(36) NOT NULL, - ArrayIndex INT NOT NULL, - PRIMARY KEY (EstateID,ArrayIndex) -); - -CREATE TABLE EstateGroups ( - EstateID INT NOT NULL, - GroupID VARCHAR(36) NOT NULL, - ArrayIndex INT NOT NULL, - PRIMARY KEY (EstateID,ArrayIndex) -); - -CREATE TABLE EstateBans ( - EstateID INT NOT NULL, - ArrayIndex INT NOT NULL, - BannedUserID VARCHAR(36) NOT NULL, - BannedHostAddress VARCHAR(16) NOT NULL, - BannedHostIPMask VARCHAR(16) NOT NULL, - BannedHostNameMask VARCHAR(16) NOT NULL, - PRIMARY KEY (EstateID,ArrayIndex) -); diff --git a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_GridStore.sql b/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_GridStore.sql deleted file mode 100644 index 4f09848..0000000 --- a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_GridStore.sql +++ /dev/null @@ -1,35 +0,0 @@ -CREATE TABLE Regions ( - RegionId VARCHAR(36) NOT NULL, - RegionHandle BIGINT UNSIGNED NOT NULL, - RegionName VARCHAR(32) DEFAULT NULL, - RegionRecvKey VARCHAR(128) DEFAULT NULL, - RegionSendKey VARCHAR(128) DEFAULT NULL, - RegionSecret VARCHAR(128) DEFAULT NULL, - RegionDataURI VARCHAR(255) DEFAULT NULL, - ServerIP VARCHAR(64) DEFAULT NULL, - ServerPort INT UNSIGNED DEFAULT NULL, - ServerURI VARCHAR(255) DEFAULT NULL, - RegionLocX INT UNSIGNED DEFAULT NULL, - RegionLocY INT UNSIGNED DEFAULT NULL, - RegionLocZ INT UNSIGNED DEFAULT NULL, - EastOverrideHandle BIGINT UNSIGNED DEFAULT NULL, - WestOverrideHandle BIGINT UNSIGNED DEFAULT NULL, - SouthOverrideHandle BIGINT UNSIGNED DEFAULT NULL, - NorthOverrideHandle BIGINT UNSIGNED DEFAULT NULL, - RegionAssetURI VARCHAR(255) DEFAULT NULL, - RegionAssetRecvKey VARCHAR(128) DEFAULT NULL, - RegionAssetSendKey VARCHAR(128) DEFAULT NULL, - RegionUserURI VARCHAR(255) DEFAULT NULL, - RegionUserRecvKey VARCHAR(128) DEFAULT NULL, - RegionUserSendKey VARCHAR(128) DEFAULT NULL, - RegionMapTextureId VARCHAR(36) DEFAULT NULL, - ServerHttpPort INT DEFAULT NULL, - ServerRemotingPort INT DEFAULT NULL, - OwnerID VARCHAR(36) DEFAULT NULL, - OriginID VARCHAR(36) DEFAULT NULL, - PRIMARY KEY (RegionId) -); - -CREATE INDEX RegionNameIndex ON Regions (RegionName); -CREATE INDEX RegionHandleIndex ON Regions (RegionHandle); -CREATE INDEX RegionHandlesIndex ON Regions (EastOverrideHandle,WestOverrideHandle,SouthOverrideHandle,NorthOverrideHandle); diff --git a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_InventoryStore.sql b/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_InventoryStore.sql deleted file mode 100644 index 38978ee..0000000 --- a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_InventoryStore.sql +++ /dev/null @@ -1,39 +0,0 @@ -CREATE TABLE InventoryFolders ( - ID VARCHAR(36) NOT NULL, - Type SMALLINT DEFAULT NULL, - Version INT DEFAULT NULL, - ParentID VARCHAR(36) DEFAULT NULL, - Owner VARCHAR(36) DEFAULT NULL, - Name VARCHAR(64) DEFAULT NULL, - PRIMARY KEY (ID) -); - -CREATE INDEX InventoryFoldersOwnerIdIndex ON InventoryFolders (Owner); -CREATE INDEX InventoryFoldersParentIdIndex ON InventoryFolders (ParentID); - -CREATE TABLE InventoryItems ( - ID VARCHAR(36) NOT NULL, - InvType INT DEFAULT NULL, - AssetType INT DEFAULT NULL, - AssetID VARCHAR(36) DEFAULT NULL, - Folder VARCHAR(36) DEFAULT NULL, - Owner VARCHAR(36) DEFAULT NULL, - Creator VARCHAR(36) DEFAULT NULL, - Name VARCHAR(64) DEFAULT NULL, - Description VARCHAR(64) DEFAULT NULL, - NextPermissions INT DEFAULT NULL, - CurrentPermissions INT DEFAULT NULL, - BasePermissions INT DEFAULT NULL, - EveryOnePermissions INT DEFAULT NULL, - GroupID VARCHAR(36) DEFAULT NULL, - GroupOwned BIT DEFAULT NULL, - SalePrice INT DEFAULT NULL, - SaleType TINYINT DEFAULT NULL, - Flags INT DEFAULT NULL, - CreationDate INT DEFAULT NULL, - PRIMARY KEY (ID) -); - -CREATE INDEX InventoryItemsGroupIdIndex ON InventoryItems (GroupID); -CREATE INDEX InventoryItemsOwnerIdIndex ON InventoryItems (Owner); -CREATE INDEX InventoryItemsFolderIdIndex ON InventoryItems (Folder); diff --git a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_RegionStore.sql b/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_RegionStore.sql deleted file mode 100644 index 2b8e62a..0000000 --- a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_RegionStore.sql +++ /dev/null @@ -1,168 +0,0 @@ -CREATE TABLE Prims ( - UUID VARCHAR(36) NOT NULL, - RegionID VARCHAR(36) DEFAULT NULL, - GroupID VARCHAR(36) DEFAULT NULL, - ParentID INT DEFAULT NULL, - ParentUUID VARCHAR(36) DEFAULT NULL, - OwnerID VARCHAR(36) DEFAULT NULL, - LastOwnerID VARCHAR(36) DEFAULT NULL, - CreatorID VARCHAR(36) DEFAULT NULL, - CreationDate INT DEFAULT NULL, - LinkNum INT DEFAULT NULL, - Name VARCHAR(255) DEFAULT NULL, - Text VARCHAR(255) DEFAULT NULL, - Description VARCHAR(255) DEFAULT NULL, - SitName VARCHAR(255) DEFAULT NULL, - TouchName VARCHAR(255) DEFAULT NULL, - ObjectFlags INT DEFAULT NULL, - OwnerMask INT DEFAULT NULL, - NextOwnerMask INT DEFAULT NULL, - GroupMask INT DEFAULT NULL, - EveryoneMask INT DEFAULT NULL, - BaseMask INT DEFAULT NULL, - Material TINYINT DEFAULT NULL, - ScriptAccessPin INT DEFAULT NULL, - TextureAnimation BLOB, - ParticleSystem BLOB, - ClickAction TINYINT DEFAULT NULL, - Color INT DEFAULT NULL, - PositionX DOUBLE DEFAULT NULL, - PositionY DOUBLE DEFAULT NULL, - PositionZ DOUBLE DEFAULT NULL, - GroupPositionX DOUBLE DEFAULT NULL, - GroupPositionY DOUBLE DEFAULT NULL, - GroupPositionZ DOUBLE DEFAULT NULL, - VelocityX DOUBLE DEFAULT NULL, - VelocityY DOUBLE DEFAULT NULL, - VelocityZ DOUBLE DEFAULT NULL, - AngularVelocityX DOUBLE DEFAULT NULL, - AngularVelocityY DOUBLE DEFAULT NULL, - AngularVelocityZ DOUBLE DEFAULT NULL, - AccelerationX DOUBLE DEFAULT NULL, - AccelerationY DOUBLE DEFAULT NULL, - AccelerationZ DOUBLE DEFAULT NULL, - RotationX DOUBLE DEFAULT NULL, - RotationY DOUBLE DEFAULT NULL, - RotationZ DOUBLE DEFAULT NULL, - RotationW DOUBLE DEFAULT NULL, - SitTargetOffsetX DOUBLE DEFAULT NULL, - SitTargetOffsetY DOUBLE DEFAULT NULL, - SitTargetOffsetZ DOUBLE DEFAULT NULL, - SitTargetOrientW DOUBLE DEFAULT NULL, - SitTargetOrientX DOUBLE DEFAULT NULL, - SitTargetOrientY DOUBLE DEFAULT NULL, - SitTargetOrientZ DOUBLE DEFAULT NULL, - -- this is the shape - Shape INT DEFAULT NULL, - ScaleX DOUBLE DEFAULT NULL, - ScaleY DOUBLE DEFAULT NULL, - ScaleZ DOUBLE DEFAULT NULL, - PCode INT DEFAULT NULL, - PathBegin INT DEFAULT NULL, - PathEnd INT DEFAULT NULL, - PathScaleX INT DEFAULT NULL, - PathScaleY INT DEFAULT NULL, - PathShearX INT DEFAULT NULL, - PathShearY INT DEFAULT NULL, - PathSkew INT DEFAULT NULL, - PathCurve INT DEFAULT NULL, - PathRadiusOffset INT DEFAULT NULL, - PathRevolutions INT DEFAULT NULL, - PathTaperX INT DEFAULT NULL, - PathTaperY INT DEFAULT NULL, - PathTwist INT DEFAULT NULL, - ProfileBegin INT DEFAULT NULL, - ProfileEnd INT DEFAULT NULL, - ProfileCurve INT DEFAULT NULL, - ProfileHollow INT DEFAULT NULL, - State INT DEFAULT NULL, - Texture BLOB, - ExtraParams BLOB, - PRIMARY KEY (UUID) -); - -CREATE INDEX PrimsRegionIdIndex ON Prims (RegionID); -CREATE INDEX PrimsRegionParentUuidIndex ON Prims (ParentUUID); - -CREATE TABLE Terrain ( - RegionID VARCHAR(36) NOT NULL, - MapData BLOB, - PRIMARY KEY (RegionID) -); - -CREATE TABLE PrimItems ( - ItemID VARCHAR(36) NOT NULL, - GroupID VARCHAR(36) DEFAULT NULL, - PrimID VARCHAR(36) DEFAULT NULL, - ParentFolderID VARCHAR(36) DEFAULT NULL, - AssetID VARCHAR(36) DEFAULT NULL, - OwnerID VARCHAR(36) DEFAULT NULL, - LastOwnerID VARCHAR(36) DEFAULT NULL, - CreatorID VARCHAR(36) DEFAULT NULL, - CreationDate BIGINT DEFAULT NULL, - Type INT DEFAULT NULL, - InvType INT DEFAULT NULL, - Name VARCHAR(255) DEFAULT NULL, - Description VARCHAR(255) DEFAULT NULL, - NextPermissions INT DEFAULT NULL, - CurrentPermissions INT DEFAULT NULL, - BasePermissions INT DEFAULT NULL, - EveryonePermissions INT DEFAULT NULL, - GroupPermissions INT DEFAULT NULL, - Flags INT DEFAULT NULL, - PRIMARY KEY (ItemID) -); - -CREATE INDEX PrimItemsPrimIdIndex ON PrimItems (PrimID); - -CREATE TABLE RegionSettings ( - RegionID VARCHAR(36) NOT NULL, - - BlockTerraform BIT DEFAULT NULL, - BlockFly BIT DEFAULT NULL, - AllowDamage BIT DEFAULT NULL, - RestrictPushing BIT DEFAULT NULL, - AllowLandResell BIT DEFAULT NULL, - AllowLandJoinDivide BIT DEFAULT NULL, - BlockShowInSearch BIT DEFAULT NULL, - - AgentLimit INT DEFAULT NULL, - ObjectBonus DOUBLE DEFAULT NULL, - Maturity INT DEFAULT NULL, - - DisableScripts BIT DEFAULT NULL, - DisableCollisions BIT DEFAULT NULL, - DisablePhysics BIT DEFAULT NULL, - - TerrainTexture1 VARCHAR(36) DEFAULT NULL, - TerrainTexture2 VARCHAR(36) DEFAULT NULL, - TerrainTexture3 VARCHAR(36) DEFAULT NULL, - TerrainTexture4 VARCHAR(36) DEFAULT NULL, - - Elevation1NW DOUBLE DEFAULT NULL, - Elevation2NW DOUBLE DEFAULT NULL, - Elevation1NE DOUBLE DEFAULT NULL, - Elevation2NE DOUBLE DEFAULT NULL, - Elevation1SE DOUBLE DEFAULT NULL, - Elevation2SE DOUBLE DEFAULT NULL, - Elevation1SW DOUBLE DEFAULT NULL, - Elevation2SW DOUBLE DEFAULT NULL, - - WaterHeight DOUBLE DEFAULT NULL, - TerrainRaiseLimit DOUBLE DEFAULT NULL, - TerrainLowerLimit DOUBLE DEFAULT NULL, - - UseEstateSun BIT DEFAULT NULL, - Sandbox BIT DEFAULT NULL, - - SunVectorX DOUBLE DEFAULT NULL, - SunVectorY DOUBLE DEFAULT NULL, - SunVectorZ DOUBLE DEFAULT NULL, - - FixedSun BIT DEFAULT NULL, - SunPosition DOUBLE DEFAULT NULL, - - Covenant VARCHAR(36) DEFAULT NULL, - - PRIMARY KEY (RegionID) -); diff --git a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_UserStore.sql b/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_UserStore.sql deleted file mode 100644 index 6084886..0000000 --- a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_UserStore.sql +++ /dev/null @@ -1,104 +0,0 @@ -CREATE TABLE UserAgents ( - ProfileID VARCHAR(36) NOT NULL, - AgentIP VARCHAR(24) DEFAULT NULL, - AgentPort INT DEFAULT NULL, - AgentOnline BIT DEFAULT NULL, - SessionID VARCHAR(36) DEFAULT NULL, - SecureSessionID VARCHAR(36) DEFAULT NULL, - InitialRegion VARCHAR(255) DEFAULT NULL, - Region VARCHAR(255) DEFAULT NULL, - LoginTime INT DEFAULT NULL, - LogoutTime INT DEFAULT NULL, - Handle BIGINT DEFAULT NULL, - PositionX DOUBLE DEFAULT NULL, - PositionY DOUBLE DEFAULT NULL, - PositionZ DOUBLE DEFAULT NULL, - LookAtX DOUBLE DEFAULT NULL, - LookAtY DOUBLE DEFAULT NULL, - LookAtZ DOUBLE DEFAULT NULL, - PRIMARY KEY (ProfileID) -); - -CREATE TABLE UserProfiles ( - ID VARCHAR(36) NOT NULL, - WebLoginKey VARCHAR(36) DEFAULT NULL, - FirstName VARCHAR(32) DEFAULT NULL, - SurName VARCHAR(32) DEFAULT NULL, - Email VARCHAR(250) DEFAULT NULL, - PasswordHash VARCHAR(32) DEFAULT NULL, - PasswordSalt VARCHAR(32) DEFAULT NULL, - HomeRegionID VARCHAR(36) DEFAULT NULL, - HomeRegionX INT DEFAULT NULL, - HomeRegionY INT DEFAULT NULL, - HomeLocationX DOUBLE DEFAULT NULL, - HomeLocationY DOUBLE DEFAULT NULL, - HomeLocationZ DOUBLE DEFAULT NULL, - HomeLookAtX DOUBLE DEFAULT NULL, - HomeLookAtY DOUBLE DEFAULT NULL, - HomeLookAtZ DOUBLE DEFAULT NULL, - Created INT DEFAULT NULL, - LastLogin INT DEFAULT NULL, - UserInventoryURI VARCHAR(255) DEFAULT NULL, - UserAssetURI VARCHAR(255) DEFAULT NULL, - Image VARCHAR(36) DEFAULT NULL, - FirstLifeImage VARCHAR(36) DEFAULT NULL, - AboutText TEXT DEFAULT NULL, - FirstLifeAboutText TEXT DEFAULT NULL, - CanDoMask INT DEFAULT NULL, - WantDoMask INT DEFAULT NULL, - UserFlags INT DEFAULT NULL, - GodLevel INT DEFAULT NULL, - CustomType VARCHAR(32) DEFAULT NULL, - Partner VARCHAR(36) DEFAULT NULL, - RootInventoryFolderID VARCHAR(36) DEFAULT NULL, - PRIMARY KEY (ID) -); - -CREATE INDEX UserSurnameIndex ON UserProfiles (SurName); -CREATE INDEX UserFirstNameIndex ON UserProfiles (FirstName); -CREATE UNIQUE INDEX UserFullNameIndex ON UserProfiles (SurName,FirstName); - -CREATE TABLE UserAppearances ( - Owner VARCHAR(36) NOT NULL, - BodyItem VARCHAR(36) DEFAULT NULL, - BodyAsset VARCHAR(36) DEFAULT NULL, - SkinItem VARCHAR(36) DEFAULT NULL, - SkinAsset VARCHAR(36) DEFAULT NULL, - HairItem VARCHAR(36) DEFAULT NULL, - HairAsset VARCHAR(36) DEFAULT NULL, - EyesItem VARCHAR(36) DEFAULT NULL, - EyesAsset VARCHAR(36) DEFAULT NULL, - ShirtItem VARCHAR(36) DEFAULT NULL, - ShirtAsset VARCHAR(36) DEFAULT NULL, - PantsItem VARCHAR(36) DEFAULT NULL, - PantsAsset VARCHAR(36) DEFAULT NULL, - ShoesItem VARCHAR(36) DEFAULT NULL, - ShoesAsset VARCHAR(36) DEFAULT NULL, - SocksItem VARCHAR(36) DEFAULT NULL, - SocksAsset VARCHAR(36) DEFAULT NULL, - JacketItem VARCHAR(36) DEFAULT NULL, - JacketAsset VARCHAR(36) DEFAULT NULL, - GlovesItem VARCHAR(36) DEFAULT NULL, - GlovesAsset VARCHAR(36) DEFAULT NULL, - UnderShirtItem VARCHAR(36) DEFAULT NULL, - UnderShirtAsset VARCHAR(36) DEFAULT NULL, - UnderPantsItem VARCHAR(36) DEFAULT NULL, - UnderPantsAsset VARCHAR(36) DEFAULT NULL, - SkirtItem VARCHAR(36) DEFAULT NULL, - SkirtAsset VARCHAR(36) DEFAULT NULL, - Texture BLOB, - VisualParams BLOB, - Serial INT DEFAULT NULL, - AvatarHeight FLOAT DEFAULT NULL, - PRIMARY KEY (Owner) -); - -CREATE TABLE UserFriends ( - UserFriendID VARCHAR(36) NOT NULL, - OwnerID VARCHAR(36) DEFAULT NULL, - FriendID VARCHAR(36) DEFAULT NULL, - FriendPermissions INT DEFAULT NULL, - PRIMARY KEY (UserFriendID) -); - -CREATE UNIQUE INDEX UserFriendsOwnerIdFriendIdIndex ON UserFriends (OwnerID,FriendID); -- cgit v1.1