From e8d51b76fe5e4455e90a3ee5c74ad3698d56ca7d Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Sat, 13 Sep 2008 21:01:21 +0000 Subject: [PATCH] * Fixes SQLite load crash. * added primary key to regionsettings table in the cached table * initialized the data adapter. * Still untested fully, so watch out! --- OpenSim/Data/SQLite/SQLiteRegionData.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs index c3ff47fa5e..ccd712a38c 100644 --- a/OpenSim/Data/SQLite/SQLiteRegionData.cs +++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs @@ -119,7 +119,7 @@ namespace OpenSim.Data.SQLite landAccessListDa = new SqliteDataAdapter(landAccessListSelectCmd); SqliteCommand regionSettingsSelectCmd = new SqliteCommand(regionSettingsSelect, m_conn); - + regionSettingsDa = new SqliteDataAdapter(regionSettingsSelectCmd); // This actually does the roll forward assembly stuff Assembly assem = GetType().Assembly; Migration m = new Migration(m_conn, assem, "RegionStore"); @@ -148,6 +148,7 @@ namespace OpenSim.Data.SQLite setupLandAccessCommands(landAccessListDa, m_conn); ds.Tables.Add(createRegionSettingsTable()); + setupRegionSettingsCommands(regionSettingsDa, m_conn); // WORKAROUND: This is a work around for sqlite on @@ -963,7 +964,7 @@ namespace OpenSim.Data.SQLite createCol(regionsettings, "fixed_sun", typeof (Int32)); createCol(regionsettings, "sun_position", typeof (Double)); createCol(regionsettings, "covenant", typeof(String)); - + regionsettings.PrimaryKey = new DataColumn[] { regionsettings.Columns["regionUUID"] }; return regionsettings; }