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

Presumptively fix MySQL 8 compat

Browse source 
`Groups` is a reserved name in MySQL 8 and this should fix compat issues
with it.
This commit is contained in:
Lucas Nicodemus 2020-05-18 18:40:51 -07:00
parent 8318b37de3
commit 35198647a1
No known key found for this signature in database
GPG key ID: A07BD9023D1664DB
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
TShockAPI/DB/RegionManager.cs
View file

@ -141,7 +141,7 @@ namespace TShockAPI.DB
try try
{ {
database.Query( database.Query(
"INSERT INTO Regions (X1, Y1, width, height, RegionName, WorldID, UserIds, Protected, Groups, Owner, Z) VALUES (@0, @1, @2, @3, @4, @5, @6, @7, @8, @9, @10);", "INSERT INTO Regions (X1, Y1, width, height, RegionName, WorldID, UserIds, Protected, `Groups`, Owner, Z) VALUES (@0, @1, @2, @3, @4, @5, @6, @7, @8, @9, @10);",
tx, ty, width, height, regionname, worldid, "", 1, "", owner, z); tx, ty, width, height, regionname, worldid, "", 1, "", owner, z);
int id; int id;
using (QueryResult res = database.QueryReader("SELECT Id FROM Regions WHERE RegionName = @0 AND WorldID = @1", regionname, worldid)) using (QueryResult res = database.QueryReader("SELECT Id FROM Regions WHERE RegionName = @0 AND WorldID = @1", regionname, worldid))
@ -609,7 +609,7 @@ namespace TShockAPI.DB
{ {
string mergedGroups = ""; string mergedGroups = "";
using ( using (
var reader = database.QueryReader("SELECT Groups FROM Regions WHERE RegionName=@0 AND WorldID=@1", regionName, var reader = database.QueryReader("SELECT `Groups` FROM Regions WHERE RegionName=@0 AND WorldID=@1", regionName,
Main.worldID.ToString())) Main.worldID.ToString()))
{ {
if (reader.Read()) if (reader.Read())
@ -625,7 +625,7 @@ namespace TShockAPI.DB
mergedGroups += ","; mergedGroups += ",";
mergedGroups += groupName; mergedGroups += groupName;
int q = database.Query("UPDATE Regions SET Groups=@0 WHERE RegionName=@1 AND WorldID=@2", mergedGroups, int q = database.Query("UPDATE Regions SET `Groups`=@0 WHERE RegionName=@1 AND WorldID=@2", mergedGroups,
regionName, Main.worldID.ToString()); regionName, Main.worldID.ToString());
Region r = GetRegionByName(regionName); Region r = GetRegionByName(regionName);
@ -654,7 +654,7 @@ namespace TShockAPI.DB
{ {
r.RemoveGroup(group); r.RemoveGroup(group);
string groups = string.Join(",", r.AllowedGroups); string groups = string.Join(",", r.AllowedGroups);
int q = database.Query("UPDATE Regions SET Groups=@0 WHERE RegionName=@1 AND WorldID=@2", groups, int q = database.Query("UPDATE Regions SET `Groups`=@0 WHERE RegionName=@1 AND WorldID=@2", groups,
regionName, Main.worldID.ToString()); regionName, Main.worldID.ToString());
if (q > 0) if (q > 0)
return true; return true;