Sync up with changes from ARM64

This commit is contained in:
2025-05-01 14:08:33 -04:00
parent 148c236af2
commit c0384feb95
40 changed files with 494 additions and 365 deletions

View File

@@ -1,9 +1,9 @@
using System;
using System.Collections.Generic;
using System.Text;
using MySql.Data.MySqlClient;
using MarketData.MarketDataModel;
using MarketData.Utils;
using System.Collections.Generic;
namespace MarketData.DataAccess
{
@@ -59,7 +59,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();
}
}
@@ -88,17 +88,6 @@ namespace MarketData.DataAccess
sb.Append(" where A.date>=@minDate and A.date<=@maxDate ");
sb.Append(" order by date ");
//sb.Append(" select A.* from ");
//sb.Append(" (select date,symbol,upper(company),brokerage_firm,type,ratings_change,price_target from analystratings where symbol=").Append(SqlUtils.ToSqlString(symbol));
//sb.Append(" union ");
//sb.Append(" select zr.date,zr.symbol,upper(sm.company) as company,'Zacks' as brokerage_firm,zr.type,zr.zacks_rank as ratings_change,null as price_target from zacksrank zr ");
//sb.Append(" left join securitymaster sm on sm.symbol=zr.symbol ");
//sb.Append(" where zr.symbol=").Append(SqlUtils.ToSqlString(symbol)).Append(" and zr.type is not null ");
//sb.Append(" )A ");
//sb.Append(" where A.date>=").Append(SqlUtils.SqlDate(minDate,true)).Append(" and A.date<=").Append(SqlUtils.SqlDate(maxDate,true));
//sb.Append(" order by date ");
strQuery = sb.ToString(); ;
sqlCommand = new MySqlCommand(strQuery, sqlConnection);
sqlCommand.CommandTimeout = SqlUtils.COMMAND_TIMEOUT;
@@ -126,7 +115,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();
}
}
@@ -157,7 +146,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 +193,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();
}
}
@@ -220,31 +209,6 @@ namespace MarketData.DataAccess
{
StringBuilder sb = new StringBuilder();
sqlConnection = SqlUtils.CreateMySqlConnection(MainDataSource.Instance.LocateDataSource("market_data"));
// sb.Append("set @symbol='").Append(symbol).Append("' COLLATE utf8mb4_unicode_ci ;");
//sb.Append("set @symbol='").Append(symbol).Append("';");
//sb.Append("set @maxDate='").Append(Utility.DateTimeToStringYYYYHMMHDD(maxDate)).Append("';");
//sb.Append(" select A.* from ");
//sb.Append(" (select date,symbol,upper(company),brokerage_firm,type,ratings_change,price_target from analystratings where symbol=@symbol ");
//sb.Append(" union ");
//sb.Append(" select zr.date,zr.symbol,upper(sm.company) as company,'Zacks' as brokerage_firm,zr.type,zr.zacks_rank as ratings_change,null as price_target from zacksrank zr ");
//sb.Append(" left join securitymaster sm on sm.symbol=zr.symbol ");
//sb.Append(" where zr.symbol=@symbol and zr.type is not null ");
//sb.Append(" )A ");
//sb.Append(" where A.date<=@maxDate ");
//sb.Append(" order by date");
//sb.Append(" select A.* from ");
//sb.Append(" (select date,symbol,upper(company),brokerage_firm,type,ratings_change,price_target from analystratings where symbol=").Append(SqlUtils.ToSqlString(symbol));
//sb.Append(" union ");
//sb.Append(" select zr.date,zr.symbol,upper(sm.company) as company,'Zacks' as brokerage_firm,zr.type,zr.zacks_rank as ratings_change,null as price_target from zacksrank zr ");
//sb.Append(" left join securitymaster sm on sm.symbol=zr.symbol ");
//sb.Append(" where zr.symbol=").Append(SqlUtils.ToSqlString(symbol)).Append(" and zr.type is not null ");
//sb.Append(" )A ");
//sb.Append(" where A.date<=").Append(SqlUtils.SqlDate(maxDate,true));
//sb.Append(" order by date");
sb.Append("set @symbol='").Append(symbol).Append("';");
sb.Append("set @maxDate='").Append(Utility.DateTimeToStringYYYYHMMHDD(maxDate)).Append("';");
sb.Append(" select A.* from ");
@@ -257,8 +221,6 @@ namespace MarketData.DataAccess
sb.Append(" where A.date<=@maxDate ");
sb.Append(" order by date");
strQuery = sb.ToString(); ;
sqlCommand = new MySqlCommand(strQuery, sqlConnection);
sqlCommand.CommandTimeout = SqlUtils.COMMAND_TIMEOUT;
@@ -286,7 +248,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();
}
}
@@ -302,7 +264,6 @@ namespace MarketData.DataAccess
{
StringBuilder sb = new StringBuilder();
sqlConnection = SqlUtils.CreateMySqlConnection(MainDataSource.Instance.LocateDataSource("market_data"));
// sb.Append("set @symbol='").Append(symbol).Append("' COLLATE utf8mb4_unicode_ci ;");
sb.Append("set @symbol='").Append(symbol).Append("';");
sb.Append("set @date='").Append(Utility.DateTimeToStringYYYYHMMHDD(date)).Append("';");
sb.Append(" select A.* from ");
@@ -315,16 +276,6 @@ namespace MarketData.DataAccess
sb.Append(" where A.date=@date ");
sb.Append(" order by A.symbol");
//sb.Append(" select A.* from ");
//sb.Append(" (select date,symbol,upper(company),brokerage_firm,type,ratings_change,price_target from analystratings where symbol=").Append(SqlUtils.ToSqlString(symbol));
//sb.Append(" union ");
//sb.Append(" select zr.date,zr.symbol,upper(sm.company) as company,'Zacks' as brokerage_firm,zr.type,zr.zacks_rank as ratings_change,null as price_target from zacksrank zr ");
//sb.Append(" left join securitymaster sm on sm.symbol=zr.symbol ");
//sb.Append(" where zr.symbol=@symbol and zr.type is not null ");
//sb.Append(" )A ");
//sb.Append(" where A.date=").Append(SqlUtils.SqlDate(date,true));
//sb.Append(" order by A.symbol");
strQuery = sb.ToString(); ;
sqlCommand = new MySqlCommand(strQuery, sqlConnection);
sqlCommand.CommandTimeout = SqlUtils.COMMAND_TIMEOUT;
@@ -352,7 +303,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();
}
}
@@ -368,18 +319,6 @@ namespace MarketData.DataAccess
{
StringBuilder sb = new StringBuilder();
sqlConnection = SqlUtils.CreateMySqlConnection(MainDataSource.Instance.LocateDataSource("market_data"));
//sb.Append("set @date='").Append(Utility.DateTimeToStringYYYYHMMHDD(date)).Append("';");
//sb.Append(" select A.* from ");
//sb.Append(" (select date,symbol,upper(company),brokerage_firm,type,ratings_change,price_target from analystratings ");
//sb.Append(" union ");
//sb.Append(" select zr.date,zr.symbol,upper(sm.company) as company,'Zacks' as brokerage_firm,zr.type,zr.zacks_rank as ratings_change,null as price_target from zacksrank zr ");
//sb.Append(" left join securitymaster sm on sm.symbol=zr.symbol ");
//sb.Append(" where zr.type is not null ");
//sb.Append(" )A ");
//sb.Append(" where A.date=@date ");
//sb.Append(" order by A.symbol; ");
//sb.Append("set @date='").Append(Utility.DateTimeToStringYYYYHMMHDD(date)).Append("';");
sb.Append(" select A.* from ");
sb.Append(" (select date,symbol,upper(company),brokerage_firm,type,ratings_change,price_target from analystratings ");
sb.Append(" union ");
@@ -417,7 +356,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();
}
}
@@ -434,25 +373,6 @@ namespace MarketData.DataAccess
StringBuilder sb = new StringBuilder();
sqlConnection = SqlUtils.CreateMySqlConnection(MainDataSource.Instance.LocateDataSource("market_data"));
//sb.Append(" set @symbol='").Append(symbol).Append("';");
//sb.Append(" select A.* from ");
//sb.Append(" (select date,symbol,upper(company),brokerage_firm,type,ratings_change,price_target from analystratings where symbol=@symbol ");
//sb.Append(" union ");
//sb.Append(" select zr.date,zr.symbol,upper(sm.company) as company,'Zacks' as brokerage_firm,zr.type,zr.zacks_rank as ratings_change,null as price_target from zacksrank zr ");
//sb.Append(" left join securitymaster sm on sm.symbol=zr.symbol ");
//sb.Append(" where zr.symbol=@symbol and zr.type is not null ");
//sb.Append(" )A ");
//sb.Append(" order by date desc ");
//sb.Append(" select A.* from ");
//sb.Append(" (select date,symbol,upper(company),brokerage_firm,type,ratings_change,price_target from analystratings where symbol=").Append(SqlUtils.ToSqlString(symbol));
//sb.Append(" union ");
//sb.Append(" select zr.date,zr.symbol,upper(sm.company) as company,'Zacks' as brokerage_firm,zr.type,zr.zacks_rank as ratings_change,null as price_target from zacksrank zr ");
//sb.Append(" left join securitymaster sm on sm.symbol=zr.symbol ");
//sb.Append(" where zr.symbol=").Append(SqlUtils.ToSqlString(symbol)).Append(" and zr.type is not null ");
//sb.Append(" )A ");
//sb.Append(" order by date desc ");
sb.Append(" set @symbol='").Append(symbol).Append("';");
sb.Append(" select A.* from ");
sb.Append(" (select date,symbol,upper(company),brokerage_firm,type,ratings_change,price_target from analystratings where symbol=@symbol ");
@@ -463,7 +383,6 @@ namespace MarketData.DataAccess
sb.Append(" )A ");
sb.Append(" order by date desc ");
strQuery = sb.ToString(); ;
sqlCommand = new MySqlCommand(strQuery, sqlConnection);
sqlCommand.CommandTimeout = SqlUtils.COMMAND_TIMEOUT;
@@ -491,7 +410,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();
}
}
@@ -528,7 +447,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();
}
}