Sean/ARM64
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix MySqlReader cleanup

Browse Source
This commit is contained in:
Sean
2025-04-01 12:56:40 -04:00
parent 137ce0e916
commit 6200e9dffc
31 changed files with 181 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
MarketData/MarketDataLib/DataAccess/OptionsDA.cs
View File

@@ -44,7 +44,7 @@ namespace MarketData.DataAccess
finally
{
if(null!=sqlCommand)sqlCommand.Dispose();
if (null != sqlDataReader) sqlDataReader.Close();
if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();}
if (null != sqlConnection) sqlConnection.Close();
}
}
@@ -98,7 +98,7 @@ namespace MarketData.DataAccess
finally
{
if(null!=sqlCommand)sqlCommand.Dispose();
if (null != sqlDataReader) sqlDataReader.Close();
if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();}
if (null != sqlConnection) sqlConnection.Close();
}
}
@@ -153,7 +153,7 @@ namespace MarketData.DataAccess
finally
{
if(null!=sqlCommand)sqlCommand.Dispose();
if (null != sqlDataReader) sqlDataReader.Close();
if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();}
if (null != sqlConnection) sqlConnection.Close();
}
}
@@ -204,7 +204,7 @@ namespace MarketData.DataAccess
finally
{
if(null!=sqlCommand)sqlCommand.Dispose();
if (null != sqlDataReader) sqlDataReader.Close();
if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();}
if (null != sqlConnection) sqlConnection.Close();
}
}
@@ -257,7 +257,7 @@ namespace MarketData.DataAccess
finally
{
if(null!=sqlCommand)sqlCommand.Dispose();
if (null != sqlDataReader) sqlDataReader.Close();
if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();}
if (null != sqlConnection) sqlConnection.Close();
}
}
@@ -304,7 +304,6 @@ namespace MarketData.DataAccess
sb.Append(" and strike=").Append(Utility.FormatNumber(option.Strike,2));
sb.Append(" and option_type=").Append(SqlUtils.AddQuotes(option.Type.Equals(OptionTypeEnum.CallOption) ? "C" : "P"));
strQuery = sb.ToString();
// MDTrace.WriteLine(LogLevel.DEBUG,String.Format("DeleteOption {0},{1},{2},{3}",option.Symbol,Utility.DateTimeToStringMMHDDHYYYY(option.Expiration),option.Type.Equals(OptionTypeEnum.CallOption)?"Call":"Put",option.Strike));
sqlCommand = new MySqlCommand(strQuery, sqlConnection, sqlTransaction);
sqlCommand.CommandTimeout = SqlUtils.COMMAND_TIMEOUT;
sqlCommand.ExecuteNonQuery();
@@ -323,43 +322,6 @@ namespace MarketData.DataAccess
if (null != sqlConnection) { sqlConnection.Close(); sqlConnection = null; }
}
}
// private static bool DeleteOption(Option option)
// {
// MySqlConnection sqlConnection = null;
// MySqlCommand sqlCommand = null;
// MySqlTransaction sqlTransaction=null;
// String strQuery = null;
// try
// {
// StringBuilder sb = new StringBuilder();
// sqlConnection = SqlUtils.CreateMySqlConnection(MainDataSource.Instance.LocateDataSource("market_data"));
// sqlTransaction = sqlConnection.BeginTransaction(System.Data.IsolationLevel.ReadCommitted);
// sb.Append("delete from options where symbol=").Append(SqlUtils.AddQuotes(option.Symbol));
// sb.Append(" and expiration_date=").Append(SqlUtils.AddQuotes(Utility.DateTimeToStringYYYYHMMHDD(option.Expiration)));
// sb.Append(" and strike=").Append(Utility.FormatNumber(option.Strike,2));
// sb.Append(" and option_type=").Append(SqlUtils.AddQuotes(option.Type.Equals(OptionTypeEnum.CallOption) ? "C" : "P"));
// strQuery = sb.ToString();
//// MDTrace.WriteLine(LogLevel.DEBUG,String.Format("DeleteOption {0},{1},{2},{3}",option.Symbol,Utility.DateTimeToStringMMHDDHYYYY(option.Expiration),option.Type.Equals(OptionTypeEnum.CallOption)?"Call":"Put",option.Strike));
// sqlCommand = new MySqlCommand(strQuery, sqlConnection, sqlTransaction);
// sqlCommand.CommandTimeout = SqlUtils.COMMAND_TIMEOUT;
// sqlCommand.ExecuteNonQuery();
// sqlTransaction.Commit();
// sqlCommand.Dispose();
// sqlCommand = null;
// return true;
// }
// catch (Exception exception)
// {
// MDTrace.WriteLine(LogLevel.DEBUG,exception);
// return false;
// }
// finally
// {
// if (null != sqlCommand) { sqlCommand.Dispose(); sqlCommand = null; }
// if (null != sqlConnection) { sqlConnection.Close(); sqlConnection.Dispose();sqlConnection = null; }
// if(null!=sqlTransaction){sqlTransaction.Dispose();sqlTransaction=null;}
// }
// }
public static bool AddOptions(Options options)
{
foreach (Option option in options)
@@ -377,10 +339,8 @@ namespace MarketData.DataAccess
try
{
// MDTrace.WriteLine(LogLevel.DEBUG,"[AddOption]Enter");
DateTime modified = DateTime.Now;
if (null == option) return false;
// DeleteOption(option);
sqlConnection = SqlUtils.CreateMySqlConnection(MainDataSource.Instance.LocateDataSource("market_data"));
sqlTransaction = sqlConnection.BeginTransaction(System.Data.IsolationLevel.ReadCommitted);
DeleteOption(option,sqlTransaction);
@@ -406,7 +366,6 @@ namespace MarketData.DataAccess
sb.Append(SqlUtils.AddQuotes(Utility.DateTimeToStringYYYYHMMHDD(modified)));
sb.Append(")");
strQuery = sb.ToString();
// MDTrace.WriteLine(LogLevel.DEBUG,String.Format("AddOption {0},{1},{2},{3}",option.Symbol,Utility.DateTimeToStringMMHDDHYYYY(option.Expiration),option.Type.Equals(OptionTypeEnum.CallOption)?"Call":"Put",option.Strike));
sqlCommand = new MySqlCommand(strQuery, sqlConnection, sqlTransaction);
sqlCommand.CommandTimeout = SqlUtils.COMMAND_TIMEOUT;
sqlCommand.ExecuteNonQuery();
@@ -425,7 +384,6 @@ namespace MarketData.DataAccess
if(null!=sqlCommand)sqlCommand.Dispose();
if (null != sqlConnection) sqlConnection.Close();
if (null != sqlTransaction) sqlTransaction.Dispose();
// MDTrace.WriteLine(LogLevel.DEBUG,"[AddOption]LEAVE");
}
}
}