From faf92e3bdc41e0ac49d6589ebbd7f6578ebfccc8 Mon Sep 17 00:00:00 2001 From: Alexey Kulakov Date: Sat, 19 Aug 2023 13:06:05 +0500 Subject: [PATCH 1/2] PersistRequest: No NodeConfiguration usage --- .../Orm/Providers/Requests/PersistRequest.cs | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Orm/Xtensive.Orm/Orm/Providers/Requests/PersistRequest.cs b/Orm/Xtensive.Orm/Orm/Providers/Requests/PersistRequest.cs index e7b706c33c..ca0bcb6557 100644 --- a/Orm/Xtensive.Orm/Orm/Providers/Requests/PersistRequest.cs +++ b/Orm/Xtensive.Orm/Orm/Providers/Requests/PersistRequest.cs @@ -28,8 +28,6 @@ public sealed class PersistRequest public IEnumerable ParameterBindings { get; private set; } - internal NodeConfiguration NodeConfiguration { get; private set; } - public SqlCompilationResult GetCompiledStatement() { if (compiledStatement==null) @@ -50,10 +48,21 @@ public void Prepare() public PersistRequest( StorageDriver driver, SqlStatement statement, IEnumerable parameterBindings) - : this(driver, statement, parameterBindings, null) { + ArgumentValidator.EnsureArgumentNotNull(driver, "driver"); + ArgumentValidator.EnsureArgumentNotNull(statement, "statement"); + + var compileUnit = statement as ISqlCompileUnit; + if (compileUnit == null) + throw new ArgumentException("Statement is not ISqlCompileUnit"); + + this.driver = driver; + Statement = statement; + CompileUnit = compileUnit; + ParameterBindings = ParameterBinding.NormalizeBindings(parameterBindings); } + [Obsolete] public PersistRequest( StorageDriver driver, SqlStatement statement, IEnumerable parameterBindings, NodeConfiguration nodeConfiguration) { @@ -68,7 +77,6 @@ public PersistRequest( Statement = statement; CompileUnit = compileUnit; ParameterBindings = ParameterBinding.NormalizeBindings(parameterBindings); - NodeConfiguration = nodeConfiguration; } } } \ No newline at end of file From 1b45d4a8228911218549750772dcf41ec5c20fe6 Mon Sep 17 00:00:00 2001 From: Alexey Kulakov Date: Mon, 21 Aug 2023 10:59:06 +0500 Subject: [PATCH 2/2] Improve changlog --- ChangeLog/7.1.1-dev.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog/7.1.1-dev.txt b/ChangeLog/7.1.1-dev.txt index 257ca8a803..1c783fc13e 100644 --- a/ChangeLog/7.1.1-dev.txt +++ b/ChangeLog/7.1.1-dev.txt @@ -1 +1,2 @@ -[main] Improved memory efficency of cached queries. \ No newline at end of file +[main] Improved memory efficency of cached queries. +[main] One of PersistRequest's constructors marked obsolete since it is no loger in use \ No newline at end of file