Skip to content

Commit a6be1d7

Browse files
ThatRendleThatRendle
committed
0.9.5.1
1 parent 152a74e commit a6be1d7

8 files changed

Lines changed: 52 additions & 14 deletions

File tree

‎CommonAssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919
// COM, set the ComVisible attribute to true on that type.
2020
[assembly: ComVisible(false)]
2121

22-
[assembly: AssemblyVersion("0.9.4.1")]
23-
[assembly: AssemblyFileVersion("0.9.4.1")]
22+
[assembly: AssemblyVersion("0.9.5.1")]
23+
[assembly: AssemblyFileVersion("0.9.5.1")]
2424

‎Simple.Data.Ado/Simple.Data.Ado.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>Simple.Data.Ado</id>
5-
<version>0.9.4.1</version>
5+
<version>0.9.5.1</version>
66
<authors>Mark Rendle</authors>
77
<owners>Mark Rendle</owners>
88
<description>ADO Adapter for the Simple.Data data access library.</description>
@@ -12,7 +12,7 @@
1212
<tags>sqlserver database data ado .net40</tags>
1313
<language>en-us</language>
1414
<dependencies>
15-
<dependency id="Simple.Data.Core" version="0.9.4.1" />
15+
<dependency id="Simple.Data.Core" version="0.9.5.1" />
1616
</dependencies>
1717
</metadata>
1818
</package>

‎Simple.Data.BehaviourTest/Query/ExplicitJoinTest.cs‎

Lines changed: 41 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.Diagnostics;
34
using System.Linq;
45
using System.Text;
56

@@ -14,14 +15,25 @@ public class ExplicitJoinTest : DatabaseIntegrationContext
1415
protected override void SetSchema(MockSchemaProvider schemaProvider)
1516
{
1617
schemaProvider.SetTables(new[] { "dbo", "Employee", "BASE TABLE" },
17-
new[] { "dbo", "Department", "BASE TABLE" });
18+
new[] { "dbo", "Department", "BASE TABLE" },
19+
new[] { "dbo", "Activity", "BASE TABLE"},
20+
new[] { "dbo", "Activity_Join", "BASE TABLE" },
21+
new[] { "dbo", "Location", "BASE_TABLE"});
1822

1923
schemaProvider.SetColumns(new[] { "dbo", "Employee", "Id" },
2024
new[] { "dbo", "Employee", "Name" },
2125
new[] { "dbo", "Employee", "ManagerId" },
2226
new[] { "dbo", "Employee", "DepartmentId" },
2327
new[] { "dbo", "Department", "Id" },
24-
new[] { "dbo", "Department", "Name" });
28+
new[] { "dbo", "Department", "Name" },
29+
new[] { "dbo", "Activity", "ID_Activity"},
30+
new[] { "dbo", "Activity", "ID_Trip" },
31+
new[] { "dbo", "Activity", "Activity_Time" },
32+
new[] { "dbo", "Activity", "Is_Public" },
33+
new[] { "dbo", "Activity_Join", "ID_Activity" },
34+
new[] { "dbo", "Activity_Join", "ID_Location"},
35+
new[] { "dbo", "Location", "ID_Location"}
36+
);
2537
}
2638

2739
[Test]
@@ -139,5 +151,32 @@ public void SelfJoinWithExplicitClauseUsingExpressionAndOutParameter()
139151
GeneratedSqlIs("select [dbo].[employee].[name],[manager].[name] as [Manager] from [dbo].[employee]" +
140152
" join [dbo].[employee] [manager] on ([manager].[id] = [dbo].[employee].[managerid])");
141153
}
154+
155+
[Test]
156+
public void TwoJoins()
157+
{
158+
_db.Activity.Query()
159+
.Join(_db.Activity_Join).On(_db.Activity.ID_Activity == _db.Activity_Join.ID_Activity)
160+
.Join(_db.Location).On(_db.Activity_Join.ID_Location == _db.Location.ID_Location)
161+
.Where(_db.Activity.ID_trip == 1 &&
162+
_db.Activity.Activity_Time == 'D' &&
163+
_db.Activity.Is_Public == true)
164+
.Select(
165+
_db.Activity.ID_Activity
166+
, _db.Activity.ID_Trip
167+
, _db.Activity.Activity_Time
168+
, _db.Activity.Is_Public)
169+
.ToList<Activity>();
170+
171+
GeneratedSqlIs("select [dbo].[Activity].[ID_Activity],[dbo].[Activity].[ID_Trip],[dbo].[Activity].[Activity_Time],[dbo].[Activity].[Is_Public] " +
172+
"from [dbo].[Activity] JOIN [dbo].[Activity_Join] ON ([dbo].[Activity].[ID_Activity] = [dbo].[Activity_Join].[ID_Activity]) " +
173+
"JOIN [dbo].[Location] ON ([dbo].[Activity_Join].[ID_Location] = [dbo].[Location].[ID_Location]) " +
174+
"WHERE (([dbo].[Activity].[ID_Trip] = @p1 AND [dbo].[Activity].[Activity_Time] = @p2) AND [dbo].[Activity].[Is_Public] = @p3)");
175+
}
176+
177+
class Activity
178+
{
179+
public int ID_Activity { get; set; }
180+
}
142181
}
143182
}

‎Simple.Data.Mocking/Simple.Data.Mocking.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
33
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
44
<id>Simple.Data.Mocking</id>
5-
<version>0.9.4.1</version>
5+
<version>0.9.5.1</version>
66
<authors>Mark Rendle</authors>
77
<owners>Mark Rendle</owners>
88
<description>XML-based Mocking adapter for the Simple.Data data access library.</description>
@@ -12,7 +12,7 @@
1212
<tags>database data .net40</tags>
1313
<language>en-us</language>
1414
<dependencies>
15-
<dependency id="Simple.Data.Ado" version="0.9.4.1" />
15+
<dependency id="Simple.Data.Ado" version="0.9.5.1" />
1616
</dependencies>
1717
</metadata>
1818
</package>

‎Simple.Data.SqlCe40/Simple.Data.SqlCe40.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
33
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
44
<id>Simple.Data.SqlCompact40</id>
5-
<version>0.9.4.1</version>
5+
<version>0.9.5.1</version>
66
<authors>Mark Rendle</authors>
77
<owners>Mark Rendle</owners>
88
<description>SQL Server Compact 4.0 ADO provider for the Simple.Data data access library.</description>
@@ -12,7 +12,7 @@
1212
<tags>sqlserver compact sqlce database data ado .net40</tags>
1313
<language>en-us</language>
1414
<dependencies>
15-
<dependency id="Simple.Data.Ado" version="0.9.4.1" />
15+
<dependency id="Simple.Data.Ado" version="0.9.5.1" />
1616
</dependencies>
1717
</metadata>
1818
</package>

‎Simple.Data.SqlServer/Simple.Data.SqlServer.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
33
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
44
<id>Simple.Data.SqlServer</id>
5-
<version>0.9.4.1</version>
5+
<version>0.9.5.1</version>
66
<authors>Mark Rendle</authors>
77
<owners>Mark Rendle</owners>
88
<description>SQL Server ADO provider for the Simple.Data data access library.</description>
@@ -12,7 +12,7 @@
1212
<tags>sqlserver database data ado .net40</tags>
1313
<language>en-us</language>
1414
<dependencies>
15-
<dependency id="Simple.Data.Ado" version="0.9.4.1" />
15+
<dependency id="Simple.Data.Ado" version="0.9.5.1" />
1616
</dependencies>
1717
</metadata>
1818
</package>

‎Simple.Data.sln‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Simple.Data", "Simple.Data\
55
EndProject
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{10F43335-5672-4BDA-91BB-5311C2BFA409}"
77
ProjectSection(SolutionItems) = preProject
8-
CommonAssemblyInfo.cs = CommonAssemblyInfo.cs
98
README.md = README.md
109
EndProjectSection
1110
EndProject

‎Simple.Data/Simple.Data.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>Simple.Data.Core</id>
5-
<version>0.9.4.1</version>
5+
<version>0.9.5.1</version>
66
<authors>Mark Rendle</authors>
77
<owners>Mark Rendle</owners>
88
<licenseUrl>http://www.opensource.org/licenses/mit-license.php</licenseUrl>

0 commit comments

Comments
 (0)