Skip to content

Commit 049bc76

Browse files
authored
Merge pull request #334 from DataObjects-NET/7.1-persistrequest-no-nc-usage
PersistRequest: No NodeConfiguration usage
2 parents 36de54c + 1b45d4a commit 049bc76

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

ChangeLog/7.1.1-dev.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
[main] Improved memory efficency of cached queries.
1+
[main] Improved memory efficency of cached queries.
2+
[main] One of PersistRequest's constructors marked obsolete since it is no loger in use

Orm/Xtensive.Orm/Orm/Providers/Requests/PersistRequest.cs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ public sealed class PersistRequest
2828

2929
public IEnumerable<PersistParameterBinding> ParameterBindings { get; private set; }
3030

31-
internal NodeConfiguration NodeConfiguration { get; private set; }
32-
3331
public SqlCompilationResult GetCompiledStatement()
3432
{
3533
if (compiledStatement==null)
@@ -50,10 +48,21 @@ public void Prepare()
5048

5149
public PersistRequest(
5250
StorageDriver driver, SqlStatement statement, IEnumerable<PersistParameterBinding> parameterBindings)
53-
: this(driver, statement, parameterBindings, null)
5451
{
52+
ArgumentValidator.EnsureArgumentNotNull(driver, "driver");
53+
ArgumentValidator.EnsureArgumentNotNull(statement, "statement");
54+
55+
var compileUnit = statement as ISqlCompileUnit;
56+
if (compileUnit == null)
57+
throw new ArgumentException("Statement is not ISqlCompileUnit");
58+
59+
this.driver = driver;
60+
Statement = statement;
61+
CompileUnit = compileUnit;
62+
ParameterBindings = ParameterBinding.NormalizeBindings(parameterBindings);
5563
}
5664

65+
[Obsolete]
5766
public PersistRequest(
5867
StorageDriver driver, SqlStatement statement, IEnumerable<PersistParameterBinding> parameterBindings, NodeConfiguration nodeConfiguration)
5968
{
@@ -68,7 +77,6 @@ public PersistRequest(
6877
Statement = statement;
6978
CompileUnit = compileUnit;
7079
ParameterBindings = ParameterBinding.NormalizeBindings(parameterBindings);
71-
NodeConfiguration = nodeConfiguration;
7280
}
7381
}
7482
}

0 commit comments

Comments
 (0)