Commit Graph

12506 Commits (e98109765c11b4ea9abac3bb24600b1414ef4a36)

Author SHA1 Message Date
AlexRa ccee95552f A bit of harmless refactoring in SQLiteAssetData.cs 2010-05-19 21:49:22 +03:00
AlexRa d71c483bf0 Prebuild: added *.migrations as resources to MSSQL, SQLiteLegacy (just in case) 2010-05-19 21:49:20 +03:00
AlexRa 527a257b9f Kind of fixed Melanie's "Exception(sql)" correction
Throwing an Ex. with SQL command in the message looks weird,
this is a bit better, but I'm still not sure if that's the
proper way to handle.  Also, there is a catch one level up,
so is this one necessary?
2010-05-19 21:49:18 +03:00
Melanie e4b8d76b10 Change appender to deal with line feeds more intelligently.
Change migration error reporting to not truncate the statement when
reporting. It's a bit messier than the old error reporting, but at least
one gets an idea of what could be wrong again. And things look a lot
neater now.
2010-05-19 04:17:56 +01:00
Melanie 0c209a469b Clean up output a bit 2010-05-19 03:48:03 +01:00
Melanie 20642f2f21 Fix the migration message to say "Continuing" again. Remove line feed, which
prevented the full message from displaying.
2010-05-19 03:26:37 +01:00
Melanie 9fa8013ca5 Remove the return that was inserted in the last merge to allow
migrations to continue in the face of an error
2010-05-19 03:07:31 +01:00
Melanie dedc0c0bd4 Revert "Allow migration steps to fail again without bringing down the house"
This reverts commit 167db50259.
2010-05-19 02:47:31 +01:00
Melanie 167db50259 Allow migration steps to fail again without bringing down the house 2010-05-19 02:33:23 +01:00
Melanie 298368dd99 Merge commit 'alex/mssql-estate-bugfix'
This fixes some type conversion bugs and also makes the estate lists
work properly for MSSQL. Strawberry, please check this.

Signed-off-by: Melanie <melanie@t-data.com>
2010-05-18 23:39:09 +01:00
Melanie d2bc673667 Make m_log in migrations private. Define new m_log in derived class 2010-05-18 23:33:05 +01:00
Melanie caf61ab7d8 Binary Guids are 16 chars long. Fix parser. 2010-05-18 23:22:30 +01:00
Melanie 4fee3f9548 Revert a revert? Am i mad? Don't answer that....!
Revert "Revert "Looks like the new files were never added to prebuild.xml""

This reverts commit f253758c2e.
2010-05-18 23:15:29 +01:00
Melanie 397326ddfa Merge commit 'alex/Migrations'
Another stab at the tests

Signed-off-by: Melanie <melanie@t-data.com>
2010-05-18 23:02:10 +01:00
AlexRa deae030145 Some more corrections after MySQL connector update 2010-05-19 02:28:19 +03:00
AlexRa 8a0c5d14d4 All (?) MySQL stores fixed to use DBGuid.FromDB()
This was needed if we want to update to the latest MySQL
connector dll.  It automatically converts CHAR(36) to
Guids, so getting them as strings no longer works.

By using DBGuid.FromDB(), we unlink from any particular
storage format of GUIDs, could even make them BINARY(16)
if we like.

Actually not all MySql units are touched, but the remaining ones don't
seem to be affected (they don't read GUIDs from DB)
2010-05-19 01:33:02 +03:00
AlexRa a27d49b188 Added DBGuids.cs (static func DBGuid.FromDB()
This DBMS-independent function to be used converting UUIDs
from whatever format used in the DB (string/binary/Guid).
This is mostly needed for MySQL, as in MSSQL they are always
UNIQUEIDENTIFIERs and in SQLite always strings (but would look
better if we use it there anyway).
2010-05-19 01:32:50 +03:00
Melanie f253758c2e Revert "Looks like the new files were never added to prebuild.xml"
This reverts commit df49756e7b.
2010-05-18 21:29:02 +01:00
Melanie df49756e7b Looks like the new files were never added to prebuild.xml 2010-05-18 21:15:58 +01:00
Melanie 6eef334059 Merge commit 'alex/Migrations'
Adding what, in the World according to Alex, will fix the tests

Signed-off-by: Melanie <melanie@t-data.com>
2010-05-18 21:00:10 +01:00
AlexRa 020f38774f MS SQL migrations converted to the new format 2010-05-18 22:16:13 +03:00
AlexRa 6e7b3950d7 Migrations for SQLite converted to new format 2010-05-18 22:16:10 +03:00
AlexRa e4419c34c3 Converted MySQL migration history to the new format
Replaced all NNN_StoreName.sql migration resources with a more
readable, single-file-per-store
2010-05-18 22:16:06 +03:00
AlexRa 4ebb985b46 Added MySqlMigrations.cs (supports stored proc/funcs)
Uses MySqlScript class to correctly run proc/func definitions
that need delimiter change. Requires MySql.Data.dll 6.2 or later.
2010-05-18 22:16:03 +03:00
AlexRa ade2e5a9d2 Embedded MySql.Data.dll updated to 6.2.3.0.
This is necessary to correct a known problem with the
DELIMITER command in previous versions of the client library.
2010-05-18 22:16:00 +03:00
AlexRa f4450ccf4f Migration.cs supports single-file migration history format
Scans for migration resources in either old-style "scattered" (one file per version)
or new-style "integrated" format (single file "Resources/{StoreName}.migrations[.nnn]") with ":VERSION nnn" sections).
In the new-style migrations it also recognizes ':GO' separators for parts of the SQL script
that must be sent to the server separately.  The old-style migrations are loaded each in one piece
and don't support the ':GO' feature.

Status:  TESTED and works fine in all modes!
2010-05-18 22:15:56 +03:00
AlexRa d95f232629 Massive bugfix in MSSQLEstateData (now works!) 2010-05-18 21:08:51 +03:00
Melanie e260610c00 Merge branch 'Migrations'
This merges AlexRa's work on migration streamlining. This merge is experimental.
If it causes issues, feel free to back out.

Signed-off-by: Melanie <melanie@t-data.com>
2010-05-18 19:03:16 +01:00
Melanie Thielker 3e1f2ddb8e Allow remote admin to be used on a different port from the main region port 2010-05-18 17:01:44 +01:00
Melanie df04ccfdc3 Change an exception reporting to include the stack trace. "e.Message" just
_won't_ do. Might look more elegant, but it's too little information.
2010-05-18 15:30:08 +01:00
Melanie a6023ea89e Prevent a crash when the two agent dictionaries get out of sync 2010-05-16 20:31:02 +01:00
Diva Canto 2fb79646c6 Fixes mantis #4691 for real. This time I tested it, and it works. 2010-05-16 10:32:57 -07:00
Diva Canto 0b43b263d4 Fixes mantis #4691 2010-05-16 09:12:40 -07:00
Diva Canto b7e6b58857 Fixes mantis #4622. 2010-05-16 09:01:27 -07:00
Diva Canto 49f4becdae * Fixed configs in StandaloneHypergrid.ini, it still had the SQLite connection strings.
* Added a comment in LLLoginService.cs, for future reference
2010-05-16 08:10:57 -07:00
AlexRa dfeb9a0b5c MS SQL migrations converted to the new format 2010-05-16 17:04:50 +03:00
AlexRa 1ad12851d0 Migrations for SQLite converted to new format 2010-05-16 17:04:39 +03:00
AlexRa ee713cb253 Converted MySQL migration history to the new format
Replaced all NNN_StoreName.sql migration resources with a more
readable, single-file-per-store
2010-05-16 17:04:13 +03:00
AlexRa b49fb3db7c Added MySqlMigrations.cs (supports stored proc/funcs)
Uses MySqlScript class to correctly run proc/func definitions
that need delimiter change. Requires MySql.Data.dll 6.2 or later.
2010-05-16 16:25:08 +03:00
AlexRa a49716dc2f Embedded MySql.Data.dll updated to 6.2.3.0.
This is necessary to correct a known problem with the
DELIMITER command in previous versions of the client library.
2010-05-16 16:24:50 +03:00
AlexRa 8b6a295874 Migration.cs supports single-file migration history format
Scans for migration resources in either old-style "scattered" (one file per version)
or new-style "integrated" format (single file "Resources/{StoreName}.migrations[.nnn]") with ":VERSION nnn" sections).
In the new-style migrations it also recognizes ':GO' separators for parts of the SQL script
that must be sent to the server separately.  The old-style migrations are loaded each in one piece
and don't support the ':GO' feature.

Status:  TESTED and works fine in all modes!
2010-05-16 16:22:38 +03:00
Teravus Ovares (Dan Olivares) a974146921 Merge branch 'master' of ssh://MyConnection/var/git/opensim 2010-05-16 01:48:28 -04:00
Teravus Ovares (Dan Olivares) d4192dcb2e * Revert last commit for now at Melanie_T's request.
* Additional ways of configuring opensim break with this
2010-05-16 01:47:53 -04:00
Diva Canto ff4f50396a Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2010-05-15 20:28:14 -07:00
Diva Canto e5e52e4072 This combination is working. It all points to not being able to use 127.0.0.1/localhost in testing HG situations. The login server must have the LAN IP address, and the regions must show ExternalHostname as SYSTEMIP. Working, but this needs more testing. 2010-05-15 20:27:25 -07:00
Teravus Ovares (Dan Olivares) 019925bb2f Merge branch 'master' of ssh://MyConnection/var/git/opensim 2010-05-15 23:22:07 -04:00
Teravus Ovares (Dan Olivares) dc1a3e9787 * Add User Friendly Configuration File Exists check. If OpenSim.ini and either StandaloneCommon.ini or GridCommon.ini don't exist in various casings then offer to copy the files for the user while warning them that they're missing out if they don't read the files. 2010-05-15 23:21:36 -04:00
Diva Canto 74b23ff9c6 Almost, but not quite. Commenting verification again, until I understand where 127.0.0.1 is being transformed to the local IP address. I suspect it's Adam's NAT snippets. 2010-05-15 19:58:30 -07:00
Diva Canto 2a1e45f657 Finalized the client's TCP IP address verification process for HG1.5. 2010-05-15 19:25:14 -07:00
unknown 9dbe90801b Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into slimupdates2 2010-05-15 02:20:47 -07:00