From ee24b2516545f57db5926aa69eb11b397fc599bb Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 21 Feb 2016 09:00:59 -0800
Subject: Flatten migrations for sqlite

Conflicts:
	OpenSim/Data/SQLite/Resources/RegionStore.migrations
(Resolved)
---
 .../SQLite/Resources/InventoryStore.migrations     | 111 ++++++---------------
 1 file changed, 29 insertions(+), 82 deletions(-)

(limited to 'OpenSim/Data/SQLite/Resources/InventoryStore.migrations')

diff --git a/OpenSim/Data/SQLite/Resources/InventoryStore.migrations b/OpenSim/Data/SQLite/Resources/InventoryStore.migrations
index 585ac49..2b48623 100644
--- a/OpenSim/Data/SQLite/Resources/InventoryStore.migrations
+++ b/OpenSim/Data/SQLite/Resources/InventoryStore.migrations
@@ -1,92 +1,39 @@
-:VERSION 1
+:VERSION 5
 
 BEGIN TRANSACTION;
 
-CREATE TABLE inventoryfolders(
-       UUID varchar(255) primary key,
-       name varchar(255),
-       agentID varchar(255),
-       parentID varchar(255),
+CREATE TABLE IF NOT EXISTS inventoryfolders(
+       folderName varchar(64),
        type integer,
-       version integer);
-
-CREATE TABLE inventoryitems(
-       UUID varchar(255) primary key,
-       assetID varchar(255),
+       version integer,
+       folderID varchar(36) primary key,
+       agentID varchar(36) not null default '00000000-0000-0000-0000-000000000000',
+       parentFolderID varchar(36) not null default '00000000-0000-0000-0000-000000000000');
+CREATE INDEX inventoryfolders_agentid on inventoryfolders(agentID);
+CREATE INDEX inventoryfolders_parentid on inventoryfolders(parentFolderID);
+
+CREATE TABLE IF NOT EXISTS inventoryitems(
+       assetID varchar(36),
        assetType integer,
-       invType integer,
-       parentFolderID varchar(255),
-       avatarID varchar(255),
-       creatorsID varchar(255),
-       inventoryName varchar(255),
-       inventoryDescription varchar(255),
+       inventoryName varchar(64),
+       inventoryDescription varchar(128),
        inventoryNextPermissions integer,
        inventoryCurrentPermissions integer,
+       invType integer,
+       creatorID varchar(128),
        inventoryBasePermissions integer,
-       inventoryEveryOnePermissions integer, 
-       salePrice integer default 99, 
-       saleType integer default 0, 
-       creationDate integer default 2000, 
-       groupID varchar(255) default '00000000-0000-0000-0000-000000000000', 
-       groupOwned integer default 0, 
-       flags integer default 0);
-
-COMMIT;
-
-:VERSION 2
-
-BEGIN TRANSACTION;
-
-create index inventoryfolders_agentid on inventoryfolders(agentid);
-create index inventoryfolders_parentid on inventoryfolders(parentid);
-create index inventoryitems_parentfolderid on inventoryitems(parentfolderid);
-create index inventoryitems_avatarid on inventoryitems(avatarid);
-
-COMMIT;
-
-:VERSION 3
-
-BEGIN;
-
-alter table inventoryitems add column inventoryGroupPermissions integer unsigned not null default 0;
-
-COMMIT;
-
-:VERSION 4
-
-BEGIN;
-
-update inventoryitems 
-  set UUID = substr(UUID, 1, 8) || "-" || substr(UUID, 9, 4) || "-" || substr(UUID, 13, 4) || "-" || substr(UUID, 17, 4) || "-" || substr(UUID, 21, 12)
-  where UUID not like '%-%';
-
-update inventoryitems
-  set assetID = substr(assetID, 1, 8) || "-" || substr(assetID, 9, 4) || "-" || substr(assetID, 13, 4) || "-" || substr(assetID, 17, 4) || "-" || substr(assetID, 21, 12) 
-  where assetID not like '%-%';
-
-update inventoryitems
-  set parentFolderID = substr(parentFolderID, 1, 8) || "-" || substr(parentFolderID, 9, 4) || "-" || substr(parentFolderID, 13, 4) || "-" || substr(parentFolderID, 17, 4) || "-" || substr(parentFolderID, 21, 12) 
-  where parentFolderID not like '%-%';
-
-update inventoryitems
-  set avatarID = substr(avatarID, 1, 8) || "-" || substr(avatarID, 9, 4) || "-" || substr(avatarID, 13, 4) || "-" || substr(avatarID, 17, 4) || "-" || substr(avatarID, 21, 12) 
-  where avatarID not like '%-%';
-
-update inventoryitems
-  set creatorsID = substr(creatorsID, 1, 8) || "-" || substr(creatorsID, 9, 4) || "-" || substr(creatorsID, 13, 4) || "-" || substr(creatorsID, 17, 4) || "-" || substr(creatorsID, 21, 12)
-  where creatorsID not like '%-%';
-
-
-update inventoryfolders
-  set UUID = substr(UUID, 1, 8) || "-" || substr(UUID, 9, 4) || "-" || substr(UUID, 13, 4) || "-" || substr(UUID, 17, 4) || "-" || substr(UUID, 21, 12)
-  where UUID not like '%-%';
-
-update inventoryfolders
-  set agentID = substr(agentID, 1, 8) || "-" || substr(agentID, 9, 4) || "-" || substr(agentID, 13, 4) || "-" || substr(agentID, 17, 4) || "-" || substr(agentID, 21, 12)
-  where agentID not like '%-%';
-
-update inventoryfolders
-  set parentID = substr(parentID, 1, 8) || "-" || substr(parentID, 9, 4) || "-" || substr(parentID, 13, 4) || "-" || substr(parentID, 17, 4) || "-" || substr(parentID, 21, 12)
-  where parentID not like '%-%';
+       inventoryEveryOnePermissions integer,
+       salePrice integer default 99,
+       saleType integer default 0,
+       creationDate integer default 2000,
+       groupID varchar(36) default '00000000-0000-0000-0000-000000000000',
+       groupOwned integer default 0,
+       flags integer default 0,
+       inventoryID varchar(36) primary key,
+       parentFolderID varchar(36) not null default '00000000-0000-0000-0000-000000000000',
+       avatarID varchar(36) not null default '00000000-0000-0000-0000-000000000000',
+       inventoryGroupPermissions integer not null default 0);
+CREATE INDEX inventoryitems_parentfolderid on inventoryitems(parentFolderID);
+CREATE INDEX inventoryitems_avatarid on inventoryitems(avatarID);
 
 COMMIT;
-- 
cgit v1.1