andy/Saxonite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Saxonite 1.2.10.4

Browse Source
This commit is contained in:
andy
2023-02-07 08:46:58 +00:00
parent c5f8b43087
commit aa2f350a35
11 changed files with 447 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SaxoniteStandardDbas/Dbas/Mgr/Support/SaxSupportMgr_Dbas-UserReport.cs
+19 -19
View File
@@ -41,12 +41,12 @@ namespace Saxonite.Net.Standard.Dbas.Mgr.Support
public override SaxUserReport CreateUserReport(SysId userAccountId)
{
ClearErrorState();
return new SaxUserReport_Dbas(CoreDatabase, null, userAccountId, 0);
return new SaxUserReport_Dbas(SupportDatabase, null, userAccountId, 0);
}
private SaxUserReport_Dbas CreateUserReport(UserReport_Db dbUserReport)
{
ClearErrorState();
SaxUserReport_Dbas userReport = new SaxUserReport_Dbas(CoreDatabase, new SysId(dbUserReport._Id), new SysId(dbUserReport._UserAccountId), (ushort)dbUserReport._Flags);
SaxUserReport_Dbas userReport = new SaxUserReport_Dbas(SupportDatabase, new SysId(dbUserReport._Id), new SysId(dbUserReport._UserAccountId), (ushort)dbUserReport._Flags);
PopulateFrom(dbUserReport, userReport);
return userReport;
}
@@ -70,13 +70,13 @@ namespace Saxonite.Net.Standard.Dbas.Mgr.Support
}
SaxUserReport userReport = null;
// Query data.
using (var dbConnection = CoreDatabase.CreateConnection())
using (var dbConnection = SupportDatabase.CreateConnection())
using (var dbCommand = dbConnection.CreateCommand())
{
try
{
dbConnection.Open();
UserReport_Db dbUserReport = new UserReport_Db(CoreDbInfo);
UserReport_Db dbUserReport = new UserReport_Db(SupportDbInfo);
dbUserReport.PopulateFrom(dbCommand, aliasUserReport, filter);
userReport = CreateUserReport(dbUserReport);
}
@@ -106,18 +106,18 @@ namespace Saxonite.Net.Standard.Dbas.Mgr.Support
ClearErrorState();
if (!IsValidUserReport(userReport)) return false;
if (SysId.IsValid(userReport.Id)) return SetErrorState(ErrorMessage.ValiditemId);
using (var dbConnection = CoreDatabase.CreateConnection())
using (var dbConnection = SupportDatabase.CreateConnection())
using (var dbCommand = dbConnection.CreateCommand())
{
try
{
dbConnection.Open();
UserReport_Db dbUserReport = new UserReport_Db(CoreDbInfo);
UserReport_Db dbUserReport = new UserReport_Db(SupportDbInfo);
PopulateTo(dbUserReport, userReport, dbUpdateInfo);
if (UserReport_Db.FieldsNonId.Contains("Id"))
{
// Generate next Id.
dbUserReport._Id = CoreDatabase.GetNextIdFromTable("UserReport");
dbUserReport._Id = SupportDatabase.GetNextIdFromTable("UserReport");
}
dbUserReport.ExecuteInsertCommand(dbCommand);
userReport.Id = new SysId(dbUserReport._Id);
@@ -142,14 +142,14 @@ namespace Saxonite.Net.Standard.Dbas.Mgr.Support
if (DebugMode) SaLogger.Debug(fn + " Data not changed. " + GetLogProperties(userReport).Concat(": ").Concat("", "\n\t"));
return true;
}
using (var dbConnection = CoreDatabase.CreateConnection())
using (var dbConnection = SupportDatabase.CreateConnection())
using (var dbCommand = dbConnection.CreateCommand())
{
try
{
// Retrieve item.
dbConnection.Open();
UserReport_Db dbUserReport = new UserReport_Db(CoreDbInfo);
UserReport_Db dbUserReport = new UserReport_Db(SupportDbInfo);
dbUserReport.PopulateFrom(dbCommand, aliasUserReport, "Id=" + SysId.ToString(userReport.Id));
// ToDo SaxUpdateLogItemMonitor_UserReport updateLogMonitor = new SaxUpdateLogItemMonitor_UserReport(SessionContext, CreateUserReport(dbUserReport), dbUpdateInfo);
// Update item.
@@ -186,14 +186,14 @@ namespace Saxonite.Net.Standard.Dbas.Mgr.Support
/*
* Physical deletion.
using (var dbConnection = CoreDatabase.CreateConnection())
using (var dbConnection = SupportDatabase.CreateConnection())
using (var dbCommand = dbConnection.CreateCommand())
{
try
{
// Retrieve item.
dbConnection.Open();
UserReport_Db dbUserReport = new UserReport_Db(CoreDbInfo);
UserReport_Db dbUserReport = new UserReport_Db(SupportDbInfo);
dbUserReport.PopulateFrom(dbCommand, aliasUserReport, "Id=" + userReport.Id.ToString());
// Delete item.
dbCommand.CommandType = System.Data.CommandType.Text;
@@ -369,7 +369,7 @@ namespace Saxonite.Net.Standard.Dbas.Mgr.Support
if (!reportTypes.IsEmpty())
filter.Add(SaxDbDfn_Support.GetColumnNameQual(SaxDbDfn_Support.ColumnIdx.UserReport_ReportType, aliasUserReport) + " IN (" + reportTypes + ")");
if (StringUtil.IsBlank(prm.UserReportFilter))
if (!StringUtil.IsBlank(prm.UserReportFilter))
{
// Split filter into words.
List<String> filterWords = prm.UserReportFilter.Split((char[])null).ToList();
@@ -460,7 +460,7 @@ namespace Saxonite.Net.Standard.Dbas.Mgr.Support
private long GetUserReportCount(String filter)
{
ClearErrorState();
return CoreDatabase.GetRowCount(SaxDbDfn_Support.GetTableName(SaxDbDfn_Support.TableIdx.UserReport) + " As " + aliasUserReport, filter);
return SupportDatabase.GetRowCount(SaxDbDfn_Support.GetTableName(SaxDbDfn_Support.TableIdx.UserReport) + " As " + aliasUserReport, filter);
}
public override long GetUserReportCount(SaxUserReport.Params prm)
{
@@ -473,14 +473,14 @@ namespace Saxonite.Net.Standard.Dbas.Mgr.Support
public override List<SaxUserReport> GetUserReportList(SaxUserReport.Params prm)
{
List<SaxUserReport> userRoles = new List<SaxUserReport>();
DbQuery qry = new DbQuery(CoreDatabase.DbmsType);
DbQuery qry = new DbQuery(SupportDatabase.DbmsType);
qry.Tables.Add(SaxDbDfn_Support.GetTableName(SaxDbDfn_Support.TableIdx.UserReport), aliasUserReport);
UserReport_Db dbUserReport = new UserReport_Db(CoreDbInfo);
UserReport_Db dbUserReport = new UserReport_Db(SupportDbInfo);
qry.Columns.AddRange(dbUserReport.ExistingColumnNames);
qry.Filters.AddRange(GetUserReportQueryFilter(prm));
qry.OrderBy.AddRange(GetUserReportSortColumns(prm));
// Query data.
using (var dbConnection = CoreDatabase.CreateConnection())
using (var dbConnection = SupportDatabase.CreateConnection())
using (var dbCommand = dbConnection.CreateCommand())
{
try
@@ -491,7 +491,7 @@ namespace Saxonite.Net.Standard.Dbas.Mgr.Support
{
while (dbDataReader.Read())
{
dbUserReport = new UserReport_Db(CoreDbInfo);
dbUserReport = new UserReport_Db(SupportDbInfo);
dbUserReport.PopulateFrom(dbDataReader);
userRoles.Add(CreateUserReport(dbUserReport));
}
@@ -513,7 +513,7 @@ namespace Saxonite.Net.Standard.Dbas.Mgr.Support
//---------------------------------------------------------------------
// Construct query.
DbQuery query = new DbQuery(CoreDatabase.DbmsType);
DbQuery query = new DbQuery(SupportDatabase.DbmsType);
query.Tables.Add(SaxDbDfn_Support.GetTableName(SaxDbDfn_Support.TableIdx.UserReport), aliasUserReport);
// Add columns as defined in query list.
@@ -554,7 +554,7 @@ namespace Saxonite.Net.Standard.Dbas.Mgr.Support
//---------------------------------------------------------------------
//return new DbResultSet_DataTableReader(db, query.BuildQuery(prm.ResultsPaging));
return DbResultSet_DataReader.ExecuteQuery(CoreDatabase, query.BuildQuery(prm.ResultsPaging));
return DbResultSet_DataReader.ExecuteQuery(SupportDatabase, query.BuildQuery(prm.ResultsPaging));
}
//-------------------------------------------------------------------