This commit is contained in:
28810
2020-04-07 18:09:29 +08:00
parent c1882cd768
commit 0f3bad338f
27 changed files with 52 additions and 52 deletions

View File

@ -78,8 +78,8 @@ namespace FreeSql.Tests.MySqlConnectorExpression
public void Array()
{
int[] nullarr = null;
Assert.Throws<MySqlException>(() => { select.Where(a => nullarr.Contains(a.testFieldInt)).ToList(); });
Assert.Throws<MySqlException>(() => { select.Where(a => new int[0].Contains(a.testFieldInt)).ToList(); });
Assert.Throws<Exception>(() => { select.Where(a => nullarr.Contains(a.testFieldInt)).ToList(); });
Assert.Throws<Exception>(() => { select.Where(a => new int[0].Contains(a.testFieldInt)).ToList(); });
IEnumerable<int> testlinqlist = new List<int>(new[] { 1, 2, 3 });
var testlinq = select.Where(a => testlinqlist.Contains(a.testFieldInt)).ToList();

View File

@ -53,7 +53,7 @@ namespace FreeSql.Tests.Odbc.MySql
[Fact]
public void QueryMultipline()
{
Assert.Throws<OdbcException>(() => g.mysql.Ado.Query<xxx, (int, string, string), dynamic>("select * from song; select * from song; select * from song"));
Assert.Throws<Exception>(() => g.mysql.Ado.Query<xxx, (int, string, string), dynamic>("select * from song; select * from song; select * from song"));
}
class xxx

View File

@ -78,8 +78,8 @@ namespace FreeSql.Tests.Odbc.MySqlExpression
public void Array()
{
int[] nullarr = null;
Assert.Throws<OdbcException>(() => { select.Where(a => nullarr.Contains(a.testFieldInt)).ToList(); });
Assert.Throws<OdbcException>(() => { select.Where(a => new int[0].Contains(a.testFieldInt)).ToList(); });
Assert.Throws<Exception>(() => { select.Where(a => nullarr.Contains(a.testFieldInt)).ToList(); });
Assert.Throws<Exception>(() => { select.Where(a => new int[0].Contains(a.testFieldInt)).ToList(); });
IEnumerable<int> testlinqlist = new List<int>(new[] { 1, 2, 3 });
var testlinq = select.Where(a => testlinqlist.Contains(a.testFieldInt)).ToList();

View File

@ -16,7 +16,7 @@ namespace FreeSql.Tests.DataAnnotations
[Fact]
public void DisableSyncStructure()
{
Assert.Throws<MySqlException>(() => g.mysql.Select<ModelDisableSyncStructure>().ToList());
Assert.Throws<Exception>(() => g.mysql.Select<ModelDisableSyncStructure>().ToList());
g.mysql.Select<ModelSyncStructure>().ToList();
}

View File

@ -20,7 +20,7 @@ namespace FreeSql.Tests.DataAnnotations
[Fact]
public void DisableSyncStructure()
{
Assert.Throws<SqlException>(() => g.sqlserver.Select<ModelDisableSyncStructure>().ToList());
Assert.Throws<Exception>(() => g.sqlserver.Select<ModelDisableSyncStructure>().ToList());
g.sqlserver.Select<ModelSyncStructure>().ToList();
}

View File

@ -78,8 +78,8 @@ namespace FreeSql.Tests.MySqlExpression
public void Array()
{
int[] nullarr = null;
Assert.Throws<MySqlException>(() => { select.Where(a => nullarr.Contains(a.testFieldInt)).ToList(); });
Assert.Throws<MySqlException>(() => { select.Where(a => new int[0].Contains(a.testFieldInt)).ToList(); });
Assert.Throws<Exception>(() => { select.Where(a => nullarr.Contains(a.testFieldInt)).ToList(); });
Assert.Throws<Exception>(() => { select.Where(a => new int[0].Contains(a.testFieldInt)).ToList(); });
IEnumerable<int> testlinqlist = new List<int>(new[] { 1, 2, 3 });
var testlinq = select.Where(a => testlinqlist.Contains(a.testFieldInt)).ToList();

View File

@ -793,7 +793,7 @@ namespace FreeSql.Tests.Oracle
[Fact]
public void ToAggregate()
{
var sql = select.ToAggregate(a => new { sum = a.Sum(a.Key.Id + 11.11), avg = a.Avg(a.Key.Id), count = a.Count(), max = a.Max(a.Key.Id), min = a.Min(a.Key.Id) });
var sql = select.ToAggregate(a => new { sum = a.Sum(a.Key.Id + 11.11), count = a.Count(), max = a.Max(a.Key.Id), min = a.Min(a.Key.Id) });
}
[Fact]
public void OrderBy()
@ -997,7 +997,7 @@ WHERE (((to_char(a.""ID"")) in (SELECT b.""TITLE""
select.AsTable((_, old) => old).AsTable((_, old) => old).Max(a => a.Id);
select.AsTable((_, old) => old).AsTable((_, old) => old).Min(a => a.Id);
select.AsTable((_, old) => old).AsTable((_, old) => old).Sum(a => a.Id);
select.AsTable((_, old) => old).AsTable((_, old) => old).Avg(a => a.Id);
//select.AsTable((_, old) => old).AsTable((_, old) => old).Avg(a => a.Id);
var sqlsss = select
.AsTable((type, old) => type == typeof(Topic) ? $"{old}_1" : null)

View File

@ -24,7 +24,7 @@ namespace FreeSql.Tests.Oracle
//NoneParameter
item1 = new TS_NCLB02 { Data = str1 };
Assert.Throws<OracleException>(() => g.oracle.Insert(item1).NoneParameter().ExecuteAffrows());
Assert.Throws<Exception>(() => g.oracle.Insert(item1).NoneParameter().ExecuteAffrows());
//Oracle.ManagedDataAccess.Client.OracleException:<3A><>ORA-01704: <20>ַ<EFBFBD><D6B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̫<EFBFBD><CCAB><EFBFBD><EFBFBD>
}
class TS_NCLB02
@ -47,7 +47,7 @@ namespace FreeSql.Tests.Oracle
//NoneParameter
item1 = new TS_NCLB01 { Data = str1 };
Assert.Throws<OracleException>(() => g.oracle.Insert(item1).NoneParameter().ExecuteAffrows());
Assert.Throws<Exception>(() => g.oracle.Insert(item1).NoneParameter().ExecuteAffrows());
//Oracle.ManagedDataAccess.Client.OracleException:<3A><>ORA-01704: <20>ַ<EFBFBD><D6B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̫<EFBFBD><CCAB><EFBFBD><EFBFBD>
}
class TS_NCLB01
@ -69,7 +69,7 @@ namespace FreeSql.Tests.Oracle
//NoneParameter
item1 = new TS_CLB01 { Data = str1 };
Assert.Throws<OracleException>(() => g.oracle.Insert(item1).NoneParameter().ExecuteAffrows());
Assert.Throws<Exception>(() => g.oracle.Insert(item1).NoneParameter().ExecuteAffrows());
//Oracle.ManagedDataAccess.Client.OracleException:<3A><>ORA-01704: <20>ַ<EFBFBD><D6B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̫<EFBFBD><CCAB><EFBFBD><EFBFBD>
}
class TS_CLB01
@ -95,7 +95,7 @@ namespace FreeSql.Tests.Oracle
//NoneParameter
item1 = new TS_BLB01 { Data = data1 };
Assert.Throws<OracleException>(() => g.oracle.Insert(item1).NoneParameter().ExecuteAffrows());
Assert.Throws<Exception>(() => g.oracle.Insert(item1).NoneParameter().ExecuteAffrows());
//Oracle.ManagedDataAccess.Client.OracleException:<3A><>ORA-01704: <20>ַ<EFBFBD><D6B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̫<EFBFBD><CCAB><EFBFBD><EFBFBD>
}
class TS_BLB01