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/config-include/StandaloneCommon.ini.example       |  8 ++++----
 bin/config-include/storage/SQLiteLegacyStandalone.ini | 16 ++++++++++++++++
 bin/config-include/storage/SQLiteNGStandalone.ini     | 16 ----------------
 3 files changed, 20 insertions(+), 20 deletions(-)
 create mode 100644 bin/config-include/storage/SQLiteLegacyStandalone.ini
 delete mode 100644 bin/config-include/storage/SQLiteNGStandalone.ini

(limited to 'bin/config-include')

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