Skip to content

Commit cef8109

Browse files
ChrisJollyAUChrisJollyAU
committed
Fix failed merge
1 parent 0018d44 commit cef8109

10 files changed

Lines changed: 98 additions & 325 deletions

‎src/EFCore.Jet.Data/JetConfiguration.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ public static object IntegerNullValue
3333
}
3434
}
3535

36-
public static DataAccessProviderType DefaultDataAccessProviderType { get; set; } = DataAccessProviderType.Odbc;
37-
36+
public static DataAccessProviderType DefaultDataAccessProviderType { get; set; } = DataAccessProviderType.Odbc;
37+
3838
// The SQL statement
3939
//
4040
// (SELECT COUNT(*) FROM MSysRelationships)

‎test/EFCore.Jet.FunctionalTests/Query/NorthwindAggregateOperatorsQueryJetTest.ResultOperators.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ public override async Task Average_with_division_on_decimal_no_significant_digit
202202
await base.Average_with_division_on_decimal_no_significant_digits(isAsync);
203203

204204
AssertSql(
205-
$@"SELECT AVG(CCUR(`o`.`Quantity`) / 2.0)
205+
$@"SELECT AVG(IIF(`o`.`Quantity` IS NULL, NULL, CCUR(`o`.`Quantity`)) / 2.0)
206206
FROM `Order Details` AS `o`");
207207
}
208208

‎test/EFCore.Jet.FunctionalTests/Query/NorthwindFunctionsQueryJetTest.Functions.cs‎

Lines changed: 4 additions & 235 deletions
Original file line numberDiff line numberDiff line change
@@ -764,7 +764,7 @@ public override async Task Where_math_abs2(bool isAsync)
764764
await base.Where_math_abs2(isAsync);
765765

766766
AssertSql(
767-
@"SELECT `o`.`OrderID`, `o`.`ProductID`, `o`.`Discount`, `o`.`Quantity`, `o`.`UnitPrice`
767+
$@"SELECT `o`.`OrderID`, `o`.`ProductID`, `o`.`Discount`, `o`.`Quantity`, `o`.`UnitPrice`
768768
FROM `Order Details` AS `o`
769769
WHERE `o`.`UnitPrice` < 7.0 AND ABS(`o`.`Quantity`) > 10");
770770
}
@@ -774,7 +774,7 @@ public override async Task Where_math_abs3(bool isAsync)
774774
await base.Where_math_abs3(isAsync);
775775

776776
AssertSql(
777-
@"SELECT `o`.`OrderID`, `o`.`ProductID`, `o`.`Discount`, `o`.`Quantity`, `o`.`UnitPrice`
777+
$@"SELECT `o`.`OrderID`, `o`.`ProductID`, `o`.`Discount`, `o`.`Quantity`, `o`.`UnitPrice`
778778
FROM `Order Details` AS `o`
779779
WHERE `o`.`Quantity` < 5 AND ABS(`o`.`UnitPrice`) > 10.0");
780780
}
@@ -1006,7 +1006,7 @@ public override async Task Where_math_acos(bool isAsync)
10061006
await base.Where_math_acos(isAsync);
10071007

10081008
AssertSql(
1009-
@"SELECT `o`.`OrderID`, `o`.`ProductID`, `o`.`Discount`, `o`.`Quantity`, `o`.`UnitPrice`
1009+
$@"SELECT `o`.`OrderID`, `o`.`ProductID`, `o`.`Discount`, `o`.`Quantity`, `o`.`UnitPrice`
10101010
FROM `Order Details` AS `o`
10111011
WHERE `o`.`OrderID` = 11077 AND (1.5707963267948966 + ATN(-CDBL(`o`.`Discount`) / SQR(-(CDBL(`o`.`Discount`) * CDBL(`o`.`Discount`)) + 1.0))) > 1.0");
10121012
}
@@ -1016,7 +1016,7 @@ public override async Task Where_math_asin(bool isAsync)
10161016
await base.Where_math_asin(isAsync);
10171017

10181018
AssertSql(
1019-
@"SELECT `o`.`OrderID`, `o`.`ProductID`, `o`.`Discount`, `o`.`Quantity`, `o`.`UnitPrice`
1019+
$@"SELECT `o`.`OrderID`, `o`.`ProductID`, `o`.`Discount`, `o`.`Quantity`, `o`.`UnitPrice`
10201020
FROM `Order Details` AS `o`
10211021
WHERE `o`.`OrderID` = 11077 AND ATN(CDBL(`o`.`Discount`) / SQR(-(CDBL(`o`.`Discount`) * CDBL(`o`.`Discount`)) + 1.0)) > 0.0");
10221022
}
@@ -1373,237 +1373,6 @@ public override async Task Where_mathf_sign(bool async)
13731373
""");
13741374
}
13751375

1376-
public override async Task Where_mathf_abs1(bool async)
1377-
{
1378-
await base.Where_mathf_abs1(async);
1379-
1380-
AssertSql(
1381-
@"SELECT `p`.`ProductID`, `p`.`Discontinued`, `p`.`ProductName`, `p`.`SupplierID`, `p`.`UnitPrice`, `p`.`UnitsInStock`
1382-
FROM `Products` AS `p`
1383-
WHERE ABS(CSNG(`p`.`ProductID`)) > 10");
1384-
}
1385-
1386-
public override async Task Where_mathf_ceiling1(bool async)
1387-
{
1388-
await base.Where_mathf_ceiling1(async);
1389-
1390-
AssertSql(
1391-
@"SELECT `o`.`OrderID`, `o`.`ProductID`, `o`.`Discount`, `o`.`Quantity`, `o`.`UnitPrice`
1392-
FROM `Order Details` AS `o`
1393-
WHERE `o`.`UnitPrice` < 7.0 AND CEILING(`o`.`Discount`) > CAST(0 AS real)");
1394-
}
1395-
1396-
public override async Task Where_mathf_floor(bool async)
1397-
{
1398-
await base.Where_mathf_floor(async);
1399-
1400-
AssertSql(
1401-
@"SELECT `o`.`OrderID`, `o`.`ProductID`, `o`.`Discount`, `o`.`Quantity`, `o`.`UnitPrice`
1402-
FROM `Order Details` AS `o`
1403-
WHERE `o`.`Quantity` < CAST(5 AS smallint) AND FLOOR(CAST(`o`.`UnitPrice` AS real)) > CAST(10 AS real)");
1404-
}
1405-
1406-
public override async Task Where_mathf_power(bool async)
1407-
{
1408-
await base.Where_mathf_power(async);
1409-
1410-
AssertSql(
1411-
@"SELECT `o`.`OrderID`, `o`.`ProductID`, `o`.`Discount`, `o`.`Quantity`, `o`.`UnitPrice`
1412-
FROM `Order Details` AS `o`
1413-
WHERE `o`.`Discount`^3 > 0.005");
1414-
}
1415-
1416-
public override async Task Where_mathf_square(bool async)
1417-
{
1418-
await base.Where_mathf_square(async);
1419-
1420-
AssertSql(
1421-
@"SELECT `o`.`OrderID`, `o`.`ProductID`, `o`.`Discount`, `o`.`Quantity`, `o`.`UnitPrice`
1422-
FROM `Order Details` AS `o`
1423-
WHERE `o`.`Discount`^2 > 0.05");
1424-
}
1425-
1426-
public override async Task Where_mathf_round2(bool async)
1427-
{
1428-
await base.Where_mathf_round2(async);
1429-
1430-
AssertSql(
1431-
@"SELECT `o`.`OrderID`, `o`.`ProductID`, `o`.`Discount`, `o`.`Quantity`, `o`.`UnitPrice`
1432-
FROM `Order Details` AS `o`
1433-
WHERE CSNG(ROUND(CSNG(`o`.`UnitPrice`), 2)) > 100");
1434-
}
1435-
1436-
public override async Task Select_mathf_round(bool async)
1437-
{
1438-
await base.Select_mathf_round(async);
1439-
1440-
AssertSql(
1441-
@"SELECT CSNG(ROUND(CSNG(`o`.`OrderID`), 0))
1442-
FROM `Orders` AS `o`
1443-
WHERE `o`.`OrderID` < 10250");
1444-
}
1445-
1446-
public override async Task Select_mathf_round2(bool async)
1447-
{
1448-
await base.Select_mathf_round2(async);
1449-
1450-
AssertSql(
1451-
@"SELECT CSNG(ROUND(CSNG(`o`.`UnitPrice`), 2))
1452-
FROM `Order Details` AS `o`
1453-
WHERE `o`.`Quantity` < 5");
1454-
}
1455-
1456-
public override async Task Where_mathf_truncate(bool async)
1457-
{
1458-
await base.Where_mathf_truncate(async);
1459-
1460-
AssertSql(
1461-
@"SELECT `o`.`OrderID`, `o`.`ProductID`, `o`.`Discount`, `o`.`Quantity`, `o`.`UnitPrice`
1462-
FROM `Order Details` AS `o`
1463-
WHERE (`o`.`Quantity` < 5) AND (CSNG(INT(CSNG(`o`.`UnitPrice`))) > 10)");
1464-
}
1465-
1466-
public override async Task Select_mathf_truncate(bool async)
1467-
{
1468-
await base.Select_mathf_truncate(async);
1469-
1470-
AssertSql(
1471-
@"SELECT CSNG(INT(CSNG(`o`.`UnitPrice`)))
1472-
FROM `Order Details` AS `o`
1473-
WHERE `o`.`Quantity` < 5");
1474-
}
1475-
1476-
public override async Task Where_mathf_exp(bool async)
1477-
{
1478-
await base.Where_mathf_exp(async);
1479-
1480-
AssertSql(
1481-
@"SELECT `o`.`OrderID`, `o`.`ProductID`, `o`.`Discount`, `o`.`Quantity`, `o`.`UnitPrice`
1482-
FROM `Order Details` AS `o`
1483-
WHERE (`o`.`OrderID` = 11077) AND (EXP(`o`.`Discount`) > 1)");
1484-
}
1485-
1486-
public override async Task Where_mathf_log10(bool async)
1487-
{
1488-
await base.Where_mathf_log10(async);
1489-
1490-
AssertSql(
1491-
@"SELECT `o`.`OrderID`, `o`.`ProductID`, `o`.`Discount`, `o`.`Quantity`, `o`.`UnitPrice`
1492-
FROM `Order Details` AS `o`
1493-
WHERE ((`o`.`OrderID` = 11077) AND (`o`.`Discount` > 0)) AND ((LOG(`o`.`Discount`) / 2.3025851) < 0)");
1494-
}
1495-
1496-
public override async Task Where_mathf_log(bool async)
1497-
{
1498-
await base.Where_mathf_log(async);
1499-
1500-
AssertSql(
1501-
@"SELECT `o`.`OrderID`, `o`.`ProductID`, `o`.`Discount`, `o`.`Quantity`, `o`.`UnitPrice`
1502-
FROM `Order Details` AS `o`
1503-
WHERE ((`o`.`OrderID` = 11077) AND (`o`.`Discount` > 0)) AND (LOG(`o`.`Discount`) < 0)");
1504-
}
1505-
1506-
public override async Task Where_mathf_log_new_base(bool async)
1507-
{
1508-
await base.Where_mathf_log_new_base(async);
1509-
1510-
AssertSql(
1511-
@"SELECT `o`.`OrderID`, `o`.`ProductID`, `o`.`Discount`, `o`.`Quantity`, `o`.`UnitPrice`
1512-
FROM `Order Details` AS `o`
1513-
WHERE ((`o`.`OrderID` = 11077) AND (`o`.`Discount` > 0)) AND ((LOG(`o`.`Discount`) / LOG(7)) < 0)");
1514-
}
1515-
1516-
public override async Task Where_mathf_sqrt(bool async)
1517-
{
1518-
await base.Where_mathf_sqrt(async);
1519-
1520-
AssertSql(
1521-
@"SELECT `o`.`OrderID`, `o`.`ProductID`, `o`.`Discount`, `o`.`Quantity`, `o`.`UnitPrice`
1522-
FROM `Order Details` AS `o`
1523-
WHERE (`o`.`OrderID` = 11077) AND (SQR(`o`.`Discount`) > 0)");
1524-
}
1525-
1526-
public override async Task Where_mathf_acos(bool async)
1527-
{
1528-
await base.Where_mathf_acos(async);
1529-
1530-
AssertSql(
1531-
@"SELECT `o`.`OrderID`, `o`.`ProductID`, `o`.`Discount`, `o`.`Quantity`, `o`.`UnitPrice`
1532-
FROM `Order Details` AS `o`
1533-
WHERE (`o`.`OrderID` = 11077) AND ((1.5707963267948966 + ATN(-`o`.`Discount` / SQR(-(`o`.`Discount` * `o`.`Discount`) + 1))) > 1.0)");
1534-
1535-
}
1536-
1537-
public override async Task Where_mathf_asin(bool async)
1538-
{
1539-
await base.Where_mathf_asin(async);
1540-
1541-
AssertSql(
1542-
@"SELECT `o`.`OrderID`, `o`.`ProductID`, `o`.`Discount`, `o`.`Quantity`, `o`.`UnitPrice`
1543-
FROM `Order Details` AS `o`
1544-
WHERE (`o`.`OrderID` = 11077) AND (ATN(`o`.`Discount` / SQR(-(`o`.`Discount` * `o`.`Discount`) + 1)) > 0)");
1545-
}
1546-
1547-
public override async Task Where_mathf_atan(bool async)
1548-
{
1549-
await base.Where_mathf_atan(async);
1550-
1551-
AssertSql(
1552-
@"SELECT `o`.`OrderID`, `o`.`ProductID`, `o`.`Discount`, `o`.`Quantity`, `o`.`UnitPrice`
1553-
FROM `Order Details` AS `o`
1554-
WHERE (`o`.`OrderID` = 11077) AND (ATN(`o`.`Discount`) > 0)");
1555-
}
1556-
1557-
public override async Task Where_mathf_atan2(bool async)
1558-
{
1559-
await base.Where_mathf_atan2(async);
1560-
1561-
AssertSql(
1562-
@"SELECT `o`.`OrderID`, `o`.`ProductID`, `o`.`Discount`, `o`.`Quantity`, `o`.`UnitPrice`
1563-
FROM `Order Details` AS `o`
1564-
WHERE (`o`.`OrderID` = 11077) AND ATN2(`o`.`Discount`, CAST(1 AS real)) > CAST(0 AS real)");
1565-
}
1566-
1567-
public override async Task Where_mathf_cos(bool async)
1568-
{
1569-
await base.Where_mathf_cos(async);
1570-
1571-
AssertSql(
1572-
@"SELECT `o`.`OrderID`, `o`.`ProductID`, `o`.`Discount`, `o`.`Quantity`, `o`.`UnitPrice`
1573-
FROM `Order Details` AS `o`
1574-
WHERE (`o`.`OrderID` = 11077) AND (COS(`o`.`Discount`) > 0)");
1575-
}
1576-
1577-
public override async Task Where_mathf_sin(bool async)
1578-
{
1579-
await base.Where_mathf_sin(async);
1580-
1581-
AssertSql(
1582-
@"SELECT `o`.`OrderID`, `o`.`ProductID`, `o`.`Discount`, `o`.`Quantity`, `o`.`UnitPrice`
1583-
FROM `Order Details` AS `o`
1584-
WHERE (`o`.`OrderID` = 11077) AND (SIN(`o`.`Discount`) > 0)");
1585-
}
1586-
1587-
public override async Task Where_mathf_tan(bool async)
1588-
{
1589-
await base.Where_mathf_tan(async);
1590-
1591-
AssertSql(
1592-
@"SELECT `o`.`OrderID`, `o`.`ProductID`, `o`.`Discount`, `o`.`Quantity`, `o`.`UnitPrice`
1593-
FROM `Order Details` AS `o`
1594-
WHERE (`o`.`OrderID` = 11077) AND (TAN(`o`.`Discount`) > 0)");
1595-
}
1596-
1597-
public override async Task Where_mathf_sign(bool async)
1598-
{
1599-
await base.Where_mathf_sign(async);
1600-
1601-
AssertSql(
1602-
@"SELECT `o`.`OrderID`, `o`.`ProductID`, `o`.`Discount`, `o`.`Quantity`, `o`.`UnitPrice`
1603-
FROM `Order Details` AS `o`
1604-
WHERE (`o`.`OrderID` = 11077) AND (SGN(`o`.`Discount`) > 0)");
1605-
}
1606-
16071376
public override async Task Where_guid_newguid(bool isAsync)
16081377
{
16091378
await base.Where_guid_newguid(isAsync);

‎test/EFCore.Jet.FunctionalTests/Query/NorthwindGroupByQueryJetTest.cs‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -922,12 +922,16 @@ public override async Task OrderBy_Skip_Take_GroupBy_Aggregate(bool isAsync)
922922
await base.OrderBy_Skip_Take_GroupBy_Aggregate(isAsync);
923923

924924
AssertSql(
925-
$@"SELECT MAX(`t`.`OrderID`)
925+
$@"{AssertSqlHelper.Declaration("@__p_0='80'")}
926+
927+
{AssertSqlHelper.Declaration("@__p_1='500'")}
928+
929+
SELECT MAX(`t`.`OrderID`)
926930
FROM (
927931
SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
928932
FROM `Orders` AS `o`
929933
ORDER BY `o`.`OrderID`
930-
SKIP 80 FETCH NEXT 50 ROWS ONLY
934+
SKIP {AssertSqlHelper.Parameter("@__p_0")} FETCH NEXT {AssertSqlHelper.Parameter("@__p_1")} ROWS ONLY
931935
) AS `t`
932936
GROUP BY `t`.`CustomerID`");
933937
}
@@ -1217,7 +1221,7 @@ public override async Task GroupBy_aggregate_Contains(bool isAsync)
12171221
await base.GroupBy_aggregate_Contains(isAsync);
12181222

12191223
AssertSql(
1220-
@"SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
1224+
$@"SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
12211225
FROM `Orders` AS `o`
12221226
WHERE EXISTS (
12231227
SELECT 1
@@ -1358,7 +1362,7 @@ public override async Task Join_GroupBy_Aggregate_single_join(bool isAsync)
13581362
await base.Join_GroupBy_Aggregate_single_join(isAsync);
13591363

13601364
AssertSql(
1361-
$@"SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, `t`.`LastOrderID`
1365+
$@"SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, `t`.`LastOrderID`
13621366
FROM `Customers` AS `c`
13631367
INNER JOIN (
13641368
SELECT `o`.`CustomerID`, MAX(`o`.`OrderID`) AS `LastOrderID`
@@ -1389,7 +1393,7 @@ public override async Task Join_GroupBy_Aggregate_in_subquery(bool isAsync)
13891393
await base.Join_GroupBy_Aggregate_in_subquery(isAsync);
13901394

13911395
AssertSql(
1392-
@"SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`, `t0`.`CustomerID`, `t0`.`Address`, `t0`.`City`, `t0`.`CompanyName`, `t0`.`ContactName`, `t0`.`ContactTitle`, `t0`.`Country`, `t0`.`Fax`, `t0`.`Phone`, `t0`.`PostalCode`, `t0`.`Region`
1396+
$@"SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`, `t0`.`CustomerID`, `t0`.`Address`, `t0`.`City`, `t0`.`CompanyName`, `t0`.`ContactName`, `t0`.`ContactTitle`, `t0`.`Country`, `t0`.`Fax`, `t0`.`Phone`, `t0`.`PostalCode`, `t0`.`Region`
13931397
FROM `Orders` AS `o`
13941398
INNER JOIN (
13951399
SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
@@ -1478,7 +1482,7 @@ THEN True ELSE False
14781482
END
14791483
), `c`.`CustomerID`
14801484
FROM `Customers` AS `c`
1481-
WHERE `c`.`CustomerID` LIKE 'A%'",
1485+
WHERE `c`.`CustomerID` LIKE 'A' & '%'",
14821486
//
14831487
$@"{AssertSqlHelper.Declaration("@_outer_CustomerID='ALFKI' (Size = 5)")}
14841488
@@ -1680,14 +1684,14 @@ public override async Task MinMax_after_GroupBy_aggregate(bool isAsync)
16801684
await base.MinMax_after_GroupBy_aggregate(isAsync);
16811685

16821686
AssertSql(
1683-
@"SELECT MIN(`t`.`c`)
1687+
$@"SELECT MIN(`t`.`c`)
16841688
FROM (
16851689
SELECT IIF(SUM(`o`.`OrderID`) IS NULL, 0, SUM(`o`.`OrderID`)) AS `c`
16861690
FROM `Orders` AS `o`
16871691
GROUP BY `o`.`CustomerID`
16881692
) AS `t`",
16891693
//
1690-
@"SELECT MAX(`t`.`c`)
1694+
$@"SELECT MAX(`t`.`c`)
16911695
FROM (
16921696
SELECT IIF(SUM(`o`.`OrderID`) IS NULL, 0, SUM(`o`.`OrderID`)) AS `c`
16931697
FROM `Orders` AS `o`

0 commit comments

Comments
 (0)