Skip to content
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

[2.1] Throw for defining query or view mapping on derived query types #11812

Merged
merged 1 commit into from
Apr 30, 2018

Conversation

AndriySvyryd
Copy link
Member

Fixes #11789
Fixes #11808

@@ -477,4 +477,7 @@
<value>A SQL parameter or literal was generated for the type '{type}' using the ValueConverter '{valueConverter}'. Review the generated SQL for correctness and consider evaluating the target expression in-memory instead.</value>
<comment>Warning RelationalEventId.ValueConversionSqlLiteralWarning object object</comment>
</data>
<data name="DerivedQueryTypeView" xml:space="preserve">
<value>The query type '{queryType}' cannot be mapped to a view bacause it is dervived from '{baseType}'. Only base query types can be mapped to a view.</value>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo: dervived

continue;
}

if (entityType.Relational().TableName != null
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merge ifs

@@ -1078,4 +1078,7 @@
<data name="ErrorInvalidQueryable" xml:space="preserve">
<value>Cannot use multiple DbContext instances within a single query execution. Ensure the query uses a single context instance.</value>
</data>
<data name="DerivedQueryTypeDefiningQuery" xml:space="preserve">
<value>The query type '{queryType}' cannot have a defining query bacause it is dervived from '{baseType}'. Only base query types can have a defining query.</value>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same typo

Copy link
Contributor

@ajcvickers ajcvickers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved but hold off on merging until branch is open for RTM.

@AndriySvyryd AndriySvyryd merged commit 6be065c into release/2.1 Apr 30, 2018
@AndriySvyryd AndriySvyryd deleted the Issue11789 branch April 30, 2018 22:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants