Leahnaya/pkmn-classic-framework
1
0
Fork 0
mirror of https://github.com/mm201/pkmn-classic-framework.git synced 2026-08-25 03:34:15 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Style

Browse Source
This commit is contained in:
Greg Edwards
2022-03-21 20:49:21 -04:00
parent 775a6a5366
commit 6f7cd593f5
6 changed files with 61 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
library/Data/DataMysql.cs
View File

@@ -16,12 +16,12 @@ namespace PkmnFoundations.Data
public class DataMysql : Database
{
#region Initialization
public DataMysql(String connString)
public DataMysql(string connString)
{
ConnectionString = connString;
}
public String ConnectionString { get; set; }
public string ConnectionString { get; set; }
private MySqlConnection CreateConnection()
{
@@ -30,14 +30,14 @@ namespace PkmnFoundations.Data
#endregion
#region Utility
public static String SqlSanitize(String s)
public static string SqlSanitize(string s)
{
return SqlSanitize(s, "");
}
public static String SqlSanitize(String s, String newChar)
public static string SqlSanitize(string s, string newChar)
{
String result = s.Replace("\'", newChar).Replace("[", newChar).Replace("]", newChar).Replace("`", newChar);
string result = s.Replace("\'", newChar).Replace("[", newChar).Replace("]", newChar).Replace("`", newChar);
int x = result.IndexOf("--");
if (x != -1) result = result.Substring(0, x);
return result;
@@ -357,7 +357,7 @@ namespace PkmnFoundations.Data
public GtsRecord4[] GtsSearch4(MySqlTransaction tran, Pokedex.Pokedex pokedex, int pid, ushort species, Genders gender, byte minLevel, byte maxLevel, byte country, int count)
{
List<MySqlParameter> _params = new List<MySqlParameter>();
String where = "WHERE pid != @pid AND IsExchanged = 0";
string where = "WHERE pid != @pid AND IsExchanged = 0";
_params.Add(new MySqlParameter("@pid", pid));
if (species > 0)
@@ -395,7 +395,7 @@ namespace PkmnFoundations.Data
_params.Add(new MySqlParameter("@country", country));
}
String limit = "";
string limit = "";
if (count > 0)
{
_params.Add(new MySqlParameter("@count", count));
@@ -825,7 +825,7 @@ namespace PkmnFoundations.Data
/// </returns>
private ulong FindBattleTowerRecord4(MySqlTransaction tran, BattleTowerRecord4 record, bool leader)
{
String tblName = leader ? "GtsBattleTowerLeaders4" : "GtsBattleTower4";
string tblName = leader ? "GtsBattleTowerLeaders4" : "GtsBattleTower4";
// If PID is missing, this is restored data.
// We assume the original server took care of matching existing
@@ -887,7 +887,7 @@ namespace PkmnFoundations.Data
if (records.Count == 0) return new BattleTowerRecord4[0];
String inClause = String.Join(", ", keys.Select(i => i.ToString()).ToArray());
string inClause = String.Join(", ", keys.Select(i => i.ToString()).ToArray());
using (MySqlDataReader reader = (MySqlDataReader)tran.ExecuteReader("SELECT party_id, " +
"Slot, Species, HeldItem, Move1, Move2, Move3, Move4, " +
"TrainerID, Personality, IVs, EVs, Unknown1, Language, " +
@@ -1425,7 +1425,7 @@ namespace PkmnFoundations.Data
public GtsRecord5[] GtsSearch5(MySqlTransaction tran, Pokedex.Pokedex pokedex, int pid, ushort species, Genders gender, byte minLevel, byte maxLevel, byte country, int count)
{
List<MySqlParameter> _params = new List<MySqlParameter>();
String where = "WHERE pid != @pid AND IsExchanged = 0";
string where = "WHERE pid != @pid AND IsExchanged = 0";
_params.Add(new MySqlParameter("@pid", pid));
if (species > 0)
@@ -1463,7 +1463,7 @@ namespace PkmnFoundations.Data
_params.Add(new MySqlParameter("@country", country));
}
String limit = "";
string limit = "";
if (count > 0)
{
_params.Add(new MySqlParameter("@count", count));
@@ -1900,7 +1900,7 @@ namespace PkmnFoundations.Data
/// </returns>
private ulong FindBattleSubwayRecord5(MySqlTransaction tran, BattleSubwayRecord5 record, bool leader)
{
String tblName = leader ? "GtsBattleSubwayLeaders5" : "GtsBattleSubway5";
string tblName = leader ? "GtsBattleSubwayLeaders5" : "GtsBattleSubway5";
// If PID is missing, this is restored data.
// We assume the original server took care of matching existing
@@ -1968,7 +1968,7 @@ namespace PkmnFoundations.Data
if (records.Count == 0) return new BattleSubwayRecord5[0];
String inClause = String.Join(", ", keys.Select(i => i.ToString()).ToArray());
string inClause = String.Join(", ", keys.Select(i => i.ToString()).ToArray());
using (MySqlDataReader reader = (MySqlDataReader)tran.ExecuteReader("SELECT party_id, " +
"Slot, Species, HeldItem, Move1, Move2, Move3, Move4, " +
"TrainerID, Personality, IVs, EVs, Unknown1, Language, " +
@@ -2377,8 +2377,8 @@ namespace PkmnFoundations.Data
public BattleVideoHeader4[] BattleVideoSearch4(MySqlTransaction tran, ushort species, BattleVideoRankings4 ranking, BattleVideoMetagames4 metagame, byte country, byte region, int count)
{
List<MySqlParameter> _params = new List<MySqlParameter>();
String where = "";
String sort = "";
string where = "";
string sort = "";
bool hasSearch = false;
if (ranking == BattleVideoRankings4.None)
@@ -2481,7 +2481,7 @@ namespace PkmnFoundations.Data
public BattleVideoRecord4 BattleVideoGet4(MySqlTransaction tran, ulong serial, bool incrementViews = false)
{
String update = incrementViews ? "UPDATE TerminalBattleVideos4 " +
string update = incrementViews ? "UPDATE TerminalBattleVideos4 " +
"SET Views = Views + 1 WHERE SerialNumber = @serial; "
: "";
@@ -2765,8 +2765,8 @@ namespace PkmnFoundations.Data
public BattleVideoHeader5[] BattleVideoSearch5(MySqlTransaction tran, ushort species, BattleVideoRankings5 ranking, BattleVideoMetagames5 metagame, byte country, byte region, int count)
{
List<MySqlParameter> _params = new List<MySqlParameter>();
String where = "";
String sort = "";
string where = "";
string sort = "";
bool hasSearch = false;
if (ranking == BattleVideoRankings5.None)
@@ -2874,7 +2874,7 @@ namespace PkmnFoundations.Data
public BattleVideoRecord5 BattleVideoGet5(MySqlTransaction tran, ulong serial, bool incrementViews = false)
{
String update = incrementViews ? "UPDATE TerminalBattleVideos5 " +
string update = incrementViews ? "UPDATE TerminalBattleVideos5 " +
"SET Views = Views + 1 WHERE SerialNumber = @serial; "
: "";
@@ -2928,26 +2928,26 @@ namespace PkmnFoundations.Data
#endregion
#region Pokedex creation
private const String INSERT_COLUMNS = "Name_JA, Name_EN, Name_FR, Name_IT, Name_DE, Name_ES, Name_KO";
private const String INSERT_VALUES = "@name_ja, @name_en, @name_fr, @name_it, @name_de, @name_es, @name_ko";
private static String[] m_query_langs = new String[] { "JA", "EN", "FR", "IT", "DE", "ES", "KO" };
private const string INSERT_COLUMNS = "Name_JA, Name_EN, Name_FR, Name_IT, Name_DE, Name_ES, Name_KO";
private const string INSERT_VALUES = "@name_ja, @name_en, @name_fr, @name_it, @name_de, @name_es, @name_ko";
private static string[] m_query_langs = new string[] { "JA", "EN", "FR", "IT", "DE", "ES", "KO" };
private static void CreateLocalizedStringQueryPieces(LocalizedString s,
List<MySqlParameter> insertParams, String prefix = "@name_")
List<MySqlParameter> insertParams, string prefix = "@name_")
{
foreach (String lang in m_query_langs)
foreach (string lang in m_query_langs)
{
MySqlParameter param = new MySqlParameter(prefix + lang.ToLowerInvariant(), s.ContainsKey(lang) ? s[lang] : (object)DBNull.Value);
insertParams.Add(param);
}
}
private static String CreateLocalizedInsertColumns(String prefix)
private static string CreateLocalizedInsertColumns(string prefix)
{
return String.Join(", ", m_query_langs.Select(lang => prefix + lang).ToArray());
}
private static String CreateLocalizedInsertValues(String prefix)
private static string CreateLocalizedInsertValues(string prefix)
{
return String.Join(", ", m_query_langs.Select(lang => prefix + lang.ToLowerInvariant()).ToArray());
}

4
library/Data/DataSqlite.cs
View File

@@ -15,12 +15,12 @@ namespace PkmnFoundations.Data
return CreateConnection(DefaultFilename);
}
public SQLiteConnection CreateConnection(String filename)
public SQLiteConnection CreateConnection(string filename)
{
if (filename.Contains('\"')) throw new ArgumentException();
return new SQLiteConnection("Data Source=" + filename + ";Version=3;");
}
public String DefaultFilename = "pokedex.sqlite";
public string DefaultFilename = "pokedex.sqlite";
}
}

2
library/Data/Database.cs
View File

@@ -42,7 +42,7 @@ namespace PkmnFoundations.Data
return CreateInstance(connStr.ConnectionString, connStr.ProviderName);
}
public static Database CreateInstance(String connStr, String provider)
public static Database CreateInstance(string connStr, string provider)
{
if (connStr == null) throw new ArgumentNullException("connStr");
if (provider == null) throw new ArgumentNullException("provider");

44
library/Data/DatabaseExtender.cs
View File

@@ -32,7 +32,7 @@ namespace PkmnFoundations.Data
/// <param name="db">Open data connection</param>
/// <param name="sqlstr">SQL string</param>
/// <param name="_params">List of parameters to use with the SQL</param>
public static DataTable ExecuteDataTable(this DbConnection db, String sqlstr, params IDataParameter[] _params)
public static DataTable ExecuteDataTable(this DbConnection db, string sqlstr, params IDataParameter[] _params)
{
IDataReader reader = db.ExecuteReader(sqlstr, _params);
DataTable result = new DataTable();
@@ -46,7 +46,7 @@ namespace PkmnFoundations.Data
/// <param name="db">Open data connection</param>
/// <param name="sqlstr">SQL string</param>
/// <param name="_params">List of parameters to use with the SQL</param>
public static DataTable ExecuteDataTable(this DbConnection db, String sqlstr, IEnumerable<IDataParameter> _params)
public static DataTable ExecuteDataTable(this DbConnection db, string sqlstr, IEnumerable<IDataParameter> _params)
{
IDataReader reader = db.ExecuteReader(sqlstr, _params.ToArray());
DataTable result = new DataTable();
@@ -60,7 +60,7 @@ namespace PkmnFoundations.Data
/// <param name="db">Open data connection</param>
/// <param name="sqlstr">SQL string</param>
/// <param name="_params">List of parameters to use with the SQL</param>
public static DataTable ExecuteDataTable(this DbTransaction tran, String sqlstr, params IDataParameter[] _params)
public static DataTable ExecuteDataTable(this DbTransaction tran, string sqlstr, params IDataParameter[] _params)
{
IDataReader reader = tran.ExecuteReader(sqlstr, _params);
DataTable result = new DataTable();
@@ -74,7 +74,7 @@ namespace PkmnFoundations.Data
/// <param name="db">Open data connection</param>
/// <param name="sqlstr">SQL string</param>
/// <param name="_params">List of parameters to use with the SQL</param>
public static DataTable ExecuteDataTable(this DbTransaction tran, String sqlstr, IEnumerable<IDataParameter> _params)
public static DataTable ExecuteDataTable(this DbTransaction tran, string sqlstr, IEnumerable<IDataParameter> _params)
{
IDataReader reader = tran.ExecuteReader(sqlstr, _params.ToArray());
DataTable result = new DataTable();
@@ -88,7 +88,7 @@ namespace PkmnFoundations.Data
/// <param name="db">Open data connection</param>
/// <param name="sqlstr">SQL string</param>
/// <param name="_params">List of parameters to use with the SQL</param>
public static IDataReader ExecuteReader(this DbConnection db, String sqlstr, params IDataParameter[] _params)
public static IDataReader ExecuteReader(this DbConnection db, string sqlstr, params IDataParameter[] _params)
{
// hooray DbConnection provides a command factory
DbCommand cmd = db.CreateCommand();
@@ -105,7 +105,7 @@ namespace PkmnFoundations.Data
/// <param name="db">Open data connection</param>
/// <param name="sqlstr">SQL string</param>
/// <param name="_params">List of parameters to use with the SQL</param>
public static IDataReader ExecuteReader(this DbConnection db, String sqlstr, IEnumerable<IDataParameter> _params)
public static IDataReader ExecuteReader(this DbConnection db, string sqlstr, IEnumerable<IDataParameter> _params)
{
return db.ExecuteReader(sqlstr, _params.ToArray());
}
@@ -116,7 +116,7 @@ namespace PkmnFoundations.Data
/// <param name="db">Open data connection</param>
/// <param name="sqlstr">SQL string</param>
/// <param name="_params">List of parameters to use with the SQL</param>
public static IDataReader ExecuteReader(this DbTransaction tran, String sqlstr, params IDataParameter[] _params)
public static IDataReader ExecuteReader(this DbTransaction tran, string sqlstr, params IDataParameter[] _params)
{
// hooray DbConnection provides a command factory
DbCommand cmd = tran.Connection.CreateCommand();
@@ -132,7 +132,7 @@ namespace PkmnFoundations.Data
/// <param name="db">Open data connection</param>
/// <param name="sqlstr">SQL string</param>
/// <param name="_params">List of parameters to use with the SQL</param>
public static IDataReader ExecuteReader(this DbTransaction tran, String sqlstr, IEnumerable<IDataParameter> _params)
public static IDataReader ExecuteReader(this DbTransaction tran, string sqlstr, IEnumerable<IDataParameter> _params)
{
return tran.ExecuteReader(sqlstr, _params.ToArray());
}
@@ -143,7 +143,7 @@ namespace PkmnFoundations.Data
/// <param name="db">Open data connection</param>
/// <param name="sqlstr">SQL string</param>
/// <param name="_params">List of parameters to use with the SQL</param>
public static object ExecuteScalar(this DbConnection db, String sqlstr, params IDataParameter[] _params)
public static object ExecuteScalar(this DbConnection db, string sqlstr, params IDataParameter[] _params)
{
DbCommand cmd = db.CreateCommand();
cmd.CommandText = sqlstr;
@@ -157,7 +157,7 @@ namespace PkmnFoundations.Data
/// <param name="db">Open data connection</param>
/// <param name="sqlstr">SQL string</param>
/// <param name="_params">List of parameters to use with the SQL</param>
public static int ExecuteNonQuery(this DbConnection db, String sqlstr, params IDataParameter[] _params)
public static int ExecuteNonQuery(this DbConnection db, string sqlstr, params IDataParameter[] _params)
{
DbCommand cmd = db.CreateCommand();
cmd.CommandText = sqlstr;
@@ -171,7 +171,7 @@ namespace PkmnFoundations.Data
/// <param name="db">Open data connection</param>
/// <param name="sqlstr">SQL string</param>
/// <param name="_params">List of parameters to use with the SQL</param>
public static object ExecuteScalar(this DbTransaction tran, String sqlstr, params IDataParameter[] _params)
public static object ExecuteScalar(this DbTransaction tran, string sqlstr, params IDataParameter[] _params)
{
DbCommand cmd = tran.Connection.CreateCommand();
cmd.CommandText = sqlstr;
@@ -186,7 +186,7 @@ namespace PkmnFoundations.Data
/// <param name="db">Open data connection</param>
/// <param name="sqlstr">SQL string</param>
/// <param name="_params">List of parameters to use with the SQL</param>
public static int ExecuteNonQuery(this DbTransaction tran, String sqlstr, params IDataParameter[] _params)
public static int ExecuteNonQuery(this DbTransaction tran, string sqlstr, params IDataParameter[] _params)
{
DbCommand cmd = tran.Connection.CreateCommand();
cmd.CommandText = sqlstr;
@@ -204,7 +204,7 @@ namespace PkmnFoundations.Data
/// <param name="column">Column ordinal</param>
/// <param name="_default">Default value</param>
/// <returns></returns>
public static String GetStringOrDefault(this IDataReader reader, int column, String _default)
public static string GetStringOrDefault(this IDataReader reader, int column, string _default)
{
return reader.IsDBNull(column) ? _default : reader.GetString(column);
}
@@ -215,7 +215,7 @@ namespace PkmnFoundations.Data
/// <param name="reader">Active reader with data</param>
/// <param name="column">Column ordinal</param>
/// <returns></returns>
public static String GetStringOrDefault(this IDataReader reader, int column)
public static string GetStringOrDefault(this IDataReader reader, int column)
{
return reader.IsDBNull(column) ? "" : reader.GetString(column);
}
@@ -227,9 +227,9 @@ namespace PkmnFoundations.Data
/// <param name="column">Column name</param>
/// <param name="_default">Default value</param>
/// <returns></returns>
public static String GetStringOrDefault(this IDataReader reader, String column, String _default)
public static string GetStringOrDefault(this IDataReader reader, string column, string _default)
{
return (reader[column] is DBNull) ? _default : (String)reader[column];
return (reader[column] is DBNull) ? _default : (string)reader[column];
}
/// <summary>
@@ -238,12 +238,12 @@ namespace PkmnFoundations.Data
/// <param name="reader">Active reader with data</param>
/// <param name="column">Column name</param>
/// <returns></returns>
public static String GetStringOrDefault(this IDataReader reader, String column)
public static string GetStringOrDefault(this IDataReader reader, string column)
{
return (reader[column] is DBNull) ? "" : (String)reader[column];
return (reader[column] is DBNull) ? "" : (string)reader[column];
}
public static void GetBytes(this IDataReader reader, String column, long fieldOffset, byte[] buffer, int bufferOffset, int length)
public static void GetBytes(this IDataReader reader, string column, long fieldOffset, byte[] buffer, int bufferOffset, int length)
{
reader.GetBytes(reader.GetOrdinal(column), fieldOffset, buffer, bufferOffset, length);
}
@@ -278,17 +278,17 @@ namespace PkmnFoundations.Data
return result;
}
public static byte[] GetByteArray(this IDataReader reader, String column)
public static byte[] GetByteArray(this IDataReader reader, string column)
{
return GetByteArray(reader, reader.GetOrdinal(column));
}
public static byte[] GetByteArray(this IDataReader reader, String column, int length)
public static byte[] GetByteArray(this IDataReader reader, string column, int length)
{
return GetByteArray(reader, reader.GetOrdinal(column), length);
}
public static bool IsDBNull(this IDataReader reader, String column)
public static bool IsDBNull(this IDataReader reader, string column)
{
return reader.IsDBNull(reader.GetOrdinal(column));
}

10
library/Data/MySqlDatabaseExtender.cs
View File

@@ -40,7 +40,7 @@ namespace PkmnFoundations.Data
/// <param name="sqlstr">SQL string</param>
/// <param name="return_type">Return value's expected type</param>
/// <param name="_params">List of parameters to use with the SQL</param>
public static object ExecuteProcedure(this MySqlConnection db, String name, MySqlDbType return_type, params MySqlParameter[] _params)
public static object ExecuteProcedure(this MySqlConnection db, string name, MySqlDbType return_type, params MySqlParameter[] _params)
{
return ExecuteProcedureInternal(db.CreateCommand(), name, return_type, _params);
}
@@ -51,7 +51,7 @@ namespace PkmnFoundations.Data
/// <param name="db">Open data connection</param>
/// <param name="sqlstr">SQL string</param>
/// <param name="_params">List of parameters to use with the SQL</param>
public static int ExecuteProcedure(this MySqlConnection db, String name, params MySqlParameter[] _params)
public static int ExecuteProcedure(this MySqlConnection db, string name, params MySqlParameter[] _params)
{
MySqlCommand cmd = db.CreateCommand();
cmd.CommandText = name;
@@ -67,7 +67,7 @@ namespace PkmnFoundations.Data
/// <param name="sqlstr">SQL string</param>
/// <param name="return_type">Return value's expected type</param>
/// <param name="_params">List of parameters to use with the SQL</param>
public static object ExecuteProcedure(this MySqlTransaction tran, String name, MySqlDbType return_type, params MySqlParameter[] _params)
public static object ExecuteProcedure(this MySqlTransaction tran, string name, MySqlDbType return_type, params MySqlParameter[] _params)
{
MySqlCommand cmd = tran.Connection.CreateCommand();
cmd.Transaction = tran;
@@ -80,7 +80,7 @@ namespace PkmnFoundations.Data
/// <param name="db">Open data connection</param>
/// <param name="sqlstr">SQL string</param>
/// <param name="_params">List of parameters to use with the SQL</param>
public static int ExecuteProcedure(this MySqlTransaction tran, String name, params MySqlParameter[] _params)
public static int ExecuteProcedure(this MySqlTransaction tran, string name, params MySqlParameter[] _params)
{
MySqlCommand cmd = tran.Connection.CreateCommand();
cmd.CommandText = name;
@@ -90,7 +90,7 @@ namespace PkmnFoundations.Data
return cmd.ExecuteNonQuery();
}
private static object ExecuteProcedureInternal(MySqlCommand cmd, String name, MySqlDbType return_type, MySqlParameter[] _params)
private static object ExecuteProcedureInternal(MySqlCommand cmd, string name, MySqlDbType return_type, MySqlParameter[] _params)
{
cmd.CommandText = name;
cmd.CommandType = CommandType.StoredProcedure;

10
library/Data/SqlDatabaseExtender.cs
View File

@@ -40,7 +40,7 @@ namespace PkmnFoundations.Data
/// <param name="sqlstr">SQL string</param>
/// <param name="return_type">Return value's expected type</param>
/// <param name="_params">List of parameters to use with the SQL</param>
public static object ExecuteProcedure(this SqlConnection db, String name, SqlDbType return_type, params SqlParameter[] _params)
public static object ExecuteProcedure(this SqlConnection db, string name, SqlDbType return_type, params SqlParameter[] _params)
{
return ExecuteProcedureInternal(db.CreateCommand(), name, return_type, _params);
}
@@ -51,7 +51,7 @@ namespace PkmnFoundations.Data
/// <param name="db">Open data connection</param>
/// <param name="sqlstr">SQL string</param>
/// <param name="_params">List of parameters to use with the SQL</param>
public static int ExecuteProcedure(this SqlConnection db, String name, params SqlParameter[] _params)
public static int ExecuteProcedure(this SqlConnection db, string name, params SqlParameter[] _params)
{
SqlCommand cmd = db.CreateCommand();
cmd.CommandText = name;
@@ -67,7 +67,7 @@ namespace PkmnFoundations.Data
/// <param name="sqlstr">SQL string</param>
/// <param name="return_type">Return value's expected type</param>
/// <param name="_params">List of parameters to use with the SQL</param>
public static object ExecuteProcedure(this SqlTransaction tran, String name, SqlDbType return_type, params SqlParameter[] _params)
public static object ExecuteProcedure(this SqlTransaction tran, string name, SqlDbType return_type, params SqlParameter[] _params)
{
SqlCommand cmd = tran.Connection.CreateCommand();
cmd.Transaction = tran;
@@ -80,7 +80,7 @@ namespace PkmnFoundations.Data
/// <param name="db">Open data connection</param>
/// <param name="sqlstr">SQL string</param>
/// <param name="_params">List of parameters to use with the SQL</param>
public static int ExecuteProcedure(this SqlTransaction tran, String name, params SqlParameter[] _params)
public static int ExecuteProcedure(this SqlTransaction tran, string name, params SqlParameter[] _params)
{
SqlCommand cmd = tran.Connection.CreateCommand();
cmd.CommandText = name;
@@ -90,7 +90,7 @@ namespace PkmnFoundations.Data
return cmd.ExecuteNonQuery();
}
private static object ExecuteProcedureInternal(SqlCommand cmd, String name, SqlDbType return_type, SqlParameter[] _params)
private static object ExecuteProcedureInternal(SqlCommand cmd, string name, SqlDbType return_type, SqlParameter[] _params)
{
cmd.CommandText = name;
cmd.CommandType = CommandType.StoredProcedure;