diff options
author | Justin Clark-Casey (justincc) | 2010-04-30 17:45:00 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-04-30 17:45:00 +0100 |
commit | cc67de5b86ebcebadbe2ea46872a0dc63d99cae7 (patch) | |
tree | 1607da4eee9e63fe45e0abcf05da37ae5e239d70 /OpenSim/Data/SQLite/SQLiteFramework.cs | |
parent | Make SQLiteNG the default since it actually does work with Mono 2.4 on Linux. (diff) | |
download | opensim-SC_OLD-cc67de5b86ebcebadbe2ea46872a0dc63d99cae7.zip opensim-SC_OLD-cc67de5b86ebcebadbe2ea46872a0dc63d99cae7.tar.gz opensim-SC_OLD-cc67de5b86ebcebadbe2ea46872a0dc63d99cae7.tar.bz2 opensim-SC_OLD-cc67de5b86ebcebadbe2ea46872a0dc63d99cae7.tar.xz |
rename SQLiteNG to SQLite and SQLite to SQLiteLegacy
this seems the least evil way forward since mono 2.6 and later will see increasing usage, and this only works with what was SQLiteNG
MAC USERS WILL NEED TO CHANGE REFERENCES TO "OpenSim.Data.SQLite.dll" to "OpenSim.Data.SQLiteLegacy.dll" in OpenSim.ini and config-include/StandaloneCommon.ini (if using standalone)
See the OpenSim.ini.example and StandaloneCommon.ini.example files for more details
This commit also temporarily changes unsigned ParentEstateID values in the OpenSim.Data.Tests to signed temporarily, since the new plugin enforces creation of signed fields in the database (which is what the SQL actually specifies). And change data columns in sqlite is a pita.
Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteFramework.cs')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteFramework.cs | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteFramework.cs b/OpenSim/Data/SQLite/SQLiteFramework.cs index 20b5085..cf114d1 100644 --- a/OpenSim/Data/SQLite/SQLiteFramework.cs +++ b/OpenSim/Data/SQLite/SQLiteFramework.cs | |||
@@ -31,7 +31,7 @@ using System.Collections.Generic; | |||
31 | using System.Data; | 31 | using System.Data; |
32 | using OpenMetaverse; | 32 | using OpenMetaverse; |
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using Mono.Data.SqliteClient; | 34 | using Mono.Data.Sqlite; |
35 | 35 | ||
36 | namespace OpenSim.Data.SQLite | 36 | namespace OpenSim.Data.SQLite |
37 | { | 37 | { |
@@ -55,11 +55,14 @@ namespace OpenSim.Data.SQLite | |||
55 | { | 55 | { |
56 | lock (connection) | 56 | lock (connection) |
57 | { | 57 | { |
58 | /* | ||
58 | SqliteConnection newConnection = | 59 | SqliteConnection newConnection = |
59 | (SqliteConnection)((ICloneable)connection).Clone(); | 60 | (SqliteConnection)((ICloneable)connection).Clone(); |
60 | newConnection.Open(); | 61 | newConnection.Open(); |
61 | 62 | ||
62 | cmd.Connection = newConnection; | 63 | cmd.Connection = newConnection; |
64 | */ | ||
65 | cmd.Connection = connection; | ||
63 | //Console.WriteLine("XXX " + cmd.CommandText); | 66 | //Console.WriteLine("XXX " + cmd.CommandText); |
64 | 67 | ||
65 | return cmd.ExecuteNonQuery(); | 68 | return cmd.ExecuteNonQuery(); |
@@ -70,11 +73,12 @@ namespace OpenSim.Data.SQLite | |||
70 | { | 73 | { |
71 | lock (connection) | 74 | lock (connection) |
72 | { | 75 | { |
73 | SqliteConnection newConnection = | 76 | //SqliteConnection newConnection = |
74 | (SqliteConnection)((ICloneable)connection).Clone(); | 77 | // (SqliteConnection)((ICloneable)connection).Clone(); |
75 | newConnection.Open(); | 78 | //newConnection.Open(); |
76 | 79 | ||
77 | cmd.Connection = newConnection; | 80 | //cmd.Connection = newConnection; |
81 | cmd.Connection = connection; | ||
78 | //Console.WriteLine("XXX " + cmd.CommandText); | 82 | //Console.WriteLine("XXX " + cmd.CommandText); |
79 | 83 | ||
80 | return cmd.ExecuteReader(); | 84 | return cmd.ExecuteReader(); |