* 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!
author: Justin Clarke Casey 2009-04-10 11:34:37 +0000
committer: Justin Clarke Casey 2009-04-10 11:34:37 +0000
commit: bc515c324140ee9770ec5c6e2b960014b1e66be0 (patch)
tree: e0ba10f0553b39839e7a09adbc78edbe90d32b29 /OpenSim/Data
parent: * Patch from RemedyTomm Mantis 3440 (diff)
download: opensim-SC_OLD-bc515c324140ee9770ec5c6e2b960014b1e66be0.zip
opensim-SC_OLD-bc515c324140ee9770ec5c6e2b960014b1e66be0.tar.gz
opensim-SC_OLD-bc515c324140ee9770ec5c6e2b960014b1e66be0.tar.bz2
opensim-SC_OLD-bc515c324140ee9770ec5c6e2b960014b1e66be0.tar.xz
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 @@
 BEGIN;
 update assets
-  set UUID = substr(UUID, 1, 8) || "-" || substr(UUID, 9, 4) || "-" || substr(UUID, 13, 4) || "-" || substr(UUID, 17, 4) || "-" || substr(UUID, 21)
+  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 '%-%';
 COMMIT;
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 @@
 BEGIN;
 update inventoryitems 
-  set UUID = substr(UUID, 1, 8) || "-" || substr(UUID, 9, 4) || "-" || substr(UUID, 13, 4) || "-" || substr(UUID, 17, 4) || "-" || substr(UUID, 21)
+  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) 
+  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) 
+  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) 
+  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)
+  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)
+  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)
+  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)
+  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 '%-%';
 COMMIT;
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 @@
 BEGIN;
 update users
-  set UUID = substr(UUID, 1, 8) || "-" || substr(UUID, 9, 4) || "-" || substr(UUID, 13, 4) || "-" || substr(UUID, 17, 4) || "-" || substr(UUID, 21)
+  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 useragents
-  set UUID = substr(UUID, 1, 8) || "-" || substr(UUID, 9, 4) || "-" || substr(UUID, 13, 4) || "-" || substr(UUID, 17, 4) || "-" || substr(UUID, 21)
+  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 '%-%';
 COMMIT;
author	Justin Clarke Casey	2009-04-10 11:34:37 +0000
committer	Justin Clarke Casey	2009-04-10 11:34:37 +0000
commit	bc515c324140ee9770ec5c6e2b960014b1e66be0 (patch)
tree	e0ba10f0553b39839e7a09adbc78edbe90d32b29 /OpenSim/Data
parent	* Patch from RemedyTomm Mantis 3440 (diff)
download	opensim-SC_OLD-bc515c324140ee9770ec5c6e2b960014b1e66be0.zip opensim-SC_OLD-bc515c324140ee9770ec5c6e2b960014b1e66be0.tar.gz opensim-SC_OLD-bc515c324140ee9770ec5c6e2b960014b1e66be0.tar.bz2 opensim-SC_OLD-bc515c324140ee9770ec5c6e2b960014b1e66be0.tar.xz

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 @@
1	BEGIN;	1	BEGIN;
2		2
3	update assets	3	update 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
7	COMMIT;	7	COMMIT;


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 @@
1	BEGIN;	1	BEGIN;
2		2
3	update inventoryitems	3	update 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
7	update inventoryitems	7	update 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
11	update inventoryitems	11	update 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
15	update inventoryitems	15	update 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
19	update inventoryitems	19	update 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
24	update inventoryfolders	24	update 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
28	update inventoryfolders	28	update 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
32	update inventoryfolders	32	update 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
36	COMMIT;	36	COMMIT;


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 @@
1	BEGIN;	1	BEGIN;
2		2
3	update users	3	update 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
7	update useragents	7	update 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
11	COMMIT;	11	COMMIT;