From 6f7cd593f59c5c8daf973beb8846a7de0206caab Mon Sep 17 00:00:00 2001 From: Greg Edwards Date: Mon, 21 Mar 2022 20:49:21 -0400 Subject: [PATCH] Style --- library/Data/DataMysql.cs | 52 +++++++++++++-------------- library/Data/DataSqlite.cs | 4 +-- library/Data/Database.cs | 2 +- library/Data/DatabaseExtender.cs | 44 +++++++++++------------ library/Data/MySqlDatabaseExtender.cs | 10 +++--- library/Data/SqlDatabaseExtender.cs | 10 +++--- 6 files changed, 61 insertions(+), 61 deletions(-) diff --git a/library/Data/DataMysql.cs b/library/Data/DataMysql.cs index 3cb25dd9..f921e792 100644 --- a/library/Data/DataMysql.cs +++ b/library/Data/DataMysql.cs @@ -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 _params = new List(); - 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 /// 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 _params = new List(); - 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 /// 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 _params = new List(); - 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 _params = new List(); - 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 insertParams, String prefix = "@name_") + List 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()); } diff --git a/library/Data/DataSqlite.cs b/library/Data/DataSqlite.cs index 71f6a3ab..340f0548 100644 --- a/library/Data/DataSqlite.cs +++ b/library/Data/DataSqlite.cs @@ -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"; } } diff --git a/library/Data/Database.cs b/library/Data/Database.cs index 299366e9..f7fadfdc 100644 --- a/library/Data/Database.cs +++ b/library/Data/Database.cs @@ -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"); diff --git a/library/Data/DatabaseExtender.cs b/library/Data/DatabaseExtender.cs index b36a1ca2..b8d8744b 100644 --- a/library/Data/DatabaseExtender.cs +++ b/library/Data/DatabaseExtender.cs @@ -32,7 +32,7 @@ namespace PkmnFoundations.Data /// Open data connection /// SQL string /// List of parameters to use with the SQL - 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 /// Open data connection /// SQL string /// List of parameters to use with the SQL - public static DataTable ExecuteDataTable(this DbConnection db, String sqlstr, IEnumerable _params) + public static DataTable ExecuteDataTable(this DbConnection db, string sqlstr, IEnumerable _params) { IDataReader reader = db.ExecuteReader(sqlstr, _params.ToArray()); DataTable result = new DataTable(); @@ -60,7 +60,7 @@ namespace PkmnFoundations.Data /// Open data connection /// SQL string /// List of parameters to use with the SQL - 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 /// Open data connection /// SQL string /// List of parameters to use with the SQL - public static DataTable ExecuteDataTable(this DbTransaction tran, String sqlstr, IEnumerable _params) + public static DataTable ExecuteDataTable(this DbTransaction tran, string sqlstr, IEnumerable _params) { IDataReader reader = tran.ExecuteReader(sqlstr, _params.ToArray()); DataTable result = new DataTable(); @@ -88,7 +88,7 @@ namespace PkmnFoundations.Data /// Open data connection /// SQL string /// List of parameters to use with the SQL - 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 /// Open data connection /// SQL string /// List of parameters to use with the SQL - public static IDataReader ExecuteReader(this DbConnection db, String sqlstr, IEnumerable _params) + public static IDataReader ExecuteReader(this DbConnection db, string sqlstr, IEnumerable _params) { return db.ExecuteReader(sqlstr, _params.ToArray()); } @@ -116,7 +116,7 @@ namespace PkmnFoundations.Data /// Open data connection /// SQL string /// List of parameters to use with the SQL - 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 /// Open data connection /// SQL string /// List of parameters to use with the SQL - public static IDataReader ExecuteReader(this DbTransaction tran, String sqlstr, IEnumerable _params) + public static IDataReader ExecuteReader(this DbTransaction tran, string sqlstr, IEnumerable _params) { return tran.ExecuteReader(sqlstr, _params.ToArray()); } @@ -143,7 +143,7 @@ namespace PkmnFoundations.Data /// Open data connection /// SQL string /// List of parameters to use with the SQL - 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 /// Open data connection /// SQL string /// List of parameters to use with the SQL - 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 /// Open data connection /// SQL string /// List of parameters to use with the SQL - 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 /// Open data connection /// SQL string /// List of parameters to use with the SQL - 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 /// Column ordinal /// Default value /// - 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 /// Active reader with data /// Column ordinal /// - 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 /// Column name /// Default value /// - 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]; } /// @@ -238,12 +238,12 @@ namespace PkmnFoundations.Data /// Active reader with data /// Column name /// - 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)); } diff --git a/library/Data/MySqlDatabaseExtender.cs b/library/Data/MySqlDatabaseExtender.cs index 03c5fa52..a8f8be21 100644 --- a/library/Data/MySqlDatabaseExtender.cs +++ b/library/Data/MySqlDatabaseExtender.cs @@ -40,7 +40,7 @@ namespace PkmnFoundations.Data /// SQL string /// Return value's expected type /// List of parameters to use with the SQL - 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 /// Open data connection /// SQL string /// List of parameters to use with the SQL - 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 /// SQL string /// Return value's expected type /// List of parameters to use with the SQL - 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 /// Open data connection /// SQL string /// List of parameters to use with the SQL - 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; diff --git a/library/Data/SqlDatabaseExtender.cs b/library/Data/SqlDatabaseExtender.cs index 00c6eadc..5249d9b9 100644 --- a/library/Data/SqlDatabaseExtender.cs +++ b/library/Data/SqlDatabaseExtender.cs @@ -40,7 +40,7 @@ namespace PkmnFoundations.Data /// SQL string /// Return value's expected type /// List of parameters to use with the SQL - 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 /// Open data connection /// SQL string /// List of parameters to use with the SQL - 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 /// SQL string /// Return value's expected type /// List of parameters to use with the SQL - 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 /// Open data connection /// SQL string /// List of parameters to use with the SQL - 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;