diff --git a/AmalgamationTool/DynamORM.Amalgamation.cs b/AmalgamationTool/DynamORM.Amalgamation.cs index 767f058..049ade1 100644 --- a/AmalgamationTool/DynamORM.Amalgamation.cs +++ b/AmalgamationTool/DynamORM.Amalgamation.cs @@ -7386,30 +7386,6 @@ namespace DynamORM /// Marker extensions for typed fluent builder expressions. public static class TypedFluentExtensions { - /// Typed select helper that avoids overload resolution with dynamic methods. - public static IDynamicTypedSelectQueryBuilder SelectTyped( - this IDynamicTypedSelectQueryBuilder builder, - System.Linq.Expressions.Expression> selector, - params System.Linq.Expressions.Expression>[] selectors) - { - return builder.Select(selector, selectors); - } - /// Typed group by helper that avoids overload resolution with dynamic methods. - public static IDynamicTypedSelectQueryBuilder GroupByTyped( - this IDynamicTypedSelectQueryBuilder builder, - System.Linq.Expressions.Expression> selector, - params System.Linq.Expressions.Expression>[] selectors) - { - return builder.GroupBy(selector, selectors); - } - /// Typed order by helper that avoids overload resolution with dynamic methods. - public static IDynamicTypedSelectQueryBuilder OrderByTyped( - this IDynamicTypedSelectQueryBuilder builder, - System.Linq.Expressions.Expression> selector, - params System.Linq.Expressions.Expression>[] selectors) - { - return builder.OrderBy(selector, selectors); - } /// Marks select projection alias in typed expressions. public static T As(this T source, string alias) { diff --git a/DynamORM.Tests/Select/TypedFluentBuilderTests.cs b/DynamORM.Tests/Select/TypedFluentBuilderTests.cs index ded6e1f..acbe033 100644 --- a/DynamORM.Tests/Select/TypedFluentBuilderTests.cs +++ b/DynamORM.Tests/Select/TypedFluentBuilderTests.cs @@ -58,8 +58,8 @@ namespace DynamORM.Tests.Select { var cmd = Database.From("u") .Where(u => u.Id == 1) - .SelectTyped(u => u.Code.As("CodeAlias")) - .OrderByTyped(u => u.Code.Desc()); + .Select(u => u.Code.As("CodeAlias")) + .OrderBy(u => u.Code.Desc()); Assert.AreEqual( string.Format("SELECT u.\"user_code\" AS \"CodeAlias\" FROM \"sample_users\" AS u WHERE (u.\"id_user\" = [${0}]) ORDER BY u.\"user_code\" DESC", cmd.Parameters.Keys.First()), @@ -73,7 +73,7 @@ namespace DynamORM.Tests.Select var cmd = Database.From("u") .Where(u => ids.Contains(u.Id)) - .SelectTyped(u => u.Id); + .Select(u => u.Id); Assert.AreEqual( string.Format("SELECT u.\"id_user\" FROM \"sample_users\" AS u WHERE (u.\"id_user\" IN([${0}], [${1}], [${2}]))", @@ -87,10 +87,10 @@ namespace DynamORM.Tests.Select public void TestTypedGroupByHavingOrderBy() { var cmd = Database.From("u") - .SelectTyped(u => u.Code) - .GroupByTyped(u => u.Code) + .Select(u => u.Code) + .GroupBy(u => u.Code) .Having(u => u.Code != null) - .OrderByTyped(u => u.Code.Asc()); + .OrderBy(u => u.Code.Asc()); Assert.AreEqual("SELECT u.\"user_code\" FROM \"sample_users\" AS u GROUP BY u.\"user_code\" HAVING (u.\"user_code\" IS NOT NULL) ORDER BY u.\"user_code\" ASC", cmd.CommandText()); @@ -101,7 +101,7 @@ namespace DynamORM.Tests.Select { var cmd = Database.From("u") .Join((l, r) => l.Id == r.Id, "x") - .SelectTyped(u => u.Id); + .Select(u => u.Id); Assert.AreEqual("SELECT u.\"id_user\" FROM \"sample_users\" AS u INNER JOIN \"sample_users\" AS x ON (u.\"id_user\" = x.\"id_user\")", cmd.CommandText()); @@ -112,7 +112,7 @@ namespace DynamORM.Tests.Select { var cmd = Database.From("u") .LeftJoin((l, r) => l.Id == r.Id, "x") - .SelectTyped(u => u.Id); + .Select(u => u.Id); Assert.AreEqual("SELECT u.\"id_user\" FROM \"sample_users\" AS u LEFT JOIN \"sample_users\" AS x ON (u.\"id_user\" = x.\"id_user\")", cmd.CommandText()); @@ -123,7 +123,7 @@ namespace DynamORM.Tests.Select { var cmd = Database.From("u") .RightJoin((l, r) => l.Id == r.Id, "x") - .SelectTyped(u => u.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\")", cmd.CommandText()); @@ -134,7 +134,7 @@ namespace DynamORM.Tests.Select { var cmd = Database.From("u") .FullJoin((l, r) => l.Id == r.Id, "x") - .SelectTyped(u => u.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\")", cmd.CommandText()); diff --git a/DynamORM/Builders/TypedFluentExtensions.cs b/DynamORM/Builders/TypedFluentExtensions.cs index a79f331..b29d4bb 100644 --- a/DynamORM/Builders/TypedFluentExtensions.cs +++ b/DynamORM/Builders/TypedFluentExtensions.cs @@ -31,33 +31,6 @@ namespace DynamORM.Builders /// Marker extensions for typed fluent builder expressions. public static class TypedFluentExtensions { - /// Typed select helper that avoids overload resolution with dynamic methods. - public static IDynamicTypedSelectQueryBuilder SelectTyped( - this IDynamicTypedSelectQueryBuilder builder, - System.Linq.Expressions.Expression> selector, - params System.Linq.Expressions.Expression>[] selectors) - { - return builder.Select(selector, selectors); - } - - /// Typed group by helper that avoids overload resolution with dynamic methods. - public static IDynamicTypedSelectQueryBuilder GroupByTyped( - this IDynamicTypedSelectQueryBuilder builder, - System.Linq.Expressions.Expression> selector, - params System.Linq.Expressions.Expression>[] selectors) - { - return builder.GroupBy(selector, selectors); - } - - /// Typed order by helper that avoids overload resolution with dynamic methods. - public static IDynamicTypedSelectQueryBuilder OrderByTyped( - this IDynamicTypedSelectQueryBuilder builder, - System.Linq.Expressions.Expression> selector, - params System.Linq.Expressions.Expression>[] selectors) - { - return builder.OrderBy(selector, selectors); - } - /// Marks select projection alias in typed expressions. public static T As(this T source, string alias) {