aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorMike Mazur2009-02-13 00:02:26 +0000
committerMike Mazur2009-02-13 00:02:26 +0000
commitebf268a5936b0fc2b2ae54cd80162643b6682092 (patch)
tree8654217e8e75ab5c21377437d9fa67086833dc18 /OpenSim/Data
parentFixes a bug in the ScenePresence test itself. (diff)
downloadopensim-SC_OLD-ebf268a5936b0fc2b2ae54cd80162643b6682092.zip
opensim-SC_OLD-ebf268a5936b0fc2b2ae54cd80162643b6682092.tar.gz
opensim-SC_OLD-ebf268a5936b0fc2b2ae54cd80162643b6682092.tar.bz2
opensim-SC_OLD-ebf268a5936b0fc2b2ae54cd80162643b6682092.tar.xz
Remove extra ID field from asset DB mapping. Mantis #3122, fixes Mantis #3080.
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml1
-rw-r--r--OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_AssetStore.sql1
-rw-r--r--OpenSim/Data/NHibernate/Resources/MySQLDialect/001_AssetStore.sql1
-rw-r--r--OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_AssetStore.sql1
-rw-r--r--OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_AssetStore.sql1
5 files changed, 0 insertions, 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 @@
6 </id> 6 </id>
7 <property name="Data" type="binary" /> 7 <property name="Data" type="binary" />
8 <component name="Metadata"> 8 <component name="Metadata">
9 <property name="ID" column="MetadataID" type="String" length="36"/>
10 <property name="Type" type="OpenSim.Data.NHibernate.SByteType, OpenSim.Data.NHibernate" /> 9 <property name="Type" type="OpenSim.Data.NHibernate.SByteType, OpenSim.Data.NHibernate" />
11 <property name="Name" type="String" length="64" /> 10 <property name="Name" type="String" length="64" />
12 <property name="Description" type="String" length="64" /> 11 <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 @@
1create table Assets ( 1create table Assets (
2 ID NVARCHAR(36) not null, 2 ID NVARCHAR(36) not null,
3 MetadataID NVARCHAR(36) NOT NULL,
4 Type SMALLINT null, 3 Type SMALLINT null,
5 Name NVARCHAR(64) null, 4 Name NVARCHAR(64) null,
6 Description NVARCHAR(64) null, 5 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 @@
1CREATE TABLE Assets ( 1CREATE TABLE Assets (
2 ID VARCHAR(36) NOT NULL, 2 ID VARCHAR(36) NOT NULL,
3 MetadataID VARCHAR(36) NOT NULL,
4 Type TINYINT DEFAULT NULL, 3 Type TINYINT DEFAULT NULL,
5 Name VARCHAR(64) DEFAULT NULL, 4 Name VARCHAR(64) DEFAULT NULL,
6 Description VARCHAR(64) DEFAULT NULL, 5 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 @@
1CREATE TABLE Assets ( 1CREATE TABLE Assets (
2 ID VARCHAR(36) NOT NULL, 2 ID VARCHAR(36) NOT NULL,
3 MetadataID VARCHAR(36) NOT NULL,
4 Type SMALLINT DEFAULT NULL, 3 Type SMALLINT DEFAULT NULL,
5 Name VARCHAR(64) DEFAULT NULL, 4 Name VARCHAR(64) DEFAULT NULL,
6 Description VARCHAR(64) DEFAULT NULL, 5 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 @@
1CREATE TABLE Assets ( 1CREATE TABLE Assets (
2 ID VARCHAR(36) NOT NULL, 2 ID VARCHAR(36) NOT NULL,
3 MetadataID VARCHAR(36) NOT NULL,
4 Type TINYINT DEFAULT NULL, 3 Type TINYINT DEFAULT NULL,
5 Name VARCHAR(64) DEFAULT NULL, 4 Name VARCHAR(64) DEFAULT NULL,
6 Description VARCHAR(64) DEFAULT NULL, 5 Description VARCHAR(64) DEFAULT NULL,