RUSSEK-Software/DynamORM
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix typed builder compatibility after rebase

Browse Source
This commit is contained in:
root
2026-02-26 19:54:37 +01:00
parent 59ce1115ea
commit 3d430b0124
7 changed files with 126 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DynamORM.Tests/Select/TypedFluentBuilderTests.cs
View File

@@ -121,7 +121,7 @@ namespace DynamORM.Tests.Select
public void TestTypedRightJoin()
{
var cmd = Database.FromTyped<TypedFluentUser>("u")
.Join<TypedFluentUser>(j => j.Right().As("X").On((l, r) => l.Id == r.Id))
.Join<TypedFluentUser>(j => j.Right().As("x").On((l, r) => l.Id == r.Id))
.Select(u => u.Id);
Assert.AreEqual("SELECT u.\"id_user\" FROM \"sample_users\" AS u RIGHT JOIN \"sample_users\" AS x ON (u.\"id_user\" = x.\"id_user\")",
@@ -132,7 +132,7 @@ namespace DynamORM.Tests.Select
public void TestTypedFullJoin()
{
var cmd = Database.FromTyped<TypedFluentUser>("u")
.Join<TypedFluentUser>(j => j.Full().As("X").On((l, r) => l.Id == r.Id))
.Join<TypedFluentUser>(j => j.Full().As("x").On((l, r) => l.Id == r.Id))
.Select(u => u.Id);
Assert.AreEqual("SELECT u.\"id_user\" FROM \"sample_users\" AS u FULL JOIN \"sample_users\" AS x ON (u.\"id_user\" = x.\"id_user\")",

14
DynamORM.Tests/Select/TypedFluentJoinSyntaxTests.cs
View File

@@ -33,7 +33,7 @@ namespace DynamORM.Tests.Select
[Test]
public void TestTypedJoinDefaultJoinKeyword()
{
var cmd = Database.From<TypedJoinUser>("usr")
var cmd = Database.FromTyped<TypedJoinUser>("usr")
.Join<TypedJoinUserClient>(j => j.As("uc").On((u, c) => u.IdUser == c.UserId));
Assert.AreEqual("SELECT * FROM \"dbo\".\"Users\" AS usr JOIN \"dbo\".\"UserClients\" AS uc ON (usr.\"Id_User\" = uc.\"User_Id\")", cmd.CommandText());
@@ -42,7 +42,7 @@ namespace DynamORM.Tests.Select
[Test]
public void TestTypedInnerJoinWithAndNull()
{
var cmd = Database.From<TypedJoinUser>("usr")
var cmd = Database.FromTyped<TypedJoinUser>("usr")
.Join<TypedJoinUserClient>(j => j.Inner().As("uc").On((u, c) => u.IdUser == c.UserId && c.Users != null))
.Select(u => u.IdUser);
@@ -52,7 +52,7 @@ namespace DynamORM.Tests.Select
[Test]
public void TestTypedJoinWithNoLock()
{
var cmd = Database.From<TypedJoinUser>("usr", noLock: true)
var cmd = Database.FromTyped<TypedJoinUser>("usr", noLock: true)
.Join<TypedJoinUserClient>(j => j.Inner().As("uc").NoLock().On((u, c) => u.IdUser == c.UserId));
Assert.AreEqual("SELECT * FROM \"dbo\".\"Users\" AS usr WITH(NOLOCK) INNER JOIN \"dbo\".\"UserClients\" AS uc WITH(NOLOCK) ON (usr.\"Id_User\" = uc.\"User_Id\")", cmd.CommandText());
@@ -61,7 +61,7 @@ namespace DynamORM.Tests.Select
[Test]
public void TestTypedLeftOuterJoin()
{
var cmd = Database.From<TypedJoinUser>("usr")
var cmd = Database.FromTyped<TypedJoinUser>("usr")
.Join<TypedJoinUserClient>(j => j.LeftOuter().As("uc").On((u, c) => u.IdUser == c.UserId));
Assert.AreEqual("SELECT * FROM \"dbo\".\"Users\" AS usr LEFT OUTER JOIN \"dbo\".\"UserClients\" AS uc ON (usr.\"Id_User\" = uc.\"User_Id\")", cmd.CommandText());
@@ -70,7 +70,7 @@ namespace DynamORM.Tests.Select
[Test]
public void TestTypedRightOuterJoin()
{
var cmd = Database.From<TypedJoinUser>("usr")
var cmd = Database.FromTyped<TypedJoinUser>("usr")
.Join<TypedJoinUserClient>(j => j.RightOuter().As("uc").On((u, c) => u.IdUser == c.UserId));
Assert.AreEqual("SELECT * FROM \"dbo\".\"Users\" AS usr RIGHT OUTER JOIN \"dbo\".\"UserClients\" AS uc ON (usr.\"Id_User\" = uc.\"User_Id\")", cmd.CommandText());
@@ -79,7 +79,7 @@ namespace DynamORM.Tests.Select
[Test]
public void TestTypedCustomJoinTypeCrossApply()
{
var cmd = Database.From<TypedJoinUser>("usr")
var cmd = Database.FromTyped<TypedJoinUser>("usr")
.Join<TypedJoinUserClient>(j => j.Type("CROSS APPLY").As("uc"));
Assert.AreEqual("SELECT * FROM \"dbo\".\"Users\" AS usr CROSS APPLY \"dbo\".\"UserClients\" AS uc", cmd.CommandText());
@@ -88,7 +88,7 @@ namespace DynamORM.Tests.Select
[Test]
public void TestTypedJoinAndWhereParameterOrder()
{
var cmd = Database.From<TypedJoinUser>("usr")
var cmd = Database.FromTyped<TypedJoinUser>("usr")
.Join<TypedJoinUserClient>(j => j.As("uc").On((u, c) => u.IdUser == c.UserId && c.Deleted == 0))
.Where(u => u.Active == 1);