From b49fb3db7ca665abf9753c74aa1e2b28eeb70946 Mon Sep 17 00:00:00 2001 From: AlexRa Date: Wed, 5 May 2010 22:34:41 +0300 Subject: 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. --- OpenSim/Data/MySQL/MySQLMigrations.cs | 85 +++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 OpenSim/Data/MySQL/MySQLMigrations.cs (limited to 'OpenSim/Data/MySQL/MySQLMigrations.cs') diff --git a/OpenSim/Data/MySQL/MySQLMigrations.cs b/OpenSim/Data/MySQL/MySQLMigrations.cs new file mode 100644 index 0000000..b16655d --- /dev/null +++ b/OpenSim/Data/MySQL/MySQLMigrations.cs @@ -0,0 +1,85 @@ +/* + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSimulator Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.Common; +using System.IO; +using System.Reflection; +using System.Text.RegularExpressions; +using log4net; +using MySql.Data.MySqlClient; + +namespace OpenSim.Data.MySQL +{ + /// This is a MySQL-customized migration processor. The only difference is in how + /// it executes SQL scripts (using MySqlScript instead of MyCommand) + /// + /// + public class MySqlMigration : Migration + { + public MySqlMigration() + : base() + { + } + + public MySqlMigration(DbConnection conn, Assembly assem, string subtype, string type) : + base(conn, assem, subtype, type) + { + } + + public MySqlMigration(DbConnection conn, Assembly assem, string type) : + base(conn, assem, type) + { + } + + protected override void ExecuteScript(DbConnection conn, string[] script) + { + if (!(conn is MySqlConnection)) + { + base.ExecuteScript(conn, script); + return; + } + + MySqlScript scr = new MySqlScript((MySqlConnection)conn); + { + foreach (string sql in script) + { + scr.Query = sql; + scr.Error += delegate(object sender, MySqlScriptErrorEventArgs args) + { + m_log.ErrorFormat("[MySQL MIGRATION]: Error {0}", args.Exception.Message); + m_log.ErrorFormat("[MySQL MIGRATION]: In SQL: {0}", args.StatementText); + throw args.Exception; + }; + scr.Execute(); + } + } + } + } +} -- cgit v1.1 From d2bc6736675f0418903f70a649808ccabbfb3fd9 Mon Sep 17 00:00:00 2001 From: Melanie Date: Tue, 18 May 2010 23:33:05 +0100 Subject: Make m_log in migrations private. Define new m_log in derived class --- OpenSim/Data/MySQL/MySQLMigrations.cs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'OpenSim/Data/MySQL/MySQLMigrations.cs') diff --git a/OpenSim/Data/MySQL/MySQLMigrations.cs b/OpenSim/Data/MySQL/MySQLMigrations.cs index b16655d..959b5d0 100644 --- a/OpenSim/Data/MySQL/MySQLMigrations.cs +++ b/OpenSim/Data/MySQL/MySQLMigrations.cs @@ -43,6 +43,8 @@ namespace OpenSim.Data.MySQL /// public class MySqlMigration : Migration { + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + public MySqlMigration() : base() { -- cgit v1.1 From 167db502593de5f535d8c322005c63ef263940ed Mon Sep 17 00:00:00 2001 From: Melanie Date: Wed, 19 May 2010 02:33:23 +0100 Subject: Allow migration steps to fail again without bringing down the house --- OpenSim/Data/MySQL/MySQLMigrations.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'OpenSim/Data/MySQL/MySQLMigrations.cs') diff --git a/OpenSim/Data/MySQL/MySQLMigrations.cs b/OpenSim/Data/MySQL/MySQLMigrations.cs index 959b5d0..a1f7844 100644 --- a/OpenSim/Data/MySQL/MySQLMigrations.cs +++ b/OpenSim/Data/MySQL/MySQLMigrations.cs @@ -77,7 +77,7 @@ namespace OpenSim.Data.MySQL { m_log.ErrorFormat("[MySQL MIGRATION]: Error {0}", args.Exception.Message); m_log.ErrorFormat("[MySQL MIGRATION]: In SQL: {0}", args.StatementText); - throw args.Exception; + m_log.Error("[MySQL MIGRATION]: The above migration failed to complete. This may cause errors in your install, but could also be normal. Continuing."); }; scr.Execute(); } -- cgit v1.1 From dedc0c0bd4ebdf6f8af056c63c7aeeed70b39627 Mon Sep 17 00:00:00 2001 From: Melanie Date: Wed, 19 May 2010 02:47:31 +0100 Subject: Revert "Allow migration steps to fail again without bringing down the house" This reverts commit 167db502593de5f535d8c322005c63ef263940ed. --- OpenSim/Data/MySQL/MySQLMigrations.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'OpenSim/Data/MySQL/MySQLMigrations.cs') diff --git a/OpenSim/Data/MySQL/MySQLMigrations.cs b/OpenSim/Data/MySQL/MySQLMigrations.cs index a1f7844..959b5d0 100644 --- a/OpenSim/Data/MySQL/MySQLMigrations.cs +++ b/OpenSim/Data/MySQL/MySQLMigrations.cs @@ -77,7 +77,7 @@ namespace OpenSim.Data.MySQL { m_log.ErrorFormat("[MySQL MIGRATION]: Error {0}", args.Exception.Message); m_log.ErrorFormat("[MySQL MIGRATION]: In SQL: {0}", args.StatementText); - m_log.Error("[MySQL MIGRATION]: The above migration failed to complete. This may cause errors in your install, but could also be normal. Continuing."); + throw args.Exception; }; scr.Execute(); } -- cgit v1.1 From 0c209a469b54a52ac7d54a7bddd2bdcf02a80522 Mon Sep 17 00:00:00 2001 From: Melanie Date: Wed, 19 May 2010 03:48:03 +0100 Subject: Clean up output a bit --- OpenSim/Data/MySQL/MySQLMigrations.cs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'OpenSim/Data/MySQL/MySQLMigrations.cs') diff --git a/OpenSim/Data/MySQL/MySQLMigrations.cs b/OpenSim/Data/MySQL/MySQLMigrations.cs index 959b5d0..81a0e83 100644 --- a/OpenSim/Data/MySQL/MySQLMigrations.cs +++ b/OpenSim/Data/MySQL/MySQLMigrations.cs @@ -43,8 +43,6 @@ namespace OpenSim.Data.MySQL /// public class MySqlMigration : Migration { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - public MySqlMigration() : base() { @@ -75,9 +73,7 @@ namespace OpenSim.Data.MySQL scr.Query = sql; scr.Error += delegate(object sender, MySqlScriptErrorEventArgs args) { - m_log.ErrorFormat("[MySQL MIGRATION]: Error {0}", args.Exception.Message); - m_log.ErrorFormat("[MySQL MIGRATION]: In SQL: {0}", args.StatementText); - throw args.Exception; + throw new Exception(sql); }; scr.Execute(); } -- cgit v1.1