* Apply http://opensimulator.org/mantis/view.php?id=3151

* Fixes NHibernate overflow exception when saving some objects (under at least PostgreSQL 8.3)
* Thanks Tommil!

3 files changed, 4 insertions, 5 deletions

diff --git a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_AssetStore.sql b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_AssetStore.sql
index 9573781..cd0958d 100644
--- a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_AssetStore.sql
+++ b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_AssetStore.sql
@@ -1,6 +1,6 @@
 CREATE TABLE Assets (
   ID VARCHAR(36) NOT NULL,
-  Type TINYINT DEFAULT NULL,
+  Type SMALLINT DEFAULT NULL,
   Name VARCHAR(64) DEFAULT NULL,
   Description VARCHAR(64) DEFAULT NULL,
   Local BIT DEFAULT NULL,
diff --git a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_InventoryStore.sql b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_InventoryStore.sql
index 13d8cf6..93d282b 100644
--- a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_InventoryStore.sql
+++ b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_InventoryStore.sql
@@ -1,7 +1,7 @@
 CREATE TABLE InventoryFolders (
   ID VARCHAR(36) NOT NULL,
   Type SMALLINT DEFAULT NULL,
-  Version SMALLINT DEFAULT NULL,
+  Version INT DEFAULT NULL,
   ParentID VARCHAR(36) DEFAULT NULL,
   Owner VARCHAR(36) DEFAULT NULL,
   Name VARCHAR(64) DEFAULT NULL,
@@ -13,8 +13,8 @@ CREATE INDEX InventoryFoldersParentIdIndex ON InventoryFolders (ParentID);
 
 CREATE TABLE InventoryItems (
   ID VARCHAR(36) NOT NULL,
-  InvType SMALLINT DEFAULT NULL,
-  AssetType SMALLINT DEFAULT NULL,
+  InvType INT DEFAULT NULL,
+  AssetType INT DEFAULT NULL,
   AssetID VARCHAR(36) DEFAULT NULL,
   Folder VARCHAR(36) DEFAULT NULL,
   Owner VARCHAR(36) DEFAULT NULL,
diff --git a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_RegionStore.sql b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_RegionStore.sql
index e44f012..74f67f2 100644
--- a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_RegionStore.sql
+++ b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_RegionStore.sql
@@ -71,7 +71,6 @@ CREATE TABLE Prims (
   PathTaperX INT DEFAULT NULL,
   PathTaperY INT DEFAULT NULL,
   PathTwist INT DEFAULT NULL,
-  PathTwistBegin INT DEFAULT NULL,
   ProfileBegin INT DEFAULT NULL,
   ProfileEnd INT DEFAULT NULL,
   ProfileCurve INT DEFAULT NULL,