aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-04-10 11:34:37 +0000
committerJustin Clarke Casey2009-04-10 11:34:37 +0000
commitbc515c324140ee9770ec5c6e2b960014b1e66be0 (patch)
treee0ba10f0553b39839e7a09adbc78edbe90d32b29
parent* Patch from RemedyTomm Mantis 3440 (diff)
downloadopensim-SC_OLD-bc515c324140ee9770ec5c6e2b960014b1e66be0.zip
opensim-SC_OLD-bc515c324140ee9770ec5c6e2b960014b1e66be0.tar.gz
opensim-SC_OLD-bc515c324140ee9770ec5c6e2b960014b1e66be0.tar.bz2
opensim-SC_OLD-bc515c324140ee9770ec5c6e2b960014b1e66be0.tar.xz
* Apply http://opensimulator.org/mantis/view.php?id=3439
* This corrects problems seen on some SQLite systems where the migration fails because the two argument substr() isn't implemented * Thanks RemedyTomm!
-rw-r--r--OpenSim/Data/SQLite/Resources/004_AssetStore.sql2
-rw-r--r--OpenSim/Data/SQLite/Resources/004_InventoryStore.sql16
-rw-r--r--OpenSim/Data/SQLite/Resources/009_UserStore.sql4
3 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Data/SQLite/Resources/004_AssetStore.sql b/OpenSim/Data/SQLite/Resources/004_AssetStore.sql
index 721f2b5..39421c4 100644
--- a/OpenSim/Data/SQLite/Resources/004_AssetStore.sql
+++ b/OpenSim/Data/SQLite/Resources/004_AssetStore.sql
@@ -1,7 +1,7 @@
1BEGIN; 1BEGIN;
2 2
3update assets 3update assets
4 set UUID = substr(UUID, 1, 8) || "-" || substr(UUID, 9, 4) || "-" || substr(UUID, 13, 4) || "-" || substr(UUID, 17, 4) || "-" || substr(UUID, 21) 4 set UUID = substr(UUID, 1, 8) || "-" || substr(UUID, 9, 4) || "-" || substr(UUID, 13, 4) || "-" || substr(UUID, 17, 4) || "-" || substr(UUID, 21, 12)
5 where UUID not like '%-%'; 5 where UUID not like '%-%';
6 6
7COMMIT; 7COMMIT;
diff --git a/OpenSim/Data/SQLite/Resources/004_InventoryStore.sql b/OpenSim/Data/SQLite/Resources/004_InventoryStore.sql
index f640f80..e8f4d46 100644
--- a/OpenSim/Data/SQLite/Resources/004_InventoryStore.sql
+++ b/OpenSim/Data/SQLite/Resources/004_InventoryStore.sql
@@ -1,36 +1,36 @@
1BEGIN; 1BEGIN;
2 2
3update inventoryitems 3update inventoryitems
4 set UUID = substr(UUID, 1, 8) || "-" || substr(UUID, 9, 4) || "-" || substr(UUID, 13, 4) || "-" || substr(UUID, 17, 4) || "-" || substr(UUID, 21) 4 set UUID = substr(UUID, 1, 8) || "-" || substr(UUID, 9, 4) || "-" || substr(UUID, 13, 4) || "-" || substr(UUID, 17, 4) || "-" || substr(UUID, 21, 12)
5 where UUID not like '%-%'; 5 where UUID not like '%-%';
6 6
7update inventoryitems 7update inventoryitems
8 set assetID = substr(assetID, 1, 8) || "-" || substr(assetID, 9, 4) || "-" || substr(assetID, 13, 4) || "-" || substr(assetID, 17, 4) || "-" || substr(assetID, 21) 8 set assetID = substr(assetID, 1, 8) || "-" || substr(assetID, 9, 4) || "-" || substr(assetID, 13, 4) || "-" || substr(assetID, 17, 4) || "-" || substr(assetID, 21, 12)
9 where assetID not like '%-%'; 9 where assetID not like '%-%';
10 10
11update inventoryitems 11update inventoryitems
12 set parentFolderID = substr(parentFolderID, 1, 8) || "-" || substr(parentFolderID, 9, 4) || "-" || substr(parentFolderID, 13, 4) || "-" || substr(parentFolderID, 17, 4) || "-" || substr(parentFolderID, 21) 12 set parentFolderID = substr(parentFolderID, 1, 8) || "-" || substr(parentFolderID, 9, 4) || "-" || substr(parentFolderID, 13, 4) || "-" || substr(parentFolderID, 17, 4) || "-" || substr(parentFolderID, 21, 12)
13 where parentFolderID not like '%-%'; 13 where parentFolderID not like '%-%';
14 14
15update inventoryitems 15update inventoryitems
16 set avatarID = substr(avatarID, 1, 8) || "-" || substr(avatarID, 9, 4) || "-" || substr(avatarID, 13, 4) || "-" || substr(avatarID, 17, 4) || "-" || substr(avatarID, 21) 16 set avatarID = substr(avatarID, 1, 8) || "-" || substr(avatarID, 9, 4) || "-" || substr(avatarID, 13, 4) || "-" || substr(avatarID, 17, 4) || "-" || substr(avatarID, 21, 12)
17 where avatarID not like '%-%'; 17 where avatarID not like '%-%';
18 18
19update inventoryitems 19update inventoryitems
20 set creatorsID = substr(creatorsID, 1, 8) || "-" || substr(creatorsID, 9, 4) || "-" || substr(creatorsID, 13, 4) || "-" || substr(creatorsID, 17, 4) || "-" || substr(creatorsID, 21) 20 set creatorsID = substr(creatorsID, 1, 8) || "-" || substr(creatorsID, 9, 4) || "-" || substr(creatorsID, 13, 4) || "-" || substr(creatorsID, 17, 4) || "-" || substr(creatorsID, 21, 12)
21 where creatorsID not like '%-%'; 21 where creatorsID not like '%-%';
22 22
23 23
24update inventoryfolders 24update inventoryfolders
25 set UUID = substr(UUID, 1, 8) || "-" || substr(UUID, 9, 4) || "-" || substr(UUID, 13, 4) || "-" || substr(UUID, 17, 4) || "-" || substr(UUID, 21) 25 set UUID = substr(UUID, 1, 8) || "-" || substr(UUID, 9, 4) || "-" || substr(UUID, 13, 4) || "-" || substr(UUID, 17, 4) || "-" || substr(UUID, 21, 12)
26 where UUID not like '%-%'; 26 where UUID not like '%-%';
27 27
28update inventoryfolders 28update inventoryfolders
29 set agentID = substr(agentID, 1, 8) || "-" || substr(agentID, 9, 4) || "-" || substr(agentID, 13, 4) || "-" || substr(agentID, 17, 4) || "-" || substr(agentID, 21) 29 set agentID = substr(agentID, 1, 8) || "-" || substr(agentID, 9, 4) || "-" || substr(agentID, 13, 4) || "-" || substr(agentID, 17, 4) || "-" || substr(agentID, 21, 12)
30 where agentID not like '%-%'; 30 where agentID not like '%-%';
31 31
32update inventoryfolders 32update inventoryfolders
33 set parentID = substr(parentID, 1, 8) || "-" || substr(parentID, 9, 4) || "-" || substr(parentID, 13, 4) || "-" || substr(parentID, 17, 4) || "-" || substr(parentID, 21) 33 set parentID = substr(parentID, 1, 8) || "-" || substr(parentID, 9, 4) || "-" || substr(parentID, 13, 4) || "-" || substr(parentID, 17, 4) || "-" || substr(parentID, 21, 12)
34 where parentID not like '%-%'; 34 where parentID not like '%-%';
35 35
36COMMIT; 36COMMIT;
diff --git a/OpenSim/Data/SQLite/Resources/009_UserStore.sql b/OpenSim/Data/SQLite/Resources/009_UserStore.sql
index b4cc00c..8ab03ef 100644
--- a/OpenSim/Data/SQLite/Resources/009_UserStore.sql
+++ b/OpenSim/Data/SQLite/Resources/009_UserStore.sql
@@ -1,11 +1,11 @@
1BEGIN; 1BEGIN;
2 2
3update users 3update users
4 set UUID = substr(UUID, 1, 8) || "-" || substr(UUID, 9, 4) || "-" || substr(UUID, 13, 4) || "-" || substr(UUID, 17, 4) || "-" || substr(UUID, 21) 4 set UUID = substr(UUID, 1, 8) || "-" || substr(UUID, 9, 4) || "-" || substr(UUID, 13, 4) || "-" || substr(UUID, 17, 4) || "-" || substr(UUID, 21, 12)
5 where UUID not like '%-%'; 5 where UUID not like '%-%';
6 6
7update useragents 7update useragents
8 set UUID = substr(UUID, 1, 8) || "-" || substr(UUID, 9, 4) || "-" || substr(UUID, 13, 4) || "-" || substr(UUID, 17, 4) || "-" || substr(UUID, 21) 8 set UUID = substr(UUID, 1, 8) || "-" || substr(UUID, 9, 4) || "-" || substr(UUID, 13, 4) || "-" || substr(UUID, 17, 4) || "-" || substr(UUID, 21, 12)
9 where UUID not like '%-%'; 9 where UUID not like '%-%';
10 10
11COMMIT; 11COMMIT;