From ebf268a5936b0fc2b2ae54cd80162643b6682092 Mon Sep 17 00:00:00 2001
From: Mike Mazur
Date: Fri, 13 Feb 2009 00:02:26 +0000
Subject: Remove extra ID field from asset DB mapping. Mantis #3122, fixes
 Mantis #3080.

---
 OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml                    | 1 -
 OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_AssetStore.sql  | 1 -
 OpenSim/Data/NHibernate/Resources/MySQLDialect/001_AssetStore.sql      | 1 -
 OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_AssetStore.sql | 1 -
 OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_AssetStore.sql     | 1 -
 5 files changed, 5 deletions(-)

diff --git a/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml b/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
index 49b4ec7..db400ea 100644
--- a/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
@@ -6,7 +6,6 @@
         </id> 
         <property name="Data" type="binary" />
         <component name="Metadata">
-            <property name="ID" column="MetadataID" type="String" length="36"/>
             <property name="Type" type="OpenSim.Data.NHibernate.SByteType, OpenSim.Data.NHibernate" />
             <property name="Name" type="String" length="64" />
             <property name="Description" type="String" length="64" />
diff --git a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_AssetStore.sql b/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_AssetStore.sql
index 4ece29a..deee78b 100644
--- a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_AssetStore.sql
+++ b/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_AssetStore.sql
@@ -1,6 +1,5 @@
 create table Assets (
    ID NVARCHAR(36) not null,
-   MetadataID NVARCHAR(36) NOT NULL,  
    Type SMALLINT null,
    Name NVARCHAR(64) null,
    Description NVARCHAR(64) null,
diff --git a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_AssetStore.sql b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_AssetStore.sql
index 1a39233..9573781 100644
--- a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_AssetStore.sql
+++ b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_AssetStore.sql
@@ -1,6 +1,5 @@
 CREATE TABLE Assets (
   ID VARCHAR(36) NOT NULL,
-  MetadataID VARCHAR(36) NOT NULL,
   Type TINYINT DEFAULT NULL,
   Name VARCHAR(64) DEFAULT NULL,
   Description VARCHAR(64) DEFAULT NULL,
diff --git a/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_AssetStore.sql b/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_AssetStore.sql
index f581b18..4753123 100644
--- a/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_AssetStore.sql
+++ b/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_AssetStore.sql
@@ -1,6 +1,5 @@
 CREATE TABLE Assets (
   ID VARCHAR(36) NOT NULL,
-  MetadataID VARCHAR(36) NOT NULL,  
   Type SMALLINT DEFAULT NULL,
   Name VARCHAR(64) DEFAULT NULL,
   Description VARCHAR(64) DEFAULT NULL,
diff --git a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_AssetStore.sql b/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_AssetStore.sql
index b71b552..15e10b3 100644
--- a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_AssetStore.sql
+++ b/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_AssetStore.sql
@@ -1,6 +1,5 @@
 CREATE TABLE Assets (
   ID VARCHAR(36) NOT NULL,
-  MetadataID VARCHAR(36) NOT NULL,  
   Type TINYINT DEFAULT NULL,
   Name VARCHAR(64) DEFAULT NULL,
   Description VARCHAR(64) DEFAULT NULL,
-- 
cgit v1.1