Skip to content

Remove CheckComposableSql() override #2035

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yykkibbb wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove CheckComposableSql() override #2035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions src/EFCore.MySql/Query/ExpressionVisitors/Internal/MySqlQuerySqlGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1016,12 +1016,5 @@ protected virtual void GenerateJsonPath(IReadOnlyList<PathSegment> path, bool? n
Sql.Append(")");
}
}

/// <inheritdoc />
protected override void CheckComposableSql(string sql)
{
// MySQL supports CTE (WITH) expressions within subqueries, as well as others,
// so we allow any raw SQL to be composed over.
}
}
}
197 changes: 0 additions & 197 deletions test/EFCore.MySql.FunctionalTests/Query/FromSqlSprocQueryMySqlTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
using System.Linq;
using System.Threading.Tasks;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Query;
using Microsoft.EntityFrameworkCore.TestModels.Northwind;
using Microsoft.EntityFrameworkCore.TestUtilities;
using MySqlConnector;
using Xunit;
using Xunit.Abstractions;

namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query
Expand All @@ -21,196 +15,5 @@ public FromSqlSprocQueryMySqlTest(

protected override string TenMostExpensiveProductsSproc => "CALL `Ten Most Expensive Products`()";
protected override string CustomerOrderHistorySproc => "CALL `CustOrderHist`({0})";

private string NormalizeDelimitersInRawString(string sql)
=> Fixture.TestStore.NormalizeDelimitersInRawString(sql);

public override async Task From_sql_queryable_stored_procedure_projection(bool async)
{
using var context = CreateContext();
var query = context
.Set<MostExpensiveProduct>()
.FromSqlRaw(TenMostExpensiveProductsSproc, GetTenMostExpensiveProductsParameters())
.Select(mep => mep.TenMostExpensiveProducts);

if (async)
{
await Assert.ThrowsAsync<MySqlException>(() => query.ToArrayAsync());
}
else
{
Assert.Throws<MySqlException>(() => query.ToArray());
}
}

public override async Task From_sql_queryable_stored_procedure_re_projection(bool async)
{
using var context = CreateContext();
var query = context
.Set<MostExpensiveProduct>()
.FromSqlRaw(TenMostExpensiveProductsSproc, GetTenMostExpensiveProductsParameters())
.Select(
mep =>
new MostExpensiveProduct { TenMostExpensiveProducts = "Foo", UnitPrice = mep.UnitPrice });

if (async)
{
await Assert.ThrowsAsync<MySqlException>(() => query.ToArrayAsync());
}
else
{
Assert.Throws<MySqlException>(() => query.ToArray());
}
}

public override async Task From_sql_queryable_stored_procedure_composed(bool async)
{
using var context = CreateContext();
var query = context
.Set<MostExpensiveProduct>()
.FromSqlRaw(TenMostExpensiveProductsSproc, GetTenMostExpensiveProductsParameters())
.Where(mep => mep.TenMostExpensiveProducts.Contains("C"))
.OrderBy(mep => mep.UnitPrice);

if (async)
{
await Assert.ThrowsAsync<MySqlException>(() => query.ToArrayAsync());
}
else
{
Assert.Throws<MySqlException>(() => query.ToArray());
}
}

public override async Task From_sql_queryable_stored_procedure_with_parameter_composed(bool async)
{
using var context = CreateContext();

var query = context
.Set<CustomerOrderHistory>()
.FromSqlRaw(CustomerOrderHistorySproc, GetCustomerOrderHistorySprocParameters())
.Where(coh => coh.ProductName.Contains("C"))
.OrderBy(coh => coh.Total);

if (async)
{
await Assert.ThrowsAsync<MySqlException>(() => query.ToArrayAsync());
}
else
{
Assert.Throws<MySqlException>(() => query.ToArray());
}
}

public override async Task From_sql_queryable_stored_procedure_take(bool async)
{
using var context = CreateContext();
var query = context
.Set<MostExpensiveProduct>()
.FromSqlRaw(TenMostExpensiveProductsSproc, GetTenMostExpensiveProductsParameters())
.OrderByDescending(mep => mep.UnitPrice)
.Take(2);

if (async)
{
await Assert.ThrowsAsync<MySqlException>(() => query.ToArrayAsync());
}
else
{
Assert.Throws<MySqlException>(() => query.ToArray());
}
}

public override async Task From_sql_queryable_stored_procedure_min(bool async)
{
using var context = CreateContext();
var query = context.Set<MostExpensiveProduct>()
.FromSqlRaw(TenMostExpensiveProductsSproc, GetTenMostExpensiveProductsParameters());

if (async)
{
await Assert.ThrowsAsync<MySqlException>(() => query.MinAsync(mep => mep.UnitPrice));
}
else
{
Assert.Throws<MySqlException>(() => query.Min(mep => mep.UnitPrice));
}
}

public override async Task From_sql_queryable_stored_procedure_with_include_throws(bool async)
{
using var context = CreateContext();
var query = context.Set<Product>()
.FromSqlRaw("SelectStoredProcedure")
.Include(p => p.OrderDetails);

if (async)
{
await Assert.ThrowsAsync<MySqlException>(() => query.ToArrayAsync());
}
else
{
Assert.Throws<MySqlException>(() => query.ToArray());
}
}

public override async Task From_sql_queryable_with_multiple_stored_procedures(bool async)
{
using var context = CreateContext();
var query = from a in context.Set<MostExpensiveProduct>()
.FromSqlRaw(TenMostExpensiveProductsSproc, GetTenMostExpensiveProductsParameters())
from b in context.Set<MostExpensiveProduct>()
.FromSqlRaw(TenMostExpensiveProductsSproc, GetTenMostExpensiveProductsParameters())
where a.TenMostExpensiveProducts == b.TenMostExpensiveProducts
select new { a, b };

if (async)
{
await Assert.ThrowsAsync<MySqlException>(() => query.ToArrayAsync());
}
else
{
Assert.Throws<MySqlException>(() => query.ToArray());
}
}

public override async Task From_sql_queryable_stored_procedure_and_select(bool async)
{
using var context = CreateContext();
var query = from mep in context.Set<MostExpensiveProduct>()
.FromSqlRaw(TenMostExpensiveProductsSproc, GetTenMostExpensiveProductsParameters())
from p in context.Set<Product>()
.FromSqlRaw(NormalizeDelimitersInRawString("SELECT * FROM [Products]"))
where mep.TenMostExpensiveProducts == p.ProductName
select new { mep, p };

if (async)
{
await Assert.ThrowsAsync<MySqlException>(() => query.ToArrayAsync());
}
else
{
Assert.Throws<MySqlException>(() => query.ToArray());
}
}

public override async Task From_sql_queryable_select_and_stored_procedure(bool async)
{
using var context = CreateContext();
var query = from p in context.Set<Product>().FromSqlRaw(NormalizeDelimitersInRawString("SELECT * FROM [Products]"))
from mep in context.Set<MostExpensiveProduct>()
.FromSqlRaw(TenMostExpensiveProductsSproc, GetTenMostExpensiveProductsParameters())
where mep.TenMostExpensiveProducts == p.ProductName
select new { mep, p };

if (async)
{
await Assert.ThrowsAsync<MySqlException>(() => query.ToArrayAsync());
}
else
{
Assert.Throws<MySqlException>(() => query.ToArray());
}
}
}
}