From 7426c54072d63e49eae8a8a9b9a1097c9ecefbd2 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Thu, 25 Jan 2018 17:12:12 +0200 Subject: Added Synchronization Configuration (SynchronizeToRemote) where rows synchronize but added only from local to remote.. JOBS, JOB_RUNS, SEGMENTS, BRUSH_STOPS. --- .../Tango.Synchronization/Local/LocalDBComparer.cs | 4 +++- .../Tango.Synchronization/Remote/RemoteDBComparer.cs | 18 ++++++++++++++---- .../Tango.Synchronization/SyncConfiguration.cs | 4 ++++ .../Tango.Synchronization/Tango.Synchronization.csproj | 4 ++++ 4 files changed, 25 insertions(+), 5 deletions(-) (limited to 'Software/Visual_Studio') diff --git a/Software/Visual_Studio/Tango.Synchronization/Local/LocalDBComparer.cs b/Software/Visual_Studio/Tango.Synchronization/Local/LocalDBComparer.cs index 79d3857ad..a279af337 100644 --- a/Software/Visual_Studio/Tango.Synchronization/Local/LocalDBComparer.cs +++ b/Software/Visual_Studio/Tango.Synchronization/Local/LocalDBComparer.cs @@ -59,7 +59,9 @@ namespace Tango.Synchronization.Local foreach (var row in sync_table.AsEnumerable()) { - if ((SyncConfiguration)row.Field(Constants.SYNC_CONFIGURATION_SYNC_TYPE_COLUMN) == SyncConfiguration.Synchronize) + SyncConfiguration config = (SyncConfiguration)row.Field(Constants.SYNC_CONFIGURATION_SYNC_TYPE_COLUMN); + + if (config == SyncConfiguration.Synchronize || config == SyncConfiguration.SynchronizeToRemote) { sync_tables.Add(MasterSQL.Tables.Single(x => x.TableName == row.Field(Constants.SYNC_CONFIGURATION_TABLE_NAME_COLUMN))); } diff --git a/Software/Visual_Studio/Tango.Synchronization/Remote/RemoteDBComparer.cs b/Software/Visual_Studio/Tango.Synchronization/Remote/RemoteDBComparer.cs index 59ac980ba..c75f5c003 100644 --- a/Software/Visual_Studio/Tango.Synchronization/Remote/RemoteDBComparer.cs +++ b/Software/Visual_Studio/Tango.Synchronization/Remote/RemoteDBComparer.cs @@ -317,7 +317,7 @@ namespace Tango.Synchronization.Remote if (masterDate > slaveDate) { - diff = new Diff(DiffAction.UpdateRowInSlave, "Update row in slave table " + typeof(Master).Name, () => + diff = new Diff(DiffAction.UpdateRowInSlave, "Update row in slave table " + typeof(Master).Name, () => { LogManager.Log("Updating row in slave table " + typeof(Master).Name); CopyEntity(master, slave); @@ -325,7 +325,7 @@ namespace Tango.Synchronization.Remote } else if (slaveDate > masterDate) { - diff = new Diff(DiffAction.UpdateRowInMaster, "Update row in master table " + typeof(Master).Name, () => + diff = new Diff(DiffAction.UpdateRowInMaster, "Update row in master table " + typeof(Master).Name, () => { LogManager.Log("Updating row in master table " + typeof(Master).Name); CopyEntity(slave, master); @@ -349,7 +349,14 @@ namespace Tango.Synchronization.Remote /// The slave set. private void CompareEntities(Master master, Slave slave, DbSet masterSet, DbSet slaveSet) where Master : class where Slave : class { - if (slave == null) + bool skipAddToSlave = false; + + if (slave == null && _remoteDB.SYNC_CONFIGURATIONS.ToList().Exists(x => (SyncConfiguration)x.SYNC_TYPE == SyncConfiguration.SynchronizeToRemote && x.TABLE_NAME.SingularizeMVC() == typeof(Master).Name)) + { + skipAddToSlave = true; + } + + if (slave == null && !skipAddToSlave) { _diffs.Add(new Diff(DiffAction.AddRowToSlave, "Add row to slave table " + typeof(Master).Name, () => { @@ -377,7 +384,10 @@ namespace Tango.Synchronization.Remote return; } - CompareEntities(master, slave); + if (slave != null && master != null) + { + CompareEntities(master, slave); + } } } } diff --git a/Software/Visual_Studio/Tango.Synchronization/SyncConfiguration.cs b/Software/Visual_Studio/Tango.Synchronization/SyncConfiguration.cs index 2262796b9..60bb0a4c0 100644 --- a/Software/Visual_Studio/Tango.Synchronization/SyncConfiguration.cs +++ b/Software/Visual_Studio/Tango.Synchronization/SyncConfiguration.cs @@ -19,5 +19,9 @@ namespace Tango.Synchronization /// Synchronize (Insert, Update) rows by LAST_UPDATED field. /// Synchronize, + /// + /// Synchronize (Insert, Update) rows by LAST_UPDATED field without adding rows from source to target. + /// + SynchronizeToRemote } } diff --git a/Software/Visual_Studio/Tango.Synchronization/Tango.Synchronization.csproj b/Software/Visual_Studio/Tango.Synchronization/Tango.Synchronization.csproj index e0a0e5e2d..9ab584ad0 100644 --- a/Software/Visual_Studio/Tango.Synchronization/Tango.Synchronization.csproj +++ b/Software/Visual_Studio/Tango.Synchronization/Tango.Synchronization.csproj @@ -93,6 +93,10 @@ + + {a34ee0f0-649d-41c8-8489-b6f1cc6924ee} + Tango.Core + {0e0eef3e-8f4e-4f23-9d19-479fd8d76c12} Tango.DAL.Local -- cgit v1.3.1