From d3190236cc8a9ec3ed8b112d845e85dd69fcbcdf Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Wed, 16 Jul 2008 21:27:55 +0000 Subject: fix RegionStore creation so that the .sql file works --- OpenSim/Data/NHibernate/NHibernateRegionData.cs | 10 +++++----- .../Data/NHibernate/Resources/MySQLDialect/001_RegionStore.sql | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/OpenSim/Data/NHibernate/NHibernateRegionData.cs b/OpenSim/Data/NHibernate/NHibernateRegionData.cs index 1c9e363..98d82a1 100644 --- a/OpenSim/Data/NHibernate/NHibernateRegionData.cs +++ b/OpenSim/Data/NHibernate/NHibernateRegionData.cs @@ -54,10 +54,10 @@ namespace OpenSim.Data.NHibernate private ISessionFactory factory; private ISession session; - public void Initialise() - { - Initialise("SQLiteDialect;SqliteClientDriver;URI=file:OpenSim.db,version=3", true); - } + // public void Initialise() + // { + // Initialise("SQLiteDialect;SqliteClientDriver;URI=file:OpenSim.db,version=3", true); + // } public void Initialise(string connect, bool persistpriminventories) { @@ -67,7 +67,7 @@ namespace OpenSim.Data.NHibernate if (parts.Length != 3) { // TODO: make this a real exception type - throw new Exception("Malformed Inventory connection string '" + connect + "'"); + throw new Exception("Malformed Region connection string '" + connect + "'"); } string dialect = parts[0]; diff --git a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_RegionStore.sql b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_RegionStore.sql index 1811a44..99a5227 100644 --- a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_RegionStore.sql +++ b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_RegionStore.sql @@ -74,6 +74,6 @@ CREATE TABLE `Prims` ( `ExtraParams` longblob, PRIMARY KEY (`UUID`), KEY `prims_regionuuid` (`RegionID`), - KEY 'prims_parentuuid' ('ParentUUID') + KEY `prims_parentuuid` (`ParentUUID`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -- cgit v1.1