* 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!

2 files changed, 8 insertions, 9 deletions

diff --git a/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_InventoryStore.sql b/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_InventoryStore.sql
index 9d0f711..42af659 100644
--- a/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_InventoryStore.sql
+++ b/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/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/PostgreSQLDialect/001_RegionStore.sql b/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_RegionStore.sql
index ff227c1..25c3945 100644
--- a/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_RegionStore.sql
+++ b/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_RegionStore.sql
@@ -58,8 +58,8 @@ CREATE TABLE Prims (
   ScaleY DOUBLE PRECISION DEFAULT NULL,
   ScaleZ DOUBLE PRECISION DEFAULT NULL,
   PCode INT DEFAULT NULL,
-  PathBegin SMALLINT DEFAULT NULL,
-  PathEnd SMALLINT DEFAULT NULL,
+  PathBegin INT DEFAULT NULL,
+  PathEnd INT DEFAULT NULL,
   PathScaleX INT DEFAULT NULL,
   PathScaleY INT DEFAULT NULL,
   PathShearX INT DEFAULT NULL,
@@ -71,11 +71,10 @@ CREATE TABLE Prims (
   PathTaperX SMALLINT DEFAULT NULL,
   PathTaperY SMALLINT DEFAULT NULL,
   PathTwist SMALLINT DEFAULT NULL,
-  PathTwistBegin INT DEFAULT NULL,
-  ProfileBegin SMALLINT DEFAULT NULL,
-  ProfileEnd SMALLINT DEFAULT NULL,
+  ProfileBegin INT DEFAULT NULL,
+  ProfileEnd INT DEFAULT NULL,
   ProfileCurve INT DEFAULT NULL,
-  ProfileHollow SMALLINT DEFAULT NULL,
+  ProfileHollow INT DEFAULT NULL,
   State INT DEFAULT NULL,
   Texture BYTEA,
   ExtraParams BYTEA,