themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #1224 from Patrikkk/general-devel

Browse source 
Show proper error message at db connect fail
This commit is contained in:
White 2016-06-25 21:05:20 +09:30 • committed by GitHub
commit dd8c253911
1 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
TShockAPI/Extensions/DbExt.cs
View file

@ -60,6 +60,8 @@ namespace TShockAPI.DB
public static QueryResult QueryReader(this IDbConnection olddb, string query, params object[] args) public static QueryResult QueryReader(this IDbConnection olddb, string query, params object[] args)
{ {
var db = olddb.CloneEx(); var db = olddb.CloneEx();
try
{
db.Open(); db.Open();
using (var com = db.CreateCommand()) using (var com = db.CreateCommand())
{ {
@ -70,6 +72,11 @@ namespace TShockAPI.DB
return new QueryResult(db, com.ExecuteReader()); return new QueryResult(db, com.ExecuteReader());
} }
} }
catch (Exception ex)
{
throw new Exception("Fatal TShock initialization exception: failed to connect to MySQL database. See inner exception for details.", ex);
}
}
public static QueryResult QueryReaderDict(this IDbConnection olddb, string query, Dictionary<string, object> values) public static QueryResult QueryReaderDict(this IDbConnection olddb, string query, Dictionary<string, object> values)
{ {