Session Console and Internals.
This commit is contained in:
@@ -55,7 +55,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
|
||||
}
|
||||
SbmVehicle vehicle = null;
|
||||
// Query data.
|
||||
using (var dbConnection = db.CreateConnection())
|
||||
using (var dbConnection = Database.CreateConnection())
|
||||
using (var dbCommand = dbConnection.CreateCommand())
|
||||
{
|
||||
try
|
||||
@@ -106,7 +106,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
|
||||
ClearErrorState();
|
||||
if (!IsValidVehicle(vehicle)) return false;
|
||||
if (SysId.IsValid(vehicle.Id)) return SetErrorState(ErrorMessage.ValiditemId);
|
||||
using (var dbConnection = db.CreateConnection())
|
||||
using (var dbConnection = Database.CreateConnection())
|
||||
using (var dbCommand = dbConnection.CreateCommand())
|
||||
{
|
||||
try
|
||||
@@ -117,7 +117,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
|
||||
if (SaVehicle_Db.FieldsNonId.Contains("Id"))
|
||||
{
|
||||
// Generate next Id.
|
||||
dbVehicle._Id = SysId.ToInt(db.GetNextId("Vehicle", dbUpdateInfo));
|
||||
dbVehicle._Id = SysId.ToInt(Database.GetNextId("Vehicle", dbUpdateInfo));
|
||||
}
|
||||
dbVehicle.ExecuteInsertCommand(dbCommand);
|
||||
vehicle.Id = new SysId(dbVehicle._Id);
|
||||
@@ -141,7 +141,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
|
||||
if (DebugMode) SaLogger.Debug($"{SysUtil.Fn} Data not changed.{GetLogProperties(vehicle).Concat(": ").Concat("", "\n\t")}");
|
||||
return true;
|
||||
}
|
||||
using (var dbConnection = db.CreateConnection())
|
||||
using (var dbConnection = Database.CreateConnection())
|
||||
using (var dbCommand = dbConnection.CreateCommand())
|
||||
{
|
||||
try
|
||||
@@ -179,7 +179,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
|
||||
{
|
||||
ClearErrorState();
|
||||
if (!VehicleCanBeDeleted(vehicle)) return false;
|
||||
using (var dbConnection = db.CreateConnection())
|
||||
using (var dbConnection = Database.CreateConnection())
|
||||
using (var dbCommand = dbConnection.CreateCommand())
|
||||
{
|
||||
try
|
||||
@@ -508,7 +508,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
|
||||
String classDesc = DbQuery.FormatForCondition(prm.ClassDescPartial);
|
||||
if (!StringUtil.IsEmpty(prm.MakeCode) || !classDesc.IsEmpty())
|
||||
{
|
||||
DbQuery qryVehicleClass = new DbQuery(db.DbmsType);
|
||||
DbQuery qryVehicleClass = new DbQuery(Database.DbmsType);
|
||||
qryVehicleClass.Tables.Add(SbmDbDfn.GetTableName(SbmDbDfn.TableIdx.SaVehicleClass), aliasVehicle_VehicleClass);
|
||||
qryVehicleClass.Columns.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.SaVehicleClass_Id, aliasVehicle_VehicleClass));
|
||||
if (!StringUtil.IsEmpty(prm.MakeCode))
|
||||
@@ -533,7 +533,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
|
||||
if (SysId.IsValid(prm.AssetCatIdInclude) || SysId.IsValid(prm.AssetCatIdExclude) || SysId.IsValid(prm.AssetProcessIdNext))
|
||||
{
|
||||
String aliasVehicle_Asset = "aVehAst";
|
||||
DbQuery qryAsset = new DbQuery(db.DbmsType);
|
||||
DbQuery qryAsset = new DbQuery(Database.DbmsType);
|
||||
qryAsset.Tables.Add(SbmDbDfn.GetTableName(SbmDbDfn.TableIdx.SaAsset), aliasVehicle_Asset);
|
||||
qryAsset.Columns.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.SaAsset_Id, aliasVehicle_Asset));
|
||||
qryAsset.Filters.Add($"{SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.SaAsset_ItemType, aliasVehicle_Asset)}={(int)Sbm.ItemType.Vehicle}");
|
||||
@@ -603,7 +603,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
|
||||
private long GetVehicleCount(String filter)
|
||||
{
|
||||
ClearErrorState();
|
||||
return db.GetRowCount($"{SbmDbDfn.GetTableName(SbmDbDfn.TableIdx.SaVehicle)} As {aliasVehicle}", filter);
|
||||
return Database.GetRowCount($"{SbmDbDfn.GetTableName(SbmDbDfn.TableIdx.SaVehicle)} As {aliasVehicle}", filter);
|
||||
}
|
||||
public override long GetVehicleCount(SbmVehicle.Params prm)
|
||||
{
|
||||
@@ -617,14 +617,14 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
|
||||
{
|
||||
ClearErrorState();
|
||||
List<SbmVehicle> vehicles = new List<SbmVehicle>();
|
||||
DbQuery qry = new DbQuery(db.DbmsType);
|
||||
DbQuery qry = new DbQuery(Database.DbmsType);
|
||||
qry.Tables.Add(SbmDbDfn.GetTableName(SbmDbDfn.TableIdx.SaVehicle), aliasVehicle);
|
||||
SaVehicle_Db dbVehicle = new SaVehicle_Db(DbInfo);
|
||||
qry.Columns.AddRange(dbVehicle.ExistingColumnNames);
|
||||
qry.Filters.AddRange(GetVehicleQueryFilter(prm));
|
||||
qry.OrderBy.AddRange(GetVehicleSortColumns(prm));
|
||||
// Query data.
|
||||
using (var dbConnection = db.CreateConnection())
|
||||
using (var dbConnection = Database.CreateConnection())
|
||||
using (var dbCommand = dbConnection.CreateCommand())
|
||||
{
|
||||
try
|
||||
@@ -657,7 +657,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
|
||||
ClearErrorState();
|
||||
//---------------------------------------------------------------------
|
||||
// Construct build database query.
|
||||
DbQuery query = new DbQuery(db.DbmsType);
|
||||
DbQuery query = new DbQuery(Database.DbmsType);
|
||||
query.Tables.Add(SbmDbDfn.GetTableName(SbmDbDfn.TableIdx.SaVehicle), aliasVehicle);
|
||||
|
||||
// Vehicle Properties - add columns as defined in query list.
|
||||
@@ -713,14 +713,14 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
|
||||
|
||||
//---------------------------------------------------------------
|
||||
// Event count.
|
||||
if (db.TableExists(SbmDbDfn.GetTableName(SbmDbDfn.TableIdx.SaVehicleEvent)))
|
||||
if (Database.TableExists(SbmDbDfn.GetTableName(SbmDbDfn.TableIdx.SaVehicleEvent)))
|
||||
{
|
||||
bool countVehicles = columns.HasId((int)SbmVehicle.Column.EventCount);
|
||||
if (countVehicles)
|
||||
{
|
||||
// Build sub query to directly return the number of associated Events:
|
||||
String aliasVehicle_VehicleEvent = "aVehVehEvt";
|
||||
DbQuery qryEvent = new DbQuery(db.DbmsType);
|
||||
DbQuery qryEvent = new DbQuery(Database.DbmsType);
|
||||
qryEvent.Tables.Add(SbmDbDfn.GetTableName(SbmDbDfn.TableIdx.SaVehicleEvent), aliasVehicle_VehicleEvent);
|
||||
qryEvent.Columns.Add($"Count({SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.SaVehicleEvent_Id, aliasVehicle_VehicleEvent)})");
|
||||
qryEvent.Filters.Add($"{SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.SaVehicleEvent_VehicleId, aliasVehicle_VehicleEvent)}={SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.SaVehicle_Id, aliasVehicle)}");
|
||||
@@ -732,11 +732,11 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
|
||||
bool bCountFeatures = columns.HasId((int)SbmVehicle.Column.FeatureCount);
|
||||
if (bCountFeatures)
|
||||
{
|
||||
if (db.TableExists(SbmDbDfn.GetTableName(SbmDbDfn.TableIdx.SaVehicleFeature)))
|
||||
if (Database.TableExists(SbmDbDfn.GetTableName(SbmDbDfn.TableIdx.SaVehicleFeature)))
|
||||
{
|
||||
// Build sub query to directly return the number of associated Features:
|
||||
String aliasVehicle_VehicleFeature = "aVehVehFtr";
|
||||
DbQuery qryFeature = new DbQuery(db.DbmsType);
|
||||
DbQuery qryFeature = new DbQuery(Database.DbmsType);
|
||||
qryFeature.Tables.Add(SbmDbDfn.GetTableName(SbmDbDfn.TableIdx.SaVehicleFeature), aliasVehicle_VehicleFeature);
|
||||
qryFeature.Columns.Add($"Count({SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.SaVehicleFeature_VehicleId, aliasVehicle_VehicleFeature)})");
|
||||
qryFeature.Filters.Add($"{SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.SaVehicleFeature_VehicleId, aliasVehicle_VehicleFeature)}={SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.SaVehicle_Id, aliasVehicle)}");
|
||||
@@ -754,7 +754,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
|
||||
{
|
||||
// Build sub query to directly return the number of associated HpiChecks.
|
||||
String aliasVehicle_ItemData = "aVehItmDat";
|
||||
DbQuery qryItemData = new DbQuery(db.DbmsType);
|
||||
DbQuery qryItemData = new DbQuery(Database.DbmsType);
|
||||
qryItemData.Tables.Add(SaItemDataDbDfn.GetTableName(SaItemDataDbDfn.TableIdx.SaItemData), aliasVehicle_ItemData);
|
||||
qryItemData.Columns.Add($"Count({SaItemDataDbDfn.GetColumnNameQual(SaItemDataDbDfn.ColumnIdx.SaItemData_Id, aliasVehicle_ItemData)})");
|
||||
qryItemData.Filters.Add($"{SaItemDataDbDfn.GetColumnNameQual(SaItemDataDbDfn.ColumnIdx.SaItemData_ItemType, aliasVehicle_ItemData)}={(int)Sbm.ItemType.Vehicle}");
|
||||
@@ -788,8 +788,8 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------
|
||||
//return new DbResultSet_DataTableReader(db, query.BuildQuery());
|
||||
return DbResultSet_DataReader.ExecuteQuery(db, query.BuildQuery(prm.ResultsPaging));
|
||||
//return new DbResultSet_DataTableReader(Database, query.BuildQuery());
|
||||
return DbResultSet_DataReader.ExecuteQuery(Database, query.BuildQuery(prm.ResultsPaging));
|
||||
}
|
||||
//-------------------------------------------------------------------
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user