diff options
author | Teravus Ovares | 2008-09-13 21:01:21 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-13 21:01:21 +0000 |
commit | e8d51b76fe5e4455e90a3ee5c74ad3698d56ca7d (patch) | |
tree | a45420fc0285c68d7cef10005961c58b002dd1d2 | |
parent | Add region settings support to SQLite (untested!) (diff) | |
download | opensim-SC_OLD-e8d51b76fe5e4455e90a3ee5c74ad3698d56ca7d.zip opensim-SC_OLD-e8d51b76fe5e4455e90a3ee5c74ad3698d56ca7d.tar.gz opensim-SC_OLD-e8d51b76fe5e4455e90a3ee5c74ad3698d56ca7d.tar.bz2 opensim-SC_OLD-e8d51b76fe5e4455e90a3ee5c74ad3698d56ca7d.tar.xz |
* Fixes SQLite load crash.
* added primary key to regionsettings table in the cached table
* initialized the data adapter.
* Still untested fully, so watch out!
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteRegionData.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs index c3ff47f..ccd712a 100644 --- a/OpenSim/Data/SQLite/SQLiteRegionData.cs +++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs | |||
@@ -119,7 +119,7 @@ namespace OpenSim.Data.SQLite | |||
119 | landAccessListDa = new SqliteDataAdapter(landAccessListSelectCmd); | 119 | landAccessListDa = new SqliteDataAdapter(landAccessListSelectCmd); |
120 | 120 | ||
121 | SqliteCommand regionSettingsSelectCmd = new SqliteCommand(regionSettingsSelect, m_conn); | 121 | SqliteCommand regionSettingsSelectCmd = new SqliteCommand(regionSettingsSelect, m_conn); |
122 | 122 | regionSettingsDa = new SqliteDataAdapter(regionSettingsSelectCmd); | |
123 | // This actually does the roll forward assembly stuff | 123 | // This actually does the roll forward assembly stuff |
124 | Assembly assem = GetType().Assembly; | 124 | Assembly assem = GetType().Assembly; |
125 | Migration m = new Migration(m_conn, assem, "RegionStore"); | 125 | Migration m = new Migration(m_conn, assem, "RegionStore"); |
@@ -148,6 +148,7 @@ namespace OpenSim.Data.SQLite | |||
148 | setupLandAccessCommands(landAccessListDa, m_conn); | 148 | setupLandAccessCommands(landAccessListDa, m_conn); |
149 | 149 | ||
150 | ds.Tables.Add(createRegionSettingsTable()); | 150 | ds.Tables.Add(createRegionSettingsTable()); |
151 | |||
151 | setupRegionSettingsCommands(regionSettingsDa, m_conn); | 152 | setupRegionSettingsCommands(regionSettingsDa, m_conn); |
152 | 153 | ||
153 | // WORKAROUND: This is a work around for sqlite on | 154 | // WORKAROUND: This is a work around for sqlite on |
@@ -963,7 +964,7 @@ namespace OpenSim.Data.SQLite | |||
963 | createCol(regionsettings, "fixed_sun", typeof (Int32)); | 964 | createCol(regionsettings, "fixed_sun", typeof (Int32)); |
964 | createCol(regionsettings, "sun_position", typeof (Double)); | 965 | createCol(regionsettings, "sun_position", typeof (Double)); |
965 | createCol(regionsettings, "covenant", typeof(String)); | 966 | createCol(regionsettings, "covenant", typeof(String)); |
966 | 967 | regionsettings.PrimaryKey = new DataColumn[] { regionsettings.Columns["regionUUID"] }; | |
967 | return regionsettings; | 968 | return regionsettings; |
968 | } | 969 | } |
969 | 970 | ||