@@ -50,11 +50,7 @@ This test:
5050``` cs
5151await Verify (connection );
5252```
53- <<<<<<< ours
54- <sup ><a href =' /src/Tests/Tests.cs#L317-L321 ' title =' Snippet source file ' >snippet source</a > | <a href =' #snippet-SqlServerSchema ' title =' Start of snippet ' >anchor</a ></sup >
55- =======
56- <sup ><a href =' /src/Tests/Tests.cs#L77-L81 ' title =' Snippet source file ' >snippet source</a > | <a href =' #snippet-SqlServerSchema ' title =' Start of snippet ' >anchor</a ></sup >
57- >>>>>>> theirs
53+ <sup ><a href =' /src/Tests/Tests.cs#L319-L323 ' title =' Snippet source file ' >snippet source</a > | <a href =' #snippet-SqlServerSchema ' title =' Start of snippet ' >anchor</a ></sup >
5854<!-- endSnippet -->
5955
6056Will result in the following verified file:
@@ -73,11 +69,7 @@ await Verify(connection)
7369 // include only tables and views
7470 .SchemaIncludes (DbObjects .Tables | DbObjects .Views );
7571```
76- <<<<<<< ours
77- <sup ><a href =' /src/Tests/Tests.cs#L683-L689 ' title =' Snippet source file ' >snippet source</a > | <a href =' #snippet-SchemaInclude ' title =' Start of snippet ' >anchor</a ></sup >
78- =======
79- <sup ><a href =' /src/Tests/Tests.cs#L443-L449 ' title =' Snippet source file ' >snippet source</a > | <a href =' #snippet-SchemaInclude ' title =' Start of snippet ' >anchor</a ></sup >
80- >>>>>>> theirs
72+ <sup ><a href =' /src/Tests/Tests.cs#L685-L691 ' title =' Snippet source file ' >snippet source</a > | <a href =' #snippet-SchemaInclude ' title =' Start of snippet ' >anchor</a ></sup >
8173<!-- endSnippet -->
8274
8375Available values:
@@ -115,11 +107,7 @@ await Verify(connection)
115107 _ => _ is TableViewBase ||
116108 _ .Name == " MyTrigger" );
117109```
118- <<<<<<< ours
119- <sup ><a href =' /src/Tests/Tests.cs#L708-L716 ' title =' Snippet source file ' >snippet source</a > | <a href =' #snippet-SchemaFilter ' title =' Start of snippet ' >anchor</a ></sup >
120- =======
121- <sup ><a href =' /src/Tests/Tests.cs#L468-L476 ' title =' Snippet source file ' >snippet source</a > | <a href =' #snippet-SchemaFilter ' title =' Start of snippet ' >anchor</a ></sup >
122- >>>>>>> theirs
110+ <sup ><a href =' /src/Tests/Tests.cs#L710-L718 ' title =' Snippet source file ' >snippet source</a > | <a href =' #snippet-SchemaFilter ' title =' Start of snippet ' >anchor</a ></sup >
123111<!-- endSnippet -->
124112
125113
@@ -141,11 +129,7 @@ command.CommandText = "select Value from MyTable";
141129var value = await command .ExecuteScalarAsync ();
142130await Verify (value ! );
143131```
144- <<<<<<< ours
145- <sup ><a href =' /src/Tests/Tests.cs#L492-L502 ' title =' Snippet source file ' >snippet source</a > | <a href =' #snippet-Recording ' title =' Start of snippet ' >anchor</a ></sup >
146- =======
147- <sup ><a href =' /src/Tests/Tests.cs#L252-L262 ' title =' Snippet source file ' >snippet source</a > | <a href =' #snippet-Recording ' title =' Start of snippet ' >anchor</a ></sup >
148- >>>>>>> theirs
132+ <sup ><a href =' /src/Tests/Tests.cs#L494-L504 ' title =' Snippet source file ' >snippet source</a > | <a href =' #snippet-Recording ' title =' Start of snippet ' >anchor</a ></sup >
149133<!-- endSnippet -->
150134
151135Will result in the following verified file:
@@ -200,11 +184,7 @@ await Verify(
200184 sqlEntries = entries
201185 });
202186```
203- <<<<<<< ours
204- <sup ><a href =' /src/Tests/Tests.cs#L569-L599 ' title =' Snippet source file ' >snippet source</a > | <a href =' #snippet-RecordingSpecific ' title =' Start of snippet ' >anchor</a ></sup >
205- =======
206- <sup ><a href =' /src/Tests/Tests.cs#L329-L359 ' title =' Snippet source file ' >snippet source</a > | <a href =' #snippet-RecordingSpecific ' title =' Start of snippet ' >anchor</a ></sup >
207- >>>>>>> theirs
187+ <sup ><a href =' /src/Tests/Tests.cs#L571-L601 ' title =' Snippet source file ' >snippet source</a > | <a href =' #snippet-RecordingSpecific ' title =' Start of snippet ' >anchor</a ></sup >
208188<!-- endSnippet -->
209189
210190
@@ -232,11 +212,7 @@ var sqlErrorsViaType = entries
232212 .Select (_ => _ .Data )
233213 .OfType <ErrorEntry >();
234214```
235- <<<<<<< ours
236- <sup ><a href =' /src/Tests/Tests.cs#L625-L644 ' title =' Snippet source file ' >snippet source</a > | <a href =' #snippet-RecordingReadingResults ' title =' Start of snippet ' >anchor</a ></sup >
237- =======
238- <sup ><a href =' /src/Tests/Tests.cs#L385-L404 ' title =' Snippet source file ' >snippet source</a > | <a href =' #snippet-RecordingReadingResults ' title =' Start of snippet ' >anchor</a ></sup >
239- >>>>>>> theirs
215+ <sup ><a href =' /src/Tests/Tests.cs#L627-L646 ' title =' Snippet source file ' >snippet source</a > | <a href =' #snippet-RecordingReadingResults ' title =' Start of snippet ' >anchor</a ></sup >
240216<!-- endSnippet -->
241217
242218
0 commit comments