From 60dbc3c6ce5b9b78a29c0968951e96895c270241 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Fri, 30 Apr 2010 17:01:50 +0100 Subject: Make SQLiteNG the default since it actually does work with Mono 2.4 on Linux. I know this is tough on Mac OSX users (since SQLiteNG requires the export of the sqlite3_column_origin_name symbol and this isn't present for the Mac OSX sqlite3 system library) Unfortunately, I need to shaft somebody (as it were) --- bin/OpenSim.ini.example | 12 ++++++++---- bin/config-include/StandaloneCommon.ini.example | 10 +++++----- 2 files changed, 13 insertions(+), 9 deletions(-) (limited to 'bin') diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 59bce36..bbc6f78 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -112,11 +112,15 @@ ;storage_plugin = "OpenSim.Data.Null.dll" ; --- To use sqlite as region storage: - ; PLEASE NOTE: If you use want to use SQLite with Mono 2.6 and above, you must use the SQLiteNG plugin rather than the existing SQLite one - ; do this by commenting out the OpenSim.Data.SQLite.dll line below and uncommenting the OpenSim.Data.SQLiteNG.dll one + ; + ; PLEASE NOTE: Unfortunately, the SQLiteNG database plugin, while necessary to use sqlite with Mono on Linux, is + ; not compatible with the sqlite3 library installed on Mac OSX. If you're using Mono 2.4 you can still use the old sqlite + ; library by uncommenting the SQLite.dll storage plugin (and commenting out SQLiteNG). Unfortunately, the older library + ; will not work with Mono 2.6 on Mac OSX so you will either need to replace the sqlite3 system library or use MySQL instead + ; ; You will also need to do the same thing in config-include/StandaloneCommon.ini if you are running in standalone mode - storage_plugin = "OpenSim.Data.SQLite.dll" - ; storage_plugin = "OpenSim.Data.SQLiteNG.dll" + storage_plugin = "OpenSim.Data.SQLiteNG.dll" + ;storage_plugin = "OpenSim.Data.SQLite.dll" storage_connection_string="URI=file:OpenSim.db,version=3"; ; --- To use MySQL storage, supply your own connection string (this is only an example): diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index 74bdbe2..58860d1 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example @@ -6,12 +6,12 @@ ; ; SQLite - ; Uncomment this line if you want to use sqlite storage with Mono 2.4 - Include-Storage = "config-include/storage/SQLiteStandalone.ini"; + Include-Storage = "config-include/storage/SQLiteNGStandalone.ini"; - ; If you want to use sqlite with Mono 2.6 and above, uncomment this line instead. - ; Don't forget to do the same thing for the storage_plugin setting in OpenSim.ini - ; Include-Storage = "config-include/storage/SQLiteNGStandalone.ini"; + ; Unfortunately SQLiteNG is not compatible with Mac OSX. You can still use the older + ; sqlite library if you are using Mono 2.4. Please see the notes in OpenSim.ini for sqlite + ; for more details + ;Include-Storage = "config-include/storage/SQLiteStandalone.ini"; ; MySql ; Uncomment these lines if you want to use mysql storage -- cgit v1.1 From cc67de5b86ebcebadbe2ea46872a0dc63d99cae7 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Fri, 30 Apr 2010 17:45:00 +0100 Subject: 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. --- bin/OpenSim.ini.example | 10 +++++----- bin/config-include/StandaloneCommon.ini.example | 8 ++++---- bin/config-include/storage/SQLiteLegacyStandalone.ini | 16 ++++++++++++++++ bin/config-include/storage/SQLiteNGStandalone.ini | 16 ---------------- 4 files changed, 25 insertions(+), 25 deletions(-) create mode 100644 bin/config-include/storage/SQLiteLegacyStandalone.ini delete mode 100644 bin/config-include/storage/SQLiteNGStandalone.ini (limited to 'bin') diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index bbc6f78..f49cd97 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -113,14 +113,14 @@ ; --- To use sqlite as region storage: ; - ; PLEASE NOTE: Unfortunately, the SQLiteNG database plugin, while necessary to use sqlite with Mono on Linux, is + ; PLEASE NOTE: Unfortunately, the current SQLite database plugin (necessary to use SQLite with Mono on Linux) is ; not compatible with the sqlite3 library installed on Mac OSX. If you're using Mono 2.4 you can still use the old sqlite - ; library by uncommenting the SQLite.dll storage plugin (and commenting out SQLiteNG). Unfortunately, the older library - ; will not work with Mono 2.6 on Mac OSX so you will either need to replace the sqlite3 system library or use MySQL instead + ; library by uncommenting the SQLiteLegacy.dll storage plugin (and commenting out SQLite.dll). Unfortunately, the older library + ; will not work with Mono 2.6 on Mac OSX so you will either need to replace the OSX sqlite3 system library or use MySQL instead ; ; You will also need to do the same thing in config-include/StandaloneCommon.ini if you are running in standalone mode - storage_plugin = "OpenSim.Data.SQLiteNG.dll" - ;storage_plugin = "OpenSim.Data.SQLite.dll" + storage_plugin = "OpenSim.Data.SQLite.dll" + ;storage_plugin = "OpenSim.Data.SQLiteLegacy.dll" storage_connection_string="URI=file:OpenSim.db,version=3"; ; --- To use MySQL storage, supply your own connection string (this is only an example): diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index 58860d1..572c153 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example @@ -6,12 +6,12 @@ ; ; SQLite - Include-Storage = "config-include/storage/SQLiteNGStandalone.ini"; + Include-Storage = "config-include/storage/SQLiteStandalone.ini"; - ; Unfortunately SQLiteNG is not compatible with Mac OSX. You can still use the older - ; sqlite library if you are using Mono 2.4. Please see the notes in OpenSim.ini for sqlite + ; Unfortunately the current SQLite database plugin is not compatible with Mac OSX. You can still use the older + ; legacy sqlite library if you are using Mono 2.4. Please see the notes in OpenSim.ini (search for sqlite) ; for more details - ;Include-Storage = "config-include/storage/SQLiteStandalone.ini"; + ;Include-Storage = "config-include/storage/SQLiteLegacyStandalone.ini"; ; MySql ; Uncomment these lines if you want to use mysql storage diff --git a/bin/config-include/storage/SQLiteLegacyStandalone.ini b/bin/config-include/storage/SQLiteLegacyStandalone.ini new file mode 100644 index 0000000..1d4dd29 --- /dev/null +++ b/bin/config-include/storage/SQLiteLegacyStandalone.ini @@ -0,0 +1,16 @@ +; These are the initialization settings for running OpenSim Standalone with an SQLite database + +[DatabaseService] + StorageProvider = "OpenSim.Data.SQLiteLegacy.dll" + +[AvatarService] + ConnectionString = "URI=file:avatars.db,version=3" + +[AuthenticationService] + ConnectionString = "URI=file:auth.db,version=3" + +[UserAccountService] + ConnectionString = "URI=file:userprofiles.db,version=3" + +[FriendsService] + ConnectionString = "URI=file:friends.db,version=3" diff --git a/bin/config-include/storage/SQLiteNGStandalone.ini b/bin/config-include/storage/SQLiteNGStandalone.ini deleted file mode 100644 index ba00aca..0000000 --- a/bin/config-include/storage/SQLiteNGStandalone.ini +++ /dev/null @@ -1,16 +0,0 @@ -; These are the initialization settings for running OpenSim Standalone with an SQLite database - -[DatabaseService] - StorageProvider = "OpenSim.Data.SQLiteNG.dll" - -[AvatarService] - ConnectionString = "URI=file:avatars.db,version=3" - -[AuthenticationService] - ConnectionString = "URI=file:auth.db,version=3" - -[UserAccountService] - ConnectionString = "URI=file:userprofiles.db,version=3" - -[FriendsService] - ConnectionString = "URI=file:friends.db,version=3" -- cgit v1.1