New Merge API #686
Merged
New Merge API #686
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… API for regression testing
fix for #200
Conflicts: Tests/Linq/Tests.csproj
Conflicts: Tests/Model/LinqDataTypes.cs
MaceWindu
commented
May 27, 2017
Source/Linq/Query.cs
Outdated
| @@ -583,7 +583,7 @@ static ParameterAccessor GetParameter(IDataContext dataContext, SqlField field) | |||
|
|
|||
| Query<int> ei; | |||
|
|
|||
| var key = new { dataContextInfo.MappingSchema, dataContextInfo.ContextID }; | |||
| var key = new { dataContextInfo.MappingSchema, dataContextInfo.ContextID, tableName, databaseName, schemaName }; | |||
There was a problem hiding this comment.
example of incorrect query caching
MaceWindu
commented
May 27, 2017
| @@ -3696,9 +3696,8 @@ internal void SetAliases() | |||
| { | |||
| objs.Add(expr, expr); | |||
| p.Name = GetAlias(p.Name, "p"); | |||
| Parameters.Add(p); | |||
There was a problem hiding this comment.
duplicate parameter fix
MaceWindu
commented
May 27, 2017
| { | ||
| [TestFixture] | ||
| public class ConcurrencyCheckTests : TestBase | ||
| using System; |
There was a problem hiding this comment.
fixed line endings only
Conflicts: Data/Create Scripts/Firebird.sql Source/Data/DataConnectionExtensions.cs Source/DataProvider/DataProviderBase.cs Source/DataProvider/IDataProvider.cs Source/DataProvider/SapHana/SapHanaMappingSchema.cs Source/Linq/Query.cs Source/LinqToDB.csproj Tests/Linq/Tests.csproj
- string literal generation fixes and tests
- trimming fixes - fix some tests
|
This feature is ready for review once more. @ili, tests for major types added (MergeTests.Types.cs) |
ili
approved these changes
Aug 8, 2017
jogibear9988
approved these changes
Aug 11, 2017
Conflicts: Data/Create Scripts/SQLite.sql Source/Data/DataConnection.cs Source/DataProvider/BasicMerge.cs Source/DataProvider/DB2/DB2DataProvider.cs Source/DataProvider/DataProviderBase.cs Source/DataProvider/Firebird/FirebirdDataProvider.cs Source/DataProvider/IDataProvider.cs Source/DataProvider/Informix/InformixDataProvider.cs Source/DataProvider/Oracle/OracleDataProvider.cs Source/DataProvider/SqlServer/SqlServerDataProvider.cs Source/Linq/Builder/ContextParser.cs Source/Linq/Query.cs Source/LinqExtensions.cs Source/LinqToDB.csproj Tests/Linq/Samples/ConcurrencyCheckTests.cs Tests/Linq/Update/MergeTests.cs
|
Merged with master and added MergeAsync method with tests |
This was referenced Aug 16, 2017
This was referenced Aug 17, 2017
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
DB2 iSeries/DB2 zOS not tested due to their public unavailability. Should work. Or not.
Fixes:
Other fixes:
Code tasks:
Documentation tasks: