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

Merge pull request #2269 from Pryaxis/h/fix-typo

Browse source 
Fix (partial) ban system conversion issue with MySQL
This commit is contained in:
Lucas Nicodemus 2021-04-11 22:06:37 -07:00 • committed by GitHub
commit 070787ed96
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -15,6 +15,9 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
## Upcoming changes ## Upcoming changes
* This could be you! * This could be you!
## TShock 4.5.0.1
* Fixed typo in conversion from old to new ban system for MySQL hosted ban databases. (@DeathCradle)
## TShock 4.5.0 ## TShock 4.5.0
* Updated OTAPI and TSAPI to Terraria 1.4.2.1. (@Stealownz, @DeathCradle) * Updated OTAPI and TSAPI to Terraria 1.4.2.1. (@Stealownz, @DeathCradle)
* Updated TShock with preliminary protocol support for Terraria 1.4.2.1. (@Stealownz) * Updated TShock with preliminary protocol support for Terraria 1.4.2.1. (@Stealownz)

2
TShockAPI/DB/BanManager.cs
View file

@ -107,7 +107,7 @@ namespace TShockAPI.DB
int res; int res;
if (database.GetSqlType() == SqlType.Mysql) if (database.GetSqlType() == SqlType.Mysql)
{ {
res = database.QueryScalar<int>("SELECT COUNT(name) FROM information_schema.tables WHERE table_schema = @0 and table_name = 'Bans'", TShock.Config.Settings.MySqlDbName); res = database.QueryScalar<int>("SELECT COUNT(table_name) FROM information_schema.tables WHERE table_schema = @0 and table_name = 'Bans'", TShock.Config.Settings.MySqlDbName);
} }
else else
{ {

4
TShockAPI/Properties/AssemblyInfo.cs
View file

@ -53,5 +53,5 @@ using System.Runtime.InteropServices;
// Also, be sure to release on github with the exact assembly version tag as below // Also, be sure to release on github with the exact assembly version tag as below
// so that the update manager works correctly (via the Github releases api and mimic) // so that the update manager works correctly (via the Github releases api and mimic)
[assembly: AssemblyVersion("4.5.0")] [assembly: AssemblyVersion("4.5.0.1")]
[assembly: AssemblyFileVersion("4.5.0")] [assembly: AssemblyFileVersion("4.5.0.1")]