diff options
author | Melanie | 2010-05-26 10:38:46 +0100 |
---|---|---|
committer | Melanie | 2010-05-26 10:56:24 +0100 |
commit | 1c7f60ab493dffe44ab0517e4a6101fe5d909e28 (patch) | |
tree | 72b6a478d32d968ad7f5f3d6d11955bee9662926 /OpenSim/Data/SQLite/Resources | |
parent | Change the way alpha is interpreted on prim text. Manris #4723 (diff) | |
parent | Minor correction to AssetTests.cs (diff) | |
download | opensim-SC_OLD-1c7f60ab493dffe44ab0517e4a6101fe5d909e28.zip opensim-SC_OLD-1c7f60ab493dffe44ab0517e4a6101fe5d909e28.tar.gz opensim-SC_OLD-1c7f60ab493dffe44ab0517e4a6101fe5d909e28.tar.bz2 opensim-SC_OLD-1c7f60ab493dffe44ab0517e4a6101fe5d909e28.tar.xz |
Merge branch 'unitests'
Signed-off-by: Melanie <melanie@t-data.com>
Diffstat (limited to 'OpenSim/Data/SQLite/Resources')
-rw-r--r-- | OpenSim/Data/SQLite/Resources/EstateStore.migrations | 88 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/Resources/RegionStore.migrations | 25 |
2 files changed, 88 insertions, 25 deletions
diff --git a/OpenSim/Data/SQLite/Resources/EstateStore.migrations b/OpenSim/Data/SQLite/Resources/EstateStore.migrations new file mode 100644 index 0000000..62f6464 --- /dev/null +++ b/OpenSim/Data/SQLite/Resources/EstateStore.migrations | |||
@@ -0,0 +1,88 @@ | |||
1 | :VERSION 6 | ||
2 | |||
3 | BEGIN TRANSACTION; | ||
4 | |||
5 | CREATE TABLE estate_groups ( | ||
6 | EstateID int(10) NOT NULL, | ||
7 | uuid char(36) NOT NULL | ||
8 | ); | ||
9 | |||
10 | CREATE TABLE estate_managers ( | ||
11 | EstateID int(10) NOT NULL, | ||
12 | uuid char(36) NOT NULL | ||
13 | ); | ||
14 | |||
15 | CREATE TABLE estate_map ( | ||
16 | RegionID char(36) NOT NULL default '00000000-0000-0000-0000-000000000000', | ||
17 | EstateID int(11) NOT NULL | ||
18 | ); | ||
19 | |||
20 | CREATE TABLE estate_settings ( | ||
21 | EstateID INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, | ||
22 | EstateName varchar(64) default NULL, | ||
23 | AbuseEmailToEstateOwner tinyint(4) NOT NULL, | ||
24 | DenyAnonymous tinyint(4) NOT NULL, | ||
25 | ResetHomeOnTeleport tinyint(4) NOT NULL, | ||
26 | FixedSun tinyint(4) NOT NULL, | ||
27 | DenyTransacted tinyint(4) NOT NULL, | ||
28 | BlockDwell tinyint(4) NOT NULL, | ||
29 | DenyIdentified tinyint(4) NOT NULL, | ||
30 | AllowVoice tinyint(4) NOT NULL, | ||
31 | UseGlobalTime tinyint(4) NOT NULL, | ||
32 | PricePerMeter int(11) NOT NULL, | ||
33 | TaxFree tinyint(4) NOT NULL, | ||
34 | AllowDirectTeleport tinyint(4) NOT NULL, | ||
35 | RedirectGridX int(11) NOT NULL, | ||
36 | RedirectGridY int(11) NOT NULL, | ||
37 | ParentEstateID int(10) NOT NULL, | ||
38 | SunPosition double NOT NULL, | ||
39 | EstateSkipScripts tinyint(4) NOT NULL, | ||
40 | BillableFactor float NOT NULL, | ||
41 | PublicAccess tinyint(4) NOT NULL | ||
42 | ); | ||
43 | |||
44 | insert into estate_settings ( | ||
45 | EstateID,EstateName,AbuseEmailToEstateOwner,DenyAnonymous,ResetHomeOnTeleport,FixedSun,DenyTransacted,BlockDwell,DenyIdentified,AllowVoice,UseGlobalTime,PricePerMeter,TaxFree,AllowDirectTeleport,RedirectGridX,RedirectGridY,ParentEstateID,SunPosition,PublicAccess,EstateSkipScripts,BillableFactor) | ||
46 | values ( 99, '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', ''); | ||
47 | delete from estate_settings; | ||
48 | |||
49 | CREATE TABLE estate_users ( | ||
50 | EstateID int(10) NOT NULL, | ||
51 | uuid char(36) NOT NULL | ||
52 | ); | ||
53 | |||
54 | CREATE TABLE estateban ( | ||
55 | EstateID int(10) NOT NULL, | ||
56 | bannedUUID varchar(36) NOT NULL, | ||
57 | bannedIp varchar(16) NOT NULL, | ||
58 | bannedIpHostMask varchar(16) NOT NULL, | ||
59 | bannedNameMask varchar(64) default NULL | ||
60 | ); | ||
61 | |||
62 | CREATE INDEX estate_ban_estate_id on estateban(EstateID); | ||
63 | CREATE INDEX estate_groups_estate_id on estate_groups(EstateID); | ||
64 | CREATE INDEX estate_managers_estate_id on estate_managers(EstateID); | ||
65 | CREATE INDEX estate_map_estate_id on estate_map(EstateID); | ||
66 | CREATE UNIQUE INDEX estate_map_region_id on estate_map(RegionID); | ||
67 | CREATE INDEX estate_users_estate_id on estate_users(EstateID); | ||
68 | |||
69 | COMMIT; | ||
70 | |||
71 | |||
72 | :VERSION 7 | ||
73 | |||
74 | begin; | ||
75 | |||
76 | alter table estate_settings add column AbuseEmail varchar(255) not null default ''; | ||
77 | |||
78 | alter table estate_settings add column EstateOwner varchar(36) not null default ''; | ||
79 | |||
80 | commit; | ||
81 | |||
82 | :VERSION 8 | ||
83 | |||
84 | begin; | ||
85 | |||
86 | alter table estate_settings add column DenyMinors tinyint not null default 0; | ||
87 | |||
88 | commit; | ||
diff --git a/OpenSim/Data/SQLite/Resources/RegionStore.migrations b/OpenSim/Data/SQLite/Resources/RegionStore.migrations index 7b27378..c47a85d 100644 --- a/OpenSim/Data/SQLite/Resources/RegionStore.migrations +++ b/OpenSim/Data/SQLite/Resources/RegionStore.migrations | |||
@@ -311,33 +311,8 @@ CREATE TABLE regionsettings ( | |||
311 | PRIMARY KEY (regionUUID) | 311 | PRIMARY KEY (regionUUID) |
312 | ); | 312 | ); |
313 | 313 | ||
314 | CREATE INDEX estate_ban_estate_id on estateban(EstateID); | ||
315 | CREATE INDEX estate_groups_estate_id on estate_groups(EstateID); | ||
316 | CREATE INDEX estate_managers_estate_id on estate_managers(EstateID); | ||
317 | CREATE INDEX estate_map_estate_id on estate_map(EstateID); | ||
318 | CREATE UNIQUE INDEX estate_map_region_id on estate_map(RegionID); | ||
319 | CREATE INDEX estate_users_estate_id on estate_users(EstateID); | ||
320 | |||
321 | COMMIT; | 314 | COMMIT; |
322 | 315 | ||
323 | :VERSION 7 | ||
324 | |||
325 | begin; | ||
326 | |||
327 | alter table estate_settings add column AbuseEmail varchar(255) not null default ''; | ||
328 | |||
329 | alter table estate_settings add column EstateOwner varchar(36) not null default ''; | ||
330 | |||
331 | commit; | ||
332 | |||
333 | :VERSION 8 | ||
334 | |||
335 | begin; | ||
336 | |||
337 | alter table estate_settings add column DenyMinors tinyint not null default 0; | ||
338 | |||
339 | commit; | ||
340 | |||
341 | :VERSION 9 | 316 | :VERSION 9 |
342 | 317 | ||
343 | BEGIN; | 318 | BEGIN; |