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 --- OpenSim/Data/NHibernate/Migration/README.txt | 3 -- OpenSim/Data/NHibernate/Migration/SqliteAssets.sql | 5 --- .../Data/NHibernate/Migration/SqliteInventory.pl | 43 ---------------------- 3 files changed, 51 deletions(-) delete mode 100644 OpenSim/Data/NHibernate/Migration/README.txt delete mode 100644 OpenSim/Data/NHibernate/Migration/SqliteAssets.sql delete mode 100755 OpenSim/Data/NHibernate/Migration/SqliteInventory.pl (limited to 'OpenSim/Data/NHibernate/Migration') diff --git a/OpenSim/Data/NHibernate/Migration/README.txt b/OpenSim/Data/NHibernate/Migration/README.txt deleted file mode 100644 index 3776960..0000000 --- a/OpenSim/Data/NHibernate/Migration/README.txt +++ /dev/null @@ -1,3 +0,0 @@ -This directory contains migration scripts for migrating from other -database backends in OpenSim to the NHibernate version of that same -database driver. \ No newline at end of file diff --git a/OpenSim/Data/NHibernate/Migration/SqliteAssets.sql b/OpenSim/Data/NHibernate/Migration/SqliteAssets.sql deleted file mode 100644 index 4a7e0d1..0000000 --- a/OpenSim/Data/NHibernate/Migration/SqliteAssets.sql +++ /dev/null @@ -1,5 +0,0 @@ --- The following converts the UUID from XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX --- to XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX. This puts it in Guid native format --- for .NET, and the prefered format for LLUUID. - -update assets 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 '%-%'; \ No newline at end of file diff --git a/OpenSim/Data/NHibernate/Migration/SqliteInventory.pl b/OpenSim/Data/NHibernate/Migration/SqliteInventory.pl deleted file mode 100755 index c59cbce..0000000 --- a/OpenSim/Data/NHibernate/Migration/SqliteInventory.pl +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/perl - -# -- CREATE TABLE inventoryitems(UUID varchar(255) primary key, -# -- assetID varchar(255), -# -- assetType integer, -# -- invType integer, -# -- parentFolderID varchar(255), -# -- avatarID varchar(255), -# -- creatorsID varchar(255), -# -- inventoryName varchar(255), -# -- inventoryDescription varchar(255), -# -- inventoryNextPermissions integer, -# -- inventoryCurrentPermissions integer, -# -- inventoryBasePermissions integer, -# -- inventoryEveryOnePermissions integer); - -# -- CREATE TABLE inventoryfolders(UUID varchar(255) primary key, -# -- name varchar(255), -# -- agentID varchar(255), -# -- parentID varchar(255), -# -- type integer, -# -- version integer); - -my $items = "INSERT INTO InventoryItems(ID, AssetID, AssetType, InvType, Folder, Owner, Creator, Name, Description, NextPermissions, CurrentPermissions, BasePermissions, EveryOnePermissions) "; -my $folders = "INSERT INTO InventoryFolders(ID, Name, Owner, ParentID, Type, Version) "; - -open(SQLITE, "sqlite3 inventoryStore.db .dump |") or die "can't open the database for migration"; -open(WRITE,"| sqlite3 Inventory.db"); - -while(my $line = ) { - $line =~ s/([0-9a-f]{8})([0-9a-f]{4})([0-9a-f]{4})([0-9a-f]{4})([0-9a-f]{12})/$1-$2-$3-$4-$5/g; - if($line =~ s/(INSERT INTO "inventoryitems")/$items/) { - print $line; - print WRITE $line; - } - if($line =~ s/(INSERT INTO "inventoryfolders")/$folders/) { - print $line; - print WRITE $line; - } -} - -close(WRITE); -close(SQLITE); -- cgit v1.1