diff options
author | Diva Canto | 2010-05-04 09:44:30 -0700 |
---|---|---|
committer | Diva Canto | 2010-05-04 09:44:30 -0700 |
commit | 484584b83ce96825c49ccf7c9c129a3961e5c223 (patch) | |
tree | dee9f85383d5a71cf800380231eb5a4b1a5e4d65 | |
parent | Allow reloading of estate settings into a running region. Move sun update (diff) | |
download | opensim-SC-484584b83ce96825c49ccf7c9c129a3961e5c223.zip opensim-SC-484584b83ce96825c49ccf7c9c129a3961e5c223.tar.gz opensim-SC-484584b83ce96825c49ccf7c9c129a3961e5c223.tar.bz2 opensim-SC-484584b83ce96825c49ccf7c9c129a3961e5c223.tar.xz |
Fixed: migration #2 for SQLite. Problem was that ATTACH cannot be done inside a transaction.
-rw-r--r-- | OpenSim/Data/SQLite/Resources/002_XInventoryStore.sql | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Data/SQLite/Resources/002_XInventoryStore.sql b/OpenSim/Data/SQLite/Resources/002_XInventoryStore.sql index 545d233..d38e2b7 100644 --- a/OpenSim/Data/SQLite/Resources/002_XInventoryStore.sql +++ b/OpenSim/Data/SQLite/Resources/002_XInventoryStore.sql | |||
@@ -1,9 +1,8 @@ | |||
1 | BEGIN TRANSACTION; | 1 | ATTACH 'inventoryStore.db' AS old; |
2 | 2 | ||
3 | ATTACH 'inventoryStore.db' AS old; | 3 | BEGIN TRANSACTION; |
4 | 4 | ||
5 | INSERT INTO inventoryfolders (folderName, type, version, folderID, agentID, parentFolderID) SELECT `name` AS folderName, `type` AS type, `version` AS version, `UUID` AS folderID, `agentID` AS agentID, `parentID` AS parentFolderID from old.inventoryfolders; | 5 | INSERT INTO inventoryfolders (folderName, type, version, folderID, agentID, parentFolderID) SELECT `name` AS folderName, `type` AS type, `version` AS version, `UUID` AS folderID, `agentID` AS agentID, `parentID` AS parentFolderID from old.inventoryfolders; |
6 | |||
7 | INSERT INTO inventoryitems (assetID, assetType, inventoryName, inventoryDescription, inventoryNextPermissions, inventoryCurrentPermissions, invType, creatorID, inventoryBasePermissions, inventoryEveryOnePermissions, salePrice, saleType, creationDate, groupID, groupOwned, flags, inventoryID, parentFolderID, avatarID, inventoryGroupPermissions) SELECT `assetID`, `assetType` AS assetType, `inventoryName` AS inventoryName, `inventoryDescription` AS inventoryDescription, `inventoryNextPermissions` AS inventoryNextPermissions, `inventoryCurrentPermissions` AS inventoryCurrentPermissions, `invType` AS invType, `creatorsID` AS creatorID, `inventoryBasePermissions` AS inventoryBasePermissions, `inventoryEveryOnePermissions` AS inventoryEveryOnePermissions, `salePrice` AS salePrice, `saleType` AS saleType, `creationDate` AS creationDate, `groupID` AS groupID, `groupOwned` AS groupOwned, `flags` AS flags, `UUID` AS inventoryID, `parentFolderID` AS parentFolderID, `avatarID` AS avatarID, `inventoryGroupPermissions` AS inventoryGroupPermissions FROM old.inventoryitems; | 6 | INSERT INTO inventoryitems (assetID, assetType, inventoryName, inventoryDescription, inventoryNextPermissions, inventoryCurrentPermissions, invType, creatorID, inventoryBasePermissions, inventoryEveryOnePermissions, salePrice, saleType, creationDate, groupID, groupOwned, flags, inventoryID, parentFolderID, avatarID, inventoryGroupPermissions) SELECT `assetID`, `assetType` AS assetType, `inventoryName` AS inventoryName, `inventoryDescription` AS inventoryDescription, `inventoryNextPermissions` AS inventoryNextPermissions, `inventoryCurrentPermissions` AS inventoryCurrentPermissions, `invType` AS invType, `creatorsID` AS creatorID, `inventoryBasePermissions` AS inventoryBasePermissions, `inventoryEveryOnePermissions` AS inventoryEveryOnePermissions, `salePrice` AS salePrice, `saleType` AS saleType, `creationDate` AS creationDate, `groupID` AS groupID, `groupOwned` AS groupOwned, `flags` AS flags, `UUID` AS inventoryID, `parentFolderID` AS parentFolderID, `avatarID` AS avatarID, `inventoryGroupPermissions` AS inventoryGroupPermissions FROM old.inventoryitems; |
8 | 7 | ||
9 | COMMIT; | 8 | COMMIT; |