aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorCharles Krinke2009-02-09 21:44:39 +0000
committerCharles Krinke2009-02-09 21:44:39 +0000
commit70051278c448c130259d2ead4af1de1696879f58 (patch)
tree2c2bca3fecad8a1752a59acfd65ebcba0f9d85b5
parent* Add the ability to type help <command> for more detailed help about a speci... (diff)
downloadopensim-SC_OLD-70051278c448c130259d2ead4af1de1696879f58.zip
opensim-SC_OLD-70051278c448c130259d2ead4af1de1696879f58.tar.gz
opensim-SC_OLD-70051278c448c130259d2ead4af1de1696879f58.tar.bz2
opensim-SC_OLD-70051278c448c130259d2ead4af1de1696879f58.tar.xz
Thank you kindly, TLaukkan (Tommil) for a patch that:
* Updated migration scripts and hbm.xml so that nhibernate tests work.
-rw-r--r--OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml1
-rw-r--r--OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_AssetStore.sql3
-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, 6 insertions, 1 deletions
diff --git a/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml b/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
index db400ea..49b4ec7 100644
--- a/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
@@ -6,6 +6,7 @@
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"/>
9 <property name="Type" type="OpenSim.Data.NHibernate.SByteType, OpenSim.Data.NHibernate" /> 10 <property name="Type" type="OpenSim.Data.NHibernate.SByteType, OpenSim.Data.NHibernate" />
10 <property name="Name" type="String" length="64" /> 11 <property name="Name" type="String" length="64" />
11 <property name="Description" type="String" length="64" /> 12 <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 b998653..4ece29a 100644
--- a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_AssetStore.sql
+++ b/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_AssetStore.sql
@@ -1,5 +1,6 @@
1create table Assets ( 1create table Assets (
2 ID NVARCHAR(255) not null, 2 ID NVARCHAR(36) not null,
3 MetadataID NVARCHAR(36) NOT NULL,
3 Type SMALLINT null, 4 Type SMALLINT null,
4 Name NVARCHAR(64) null, 5 Name NVARCHAR(64) null,
5 Description NVARCHAR(64) null, 6 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 9573781..1a39233 100644
--- a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_AssetStore.sql
+++ b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_AssetStore.sql
@@ -1,5 +1,6 @@
1CREATE TABLE Assets ( 1CREATE TABLE Assets (
2 ID VARCHAR(36) NOT NULL, 2 ID VARCHAR(36) NOT NULL,
3 MetadataID VARCHAR(36) NOT NULL,
3 Type TINYINT DEFAULT NULL, 4 Type TINYINT DEFAULT NULL,
4 Name VARCHAR(64) DEFAULT NULL, 5 Name VARCHAR(64) DEFAULT NULL,
5 Description VARCHAR(64) DEFAULT NULL, 6 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 4753123..f581b18 100644
--- a/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_AssetStore.sql
+++ b/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_AssetStore.sql
@@ -1,5 +1,6 @@
1CREATE TABLE Assets ( 1CREATE TABLE Assets (
2 ID VARCHAR(36) NOT NULL, 2 ID VARCHAR(36) NOT NULL,
3 MetadataID VARCHAR(36) NOT NULL,
3 Type SMALLINT DEFAULT NULL, 4 Type SMALLINT DEFAULT NULL,
4 Name VARCHAR(64) DEFAULT NULL, 5 Name VARCHAR(64) DEFAULT NULL,
5 Description VARCHAR(64) DEFAULT NULL, 6 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 15e10b3..b71b552 100644
--- a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_AssetStore.sql
+++ b/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_AssetStore.sql
@@ -1,5 +1,6 @@
1CREATE TABLE Assets ( 1CREATE TABLE Assets (
2 ID VARCHAR(36) NOT NULL, 2 ID VARCHAR(36) NOT NULL,
3 MetadataID VARCHAR(36) NOT NULL,
3 Type TINYINT DEFAULT NULL, 4 Type TINYINT DEFAULT NULL,
4 Name VARCHAR(64) DEFAULT NULL, 5 Name VARCHAR(64) DEFAULT NULL,
5 Description VARCHAR(64) DEFAULT NULL, 6 Description VARCHAR(64) DEFAULT NULL,