-
Notifications
You must be signed in to change notification settings - Fork 12
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Feature delete and insert #62
Open
s-andrey
wants to merge
4
commits into
develop
Choose a base branch
from
feature-delete-and-insert
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -66,9 +66,15 @@ public virtual void UpdateObjects(ref DataObject[] objects, DataObjectCache Data | |
|
||
var AllQueriedObjects = new ArrayList(); | ||
|
||
// Массив имен (или storage) мастера. | ||
var InsertDeleteValue = new StringCollection(); | ||
|
||
// Массив имен (или storage) объектов в котором меняяется мастер. | ||
var UpdateClassesValue = new StringCollection(); | ||
|
||
var auditOperationInfoList = new List<AuditAdditionalInfo>(); | ||
var extraProcessingList = new List<DataObject>(); | ||
GenerateQueriesForUpdateObjects(DeleteQueries, DeleteTables, UpdateQueries, UpdateFirstQueries, UpdateLastQueries, UpdateTables, InsertQueries, InsertTables, TableOperations, QueryOrder, true, AllQueriedObjects, DataObjectCache, extraProcessingList, objects); | ||
GenerateQueriesForUpdateObjects(DeleteQueries, DeleteTables, UpdateQueries, UpdateFirstQueries, UpdateLastQueries, UpdateTables, InsertQueries, InsertTables, TableOperations, QueryOrder, true, AllQueriedObjects, DataObjectCache, InsertDeleteValue, UpdateClassesValue, extraProcessingList, objects); | ||
|
||
GenerateAuditForAggregators(AllQueriedObjects, DataObjectCache, ref extraProcessingList); | ||
|
||
|
@@ -186,9 +192,10 @@ public virtual void UpdateObjects(ref DataObject[] objects, DataObjectCache Data | |
go = false; | ||
} | ||
} | ||
while (go); | ||
|
||
while (go); | ||
#endregion | ||
|
||
if (QueryOrder.Count > 0) | ||
{ | ||
#region сзади чистые Update | ||
|
@@ -202,7 +209,7 @@ public virtual void UpdateObjects(ref DataObject[] objects, DataObjectCache Data | |
{ | ||
var ops = (OperationType)TableOperations[table]; | ||
|
||
if (ops == OperationType.Update && UpdateLastQueries.Count == 0) | ||
if (ops == OperationType.Update && UpdateLastQueries.Count == 0 && !UpdateClassesValue.Contains(table)) | ||
{ | ||
if ( | ||
(ex = RunCommands(UpdateQueries, UpdateTables, table, command, id, AlwaysThrowException)) == null) | ||
|
@@ -248,7 +255,7 @@ public virtual void UpdateObjects(ref DataObject[] objects, DataObjectCache Data | |
for (int i = QueryOrder.Count - 1; i >= 0; i--) | ||
{ | ||
string table = QueryOrder[i]; | ||
if ((ex = RunCommands(DeleteQueries, DeleteTables, table, command, id, AlwaysThrowException)) != null) | ||
if (!InsertDeleteValue.Contains(table) && (ex = RunCommands(DeleteQueries, DeleteTables, table, command, id, AlwaysThrowException)) != null) | ||
{ | ||
throw ex; | ||
} | ||
|
@@ -268,6 +275,17 @@ public virtual void UpdateObjects(ref DataObject[] objects, DataObjectCache Data | |
} | ||
} | ||
|
||
if (InsertDeleteValue.Count > 0) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Аналогичные проверки нужно добавить и для других циклов. |
||
{ | ||
foreach (string table in InsertDeleteValue) | ||
{ | ||
if ((ex = RunCommands(DeleteQueries, DeleteTables, table, command, id, AlwaysThrowException)) != null) | ||
{ | ||
throw ex; | ||
} | ||
} | ||
} | ||
|
||
foreach (string table in QueryOrder) | ||
{ | ||
if ((ex = RunCommands(UpdateLastQueries, UpdateTables, table, command, id, AlwaysThrowException)) != null) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4209,6 +4209,8 @@ private bool ContainsKeyINProcessing(Dictionary<TypeKeyPair, bool> processedDict | |
/// <param name="checkLoadedProps"> Проверять ли загруженность свойств </param> | ||
/// <param name="processingObjects"> The processing Objects. </param> | ||
/// <param name="dataObjectCache"> The Data Object Cache.</param> | ||
/// <param name="insertDeleteValue"> Обработка случая когда создается новый мастер и старый удаляется, массив мастеров.</param> | ||
/// <param name="updateClassesValue"> Обработка случая когда создается новый мастер и старый удаляется, массив агрегаторов.</param> | ||
/// <param name="dobjects"> Для чего генерим запросы </param> | ||
public virtual void GenerateQueriesForUpdateObjects( | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Тут поменять сигнатуру. |
||
StringCollection deleteQueries, | ||
|
@@ -4224,6 +4226,8 @@ public virtual void GenerateQueriesForUpdateObjects( | |
bool checkLoadedProps, | ||
System.Collections.ArrayList processingObjects, | ||
DataObjectCache dataObjectCache, | ||
StringCollection insertDeleteValue, | ||
StringCollection updateClassesValue, | ||
params ICSSoft.STORMNET.DataObject[] dobjects) | ||
{ | ||
GenerateQueriesForUpdateObjects( | ||
|
@@ -4240,6 +4244,8 @@ public virtual void GenerateQueriesForUpdateObjects( | |
checkLoadedProps, | ||
processingObjects, | ||
dataObjectCache, | ||
insertDeleteValue, | ||
updateClassesValue, | ||
null, | ||
dobjects); | ||
} | ||
|
@@ -4875,6 +4881,8 @@ private bool FixCyclic( | |
/// <param name="processingObjects">Текущие обрабатываемые объекты (то есть объекты, которые данный сервис данных планирует подтвердить в БД | ||
/// в текущей транзакции). Выходной параметр.</param> | ||
/// <param name="dataObjectCache">Кэш объектов данных.</param> | ||
/// <param name="insertDeleteValue">Список типов соответствующих случаю когда создается новый мастер и старый удаляется, массив мастеров.</param> | ||
/// <param name="updateClassesValue"> Обработка случая когда создается новый мастер и старый удаляется, массив агрегаторов.</param> | ||
/// <param name="auditObjects">Список объектов, которые необходимо записать в аудит (выходной параметр). Заполняется в том случае, когда | ||
/// передан не null и текущий сервис аудита включен.</param> | ||
/// <param name="dobjects">Объекты, для которых генерируются запросы.</param> | ||
|
@@ -4892,6 +4900,8 @@ public virtual void GenerateQueriesForUpdateObjects( | |
bool checkLoadedProps, | ||
ArrayList processingObjects, | ||
DataObjectCache dataObjectCache, | ||
StringCollection insertDeleteValue, | ||
StringCollection updateClassesValue, | ||
List<DataObject> auditObjects, | ||
params DataObject[] dobjects) | ||
{ | ||
|
@@ -5168,7 +5178,51 @@ public virtual void GenerateQueriesForUpdateObjects( | |
{ | ||
// Включем текущий объект в граф зависимостей. | ||
GetDependencies(processingObject, processingObject.GetType(), dependencies, extraUpdateList); | ||
} | ||
} | ||
|
||
var processingObjectsIsList = processingObjects.Cast<DataObject>().ToList(); | ||
var processingObjectsListOnDelete = processingObjectsIsList.Where(t => t.GetStatus() == ObjectStatus.Deleted); | ||
var processingObjectsListOnInsert = processingObjectsIsList.Where(t => t.GetStatus() == ObjectStatus.Created); | ||
var processingObjectsListOnAltered = processingObjectsIsList.Where(t => t.GetStatus() == ObjectStatus.Altered); | ||
|
||
foreach (DataObject processingObject in processingObjectsListOnAltered) | ||
{ | ||
Type processingObjectType = processingObject.GetType(); | ||
string[] props = Information.GetAllPropertyNames(processingObjectType); | ||
|
||
foreach (var value in props) | ||
{ | ||
Type[] propertyTypes = TypeUsage.GetUsageTypes(processingObjectType, value); | ||
foreach (var type in propertyTypes) | ||
{ | ||
var objectOnInsert = processingObjectsListOnInsert.FirstOrDefault(t => t.GetType() == type); | ||
var objectOnDelete = processingObjectsListOnDelete.FirstOrDefault(t => t.GetType() == type); | ||
|
||
if (objectOnInsert != null && objectOnDelete != null) | ||
{ | ||
string processingObjectStorageName = Information.GetClassStorageName(processingObjectType); | ||
string processingObjectValue = processingObjectStorageName == string.Empty ? value : processingObjectStorageName; | ||
|
||
string storageNameClass = Information.GetClassStorageName(objectOnInsert.GetType()); | ||
string classValue = storageNameClass == string.Empty ? value : storageNameClass; | ||
|
||
// Случай когда создается новый мастер и старый удаляется. | ||
|
||
// Массив имен (или storage) мастера. | ||
if (!insertDeleteValue.Contains(classValue)) | ||
{ | ||
insertDeleteValue.Add(classValue); | ||
} | ||
|
||
// Массив имен (или storage) объектов в котором меняяется мастер. | ||
if (!updateClassesValue.Contains(processingObjectValue)) | ||
{ | ||
updateClassesValue.Add(processingObjectValue); | ||
} | ||
} | ||
} | ||
} | ||
} | ||
|
||
// Поиск и разрешение циклов в зависимостях. | ||
List<Type> grafDependencies = new List<Type>(); | ||
|
@@ -5646,11 +5700,20 @@ public virtual void UpdateObjectsByExtConn( | |
var tableOperations = new SortedList(); | ||
var queryOrder = new StringCollection(); | ||
|
||
var allQueriedObjects = new System.Collections.ArrayList(); | ||
var allQueriedObjects = new System.Collections.ArrayList(); | ||
|
||
// Случай когда создается новый мастер и старый удаляется. | ||
//var InsertDeleteValue = new Dictionary<string, string>(); | ||
|
||
// Массив имен (или storage) мастера. | ||
var InsertDeleteValue = new StringCollection(); | ||
|
||
// Массив имен (или storage) объектов в котором меняяется мастер. | ||
var UpdateClassesValue = new StringCollection(); | ||
|
||
var auditOperationInfoList = new List<AuditAdditionalInfo>(); | ||
var extraProcessingList = new List<DataObject>(); | ||
GenerateQueriesForUpdateObjects(deleteQueries, deleteTables, updateQueries, updateFirstQueries, updateLastQueries, updateTables, insertQueries, insertTables, tableOperations, queryOrder, true, allQueriedObjects, dataObjectCache, extraProcessingList, objects); | ||
GenerateQueriesForUpdateObjects(deleteQueries, deleteTables, updateQueries, updateFirstQueries, updateLastQueries, updateTables, insertQueries, insertTables, tableOperations, queryOrder, true, allQueriedObjects, dataObjectCache, InsertDeleteValue, UpdateClassesValue, extraProcessingList, objects); | ||
|
||
GenerateAuditForAggregators(allQueriedObjects, dataObjectCache, ref extraProcessingList, transaction); | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Предлагаю избавиться от этого бесконечного кол-ва параметров, заменить на объект
GenerateQueriesContext
, в который и запрятать всё необходимое.