1 files changed, 99 insertions, 101 deletions
diff --git a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_UserStore.sql b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_UserStore.sql
index a66f5b8..140aea4 100644
--- a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_UserStore.sql
+++ b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_UserStore.sql
@@ -1,106 +1,104 @@
-START TRANSACTION;
+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)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
-CREATE TABLE `UserAgents` (
+CREATE TABLE UserProfiles (
-  `ProfileID` varchar(36) NOT NULL,
+  ID VARCHAR(36) NOT NULL,
-  `AgentIP` varchar(24) default NULL,
+  WebLoginKey VARCHAR(36) DEFAULT NULL,
-  `AgentPort` int(11) default NULL,
+  FirstName VARCHAR(32) DEFAULT NULL,
-  `AgentOnline` tinyint(1) default NULL,
+  SurName VARCHAR(32) DEFAULT NULL,
-  `SessionID` varchar(36) default NULL,
+  Email VARCHAR(250) DEFAULT NULL,
-  `SecureSessionID` varchar(36) default NULL,
+  PasswordHash VARCHAR(32) DEFAULT NULL,
-  `InitialRegion` varchar(255) default NULL,
+  PasswordSalt VARCHAR(32) DEFAULT NULL,
-  `Region` varchar(255) default NULL,
+  HomeRegionID VARCHAR(36) DEFAULT NULL,
-  `LoginTime` int(11) default NULL,
+  HomeRegionX INT DEFAULT NULL,
-  `LogoutTime` int(11) default NULL,
+  HomeRegionY INT DEFAULT NULL,
-  `Handle` bigint(20) default NULL,
+  HomeLocationX DOUBLE DEFAULT NULL,
-  `PositionX` float default NULL,
+  HomeLocationY DOUBLE DEFAULT NULL,
-  `PositionY` float default NULL,
+  HomeLocationZ DOUBLE DEFAULT NULL,
-  `PositionZ` float default NULL,
+  HomeLookAtX DOUBLE DEFAULT NULL,
-  `LookAtX` float default NULL,
+  HomeLookAtY DOUBLE DEFAULT NULL,
-  `LookAtY` float default NULL,
+  HomeLookAtZ DOUBLE DEFAULT NULL,
-  `LookAtZ` float default NULL,  
+  Created INT DEFAULT NULL,
-  PRIMARY KEY  (`ProfileID`)
+  LastLogin INT DEFAULT NULL,
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+  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)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
-CREATE TABLE `UserProfiles` (
+CREATE INDEX UserSurnameIndex ON UserProfiles (SurName);
-  `ID` varchar(36) NOT NULL,
+CREATE INDEX UserFirstNameIndex ON UserProfiles (FirstName);
-  `WebLoginKey` varchar(36) default NULL,
+CREATE UNIQUE INDEX UserFullNameIndex ON UserProfiles (SurName,FirstName);
-  `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(11) default NULL,
-  `HomeRegionY` int(11) default NULL,
-  `HomeLocationX` float default NULL,
-  `HomeLocationY` float default NULL,
-  `HomeLocationZ` float default NULL,
-  `HomeLookAtX` float default NULL,
-  `HomeLookAtY` float default NULL,
-  `HomeLookAtZ` float default NULL,
-  `Created` int(11) default NULL,
-  `LastLogin` int(11) 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(11) default NULL,
-  `WantDoMask` int(11) default NULL,
-  `UserFlags` int(11) default NULL,
-  `GodLevel` int(11) default NULL,  
-  `CustomType` varchar(32) default NULL,
-  `Partner` varchar(36) default NULL,
-  `RootInventoryFolderID` varchar(36) default NULL,
-  PRIMARY KEY  (`ID`),
-  INDEX `UserSurnameIndex` (`SurName`),
-  INDEX `UserFirstNameIndex` (`FirstName`),
-  UNIQUE INDEX `UserFullNameIndex` (`SurName`,`FirstName`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-CREATE TABLE `UserAppearances` (
+CREATE TABLE UserAppearances (
-  `Owner` varchar(36) NOT NULL,
+  Owner VARCHAR(36) NOT NULL,
-  `BodyItem` varchar(36) default NULL,
+  BodyItem VARCHAR(36) DEFAULT NULL,
-  `BodyAsset` varchar(36) default NULL,
+  BodyAsset VARCHAR(36) DEFAULT NULL,
-  `SkinItem` varchar(36) default NULL,
+  SkinItem VARCHAR(36) DEFAULT NULL,
-  `SkinAsset` varchar(36) default NULL,
+  SkinAsset VARCHAR(36) DEFAULT NULL,
-  `HairItem` varchar(36) default NULL,
+  HairItem VARCHAR(36) DEFAULT NULL,
-  `HairAsset` varchar(36) default NULL,
+  HairAsset VARCHAR(36) DEFAULT NULL,
-  `EyesItem` varchar(36) default NULL,
+  EyesItem VARCHAR(36) DEFAULT NULL,
-  `EyesAsset` varchar(36) default NULL,
+  EyesAsset VARCHAR(36) DEFAULT NULL,
-  `ShirtItem` varchar(36) default NULL,
+  ShirtItem VARCHAR(36) DEFAULT NULL,
-  `ShirtAsset` varchar(36) default NULL,
+  ShirtAsset VARCHAR(36) DEFAULT NULL,
-  `PantsItem` varchar(36) default NULL,
+  PantsItem VARCHAR(36) DEFAULT NULL,
-  `PantsAsset` varchar(36) default NULL,
+  PantsAsset VARCHAR(36) DEFAULT NULL,
-  `ShoesItem` varchar(36) default NULL,
+  ShoesItem VARCHAR(36) DEFAULT NULL,
-  `ShoesAsset` varchar(36) default NULL,
+  ShoesAsset VARCHAR(36) DEFAULT NULL,
-  `SocksItem` varchar(36) default NULL,
+  SocksItem VARCHAR(36) DEFAULT NULL,
-  `SocksAsset` varchar(36) default NULL,
+  SocksAsset VARCHAR(36) DEFAULT NULL,
-  `JacketItem` varchar(36) default NULL,
+  JacketItem VARCHAR(36) DEFAULT NULL,
-  `JacketAsset` varchar(36) default NULL,
+  JacketAsset VARCHAR(36) DEFAULT NULL,
-  `GlovesItem` varchar(36) default NULL,
+  GlovesItem VARCHAR(36) DEFAULT NULL,
-  `GlovesAsset` varchar(36) default NULL,
+  GlovesAsset VARCHAR(36) DEFAULT NULL,
-  `UnderShirtItem` varchar(36) default NULL,
+  UnderShirtItem VARCHAR(36) DEFAULT NULL,
-  `UnderShirtAsset` varchar(36) default NULL,
+  UnderShirtAsset VARCHAR(36) DEFAULT NULL,
-  `UnderPantsItem` varchar(36) default NULL,
+  UnderPantsItem VARCHAR(36) DEFAULT NULL,
-  `UnderPantsAsset` varchar(36) default NULL,
+  UnderPantsAsset VARCHAR(36) DEFAULT NULL,
-  `SkirtItem` varchar(36) default NULL,
+  SkirtItem VARCHAR(36) DEFAULT NULL,
-  `SkirtAsset` varchar(36) default NULL,
+  SkirtAsset VARCHAR(36) DEFAULT NULL,
-  `Texture` longblob,
+  Texture LONGBLOB,
-  `VisualParams` longblob,
+  VisualParams LONGBLOB,
-  `Serial` int(11) default NULL,
+  Serial INT DEFAULT NULL,
-  `AvatarHeight` float default NULL,    
+  AvatarHeight FLOAT DEFAULT NULL,    
-  PRIMARY KEY  (`Owner`)
+  PRIMARY KEY (Owner)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
-CREATE TABLE `UserFriends` (
+CREATE TABLE UserFriends (
-   `UserFriendID` VARCHAR(36) NOT NULL,
+  UserFriendID VARCHAR(36) NOT NULL,
-   `OwnerID` VARCHAR(36) NOT NULL,
+  OwnerID VARCHAR(36) DEFAULT NULL,
-   `FriendID` VARCHAR(36) NOT NULL,
+  FriendID VARCHAR(36) DEFAULT NULL,
-   `FriendPermissions` INT(11) NOT NULL,
+  FriendPermissions INT DEFAULT NULL,
-    PRIMARY KEY  (`UserFriendID`),
+  PRIMARY KEY (UserFriendID)  
-    UNIQUE INDEX (`OwnerID`,`FriendID`)    
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-COMMIT;
+CREATE UNIQUE INDEX UserFriendsOwnerIdFriendIdIndex ON UserFriends (OwnerID,FriendID);

diff --git a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_UserStore.sql b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_UserStore.sql index a66f5b8..140aea4 100644 --- a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_UserStore.sql +++ b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_UserStore.sql
@@ -1,106 +1,104 @@
1	START TRANSACTION;	1	CREATE TABLE UserAgents (
		2	ProfileID VARCHAR(36) NOT NULL,
		3	AgentIP VARCHAR(24) DEFAULT NULL,
		4	AgentPort INT DEFAULT NULL,
		5	AgentOnline BIT DEFAULT NULL,
		6	SessionID VARCHAR(36) DEFAULT NULL,
		7	SecureSessionID VARCHAR(36) DEFAULT NULL,
		8	InitialRegion VARCHAR(255) DEFAULT NULL,
		9	Region VARCHAR(255) DEFAULT NULL,
		10	LoginTime INT DEFAULT NULL,
		11	LogoutTime INT DEFAULT NULL,
		12	Handle BIGINT DEFAULT NULL,
		13	PositionX DOUBLE DEFAULT NULL,
		14	PositionY DOUBLE DEFAULT NULL,
		15	PositionZ DOUBLE DEFAULT NULL,
		16	LookAtX DOUBLE DEFAULT NULL,
		17	LookAtY DOUBLE DEFAULT NULL,
		18	LookAtZ DOUBLE DEFAULT NULL,
		19	PRIMARY KEY (ProfileID)
		20	) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
2		21
3	CREATE TABLE `UserAgents` (	22	CREATE TABLE UserProfiles (
4	`ProfileID` varchar(36) NOT NULL,	23	ID VARCHAR(36) NOT NULL,
5	`AgentIP` varchar(24) default NULL,	24	WebLoginKey VARCHAR(36) DEFAULT NULL,
6	`AgentPort` int(11) default NULL,	25	FirstName VARCHAR(32) DEFAULT NULL,
7	`AgentOnline` tinyint(1) default NULL,	26	SurName VARCHAR(32) DEFAULT NULL,
8	`SessionID` varchar(36) default NULL,	27	Email VARCHAR(250) DEFAULT NULL,
9	`SecureSessionID` varchar(36) default NULL,	28	PasswordHash VARCHAR(32) DEFAULT NULL,
10	`InitialRegion` varchar(255) default NULL,	29	PasswordSalt VARCHAR(32) DEFAULT NULL,
11	`Region` varchar(255) default NULL,	30	HomeRegionID VARCHAR(36) DEFAULT NULL,
12	`LoginTime` int(11) default NULL,	31	HomeRegionX INT DEFAULT NULL,
13	`LogoutTime` int(11) default NULL,	32	HomeRegionY INT DEFAULT NULL,
14	`Handle` bigint(20) default NULL,	33	HomeLocationX DOUBLE DEFAULT NULL,
15	`PositionX` float default NULL,	34	HomeLocationY DOUBLE DEFAULT NULL,
16	`PositionY` float default NULL,	35	HomeLocationZ DOUBLE DEFAULT NULL,
17	`PositionZ` float default NULL,	36	HomeLookAtX DOUBLE DEFAULT NULL,
18	`LookAtX` float default NULL,	37	HomeLookAtY DOUBLE DEFAULT NULL,
19	`LookAtY` float default NULL,	38	HomeLookAtZ DOUBLE DEFAULT NULL,
20	`LookAtZ` float default NULL,	39	Created INT DEFAULT NULL,
21	PRIMARY KEY (`ProfileID`)	40	LastLogin INT DEFAULT NULL,
22	) ENGINE=InnoDB DEFAULT CHARSET=utf8;	41	UserInventoryURI VARCHAR(255) DEFAULT NULL,
		42	UserAssetURI VARCHAR(255) DEFAULT NULL,
		43	Image VARCHAR(36) DEFAULT NULL,
		44	FirstLifeImage VARCHAR(36) DEFAULT NULL,
		45	AboutText TEXT DEFAULT NULL,
		46	FirstLifeAboutText TEXT DEFAULT NULL,
		47	CanDoMask INT DEFAULT NULL,
		48	WantDoMask INT DEFAULT NULL,
		49	UserFlags INT DEFAULT NULL,
		50	GodLevel INT DEFAULT NULL,
		51	CustomType VARCHAR(32) DEFAULT NULL,
		52	Partner VARCHAR(36) DEFAULT NULL,
		53	RootInventoryFolderID VARCHAR(36) DEFAULT NULL,
		54	PRIMARY KEY (ID)
		55	) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
23		56
24	CREATE TABLE `UserProfiles` (	57	CREATE INDEX UserSurnameIndex ON UserProfiles (SurName);
25	`ID` varchar(36) NOT NULL,	58	CREATE INDEX UserFirstNameIndex ON UserProfiles (FirstName);
26	`WebLoginKey` varchar(36) default NULL,	59	CREATE UNIQUE INDEX UserFullNameIndex ON UserProfiles (SurName,FirstName);
27	`FirstName` varchar(32) default NULL,
28	`SurName` varchar(32) default NULL,
29	`Email` varchar(250) default NULL,
30	`PasswordHash` varchar(32) default NULL,
31	`PasswordSalt` varchar(32) default NULL,
32	`HomeRegionID` varchar(36) default NULL,
33	`HomeRegionX` int(11) default NULL,
34	`HomeRegionY` int(11) default NULL,
35	`HomeLocationX` float default NULL,
36	`HomeLocationY` float default NULL,
37	`HomeLocationZ` float default NULL,
38	`HomeLookAtX` float default NULL,
39	`HomeLookAtY` float default NULL,
40	`HomeLookAtZ` float default NULL,
41	`Created` int(11) default NULL,
42	`LastLogin` int(11) default NULL,
43	`UserInventoryURI` varchar(255) default NULL,
44	`UserAssetURI` varchar(255) default NULL,
45	`Image` varchar(36) default NULL,
46	`FirstLifeImage` varchar(36) default NULL,
47	`AboutText` text default NULL,
48	`FirstLifeAboutText` text default NULL,
49	`CanDoMask` int(11) default NULL,
50	`WantDoMask` int(11) default NULL,
51	`UserFlags` int(11) default NULL,
52	`GodLevel` int(11) default NULL,
53	`CustomType` varchar(32) default NULL,
54	`Partner` varchar(36) default NULL,
55	`RootInventoryFolderID` varchar(36) default NULL,
56	PRIMARY KEY (`ID`),
57	INDEX `UserSurnameIndex` (`SurName`),
58	INDEX `UserFirstNameIndex` (`FirstName`),
59	UNIQUE INDEX `UserFullNameIndex` (`SurName`,`FirstName`)
60	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
61		60
62	CREATE TABLE `UserAppearances` (	61	CREATE TABLE UserAppearances (
63	`Owner` varchar(36) NOT NULL,	62	Owner VARCHAR(36) NOT NULL,
64	`BodyItem` varchar(36) default NULL,	63	BodyItem VARCHAR(36) DEFAULT NULL,
65	`BodyAsset` varchar(36) default NULL,	64	BodyAsset VARCHAR(36) DEFAULT NULL,
66	`SkinItem` varchar(36) default NULL,	65	SkinItem VARCHAR(36) DEFAULT NULL,
67	`SkinAsset` varchar(36) default NULL,	66	SkinAsset VARCHAR(36) DEFAULT NULL,
68	`HairItem` varchar(36) default NULL,	67	HairItem VARCHAR(36) DEFAULT NULL,
69	`HairAsset` varchar(36) default NULL,	68	HairAsset VARCHAR(36) DEFAULT NULL,
70	`EyesItem` varchar(36) default NULL,	69	EyesItem VARCHAR(36) DEFAULT NULL,
71	`EyesAsset` varchar(36) default NULL,	70	EyesAsset VARCHAR(36) DEFAULT NULL,
72	`ShirtItem` varchar(36) default NULL,	71	ShirtItem VARCHAR(36) DEFAULT NULL,
73	`ShirtAsset` varchar(36) default NULL,	72	ShirtAsset VARCHAR(36) DEFAULT NULL,
74	`PantsItem` varchar(36) default NULL,	73	PantsItem VARCHAR(36) DEFAULT NULL,
75	`PantsAsset` varchar(36) default NULL,	74	PantsAsset VARCHAR(36) DEFAULT NULL,
76	`ShoesItem` varchar(36) default NULL,	75	ShoesItem VARCHAR(36) DEFAULT NULL,
77	`ShoesAsset` varchar(36) default NULL,	76	ShoesAsset VARCHAR(36) DEFAULT NULL,
78	`SocksItem` varchar(36) default NULL,	77	SocksItem VARCHAR(36) DEFAULT NULL,
79	`SocksAsset` varchar(36) default NULL,	78	SocksAsset VARCHAR(36) DEFAULT NULL,
80	`JacketItem` varchar(36) default NULL,	79	JacketItem VARCHAR(36) DEFAULT NULL,
81	`JacketAsset` varchar(36) default NULL,	80	JacketAsset VARCHAR(36) DEFAULT NULL,
82	`GlovesItem` varchar(36) default NULL,	81	GlovesItem VARCHAR(36) DEFAULT NULL,
83	`GlovesAsset` varchar(36) default NULL,	82	GlovesAsset VARCHAR(36) DEFAULT NULL,
84	`UnderShirtItem` varchar(36) default NULL,	83	UnderShirtItem VARCHAR(36) DEFAULT NULL,
85	`UnderShirtAsset` varchar(36) default NULL,	84	UnderShirtAsset VARCHAR(36) DEFAULT NULL,
86	`UnderPantsItem` varchar(36) default NULL,	85	UnderPantsItem VARCHAR(36) DEFAULT NULL,
87	`UnderPantsAsset` varchar(36) default NULL,	86	UnderPantsAsset VARCHAR(36) DEFAULT NULL,
88	`SkirtItem` varchar(36) default NULL,	87	SkirtItem VARCHAR(36) DEFAULT NULL,
89	`SkirtAsset` varchar(36) default NULL,	88	SkirtAsset VARCHAR(36) DEFAULT NULL,
90	`Texture` longblob,	89	Texture LONGBLOB,
91	`VisualParams` longblob,	90	VisualParams LONGBLOB,
92	`Serial` int(11) default NULL,	91	Serial INT DEFAULT NULL,
93	`AvatarHeight` float default NULL,	92	AvatarHeight FLOAT DEFAULT NULL,
94	PRIMARY KEY (`Owner`)	93	PRIMARY KEY (Owner)
95	) ENGINE=InnoDB DEFAULT CHARSET=utf8;	94	) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
96		95
97	CREATE TABLE `UserFriends` (	96	CREATE TABLE UserFriends (
98	`UserFriendID` VARCHAR(36) NOT NULL,	97	UserFriendID VARCHAR(36) NOT NULL,
99	`OwnerID` VARCHAR(36) NOT NULL,	98	OwnerID VARCHAR(36) DEFAULT NULL,
100	`FriendID` VARCHAR(36) NOT NULL,	99	FriendID VARCHAR(36) DEFAULT NULL,
101	`FriendPermissions` INT(11) NOT NULL,	100	FriendPermissions INT DEFAULT NULL,
102	PRIMARY KEY (`UserFriendID`),	101	PRIMARY KEY (UserFriendID)
103	UNIQUE INDEX (`OwnerID`,`FriendID`)	102	) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
104	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
105		103
106	COMMIT;	104	CREATE UNIQUE INDEX UserFriendsOwnerIdFriendIdIndex ON UserFriends (OwnerID,FriendID);