Refactoring: cancellation token is the last mandatory parameters

Husqvik · Husqvik · commit e366af4234be · 2016-07-03T21:02:48.000+02:00
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-SQLPad 0.4.0.371
+SQLPad 0.4.0.372
 ================
 
 SQLPad is an experimental SQL editor focused to quick and comfortable work.
diff --git a/SqlPad.Oracle.Database.Test/OracleDatabaseModelTest.cs b/SqlPad.Oracle.Database.Test/OracleDatabaseModelTest.cs
@@ -730,13 +730,13 @@ public async Task TestDatabaseMonitorDataProviders()
 				var sessionValues = (OracleSessionValues)databaseSessions.Rows.Single(s => s.Id == connectionAdapter.SessionIdentifier.Value.SessionId).ProviderValues;
 
 				var monitorDataProvider = new SqlMonitorDataProvider(sessionValues.Instance, sessionValues.Id, sessionValues.ExecutionStart.Value, sessionValues.ExecutionId.Value, sessionValues.SqlId, sessionValues.ChildNumber.Value);
-				await OracleDatabaseModel.UpdateModelAsync(ConnectionString.ConnectionString, null, CancellationToken.None, false, monitorDataProvider);
+				await OracleDatabaseModel.UpdateModelAsync(ConnectionString.ConnectionString, null, false, CancellationToken.None, monitorDataProvider);
 				var planItemCollection = monitorDataProvider.ItemCollection;
 				var sessionMonitorDataProvider = new SessionMonitorDataProvider(planItemCollection);
 				var activeSessionHistoryDataProvider = new SqlMonitorActiveSessionHistoryDataProvider(planItemCollection);
 				var planMonitorDataProvider = new SqlMonitorSessionPlanMonitorDataProvider(planItemCollection);
 				var sessionLongOperationDataProvider = new SessionLongOperationPlanMonitorDataProvider(planItemCollection);
-				await OracleDatabaseModel.UpdateModelAsync(ConnectionString.ConnectionString, null, CancellationToken.None, false, sessionMonitorDataProvider, planMonitorDataProvider, activeSessionHistoryDataProvider, sessionLongOperationDataProvider);
+				await OracleDatabaseModel.UpdateModelAsync(ConnectionString.ConnectionString, null, false, CancellationToken.None, sessionMonitorDataProvider, planMonitorDataProvider, activeSessionHistoryDataProvider, sessionLongOperationDataProvider);
 
 				var statementBatchResult = executionTask.Result;
 				statementBatchResult.StatementResults.Count.ShouldBe(1);
@@ -1003,7 +1003,7 @@ private async Task ExecuteDataProvider(params IModelDataProvider[] updaters)
 		{
 			using (var databaseModel = DataModelInitializer.GetInitializedDataModel(ConnectionString))
 			{
-				await (Task)typeof (OracleDatabaseModel).GetMethod("UpdateModelAsync", BindingFlags.Instance | BindingFlags.NonPublic).Invoke(databaseModel, new object[] { CancellationToken.None, false, updaters });
+				await (Task)typeof (OracleDatabaseModel).GetMethod("UpdateModelAsync", BindingFlags.Instance | BindingFlags.NonPublic).Invoke(databaseModel, new object[] { false, CancellationToken.None, updaters });
 			}
 		}
 	}
diff --git a/SqlPad.Oracle/DatabaseConnection/OracleConnectionAdapter.cs b/SqlPad.Oracle/DatabaseConnection/OracleConnectionAdapter.cs
@@ -244,7 +244,7 @@ public override bool CanFetch(ResultInfo resultInfo)
 
 		public override async Task<ICollection<SessionExecutionStatisticsRecord>> GetExecutionStatisticsAsync(CancellationToken cancellationToken)
 		{
-			await _databaseModel.UpdateModelAsync(cancellationToken, true, _executionStatisticsDataProvider.SessionEndExecutionStatisticsDataProvider);
+			await _databaseModel.UpdateModelAsync(true, cancellationToken, _executionStatisticsDataProvider.SessionEndExecutionStatisticsDataProvider);
 			return _executionStatisticsDataProvider.ExecutionStatistics;
 		}
 
@@ -282,10 +282,10 @@ public override async Task<ExecutionPlanItemCollection> ExplainPlanAsync(Stateme
 				throw new InvalidOperationException($"OracleConfiguration/Connections/Connection[@ConnectionName = '{connectionName}']/ExecutionPlan/TargetTable[Name] is missing. ");
 			}
 
-			var planKey = Convert.ToString(executionModel.StatementText.GetHashCode());
+			var planKey = Convert.ToString(DateTime.UtcNow.Ticks);
 			var explainPlanDataProvider = new ExplainPlanDataProvider(executionModel.StatementText, planKey, targetTable);
 
-			await OracleDatabaseModel.UpdateModelAsync(_databaseModel.ConnectionString.ConnectionString, _currentSchema, cancellationToken, false, explainPlanDataProvider.CreateExplainPlanUpdater, explainPlanDataProvider.LoadExplainPlanUpdater);
+			await OracleDatabaseModel.UpdateModelAsync(_databaseModel.ConnectionString.ConnectionString, _currentSchema, false, cancellationToken, explainPlanDataProvider.CreateExplainPlanUpdater, explainPlanDataProvider.LoadExplainPlanUpdater);
 
 			return explainPlanDataProvider.ItemCollection;
 		}
@@ -294,7 +294,7 @@ public override async Task<ExecutionStatisticsPlanItemCollection> GetCursorExecu
 		{
 			var cursorExecutionStatisticsDataProvider = new CursorExecutionStatisticsDataProvider(_userCommandSqlId, _userCommandChildNumber);
 			var displayCursorDataProvider = new DisplayCursorDataProvider(_userCommandSqlId, _userCommandChildNumber, _databaseModel.Version);
-			await _databaseModel.UpdateModelAsync(cancellationToken, false, cursorExecutionStatisticsDataProvider, displayCursorDataProvider);
+			await _databaseModel.UpdateModelAsync(false, cancellationToken, cursorExecutionStatisticsDataProvider, displayCursorDataProvider);
 			cursorExecutionStatisticsDataProvider.ItemCollection.PlanText = displayCursorDataProvider.PlanText;
 			return cursorExecutionStatisticsDataProvider.ItemCollection;
 		}
@@ -738,7 +738,7 @@ private async Task<StatementExecutionBatchResult> ExecuteUserStatementAsync(Stat
 				if (batchExecutionModel.GatherExecutionStatistics)
 				{
 					_executionStatisticsDataProvider = new SessionExecutionStatisticsDataProvider(_databaseModel.StatisticsKeys, _userSessionIdentifier.Value.SessionId);
-					await _databaseModel.UpdateModelAsync(cancellationToken, true, _executionStatisticsDataProvider.SessionBeginExecutionStatisticsDataProvider);
+					await _databaseModel.UpdateModelAsync(true, cancellationToken, _executionStatisticsDataProvider.SessionBeginExecutionStatisticsDataProvider);
 				}
 
 				_userConnection.ActionName = UserCommand;
@@ -1211,7 +1211,7 @@ private async Task<Exception> ResolveExecutionPlanIdentifiersAndTransactionStatu
 		private async Task<IReadOnlyList<CompilationError>> RetrieveCompilationErrors(StatementBase statement, CancellationToken cancellationToken)
 		{
 			var compilationErrorUpdater = new CompilationErrorDataProvider(statement, _currentSchema);
-			await _databaseModel.UpdateModelAsync(cancellationToken, true, compilationErrorUpdater);
+			await _databaseModel.UpdateModelAsync(true, cancellationToken, compilationErrorUpdater);
 			return compilationErrorUpdater.Errors;
 		}
 
diff --git a/SqlPad.Oracle/DatabaseConnection/OracleDatabaseModel.cs b/SqlPad.Oracle/DatabaseConnection/OracleDatabaseModel.cs
@@ -16,7 +16,6 @@
 #else
 using Oracle.DataAccess.Client;
 #endif
-using SqlPad.Oracle.ExecutionPlan;
 using SqlPad.Oracle.ModelDataProviders;
 using SqlPad.Oracle.ToolTips;
 using Timer = System.Timers.Timer;
@@ -354,14 +353,14 @@ public override async Task UpdatePartitionDetailsAsync(PartitionDetailsModel dat
 		{
 			var partitionDataProvider = new PartitionDataProvider(dataModel, Version);
 			var spaceAllocationDataProvider = new TableSpaceAllocationDataProvider(dataModel, dataModel.Owner, dataModel.Name);
-			await UpdateModelAsync(cancellationToken, true, partitionDataProvider.PartitionDetailDataProvider, partitionDataProvider.SubPartitionDetailDataProvider, spaceAllocationDataProvider);
+			await UpdateModelAsync(true, cancellationToken, partitionDataProvider.PartitionDetailDataProvider, partitionDataProvider.SubPartitionDetailDataProvider, spaceAllocationDataProvider);
 		}
 
 		public override async Task UpdateSubPartitionDetailsAsync(SubPartitionDetailsModel dataModel, CancellationToken cancellationToken)
 		{
 			var partitionDataProvider = new PartitionDataProvider(dataModel, Version);
 			var spaceAllocationDataProvider = new TableSpaceAllocationDataProvider(dataModel, dataModel.Owner, dataModel.Name);
-			await UpdateModelAsync(cancellationToken, true, partitionDataProvider.SubPartitionDetailDataProvider, spaceAllocationDataProvider);
+			await UpdateModelAsync(true, cancellationToken, partitionDataProvider.SubPartitionDetailDataProvider, spaceAllocationDataProvider);
 		}
 
 		public override async Task UpdateTableDetailsAsync(OracleObjectIdentifier objectIdentifier, TableDetailsModel dataModel, CancellationToken cancellationToken)
@@ -375,14 +374,14 @@ public override async Task UpdateTableDetailsAsync(OracleObjectIdentifier object
 			var partitionDataProvider = new PartitionDataProvider(dataModel, objectIdentifier, Version);
 			var tablespaceDetailDataProvider = new TablespaceDetailDataProvider(dataModel.TablespaceDataModel);
 			var datafileDataProvider = new TablespaceFilesDataProvider(dataModel.TablespaceDataModel);
-			await UpdateModelAsync(cancellationToken, true, tableDetailDataProvider, tableCommentDataProvider, spaceAllocationDataProvider, tableInMemorySpaceAllocationDataProvider, indexDetailDataProvider, indexColumnDataProvider, partitionDataProvider.PartitionDetailDataProvider, partitionDataProvider.SubPartitionDetailDataProvider, tablespaceDetailDataProvider, datafileDataProvider);
+			await UpdateModelAsync(true, cancellationToken, tableDetailDataProvider, tableCommentDataProvider, spaceAllocationDataProvider, tableInMemorySpaceAllocationDataProvider, indexDetailDataProvider, indexColumnDataProvider, partitionDataProvider.PartitionDetailDataProvider, partitionDataProvider.SubPartitionDetailDataProvider, tablespaceDetailDataProvider, datafileDataProvider);
 		}
 
 		public override async Task UpdateViewDetailsAsync(OracleObjectIdentifier objectIdentifier, ObjectDetailsModel dataModel, CancellationToken cancellationToken)
 		{
 			var viewCommentDataProvider = new CommentDataProvider(dataModel, objectIdentifier, null);
 			var columnConstraintDataProvider = new ConstraintDataProvider(dataModel, objectIdentifier, null);
-			await UpdateModelAsync(cancellationToken, true, viewCommentDataProvider, columnConstraintDataProvider);
+			await UpdateModelAsync(true, cancellationToken, viewCommentDataProvider, columnConstraintDataProvider);
 		}
 
 		public override async Task UpdateColumnDetailsAsync(OracleObjectIdentifier objectIdentifier, string columnName, ColumnDetailsModel dataModel, CancellationToken cancellationToken)
@@ -394,7 +393,7 @@ public override async Task UpdateColumnDetailsAsync(OracleObjectIdentifier objec
 			var indexColumnDataProvider = new IndexColumnDataProvider(dataModel, objectIdentifier, columnName);
 			var detailHistogramDataProvider = new ColumnDetailHistogramDataProvider(dataModel, objectIdentifier, columnName);
 			var columnInMemoryDetailsDataProvider = new ColumnDetailInMemoryDataProvider(dataModel, objectIdentifier, columnName, Version);
-			await UpdateModelAsync(cancellationToken, true, columnDetailDataProvider, columnCommentDataProvider, columnConstraintDataProvider, columnIndexesDataProvider, indexColumnDataProvider, detailHistogramDataProvider, columnInMemoryDetailsDataProvider);
+			await UpdateModelAsync(true, cancellationToken, columnDetailDataProvider, columnCommentDataProvider, columnConstraintDataProvider, columnIndexesDataProvider, indexColumnDataProvider, detailHistogramDataProvider, columnInMemoryDetailsDataProvider);
 		}
 
 		public override async Task UpdateUserDetailsAsync(OracleSchemaModel dataModel, CancellationToken cancellationToken)
@@ -405,22 +404,22 @@ public override async Task UpdateUserDetailsAsync(OracleSchemaModel dataModel, C
 			var temporaryTablespaceDetailDataProvider = new TablespaceDetailDataProvider(dataModel.TemporaryTablespaceModel);
 			var temporaryDatafileDataProvider = new TablespaceFilesDataProvider(dataModel.TemporaryTablespaceModel);
 			var profileDataProvider = new ProfileDetailsDataProvider(dataModel.ProfileModel);
-			await UpdateModelAsync(cancellationToken, true, userDetailDataProvider, defaultTablespaceDetailDataProvider, temporaryTablespaceDetailDataProvider, defaultDatafileDataProvider, temporaryDatafileDataProvider, profileDataProvider);
+			await UpdateModelAsync(true, cancellationToken, userDetailDataProvider, defaultTablespaceDetailDataProvider, temporaryTablespaceDetailDataProvider, defaultDatafileDataProvider, temporaryDatafileDataProvider, profileDataProvider);
 		}
 
 		public override async Task<IReadOnlyList<string>> GetRemoteTableColumnsAsync(string databaseLink, OracleObjectIdentifier schemaObject, CancellationToken cancellationToken)
 		{
 			var remoteTableColumnDataProvider = new RemoteTableColumnDataProvider(databaseLink, schemaObject);
-			await UpdateModelAsync(cancellationToken, false, remoteTableColumnDataProvider);
+			await UpdateModelAsync(false, cancellationToken, remoteTableColumnDataProvider);
 			return remoteTableColumnDataProvider.Columns;
 		}
 
-		internal Task UpdateModelAsync(CancellationToken cancellationToken, bool suppressException, params IModelDataProvider[] updaters)
+		internal Task UpdateModelAsync(bool suppressException, CancellationToken cancellationToken, params IModelDataProvider[] updaters)
 		{
-			return UpdateModelAsync(BackgroundConnectionString, _currentSchema, cancellationToken, suppressException, updaters);
+			return UpdateModelAsync(BackgroundConnectionString, _currentSchema, suppressException, cancellationToken, updaters);
 		}
 
-		internal static async Task UpdateModelAsync(string connectionString, string currentSchema, CancellationToken cancellationToken, bool suppressException, params IModelDataProvider[] updaters)
+		internal static async Task UpdateModelAsync(string connectionString, string currentSchema, bool suppressException, CancellationToken cancellationToken, params IModelDataProvider[] updaters)
 		{
 			using (var connection = new OracleConnection())
 			{
diff --git a/SqlPad.Oracle/DatabaseConnection/OracleObjectScriptExtractor.cs b/SqlPad.Oracle/DatabaseConnection/OracleObjectScriptExtractor.cs
@@ -48,7 +48,7 @@ public async Task<string> ExtractViewTextAsync(OracleObjectIdentifier viewIdenti
 		private async Task UpdateDataModel(CancellationToken cancellationToken, IModelDataProvider scriptDataProvider)
 		{
 			var connectionString = OracleConnectionStringRepository.GetBackgroundConnectionString(_databaseModel.ConnectionString.ConnectionString);
-			await OracleDatabaseModel.UpdateModelAsync(connectionString, _databaseModel.CurrentSchema, cancellationToken, false, scriptDataProvider);
+			await OracleDatabaseModel.UpdateModelAsync(connectionString, _databaseModel.CurrentSchema, false, cancellationToken, scriptDataProvider);
 		}
 	}
 }
diff --git a/SqlPad.Oracle/OracleSessionDetailViewer.xaml.cs b/SqlPad.Oracle/OracleSessionDetailViewer.xaml.cs
@@ -181,7 +181,7 @@ public async Task Refresh(CancellationToken cancellationToken)
 				var activeSessionHistoryDataProvider = new SqlMonitorActiveSessionHistoryDataProvider(planItemCollection);
 				var planMonitorDataProvider = new SqlMonitorSessionPlanMonitorDataProvider(planItemCollection);
 				var sessionLongOperationDataProvider = new SessionLongOperationPlanMonitorDataProvider(planItemCollection);
-				await OracleDatabaseModel.UpdateModelAsync(OracleConnectionStringRepository.GetBackgroundConnectionString(_connectionString.ConnectionString), null, cancellationToken, false, sessionMonitorDataProvider, planMonitorDataProvider, activeSessionHistoryDataProvider, sessionLongOperationDataProvider);
+				await OracleDatabaseModel.UpdateModelAsync(OracleConnectionStringRepository.GetBackgroundConnectionString(_connectionString.ConnectionString), null, false, cancellationToken, sessionMonitorDataProvider, planMonitorDataProvider, activeSessionHistoryDataProvider, sessionLongOperationDataProvider);
 				if (planItemCollection != _planItemCollection)
 				{
 					return;
@@ -216,7 +216,7 @@ public async Task Initialize(DatabaseSession databaseSession, CancellationToken
 				if (!String.IsNullOrEmpty(_oracleSessionValues.SqlId) && _oracleSessionValues.ExecutionId.HasValue)
 				{
 					var monitorDataProvider = new SqlMonitorDataProvider(_oracleSessionValues.Instance, _oracleSessionValues.Id, _oracleSessionValues.ExecutionStart.Value, _oracleSessionValues.ExecutionId.Value, _oracleSessionValues.SqlId, _oracleSessionValues.ChildNumber.Value);
-					await OracleDatabaseModel.UpdateModelAsync(OracleConnectionStringRepository.GetBackgroundConnectionString(_connectionString.ConnectionString), null, cancellationToken, false, monitorDataProvider);
+					await OracleDatabaseModel.UpdateModelAsync(OracleConnectionStringRepository.GetBackgroundConnectionString(_connectionString.ConnectionString), null, false, cancellationToken, monitorDataProvider);
 
 					_planItemCollection = monitorDataProvider.ItemCollection;
 					_planItemCollection.RefreshPeriod = DefaultRefreshPeriod;
diff --git a/SqlPad.Oracle/Properties/AssemblyInfo.cs b/SqlPad.Oracle/Properties/AssemblyInfo.cs
@@ -37,7 +37,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.4.0.371")]
-[assembly: AssemblyFileVersion("0.4.0.371")]
-[assembly: AssemblyBuildInfo("52cdd64", "2016-07-03 20:05:21")]
+[assembly: AssemblyVersion("0.4.0.372")]
+[assembly: AssemblyFileVersion("0.4.0.372")]
+[assembly: AssemblyBuildInfo("1e378d9", "2016-07-03 21:02:37")]
 [assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
diff --git a/SqlPad/Properties/AssemblyInfo.cs b/SqlPad/Properties/AssemblyInfo.cs
@@ -54,6 +54,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.4.0.371")]
-[assembly: AssemblyFileVersion("0.4.0.371")]
-[assembly: AssemblyBuildInfo("52cdd64", "2016-07-03 20:05:21")]
+[assembly: AssemblyVersion("0.4.0.372")]
+[assembly: AssemblyFileVersion("0.4.0.372")]
+[assembly: AssemblyBuildInfo("1e378d9", "2016-07-03 21:02:37")]

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-SQLPad 0.4.0.371`
	`1`	`+SQLPad 0.4.0.372`
`2`	`2`	`================`
`3`	`3`
`4`	`4`	`SQLPad is an experimental SQL editor focused to quick and comfortable work.`
Original file line number	Diff line number	Diff line change
`@@ -730,13 +730,13 @@ public async Task TestDatabaseMonitorDataProviders()`
`730`	`730`	`var sessionValues = (OracleSessionValues)databaseSessions.Rows.Single(s => s.Id == connectionAdapter.SessionIdentifier.Value.SessionId).ProviderValues;`
`731`	`731`
`732`	`732`	`var monitorDataProvider = new SqlMonitorDataProvider(sessionValues.Instance, sessionValues.Id, sessionValues.ExecutionStart.Value, sessionValues.ExecutionId.Value, sessionValues.SqlId, sessionValues.ChildNumber.Value);`
`733`		`- await OracleDatabaseModel.UpdateModelAsync(ConnectionString.ConnectionString, null, CancellationToken.None, false, monitorDataProvider);`
	`733`	`+ await OracleDatabaseModel.UpdateModelAsync(ConnectionString.ConnectionString, null, false, CancellationToken.None, monitorDataProvider);`
`734`	`734`	`var planItemCollection = monitorDataProvider.ItemCollection;`
`735`	`735`	`var sessionMonitorDataProvider = new SessionMonitorDataProvider(planItemCollection);`
`736`	`736`	`var activeSessionHistoryDataProvider = new SqlMonitorActiveSessionHistoryDataProvider(planItemCollection);`
`737`	`737`	`var planMonitorDataProvider = new SqlMonitorSessionPlanMonitorDataProvider(planItemCollection);`
`738`	`738`	`var sessionLongOperationDataProvider = new SessionLongOperationPlanMonitorDataProvider(planItemCollection);`
`739`		`- await OracleDatabaseModel.UpdateModelAsync(ConnectionString.ConnectionString, null, CancellationToken.None, false, sessionMonitorDataProvider, planMonitorDataProvider, activeSessionHistoryDataProvider, sessionLongOperationDataProvider);`
	`739`	`+ await OracleDatabaseModel.UpdateModelAsync(ConnectionString.ConnectionString, null, false, CancellationToken.None, sessionMonitorDataProvider, planMonitorDataProvider, activeSessionHistoryDataProvider, sessionLongOperationDataProvider);`
`740`	`740`
`741`	`741`	`var statementBatchResult = executionTask.Result;`
`742`	`742`	`statementBatchResult.StatementResults.Count.ShouldBe(1);`
`@@ -1003,7 +1003,7 @@ private async Task ExecuteDataProvider(params IModelDataProvider[] updaters)`
`1003`	`1003`	`{`
`1004`	`1004`	`using (var databaseModel = DataModelInitializer.GetInitializedDataModel(ConnectionString))`
`1005`	`1005`	`{`
`1006`		`- await (Task)typeof (OracleDatabaseModel).GetMethod("UpdateModelAsync", BindingFlags.Instance \| BindingFlags.NonPublic).Invoke(databaseModel, new object[] { CancellationToken.None, false, updaters });`
	`1006`	`+ await (Task)typeof (OracleDatabaseModel).GetMethod("UpdateModelAsync", BindingFlags.Instance \| BindingFlags.NonPublic).Invoke(databaseModel, new object[] { false, CancellationToken.None, updaters });`
`1007`	`1007`	`}`
`1008`	`1008`	`}`
`1009`	`1009`	`}`
Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,7 @@ public override bool CanFetch(ResultInfo resultInfo)`
`244`	`244`
`245`	`245`	`public override async Task<ICollection<SessionExecutionStatisticsRecord>> GetExecutionStatisticsAsync(CancellationToken cancellationToken)`
`246`	`246`	`{`
`247`		`- await _databaseModel.UpdateModelAsync(cancellationToken, true, _executionStatisticsDataProvider.SessionEndExecutionStatisticsDataProvider);`
	`247`	`+ await _databaseModel.UpdateModelAsync(true, cancellationToken, _executionStatisticsDataProvider.SessionEndExecutionStatisticsDataProvider);`
`248`	`248`	`return _executionStatisticsDataProvider.ExecutionStatistics;`
`249`	`249`	`}`
`250`	`250`
`@@ -282,10 +282,10 @@ public override async Task<ExecutionPlanItemCollection> ExplainPlanAsync(Stateme`
`282`	`282`	`throw new InvalidOperationException($"OracleConfiguration/Connections/Connection[@ConnectionName = '{connectionName}']/ExecutionPlan/TargetTable[Name] is missing. ");`
`283`	`283`	`}`
`284`	`284`
`285`		`- var planKey = Convert.ToString(executionModel.StatementText.GetHashCode());`
	`285`	`+ var planKey = Convert.ToString(DateTime.UtcNow.Ticks);`
`286`	`286`	`var explainPlanDataProvider = new ExplainPlanDataProvider(executionModel.StatementText, planKey, targetTable);`
`287`	`287`
`288`		`- await OracleDatabaseModel.UpdateModelAsync(_databaseModel.ConnectionString.ConnectionString, _currentSchema, cancellationToken, false, explainPlanDataProvider.CreateExplainPlanUpdater, explainPlanDataProvider.LoadExplainPlanUpdater);`
	`288`	`+ await OracleDatabaseModel.UpdateModelAsync(_databaseModel.ConnectionString.ConnectionString, _currentSchema, false, cancellationToken, explainPlanDataProvider.CreateExplainPlanUpdater, explainPlanDataProvider.LoadExplainPlanUpdater);`
`289`	`289`
`290`	`290`	`return explainPlanDataProvider.ItemCollection;`
`291`	`291`	`}`
`@@ -294,7 +294,7 @@ public override async Task<ExecutionStatisticsPlanItemCollection> GetCursorExecu`
`294`	`294`	`{`
`295`	`295`	`var cursorExecutionStatisticsDataProvider = new CursorExecutionStatisticsDataProvider(_userCommandSqlId, _userCommandChildNumber);`
`296`	`296`	`var displayCursorDataProvider = new DisplayCursorDataProvider(_userCommandSqlId, _userCommandChildNumber, _databaseModel.Version);`
`297`		`- await _databaseModel.UpdateModelAsync(cancellationToken, false, cursorExecutionStatisticsDataProvider, displayCursorDataProvider);`
	`297`	`+ await _databaseModel.UpdateModelAsync(false, cancellationToken, cursorExecutionStatisticsDataProvider, displayCursorDataProvider);`
`298`	`298`	`cursorExecutionStatisticsDataProvider.ItemCollection.PlanText = displayCursorDataProvider.PlanText;`
`299`	`299`	`return cursorExecutionStatisticsDataProvider.ItemCollection;`
`300`	`300`	`}`
`@@ -738,7 +738,7 @@ private async Task<StatementExecutionBatchResult> ExecuteUserStatementAsync(Stat`
`738`	`738`	`if (batchExecutionModel.GatherExecutionStatistics)`
`739`	`739`	`{`
`740`	`740`	`_executionStatisticsDataProvider = new SessionExecutionStatisticsDataProvider(_databaseModel.StatisticsKeys, _userSessionIdentifier.Value.SessionId);`
`741`		`- await _databaseModel.UpdateModelAsync(cancellationToken, true, _executionStatisticsDataProvider.SessionBeginExecutionStatisticsDataProvider);`
	`741`	`+ await _databaseModel.UpdateModelAsync(true, cancellationToken, _executionStatisticsDataProvider.SessionBeginExecutionStatisticsDataProvider);`
`742`	`742`	`}`
`743`	`743`
`744`	`744`	`_userConnection.ActionName = UserCommand;`
`@@ -1211,7 +1211,7 @@ private async Task<Exception> ResolveExecutionPlanIdentifiersAndTransactionStatu`
`1211`	`1211`	`private async Task<IReadOnlyList<CompilationError>> RetrieveCompilationErrors(StatementBase statement, CancellationToken cancellationToken)`
`1212`	`1212`	`{`
`1213`	`1213`	`var compilationErrorUpdater = new CompilationErrorDataProvider(statement, _currentSchema);`
`1214`		`- await _databaseModel.UpdateModelAsync(cancellationToken, true, compilationErrorUpdater);`
	`1214`	`+ await _databaseModel.UpdateModelAsync(true, cancellationToken, compilationErrorUpdater);`
`1215`	`1215`	`return compilationErrorUpdater.Errors;`
`1216`	`1216`	`}`
`1217`	`1217`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@`
`16`	`16`	`#else`
`17`	`17`	`using Oracle.DataAccess.Client;`
`18`	`18`	`#endif`
`19`		`-using SqlPad.Oracle.ExecutionPlan;`
`20`	`19`	`using SqlPad.Oracle.ModelDataProviders;`
`21`	`20`	`using SqlPad.Oracle.ToolTips;`
`22`	`21`	`using Timer = System.Timers.Timer;`
`@@ -354,14 +353,14 @@ public override async Task UpdatePartitionDetailsAsync(PartitionDetailsModel dat`
`354`	`353`	`{`
`355`	`354`	`var partitionDataProvider = new PartitionDataProvider(dataModel, Version);`
`356`	`355`	`var spaceAllocationDataProvider = new TableSpaceAllocationDataProvider(dataModel, dataModel.Owner, dataModel.Name);`
`357`		`- await UpdateModelAsync(cancellationToken, true, partitionDataProvider.PartitionDetailDataProvider, partitionDataProvider.SubPartitionDetailDataProvider, spaceAllocationDataProvider);`
	`356`	`+ await UpdateModelAsync(true, cancellationToken, partitionDataProvider.PartitionDetailDataProvider, partitionDataProvider.SubPartitionDetailDataProvider, spaceAllocationDataProvider);`
`358`	`357`	`}`
`359`	`358`
`360`	`359`	`public override async Task UpdateSubPartitionDetailsAsync(SubPartitionDetailsModel dataModel, CancellationToken cancellationToken)`
`361`	`360`	`{`
`362`	`361`	`var partitionDataProvider = new PartitionDataProvider(dataModel, Version);`
`363`	`362`	`var spaceAllocationDataProvider = new TableSpaceAllocationDataProvider(dataModel, dataModel.Owner, dataModel.Name);`
`364`		`- await UpdateModelAsync(cancellationToken, true, partitionDataProvider.SubPartitionDetailDataProvider, spaceAllocationDataProvider);`
	`363`	`+ await UpdateModelAsync(true, cancellationToken, partitionDataProvider.SubPartitionDetailDataProvider, spaceAllocationDataProvider);`
`365`	`364`	`}`
`366`	`365`
`367`	`366`	`public override async Task UpdateTableDetailsAsync(OracleObjectIdentifier objectIdentifier, TableDetailsModel dataModel, CancellationToken cancellationToken)`
`@@ -375,14 +374,14 @@ public override async Task UpdateTableDetailsAsync(OracleObjectIdentifier object`
`375`	`374`	`var partitionDataProvider = new PartitionDataProvider(dataModel, objectIdentifier, Version);`
`376`	`375`	`var tablespaceDetailDataProvider = new TablespaceDetailDataProvider(dataModel.TablespaceDataModel);`
`377`	`376`	`var datafileDataProvider = new TablespaceFilesDataProvider(dataModel.TablespaceDataModel);`
`378`		`- await UpdateModelAsync(cancellationToken, true, tableDetailDataProvider, tableCommentDataProvider, spaceAllocationDataProvider, tableInMemorySpaceAllocationDataProvider, indexDetailDataProvider, indexColumnDataProvider, partitionDataProvider.PartitionDetailDataProvider, partitionDataProvider.SubPartitionDetailDataProvider, tablespaceDetailDataProvider, datafileDataProvider);`
	`377`	`+ await UpdateModelAsync(true, cancellationToken, tableDetailDataProvider, tableCommentDataProvider, spaceAllocationDataProvider, tableInMemorySpaceAllocationDataProvider, indexDetailDataProvider, indexColumnDataProvider, partitionDataProvider.PartitionDetailDataProvider, partitionDataProvider.SubPartitionDetailDataProvider, tablespaceDetailDataProvider, datafileDataProvider);`
`379`	`378`	`}`
`380`	`379`
`381`	`380`	`public override async Task UpdateViewDetailsAsync(OracleObjectIdentifier objectIdentifier, ObjectDetailsModel dataModel, CancellationToken cancellationToken)`
`382`	`381`	`{`
`383`	`382`	`var viewCommentDataProvider = new CommentDataProvider(dataModel, objectIdentifier, null);`
`384`	`383`	`var columnConstraintDataProvider = new ConstraintDataProvider(dataModel, objectIdentifier, null);`
`385`		`- await UpdateModelAsync(cancellationToken, true, viewCommentDataProvider, columnConstraintDataProvider);`
	`384`	`+ await UpdateModelAsync(true, cancellationToken, viewCommentDataProvider, columnConstraintDataProvider);`
`386`	`385`	`}`
`387`	`386`
`388`	`387`	`public override async Task UpdateColumnDetailsAsync(OracleObjectIdentifier objectIdentifier, string columnName, ColumnDetailsModel dataModel, CancellationToken cancellationToken)`
`@@ -394,7 +393,7 @@ public override async Task UpdateColumnDetailsAsync(OracleObjectIdentifier objec`
`394`	`393`	`var indexColumnDataProvider = new IndexColumnDataProvider(dataModel, objectIdentifier, columnName);`
`395`	`394`	`var detailHistogramDataProvider = new ColumnDetailHistogramDataProvider(dataModel, objectIdentifier, columnName);`
`396`	`395`	`var columnInMemoryDetailsDataProvider = new ColumnDetailInMemoryDataProvider(dataModel, objectIdentifier, columnName, Version);`
`397`		`- await UpdateModelAsync(cancellationToken, true, columnDetailDataProvider, columnCommentDataProvider, columnConstraintDataProvider, columnIndexesDataProvider, indexColumnDataProvider, detailHistogramDataProvider, columnInMemoryDetailsDataProvider);`
	`396`	`+ await UpdateModelAsync(true, cancellationToken, columnDetailDataProvider, columnCommentDataProvider, columnConstraintDataProvider, columnIndexesDataProvider, indexColumnDataProvider, detailHistogramDataProvider, columnInMemoryDetailsDataProvider);`
`398`	`397`	`}`
`399`	`398`
`400`	`399`	`public override async Task UpdateUserDetailsAsync(OracleSchemaModel dataModel, CancellationToken cancellationToken)`
`@@ -405,22 +404,22 @@ public override async Task UpdateUserDetailsAsync(OracleSchemaModel dataModel, C`
`405`	`404`	`var temporaryTablespaceDetailDataProvider = new TablespaceDetailDataProvider(dataModel.TemporaryTablespaceModel);`
`406`	`405`	`var temporaryDatafileDataProvider = new TablespaceFilesDataProvider(dataModel.TemporaryTablespaceModel);`
`407`	`406`	`var profileDataProvider = new ProfileDetailsDataProvider(dataModel.ProfileModel);`
`408`		`- await UpdateModelAsync(cancellationToken, true, userDetailDataProvider, defaultTablespaceDetailDataProvider, temporaryTablespaceDetailDataProvider, defaultDatafileDataProvider, temporaryDatafileDataProvider, profileDataProvider);`
	`407`	`+ await UpdateModelAsync(true, cancellationToken, userDetailDataProvider, defaultTablespaceDetailDataProvider, temporaryTablespaceDetailDataProvider, defaultDatafileDataProvider, temporaryDatafileDataProvider, profileDataProvider);`
`409`	`408`	`}`
`410`	`409`
`411`	`410`	`public override async Task<IReadOnlyList<string>> GetRemoteTableColumnsAsync(string databaseLink, OracleObjectIdentifier schemaObject, CancellationToken cancellationToken)`
`412`	`411`	`{`
`413`	`412`	`var remoteTableColumnDataProvider = new RemoteTableColumnDataProvider(databaseLink, schemaObject);`
`414`		`- await UpdateModelAsync(cancellationToken, false, remoteTableColumnDataProvider);`
	`413`	`+ await UpdateModelAsync(false, cancellationToken, remoteTableColumnDataProvider);`
`415`	`414`	`return remoteTableColumnDataProvider.Columns;`
`416`	`415`	`}`
`417`	`416`
`418`		`- internal Task UpdateModelAsync(CancellationToken cancellationToken, bool suppressException, params IModelDataProvider[] updaters)`
	`417`	`+ internal Task UpdateModelAsync(bool suppressException, CancellationToken cancellationToken, params IModelDataProvider[] updaters)`
`419`	`418`	`{`
`420`		`- return UpdateModelAsync(BackgroundConnectionString, _currentSchema, cancellationToken, suppressException, updaters);`
	`419`	`+ return UpdateModelAsync(BackgroundConnectionString, _currentSchema, suppressException, cancellationToken, updaters);`
`421`	`420`	`}`
`422`	`421`
`423`		`- internal static async Task UpdateModelAsync(string connectionString, string currentSchema, CancellationToken cancellationToken, bool suppressException, params IModelDataProvider[] updaters)`
	`422`	`+ internal static async Task UpdateModelAsync(string connectionString, string currentSchema, bool suppressException, CancellationToken cancellationToken, params IModelDataProvider[] updaters)`
`424`	`423`	`{`
`425`	`424`	`using (var connection = new OracleConnection())`
`426`	`425`	`{`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public async Task<string> ExtractViewTextAsync(OracleObjectIdentifier viewIdenti`
`48`	`48`	`private async Task UpdateDataModel(CancellationToken cancellationToken, IModelDataProvider scriptDataProvider)`
`49`	`49`	`{`
`50`	`50`	`var connectionString = OracleConnectionStringRepository.GetBackgroundConnectionString(_databaseModel.ConnectionString.ConnectionString);`
`51`		`- await OracleDatabaseModel.UpdateModelAsync(connectionString, _databaseModel.CurrentSchema, cancellationToken, false, scriptDataProvider);`
	`51`	`+ await OracleDatabaseModel.UpdateModelAsync(connectionString, _databaseModel.CurrentSchema, false, cancellationToken, scriptDataProvider);`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`	`}`