mirror of
https://github.com/nsnail/FreeSql.git
synced 2025-04-22 02:32:50 +08:00
- 恢复 代码 preview 改动,优化补全 CanUpdate false;#1630
This commit is contained in:
parent
58f261b5e5
commit
94fa653ec9
@ -404,7 +404,7 @@ namespace FreeSql
|
|||||||
|
|
||||||
if (data?.Count > 0)
|
if (data?.Count > 0)
|
||||||
{
|
{
|
||||||
if (cuig.Length >= _table.Columns.Count - _table.Primarys.Length)
|
if (cuig.Length == _table.Columns.Count)
|
||||||
return ups.Length == data.Count ? -998 : -997;
|
return ups.Length == data.Count ? -998 : -997;
|
||||||
|
|
||||||
var update = this.OrmUpdate(data.Select(a => a.Value)).IgnoreColumns(cuig);
|
var update = this.OrmUpdate(data.Select(a => a.Value)).IgnoreColumns(cuig);
|
||||||
|
@ -438,7 +438,7 @@ namespace FreeSql
|
|||||||
|
|
||||||
if (data?.Count > 0)
|
if (data?.Count > 0)
|
||||||
{
|
{
|
||||||
if (cuig.Length >= _table.Columns.Count - _table.Primarys.Length)
|
if (cuig.Length == _table.Columns.Count)
|
||||||
return ups.Length == data.Count ? -998 : -997;
|
return ups.Length == data.Count ? -998 : -997;
|
||||||
|
|
||||||
var update = this.OrmUpdate(data.Select(a => a.Value)).IgnoreColumns(cuig);
|
var update = this.OrmUpdate(data.Select(a => a.Value)).IgnoreColumns(cuig);
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
using FreeSql.DataAnnotations;
|
using FreeSql.DataAnnotations;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
@ -17,83 +17,27 @@ namespace FreeSql.Tests.Sqlite
|
|||||||
fsql.Delete<tbioudb02>().Where("1=1").ExecuteAffrows();
|
fsql.Delete<tbioudb02>().Where("1=1").ExecuteAffrows();
|
||||||
var iou = fsql.InsertOrUpdate<tbioudb02>().IfExistsDoNothing().SetSource(new tbioudb02 { id = 1, name = "01" });
|
var iou = fsql.InsertOrUpdate<tbioudb02>().IfExistsDoNothing().SetSource(new tbioudb02 { id = 1, name = "01" });
|
||||||
var sql = iou.ToSql();
|
var sql = iou.ToSql();
|
||||||
Assert.Equal(@"INSERT INTO ""tbioudb02""(""id"", ""name"") SELECT 1, '01'
|
Assert.Equal(@"INSERT OR IGNORE INTO ""tbioudb02""(""id"", ""name"") VALUES(1, '01')", sql);
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb02"" a
|
|
||||||
WHERE (a.""id"" = 1)
|
|
||||||
limit 0,1)", sql);
|
|
||||||
Assert.Equal(1, iou.ExecuteAffrows());
|
Assert.Equal(1, iou.ExecuteAffrows());
|
||||||
|
|
||||||
iou = fsql.InsertOrUpdate<tbioudb02>().IfExistsDoNothing().SetSource(new tbioudb02 { id = 1, name = "011" });
|
iou = fsql.InsertOrUpdate<tbioudb02>().IfExistsDoNothing().SetSource(new tbioudb02 { id = 1, name = "011" });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"INSERT INTO ""tbioudb02""(""id"", ""name"") SELECT 1, '011'
|
Assert.Equal(@"INSERT OR IGNORE INTO ""tbioudb02""(""id"", ""name"") VALUES(1, '011')", sql);
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb02"" a
|
|
||||||
WHERE (a.""id"" = 1)
|
|
||||||
limit 0,1)", sql);
|
|
||||||
Assert.Equal(0, iou.ExecuteAffrows());
|
Assert.Equal(0, iou.ExecuteAffrows());
|
||||||
|
|
||||||
iou = fsql.InsertOrUpdate<tbioudb02>().IfExistsDoNothing().SetSource(new tbioudb02 { id = 2, name = "02" });
|
iou = fsql.InsertOrUpdate<tbioudb02>().IfExistsDoNothing().SetSource(new tbioudb02 { id = 2, name = "02" });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"INSERT INTO ""tbioudb02""(""id"", ""name"") SELECT 2, '02'
|
Assert.Equal(@"INSERT OR IGNORE INTO ""tbioudb02""(""id"", ""name"") VALUES(2, '02')", sql);
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb02"" a
|
|
||||||
WHERE (a.""id"" = 2)
|
|
||||||
limit 0,1)", sql);
|
|
||||||
Assert.Equal(1, iou.ExecuteAffrows());
|
Assert.Equal(1, iou.ExecuteAffrows());
|
||||||
|
|
||||||
iou = fsql.InsertOrUpdate<tbioudb02>().IfExistsDoNothing().SetSource(new[] { new tbioudb02 { id = 1, name = "01" }, new tbioudb02 { id = 2, name = "02" }, new tbioudb02 { id = 3, name = "03" }, new tbioudb02 { id = 4, name = "04" } });
|
iou = fsql.InsertOrUpdate<tbioudb02>().IfExistsDoNothing().SetSource(new[] { new tbioudb02 { id = 1, name = "01" }, new tbioudb02 { id = 2, name = "02" }, new tbioudb02 { id = 3, name = "03" }, new tbioudb02 { id = 4, name = "04" } });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"INSERT INTO ""tbioudb02""(""id"", ""name"") SELECT 1, '01'
|
Assert.Equal(@"INSERT OR IGNORE INTO ""tbioudb02""(""id"", ""name"") VALUES(1, '01'), (2, '02'), (3, '03'), (4, '04')", sql);
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb02"" a
|
|
||||||
WHERE (a.""id"" = 1)
|
|
||||||
limit 0,1)
|
|
||||||
UNION ALL
|
|
||||||
SELECT 2, '02'
|
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb02"" a
|
|
||||||
WHERE (a.""id"" = 2)
|
|
||||||
limit 0,1)
|
|
||||||
UNION ALL
|
|
||||||
SELECT 3, '03'
|
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb02"" a
|
|
||||||
WHERE (a.""id"" = 3)
|
|
||||||
limit 0,1)
|
|
||||||
UNION ALL
|
|
||||||
SELECT 4, '04'
|
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb02"" a
|
|
||||||
WHERE (a.""id"" = 4)
|
|
||||||
limit 0,1)", sql);
|
|
||||||
Assert.Equal(2, iou.ExecuteAffrows());
|
Assert.Equal(2, iou.ExecuteAffrows());
|
||||||
|
|
||||||
iou = fsql.InsertOrUpdate<tbioudb02>().IfExistsDoNothing().SetSource(new[] { new tbioudb02 { id = 1, name = "001" }, new tbioudb02 { id = 2, name = "002" }, new tbioudb02 { id = 3, name = "003" }, new tbioudb02 { id = 4, name = "004" } });
|
iou = fsql.InsertOrUpdate<tbioudb02>().IfExistsDoNothing().SetSource(new[] { new tbioudb02 { id = 1, name = "001" }, new tbioudb02 { id = 2, name = "002" }, new tbioudb02 { id = 3, name = "003" }, new tbioudb02 { id = 4, name = "004" } });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"INSERT INTO ""tbioudb02""(""id"", ""name"") SELECT 1, '001'
|
Assert.Equal(@"INSERT OR IGNORE INTO ""tbioudb02""(""id"", ""name"") VALUES(1, '001'), (2, '002'), (3, '003'), (4, '004')", sql);
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb02"" a
|
|
||||||
WHERE (a.""id"" = 1)
|
|
||||||
limit 0,1)
|
|
||||||
UNION ALL
|
|
||||||
SELECT 2, '002'
|
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb02"" a
|
|
||||||
WHERE (a.""id"" = 2)
|
|
||||||
limit 0,1)
|
|
||||||
UNION ALL
|
|
||||||
SELECT 3, '003'
|
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb02"" a
|
|
||||||
WHERE (a.""id"" = 3)
|
|
||||||
limit 0,1)
|
|
||||||
UNION ALL
|
|
||||||
SELECT 4, '004'
|
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb02"" a
|
|
||||||
WHERE (a.""id"" = 4)
|
|
||||||
limit 0,1)", sql);
|
|
||||||
Assert.Equal(0, iou.ExecuteAffrows());
|
Assert.Equal(0, iou.ExecuteAffrows());
|
||||||
var lst = fsql.Select<tbioudb02>().Where(a => new[] { 1, 2, 3, 4 }.Contains(a.id)).ToList();
|
var lst = fsql.Select<tbioudb02>().Where(a => new[] { 1, 2, 3, 4 }.Contains(a.id)).ToList();
|
||||||
Assert.Equal(4, lst.Where(a => a.name == "0" + a.id).Count());
|
Assert.Equal(4, lst.Where(a => a.name == "0" + a.id).Count());
|
||||||
@ -109,83 +53,27 @@ UNION ALL
|
|||||||
fsql.Delete<tbioudb022>().Where("1=1").ExecuteAffrows();
|
fsql.Delete<tbioudb022>().Where("1=1").ExecuteAffrows();
|
||||||
var iou = fsql.InsertOrUpdate<tbioudb022>().IfExistsDoNothing().SetSource(new tbioudb022 { id = 1, name = "01" });
|
var iou = fsql.InsertOrUpdate<tbioudb022>().IfExistsDoNothing().SetSource(new tbioudb022 { id = 1, name = "01" });
|
||||||
var sql = iou.ToSql();
|
var sql = iou.ToSql();
|
||||||
Assert.Equal(@"INSERT INTO ""tbioudb022""(""id"", ""name"") SELECT 1, '01'
|
Assert.Equal(@"INSERT OR IGNORE INTO ""tbioudb022""(""id"", ""name"") VALUES(1, '01')", sql);
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb022"" a
|
|
||||||
WHERE (a.""id"" = 1)
|
|
||||||
limit 0,1)", sql);
|
|
||||||
Assert.Equal(1, iou.ExecuteAffrows());
|
Assert.Equal(1, iou.ExecuteAffrows());
|
||||||
|
|
||||||
iou = fsql.InsertOrUpdate<tbioudb022>().IfExistsDoNothing().SetSource(new tbioudb022 { id = 1, name = "011" });
|
iou = fsql.InsertOrUpdate<tbioudb022>().IfExistsDoNothing().SetSource(new tbioudb022 { id = 1, name = "011" });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"INSERT INTO ""tbioudb022""(""id"", ""name"") SELECT 1, '011'
|
Assert.Equal(@"INSERT OR IGNORE INTO ""tbioudb022""(""id"", ""name"") VALUES(1, '011')", sql);
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb022"" a
|
|
||||||
WHERE (a.""id"" = 1)
|
|
||||||
limit 0,1)", sql);
|
|
||||||
Assert.Equal(0, iou.ExecuteAffrows());
|
Assert.Equal(0, iou.ExecuteAffrows());
|
||||||
|
|
||||||
iou = fsql.InsertOrUpdate<tbioudb022>().IfExistsDoNothing().SetSource(new tbioudb022 { id = 2, name = "02" });
|
iou = fsql.InsertOrUpdate<tbioudb022>().IfExistsDoNothing().SetSource(new tbioudb022 { id = 2, name = "02" });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"INSERT INTO ""tbioudb022""(""id"", ""name"") SELECT 2, '02'
|
Assert.Equal(@"INSERT OR IGNORE INTO ""tbioudb022""(""id"", ""name"") VALUES(2, '02')", sql);
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb022"" a
|
|
||||||
WHERE (a.""id"" = 2)
|
|
||||||
limit 0,1)", sql);
|
|
||||||
Assert.Equal(1, iou.ExecuteAffrows());
|
Assert.Equal(1, iou.ExecuteAffrows());
|
||||||
|
|
||||||
iou = fsql.InsertOrUpdate<tbioudb022>().IfExistsDoNothing().SetSource(new[] { new tbioudb022 { id = 1, name = "01" }, new tbioudb022 { id = 2, name = "02" }, new tbioudb022 { id = 3, name = "03" }, new tbioudb022 { id = 4, name = "04" } });
|
iou = fsql.InsertOrUpdate<tbioudb022>().IfExistsDoNothing().SetSource(new[] { new tbioudb022 { id = 1, name = "01" }, new tbioudb022 { id = 2, name = "02" }, new tbioudb022 { id = 3, name = "03" }, new tbioudb022 { id = 4, name = "04" } });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"INSERT INTO ""tbioudb022""(""id"", ""name"") SELECT 1, '01'
|
Assert.Equal(@"INSERT OR IGNORE INTO ""tbioudb022""(""id"", ""name"") VALUES(1, '01'), (2, '02'), (3, '03'), (4, '04')", sql);
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb022"" a
|
|
||||||
WHERE (a.""id"" = 1)
|
|
||||||
limit 0,1)
|
|
||||||
UNION ALL
|
|
||||||
SELECT 2, '02'
|
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb022"" a
|
|
||||||
WHERE (a.""id"" = 2)
|
|
||||||
limit 0,1)
|
|
||||||
UNION ALL
|
|
||||||
SELECT 3, '03'
|
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb022"" a
|
|
||||||
WHERE (a.""id"" = 3)
|
|
||||||
limit 0,1)
|
|
||||||
UNION ALL
|
|
||||||
SELECT 4, '04'
|
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb022"" a
|
|
||||||
WHERE (a.""id"" = 4)
|
|
||||||
limit 0,1)", sql);
|
|
||||||
Assert.Equal(2, iou.ExecuteAffrows());
|
Assert.Equal(2, iou.ExecuteAffrows());
|
||||||
|
|
||||||
iou = fsql.InsertOrUpdate<tbioudb022>().IfExistsDoNothing().SetSource(new[] { new tbioudb022 { id = 1, name = "001" }, new tbioudb022 { id = 2, name = "002" }, new tbioudb022 { id = 3, name = "003" }, new tbioudb022 { id = 4, name = "004" } });
|
iou = fsql.InsertOrUpdate<tbioudb022>().IfExistsDoNothing().SetSource(new[] { new tbioudb022 { id = 1, name = "001" }, new tbioudb022 { id = 2, name = "002" }, new tbioudb022 { id = 3, name = "003" }, new tbioudb022 { id = 4, name = "004" } });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"INSERT INTO ""tbioudb022""(""id"", ""name"") SELECT 1, '001'
|
Assert.Equal(@"INSERT OR IGNORE INTO ""tbioudb022""(""id"", ""name"") VALUES(1, '001'), (2, '002'), (3, '003'), (4, '004')", sql);
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb022"" a
|
|
||||||
WHERE (a.""id"" = 1)
|
|
||||||
limit 0,1)
|
|
||||||
UNION ALL
|
|
||||||
SELECT 2, '002'
|
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb022"" a
|
|
||||||
WHERE (a.""id"" = 2)
|
|
||||||
limit 0,1)
|
|
||||||
UNION ALL
|
|
||||||
SELECT 3, '003'
|
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb022"" a
|
|
||||||
WHERE (a.""id"" = 3)
|
|
||||||
limit 0,1)
|
|
||||||
UNION ALL
|
|
||||||
SELECT 4, '004'
|
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb022"" a
|
|
||||||
WHERE (a.""id"" = 4)
|
|
||||||
limit 0,1)", sql);
|
|
||||||
Assert.Equal(0, iou.ExecuteAffrows());
|
Assert.Equal(0, iou.ExecuteAffrows());
|
||||||
var lst = fsql.Select<tbioudb022>().Where(a => new[] { 1, 2, 3, 4 }.Contains(a.id)).ToList();
|
var lst = fsql.Select<tbioudb022>().Where(a => new[] { 1, 2, 3, 4 }.Contains(a.id)).ToList();
|
||||||
Assert.Equal(4, lst.Where(a => a.name == "0" + a.id).Count());
|
Assert.Equal(4, lst.Where(a => a.name == "0" + a.id).Count());
|
||||||
@ -219,29 +107,7 @@ UNION ALL
|
|||||||
//--no primary and yes
|
//--no primary and yes
|
||||||
iou = fsql.InsertOrUpdate<tbioudb022>().IfExistsDoNothing().SetSource(new[] { new tbioudb022 { id = 1, name = "100001" }, new tbioudb022 { name = "00001" }, new tbioudb022 { id = 2, name = "100002" }, new tbioudb022 { name = "00002" }, new tbioudb022 { id = 3, name = "100003" }, new tbioudb022 { name = "00003" }, new tbioudb022 { id = 4, name = "100004" }, new tbioudb022 { name = "00004" } });
|
iou = fsql.InsertOrUpdate<tbioudb022>().IfExistsDoNothing().SetSource(new[] { new tbioudb022 { id = 1, name = "100001" }, new tbioudb022 { name = "00001" }, new tbioudb022 { id = 2, name = "100002" }, new tbioudb022 { name = "00002" }, new tbioudb022 { id = 3, name = "100003" }, new tbioudb022 { name = "00003" }, new tbioudb022 { id = 4, name = "100004" }, new tbioudb022 { name = "00004" } });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"INSERT INTO ""tbioudb022""(""id"", ""name"") SELECT 1, '100001'
|
Assert.Equal(@"INSERT OR IGNORE INTO ""tbioudb022""(""id"", ""name"") VALUES(1, '100001'), (2, '100002'), (3, '100003'), (4, '100004')
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb022"" a
|
|
||||||
WHERE (a.""id"" = 1)
|
|
||||||
limit 0,1)
|
|
||||||
UNION ALL
|
|
||||||
SELECT 2, '100002'
|
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb022"" a
|
|
||||||
WHERE (a.""id"" = 2)
|
|
||||||
limit 0,1)
|
|
||||||
UNION ALL
|
|
||||||
SELECT 3, '100003'
|
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb022"" a
|
|
||||||
WHERE (a.""id"" = 3)
|
|
||||||
limit 0,1)
|
|
||||||
UNION ALL
|
|
||||||
SELECT 4, '100004'
|
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb022"" a
|
|
||||||
WHERE (a.""id"" = 4)
|
|
||||||
limit 0,1)
|
|
||||||
|
|
||||||
;
|
;
|
||||||
|
|
||||||
@ -263,83 +129,27 @@ INSERT INTO ""tbioudb022""(""name"") VALUES('00001'), ('00002'), ('00003'), ('00
|
|||||||
fsql.Delete<tbioudb03>().Where("1=1").ExecuteAffrows();
|
fsql.Delete<tbioudb03>().Where("1=1").ExecuteAffrows();
|
||||||
var iou = fsql.InsertOrUpdate<tbioudb03>().IfExistsDoNothing().SetSource(new tbioudb03 { id1 = 1, id2 = "01", name = "01" });
|
var iou = fsql.InsertOrUpdate<tbioudb03>().IfExistsDoNothing().SetSource(new tbioudb03 { id1 = 1, id2 = "01", name = "01" });
|
||||||
var sql = iou.ToSql();
|
var sql = iou.ToSql();
|
||||||
Assert.Equal(@"INSERT INTO ""tbioudb03""(""id1"", ""id2"", ""name"") SELECT 1, '01', '01'
|
Assert.Equal(@"INSERT OR IGNORE INTO ""tbioudb03""(""id1"", ""id2"", ""name"") VALUES(1, '01', '01')", sql);
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb03"" a
|
|
||||||
WHERE (a.""id1"" = 1 AND a.""id2"" = '01')
|
|
||||||
limit 0,1)", sql);
|
|
||||||
Assert.Equal(1, iou.ExecuteAffrows());
|
Assert.Equal(1, iou.ExecuteAffrows());
|
||||||
|
|
||||||
iou = fsql.InsertOrUpdate<tbioudb03>().IfExistsDoNothing().SetSource(new tbioudb03 { id1 = 1, id2 = "01", name = "011" });
|
iou = fsql.InsertOrUpdate<tbioudb03>().IfExistsDoNothing().SetSource(new tbioudb03 { id1 = 1, id2 = "01", name = "011" });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"INSERT INTO ""tbioudb03""(""id1"", ""id2"", ""name"") SELECT 1, '01', '011'
|
Assert.Equal(@"INSERT OR IGNORE INTO ""tbioudb03""(""id1"", ""id2"", ""name"") VALUES(1, '01', '011')", sql);
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb03"" a
|
|
||||||
WHERE (a.""id1"" = 1 AND a.""id2"" = '01')
|
|
||||||
limit 0,1)", sql);
|
|
||||||
Assert.Equal(0, iou.ExecuteAffrows());
|
Assert.Equal(0, iou.ExecuteAffrows());
|
||||||
|
|
||||||
iou = fsql.InsertOrUpdate<tbioudb03>().IfExistsDoNothing().SetSource(new tbioudb03 { id1 = 2, id2 = "02", name = "02" });
|
iou = fsql.InsertOrUpdate<tbioudb03>().IfExistsDoNothing().SetSource(new tbioudb03 { id1 = 2, id2 = "02", name = "02" });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"INSERT INTO ""tbioudb03""(""id1"", ""id2"", ""name"") SELECT 2, '02', '02'
|
Assert.Equal(@"INSERT OR IGNORE INTO ""tbioudb03""(""id1"", ""id2"", ""name"") VALUES(2, '02', '02')", sql);
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb03"" a
|
|
||||||
WHERE (a.""id1"" = 2 AND a.""id2"" = '02')
|
|
||||||
limit 0,1)", sql);
|
|
||||||
Assert.Equal(1, iou.ExecuteAffrows());
|
Assert.Equal(1, iou.ExecuteAffrows());
|
||||||
|
|
||||||
iou = fsql.InsertOrUpdate<tbioudb03>().IfExistsDoNothing().SetSource(new[] { new tbioudb03 { id1 = 1, id2 = "01", name = "01" }, new tbioudb03 { id1 = 2, id2 = "02", name = "02" }, new tbioudb03 { id1 = 3, id2 = "03", name = "03" }, new tbioudb03 { id1 = 4, id2 = "04", name = "04" } });
|
iou = fsql.InsertOrUpdate<tbioudb03>().IfExistsDoNothing().SetSource(new[] { new tbioudb03 { id1 = 1, id2 = "01", name = "01" }, new tbioudb03 { id1 = 2, id2 = "02", name = "02" }, new tbioudb03 { id1 = 3, id2 = "03", name = "03" }, new tbioudb03 { id1 = 4, id2 = "04", name = "04" } });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"INSERT INTO ""tbioudb03""(""id1"", ""id2"", ""name"") SELECT 1, '01', '01'
|
Assert.Equal(@"INSERT OR IGNORE INTO ""tbioudb03""(""id1"", ""id2"", ""name"") VALUES(1, '01', '01'), (2, '02', '02'), (3, '03', '03'), (4, '04', '04')", sql);
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb03"" a
|
|
||||||
WHERE (a.""id1"" = 1 AND a.""id2"" = '01')
|
|
||||||
limit 0,1)
|
|
||||||
UNION ALL
|
|
||||||
SELECT 2, '02', '02'
|
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb03"" a
|
|
||||||
WHERE (a.""id1"" = 2 AND a.""id2"" = '02')
|
|
||||||
limit 0,1)
|
|
||||||
UNION ALL
|
|
||||||
SELECT 3, '03', '03'
|
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb03"" a
|
|
||||||
WHERE (a.""id1"" = 3 AND a.""id2"" = '03')
|
|
||||||
limit 0,1)
|
|
||||||
UNION ALL
|
|
||||||
SELECT 4, '04', '04'
|
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb03"" a
|
|
||||||
WHERE (a.""id1"" = 4 AND a.""id2"" = '04')
|
|
||||||
limit 0,1)", sql);
|
|
||||||
Assert.Equal(2, iou.ExecuteAffrows());
|
Assert.Equal(2, iou.ExecuteAffrows());
|
||||||
|
|
||||||
iou = fsql.InsertOrUpdate<tbioudb03>().IfExistsDoNothing().SetSource(new[] { new tbioudb03 { id1 = 1, id2 = "01", name = "001" }, new tbioudb03 { id1 = 2, id2 = "02", name = "002" }, new tbioudb03 { id1 = 3, id2 = "03", name = "003" }, new tbioudb03 { id1 = 4, id2 = "04", name = "004" } });
|
iou = fsql.InsertOrUpdate<tbioudb03>().IfExistsDoNothing().SetSource(new[] { new tbioudb03 { id1 = 1, id2 = "01", name = "001" }, new tbioudb03 { id1 = 2, id2 = "02", name = "002" }, new tbioudb03 { id1 = 3, id2 = "03", name = "003" }, new tbioudb03 { id1 = 4, id2 = "04", name = "004" } });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"INSERT INTO ""tbioudb03""(""id1"", ""id2"", ""name"") SELECT 1, '01', '001'
|
Assert.Equal(@"INSERT OR IGNORE INTO ""tbioudb03""(""id1"", ""id2"", ""name"") VALUES(1, '01', '001'), (2, '02', '002'), (3, '03', '003'), (4, '04', '004')", sql);
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb03"" a
|
|
||||||
WHERE (a.""id1"" = 1 AND a.""id2"" = '01')
|
|
||||||
limit 0,1)
|
|
||||||
UNION ALL
|
|
||||||
SELECT 2, '02', '002'
|
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb03"" a
|
|
||||||
WHERE (a.""id1"" = 2 AND a.""id2"" = '02')
|
|
||||||
limit 0,1)
|
|
||||||
UNION ALL
|
|
||||||
SELECT 3, '03', '003'
|
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb03"" a
|
|
||||||
WHERE (a.""id1"" = 3 AND a.""id2"" = '03')
|
|
||||||
limit 0,1)
|
|
||||||
UNION ALL
|
|
||||||
SELECT 4, '04', '004'
|
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb03"" a
|
|
||||||
WHERE (a.""id1"" = 4 AND a.""id2"" = '04')
|
|
||||||
limit 0,1)", sql);
|
|
||||||
Assert.Equal(0, iou.ExecuteAffrows());
|
Assert.Equal(0, iou.ExecuteAffrows());
|
||||||
var lst = fsql.Select<tbioudb03>().Where(a => a.id1 == 1 && a.id2 == "01" || a.id1 == 2 && a.id2 == "02" || a.id1 == 3 && a.id2 == "03" || a.id1 == 4 && a.id2 == "04").ToList();
|
var lst = fsql.Select<tbioudb03>().Where(a => a.id1 == 1 && a.id2 == "01" || a.id1 == 2 && a.id2 == "02" || a.id1 == 3 && a.id2 == "03" || a.id1 == 4 && a.id2 == "04").ToList();
|
||||||
Assert.Equal(4, lst.Where(a => a.name == "0" + a.id1).Count());
|
Assert.Equal(4, lst.Where(a => a.name == "0" + a.id1).Count());
|
||||||
@ -359,83 +169,27 @@ UNION ALL
|
|||||||
fsql.Delete<tbioudb04>().Where("1=1").ExecuteAffrows();
|
fsql.Delete<tbioudb04>().Where("1=1").ExecuteAffrows();
|
||||||
var iou = fsql.InsertOrUpdate<tbioudb04>().IfExistsDoNothing().SetSource(new tbioudb04 { id = 1, name = "01" });
|
var iou = fsql.InsertOrUpdate<tbioudb04>().IfExistsDoNothing().SetSource(new tbioudb04 { id = 1, name = "01" });
|
||||||
var sql = iou.ToSql();
|
var sql = iou.ToSql();
|
||||||
Assert.Equal(@"INSERT INTO ""tbioudb04""(""id"", ""name"", ""version"", ""CreateTime"") SELECT 1, '01', 0, datetime(current_timestamp,'localtime')
|
Assert.Equal(@"INSERT OR IGNORE INTO ""tbioudb04""(""id"", ""name"", ""version"", ""CreateTime"") VALUES(1, '01', 0, datetime(current_timestamp,'localtime'))", sql);
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb04"" a
|
|
||||||
WHERE (a.""id"" = 1)
|
|
||||||
limit 0,1)", sql);
|
|
||||||
Assert.Equal(1, iou.ExecuteAffrows());
|
Assert.Equal(1, iou.ExecuteAffrows());
|
||||||
|
|
||||||
iou = fsql.InsertOrUpdate<tbioudb04>().IfExistsDoNothing().SetSource(new tbioudb04 { id = 1, name = "011" });
|
iou = fsql.InsertOrUpdate<tbioudb04>().IfExistsDoNothing().SetSource(new tbioudb04 { id = 1, name = "011" });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"INSERT INTO ""tbioudb04""(""id"", ""name"", ""version"", ""CreateTime"") SELECT 1, '011', 0, datetime(current_timestamp,'localtime')
|
Assert.Equal(@"INSERT OR IGNORE INTO ""tbioudb04""(""id"", ""name"", ""version"", ""CreateTime"") VALUES(1, '011', 0, datetime(current_timestamp,'localtime'))", sql);
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb04"" a
|
|
||||||
WHERE (a.""id"" = 1)
|
|
||||||
limit 0,1)", sql);
|
|
||||||
Assert.Equal(0, iou.ExecuteAffrows());
|
Assert.Equal(0, iou.ExecuteAffrows());
|
||||||
|
|
||||||
iou = fsql.InsertOrUpdate<tbioudb04>().IfExistsDoNothing().SetSource(new tbioudb04 { id = 2, name = "02" });
|
iou = fsql.InsertOrUpdate<tbioudb04>().IfExistsDoNothing().SetSource(new tbioudb04 { id = 2, name = "02" });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"INSERT INTO ""tbioudb04""(""id"", ""name"", ""version"", ""CreateTime"") SELECT 2, '02', 0, datetime(current_timestamp,'localtime')
|
Assert.Equal(@"INSERT OR IGNORE INTO ""tbioudb04""(""id"", ""name"", ""version"", ""CreateTime"") VALUES(2, '02', 0, datetime(current_timestamp,'localtime'))", sql);
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb04"" a
|
|
||||||
WHERE (a.""id"" = 2)
|
|
||||||
limit 0,1)", sql);
|
|
||||||
Assert.Equal(1, iou.ExecuteAffrows());
|
Assert.Equal(1, iou.ExecuteAffrows());
|
||||||
|
|
||||||
iou = fsql.InsertOrUpdate<tbioudb04>().IfExistsDoNothing().SetSource(new[] { new tbioudb04 { id = 1, name = "01" }, new tbioudb04 { id = 2, name = "02" }, new tbioudb04 { id = 3, name = "03" }, new tbioudb04 { id = 4, name = "04" } });
|
iou = fsql.InsertOrUpdate<tbioudb04>().IfExistsDoNothing().SetSource(new[] { new tbioudb04 { id = 1, name = "01" }, new tbioudb04 { id = 2, name = "02" }, new tbioudb04 { id = 3, name = "03" }, new tbioudb04 { id = 4, name = "04" } });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"INSERT INTO ""tbioudb04""(""id"", ""name"", ""version"", ""CreateTime"") SELECT 1, '01', 0, datetime(current_timestamp,'localtime')
|
Assert.Equal(@"INSERT OR IGNORE INTO ""tbioudb04""(""id"", ""name"", ""version"", ""CreateTime"") VALUES(1, '01', 0, datetime(current_timestamp,'localtime')), (2, '02', 0, datetime(current_timestamp,'localtime')), (3, '03', 0, datetime(current_timestamp,'localtime')), (4, '04', 0, datetime(current_timestamp,'localtime'))", sql);
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb04"" a
|
|
||||||
WHERE (a.""id"" = 1)
|
|
||||||
limit 0,1)
|
|
||||||
UNION ALL
|
|
||||||
SELECT 2, '02', 0, datetime(current_timestamp,'localtime')
|
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb04"" a
|
|
||||||
WHERE (a.""id"" = 2)
|
|
||||||
limit 0,1)
|
|
||||||
UNION ALL
|
|
||||||
SELECT 3, '03', 0, datetime(current_timestamp,'localtime')
|
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb04"" a
|
|
||||||
WHERE (a.""id"" = 3)
|
|
||||||
limit 0,1)
|
|
||||||
UNION ALL
|
|
||||||
SELECT 4, '04', 0, datetime(current_timestamp,'localtime')
|
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb04"" a
|
|
||||||
WHERE (a.""id"" = 4)
|
|
||||||
limit 0,1)", sql);
|
|
||||||
Assert.Equal(2, iou.ExecuteAffrows());
|
Assert.Equal(2, iou.ExecuteAffrows());
|
||||||
|
|
||||||
iou = fsql.InsertOrUpdate<tbioudb04>().IfExistsDoNothing().SetSource(new[] { new tbioudb04 { id = 1, name = "001" }, new tbioudb04 { id = 2, name = "002" }, new tbioudb04 { id = 3, name = "003" }, new tbioudb04 { id = 4, name = "004" } });
|
iou = fsql.InsertOrUpdate<tbioudb04>().IfExistsDoNothing().SetSource(new[] { new tbioudb04 { id = 1, name = "001" }, new tbioudb04 { id = 2, name = "002" }, new tbioudb04 { id = 3, name = "003" }, new tbioudb04 { id = 4, name = "004" } });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"INSERT INTO ""tbioudb04""(""id"", ""name"", ""version"", ""CreateTime"") SELECT 1, '001', 0, datetime(current_timestamp,'localtime')
|
Assert.Equal(@"INSERT OR IGNORE INTO ""tbioudb04""(""id"", ""name"", ""version"", ""CreateTime"") VALUES(1, '001', 0, datetime(current_timestamp,'localtime')), (2, '002', 0, datetime(current_timestamp,'localtime')), (3, '003', 0, datetime(current_timestamp,'localtime')), (4, '004', 0, datetime(current_timestamp,'localtime'))", sql);
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb04"" a
|
|
||||||
WHERE (a.""id"" = 1)
|
|
||||||
limit 0,1)
|
|
||||||
UNION ALL
|
|
||||||
SELECT 2, '002', 0, datetime(current_timestamp,'localtime')
|
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb04"" a
|
|
||||||
WHERE (a.""id"" = 2)
|
|
||||||
limit 0,1)
|
|
||||||
UNION ALL
|
|
||||||
SELECT 3, '003', 0, datetime(current_timestamp,'localtime')
|
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb04"" a
|
|
||||||
WHERE (a.""id"" = 3)
|
|
||||||
limit 0,1)
|
|
||||||
UNION ALL
|
|
||||||
SELECT 4, '004', 0, datetime(current_timestamp,'localtime')
|
|
||||||
WHERE NOT EXISTS(SELECT 1
|
|
||||||
FROM ""tbioudb04"" a
|
|
||||||
WHERE (a.""id"" = 4)
|
|
||||||
limit 0,1)", sql);
|
|
||||||
Assert.Equal(0, iou.ExecuteAffrows());
|
Assert.Equal(0, iou.ExecuteAffrows());
|
||||||
var lst = fsql.Select<tbioudb04>().Where(a => new[] { 1, 2, 3, 4 }.Contains(a.id)).ToList();
|
var lst = fsql.Select<tbioudb04>().Where(a => new[] { 1, 2, 3, 4 }.Contains(a.id)).ToList();
|
||||||
Assert.Equal(4, lst.Where(a => a.name == "0" + a.id).Count());
|
Assert.Equal(4, lst.Where(a => a.name == "0" + a.id).Count());
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
using FreeSql.DataAnnotations;
|
using FreeSql.DataAnnotations;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
@ -16,27 +16,27 @@ namespace FreeSql.Tests.Sqlite
|
|||||||
fsql.Delete<tbiou01>().Where("1=1").ExecuteAffrows();
|
fsql.Delete<tbiou01>().Where("1=1").ExecuteAffrows();
|
||||||
var iou = fsql.InsertOrUpdate<tbiou01>().SetSource(new tbiou01 { id = 1 });
|
var iou = fsql.InsertOrUpdate<tbiou01>().SetSource(new tbiou01 { id = 1 });
|
||||||
var sql = iou.ToSql();
|
var sql = iou.ToSql();
|
||||||
Assert.Equal(@"REPLACE INTO ""tbiou01""(""id"") VALUES(1)", sql);
|
Assert.Equal(@"INSERT OR REPLACE INTO ""tbiou01""(""id"") VALUES(1)", sql);
|
||||||
Assert.Equal(1, iou.ExecuteAffrows());
|
Assert.Equal(1, iou.ExecuteAffrows());
|
||||||
|
|
||||||
iou = fsql.InsertOrUpdate<tbiou01>().SetSource(new tbiou01 { id = 1 });
|
iou = fsql.InsertOrUpdate<tbiou01>().SetSource(new tbiou01 { id = 1 });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"REPLACE INTO ""tbiou01""(""id"") VALUES(1)", sql);
|
Assert.Equal(@"INSERT OR REPLACE INTO ""tbiou01""(""id"") VALUES(1)", sql);
|
||||||
Assert.Equal(1, iou.ExecuteAffrows());
|
Assert.Equal(1, iou.ExecuteAffrows());
|
||||||
|
|
||||||
iou = fsql.InsertOrUpdate<tbiou01>().SetSource(new tbiou01 { id = 2 });
|
iou = fsql.InsertOrUpdate<tbiou01>().SetSource(new tbiou01 { id = 2 });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"REPLACE INTO ""tbiou01""(""id"") VALUES(2)", sql);
|
Assert.Equal(@"INSERT OR REPLACE INTO ""tbiou01""(""id"") VALUES(2)", sql);
|
||||||
Assert.Equal(1, iou.ExecuteAffrows());
|
Assert.Equal(1, iou.ExecuteAffrows());
|
||||||
|
|
||||||
iou = fsql.InsertOrUpdate<tbiou01>().SetSource(new[] { new tbiou01 { id = 1 }, new tbiou01 { id = 2 }, new tbiou01 { id = 3 }, new tbiou01 { id = 4 } });
|
iou = fsql.InsertOrUpdate<tbiou01>().SetSource(new[] { new tbiou01 { id = 1 }, new tbiou01 { id = 2 }, new tbiou01 { id = 3 }, new tbiou01 { id = 4 } });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"REPLACE INTO ""tbiou01""(""id"") VALUES(1), (2), (3), (4)", sql);
|
Assert.Equal(@"INSERT OR REPLACE INTO ""tbiou01""(""id"") VALUES(1), (2), (3), (4)", sql);
|
||||||
Assert.Equal(4, iou.ExecuteAffrows());
|
Assert.Equal(4, iou.ExecuteAffrows());
|
||||||
|
|
||||||
iou = fsql.InsertOrUpdate<tbiou01>().SetSource(new[] { new tbiou01 { id = 1 }, new tbiou01 { id = 2 }, new tbiou01 { id = 3 }, new tbiou01 { id = 4 } });
|
iou = fsql.InsertOrUpdate<tbiou01>().SetSource(new[] { new tbiou01 { id = 1 }, new tbiou01 { id = 2 }, new tbiou01 { id = 3 }, new tbiou01 { id = 4 } });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"REPLACE INTO ""tbiou01""(""id"") VALUES(1), (2), (3), (4)", sql);
|
Assert.Equal(@"INSERT OR REPLACE INTO ""tbiou01""(""id"") VALUES(1), (2), (3), (4)", sql);
|
||||||
Assert.Equal(4, iou.ExecuteAffrows());
|
Assert.Equal(4, iou.ExecuteAffrows());
|
||||||
}
|
}
|
||||||
class tbiou01
|
class tbiou01
|
||||||
@ -50,27 +50,27 @@ namespace FreeSql.Tests.Sqlite
|
|||||||
fsql.Delete<tbiou02>().Where("1=1").ExecuteAffrows();
|
fsql.Delete<tbiou02>().Where("1=1").ExecuteAffrows();
|
||||||
var iou = fsql.InsertOrUpdate<tbiou02>().SetSource(new tbiou02 { id = 1, name = "01" });
|
var iou = fsql.InsertOrUpdate<tbiou02>().SetSource(new tbiou02 { id = 1, name = "01" });
|
||||||
var sql = iou.ToSql();
|
var sql = iou.ToSql();
|
||||||
Assert.Equal(@"REPLACE INTO ""tbiou02""(""id"", ""name"") VALUES(1, '01')", sql);
|
Assert.Equal(@"INSERT OR REPLACE INTO ""tbiou02""(""id"", ""name"") VALUES(1, '01')", sql);
|
||||||
Assert.Equal(1, iou.ExecuteAffrows());
|
Assert.Equal(1, iou.ExecuteAffrows());
|
||||||
|
|
||||||
iou = fsql.InsertOrUpdate<tbiou02>().SetSource(new tbiou02 { id = 1, name = "011" });
|
iou = fsql.InsertOrUpdate<tbiou02>().SetSource(new tbiou02 { id = 1, name = "011" });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"REPLACE INTO ""tbiou02""(""id"", ""name"") VALUES(1, '011')", sql);
|
Assert.Equal(@"INSERT OR REPLACE INTO ""tbiou02""(""id"", ""name"") VALUES(1, '011')", sql);
|
||||||
Assert.Equal(1, iou.ExecuteAffrows());
|
Assert.Equal(1, iou.ExecuteAffrows());
|
||||||
|
|
||||||
iou = fsql.InsertOrUpdate<tbiou02>().SetSource(new tbiou02 { id = 2, name = "02" });
|
iou = fsql.InsertOrUpdate<tbiou02>().SetSource(new tbiou02 { id = 2, name = "02" });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"REPLACE INTO ""tbiou02""(""id"", ""name"") VALUES(2, '02')", sql);
|
Assert.Equal(@"INSERT OR REPLACE INTO ""tbiou02""(""id"", ""name"") VALUES(2, '02')", sql);
|
||||||
Assert.Equal(1, iou.ExecuteAffrows());
|
Assert.Equal(1, iou.ExecuteAffrows());
|
||||||
|
|
||||||
iou = fsql.InsertOrUpdate<tbiou02>().SetSource(new[] { new tbiou02 { id = 1, name = "01" }, new tbiou02 { id = 2, name = "02" }, new tbiou02 { id = 3, name = "03" }, new tbiou02 { id = 4, name = "04" } });
|
iou = fsql.InsertOrUpdate<tbiou02>().SetSource(new[] { new tbiou02 { id = 1, name = "01" }, new tbiou02 { id = 2, name = "02" }, new tbiou02 { id = 3, name = "03" }, new tbiou02 { id = 4, name = "04" } });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"REPLACE INTO ""tbiou02""(""id"", ""name"") VALUES(1, '01'), (2, '02'), (3, '03'), (4, '04')", sql);
|
Assert.Equal(@"INSERT OR REPLACE INTO ""tbiou02""(""id"", ""name"") VALUES(1, '01'), (2, '02'), (3, '03'), (4, '04')", sql);
|
||||||
Assert.Equal(4, iou.ExecuteAffrows());
|
Assert.Equal(4, iou.ExecuteAffrows());
|
||||||
|
|
||||||
iou = fsql.InsertOrUpdate<tbiou02>().SetSource(new[] { new tbiou02 { id = 1, name = "001" }, new tbiou02 { id = 2, name = "002" }, new tbiou02 { id = 3, name = "003" }, new tbiou02 { id = 4, name = "004" } });
|
iou = fsql.InsertOrUpdate<tbiou02>().SetSource(new[] { new tbiou02 { id = 1, name = "001" }, new tbiou02 { id = 2, name = "002" }, new tbiou02 { id = 3, name = "003" }, new tbiou02 { id = 4, name = "004" } });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"REPLACE INTO ""tbiou02""(""id"", ""name"") VALUES(1, '001'), (2, '002'), (3, '003'), (4, '004')", sql);
|
Assert.Equal(@"INSERT OR REPLACE INTO ""tbiou02""(""id"", ""name"") VALUES(1, '001'), (2, '002'), (3, '003'), (4, '004')", sql);
|
||||||
Assert.Equal(4, iou.ExecuteAffrows());
|
Assert.Equal(4, iou.ExecuteAffrows());
|
||||||
var lst = fsql.Select<tbiou02>().Where(a => new[] { 1, 2, 3, 4 }.Contains(a.id)).ToList();
|
var lst = fsql.Select<tbiou02>().Where(a => new[] { 1, 2, 3, 4 }.Contains(a.id)).ToList();
|
||||||
Assert.Equal(4, lst.Where(a => a.name == "00" + a.id).Count());
|
Assert.Equal(4, lst.Where(a => a.name == "00" + a.id).Count());
|
||||||
@ -87,27 +87,27 @@ namespace FreeSql.Tests.Sqlite
|
|||||||
fsql.Delete<tbiou022>().Where("1=1").ExecuteAffrows();
|
fsql.Delete<tbiou022>().Where("1=1").ExecuteAffrows();
|
||||||
var iou = fsql.InsertOrUpdate<tbiou022>().SetSource(new tbiou022 { id = 1, name = "01" });
|
var iou = fsql.InsertOrUpdate<tbiou022>().SetSource(new tbiou022 { id = 1, name = "01" });
|
||||||
var sql = iou.ToSql();
|
var sql = iou.ToSql();
|
||||||
Assert.Equal(@"REPLACE INTO ""tbiou022""(""id"", ""name"") VALUES(1, '01')", sql);
|
Assert.Equal(@"INSERT OR REPLACE INTO ""tbiou022""(""id"", ""name"") VALUES(1, '01')", sql);
|
||||||
Assert.Equal(1, iou.ExecuteAffrows());
|
Assert.Equal(1, iou.ExecuteAffrows());
|
||||||
|
|
||||||
iou = fsql.InsertOrUpdate<tbiou022>().SetSource(new tbiou022 { id = 1, name = "011" });
|
iou = fsql.InsertOrUpdate<tbiou022>().SetSource(new tbiou022 { id = 1, name = "011" });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"REPLACE INTO ""tbiou022""(""id"", ""name"") VALUES(1, '011')", sql);
|
Assert.Equal(@"INSERT OR REPLACE INTO ""tbiou022""(""id"", ""name"") VALUES(1, '011')", sql);
|
||||||
Assert.Equal(1, iou.ExecuteAffrows());
|
Assert.Equal(1, iou.ExecuteAffrows());
|
||||||
|
|
||||||
iou = fsql.InsertOrUpdate<tbiou022>().SetSource(new tbiou022 { id = 2, name = "02" });
|
iou = fsql.InsertOrUpdate<tbiou022>().SetSource(new tbiou022 { id = 2, name = "02" });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"REPLACE INTO ""tbiou022""(""id"", ""name"") VALUES(2, '02')", sql);
|
Assert.Equal(@"INSERT OR REPLACE INTO ""tbiou022""(""id"", ""name"") VALUES(2, '02')", sql);
|
||||||
Assert.Equal(1, iou.ExecuteAffrows());
|
Assert.Equal(1, iou.ExecuteAffrows());
|
||||||
|
|
||||||
iou = fsql.InsertOrUpdate<tbiou022>().SetSource(new[] { new tbiou022 { id = 1, name = "01" }, new tbiou022 { id = 2, name = "02" }, new tbiou022 { id = 3, name = "03" }, new tbiou022 { id = 4, name = "04" } });
|
iou = fsql.InsertOrUpdate<tbiou022>().SetSource(new[] { new tbiou022 { id = 1, name = "01" }, new tbiou022 { id = 2, name = "02" }, new tbiou022 { id = 3, name = "03" }, new tbiou022 { id = 4, name = "04" } });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"REPLACE INTO ""tbiou022""(""id"", ""name"") VALUES(1, '01'), (2, '02'), (3, '03'), (4, '04')", sql);
|
Assert.Equal(@"INSERT OR REPLACE INTO ""tbiou022""(""id"", ""name"") VALUES(1, '01'), (2, '02'), (3, '03'), (4, '04')", sql);
|
||||||
Assert.Equal(4, iou.ExecuteAffrows());
|
Assert.Equal(4, iou.ExecuteAffrows());
|
||||||
|
|
||||||
iou = fsql.InsertOrUpdate<tbiou022>().SetSource(new[] { new tbiou022 { id = 1, name = "001" }, new tbiou022 { id = 2, name = "002" }, new tbiou022 { id = 3, name = "003" }, new tbiou022 { id = 4, name = "004" } });
|
iou = fsql.InsertOrUpdate<tbiou022>().SetSource(new[] { new tbiou022 { id = 1, name = "001" }, new tbiou022 { id = 2, name = "002" }, new tbiou022 { id = 3, name = "003" }, new tbiou022 { id = 4, name = "004" } });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"REPLACE INTO ""tbiou022""(""id"", ""name"") VALUES(1, '001'), (2, '002'), (3, '003'), (4, '004')", sql);
|
Assert.Equal(@"INSERT OR REPLACE INTO ""tbiou022""(""id"", ""name"") VALUES(1, '001'), (2, '002'), (3, '003'), (4, '004')", sql);
|
||||||
Assert.Equal(4, iou.ExecuteAffrows());
|
Assert.Equal(4, iou.ExecuteAffrows());
|
||||||
var lst = fsql.Select<tbiou022>().Where(a => new[] { 1, 2, 3, 4 }.Contains(a.id)).ToList();
|
var lst = fsql.Select<tbiou022>().Where(a => new[] { 1, 2, 3, 4 }.Contains(a.id)).ToList();
|
||||||
Assert.Equal(4, lst.Where(a => a.name == "00" + a.id).Count());
|
Assert.Equal(4, lst.Where(a => a.name == "00" + a.id).Count());
|
||||||
@ -141,7 +141,7 @@ namespace FreeSql.Tests.Sqlite
|
|||||||
//--no primary and yes
|
//--no primary and yes
|
||||||
iou = fsql.InsertOrUpdate<tbiou022>().SetSource(new[] { new tbiou022 { id = 1, name = "100001" }, new tbiou022 { name = "00001" }, new tbiou022 { id = 2, name = "100002" }, new tbiou022 { name = "00002" }, new tbiou022 { id = 3, name = "100003" }, new tbiou022 { name = "00003" }, new tbiou022 { id = 4, name = "100004" }, new tbiou022 { name = "00004" } });
|
iou = fsql.InsertOrUpdate<tbiou022>().SetSource(new[] { new tbiou022 { id = 1, name = "100001" }, new tbiou022 { name = "00001" }, new tbiou022 { id = 2, name = "100002" }, new tbiou022 { name = "00002" }, new tbiou022 { id = 3, name = "100003" }, new tbiou022 { name = "00003" }, new tbiou022 { id = 4, name = "100004" }, new tbiou022 { name = "00004" } });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"REPLACE INTO ""tbiou022""(""id"", ""name"") VALUES(1, '100001'), (2, '100002'), (3, '100003'), (4, '100004')
|
Assert.Equal(@"INSERT OR REPLACE INTO ""tbiou022""(""id"", ""name"") VALUES(1, '100001'), (2, '100002'), (3, '100003'), (4, '100004')
|
||||||
|
|
||||||
;
|
;
|
||||||
|
|
||||||
@ -163,27 +163,27 @@ INSERT INTO ""tbiou022""(""name"") VALUES('00001'), ('00002'), ('00003'), ('0000
|
|||||||
fsql.Delete<tbiou03>().Where("1=1").ExecuteAffrows();
|
fsql.Delete<tbiou03>().Where("1=1").ExecuteAffrows();
|
||||||
var iou = fsql.InsertOrUpdate<tbiou03>().SetSource(new tbiou03 { id1 = 1, id2 = "01", name = "01" });
|
var iou = fsql.InsertOrUpdate<tbiou03>().SetSource(new tbiou03 { id1 = 1, id2 = "01", name = "01" });
|
||||||
var sql = iou.ToSql();
|
var sql = iou.ToSql();
|
||||||
Assert.Equal(@"REPLACE INTO ""tbiou03""(""id1"", ""id2"", ""name"") VALUES(1, '01', '01')", sql);
|
Assert.Equal(@"INSERT OR REPLACE INTO ""tbiou03""(""id1"", ""id2"", ""name"") VALUES(1, '01', '01')", sql);
|
||||||
Assert.Equal(1, iou.ExecuteAffrows());
|
Assert.Equal(1, iou.ExecuteAffrows());
|
||||||
|
|
||||||
iou = fsql.InsertOrUpdate<tbiou03>().SetSource(new tbiou03 { id1 = 1, id2 = "01", name = "011" });
|
iou = fsql.InsertOrUpdate<tbiou03>().SetSource(new tbiou03 { id1 = 1, id2 = "01", name = "011" });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"REPLACE INTO ""tbiou03""(""id1"", ""id2"", ""name"") VALUES(1, '01', '011')", sql);
|
Assert.Equal(@"INSERT OR REPLACE INTO ""tbiou03""(""id1"", ""id2"", ""name"") VALUES(1, '01', '011')", sql);
|
||||||
Assert.Equal(1, iou.ExecuteAffrows());
|
Assert.Equal(1, iou.ExecuteAffrows());
|
||||||
|
|
||||||
iou = fsql.InsertOrUpdate<tbiou03>().SetSource(new tbiou03 { id1 = 2, id2 = "02", name = "02" });
|
iou = fsql.InsertOrUpdate<tbiou03>().SetSource(new tbiou03 { id1 = 2, id2 = "02", name = "02" });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"REPLACE INTO ""tbiou03""(""id1"", ""id2"", ""name"") VALUES(2, '02', '02')", sql);
|
Assert.Equal(@"INSERT OR REPLACE INTO ""tbiou03""(""id1"", ""id2"", ""name"") VALUES(2, '02', '02')", sql);
|
||||||
Assert.Equal(1, iou.ExecuteAffrows());
|
Assert.Equal(1, iou.ExecuteAffrows());
|
||||||
|
|
||||||
iou = fsql.InsertOrUpdate<tbiou03>().SetSource(new[] { new tbiou03 { id1 = 1, id2 = "01", name = "01" }, new tbiou03 { id1 = 2, id2 = "02", name = "02" }, new tbiou03 { id1 = 3, id2 = "03", name = "03" }, new tbiou03 { id1 = 4, id2 = "04", name = "04" } });
|
iou = fsql.InsertOrUpdate<tbiou03>().SetSource(new[] { new tbiou03 { id1 = 1, id2 = "01", name = "01" }, new tbiou03 { id1 = 2, id2 = "02", name = "02" }, new tbiou03 { id1 = 3, id2 = "03", name = "03" }, new tbiou03 { id1 = 4, id2 = "04", name = "04" } });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"REPLACE INTO ""tbiou03""(""id1"", ""id2"", ""name"") VALUES(1, '01', '01'), (2, '02', '02'), (3, '03', '03'), (4, '04', '04')", sql);
|
Assert.Equal(@"INSERT OR REPLACE INTO ""tbiou03""(""id1"", ""id2"", ""name"") VALUES(1, '01', '01'), (2, '02', '02'), (3, '03', '03'), (4, '04', '04')", sql);
|
||||||
Assert.Equal(4, iou.ExecuteAffrows());
|
Assert.Equal(4, iou.ExecuteAffrows());
|
||||||
|
|
||||||
iou = fsql.InsertOrUpdate<tbiou03>().SetSource(new[] { new tbiou03 { id1 = 1, id2 = "01", name = "001" }, new tbiou03 { id1 = 2, id2 = "02", name = "002" }, new tbiou03 { id1 = 3, id2 = "03", name = "003" }, new tbiou03 { id1 = 4, id2 = "04", name = "004" } });
|
iou = fsql.InsertOrUpdate<tbiou03>().SetSource(new[] { new tbiou03 { id1 = 1, id2 = "01", name = "001" }, new tbiou03 { id1 = 2, id2 = "02", name = "002" }, new tbiou03 { id1 = 3, id2 = "03", name = "003" }, new tbiou03 { id1 = 4, id2 = "04", name = "004" } });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"REPLACE INTO ""tbiou03""(""id1"", ""id2"", ""name"") VALUES(1, '01', '001'), (2, '02', '002'), (3, '03', '003'), (4, '04', '004')", sql);
|
Assert.Equal(@"INSERT OR REPLACE INTO ""tbiou03""(""id1"", ""id2"", ""name"") VALUES(1, '01', '001'), (2, '02', '002'), (3, '03', '003'), (4, '04', '004')", sql);
|
||||||
Assert.Equal(4, iou.ExecuteAffrows());
|
Assert.Equal(4, iou.ExecuteAffrows());
|
||||||
var lst = fsql.Select<tbiou03>().Where(a => a.id1 == 1 && a.id2 == "01" || a.id1 == 2 && a.id2 == "02" || a.id1 == 3 && a.id2 == "03" || a.id1 == 4 && a.id2 == "04").ToList();
|
var lst = fsql.Select<tbiou03>().Where(a => a.id1 == 1 && a.id2 == "01" || a.id1 == 2 && a.id2 == "02" || a.id1 == 3 && a.id2 == "03" || a.id1 == 4 && a.id2 == "04").ToList();
|
||||||
Assert.Equal(4, lst.Where(a => a.name == "00" + a.id1).Count());
|
Assert.Equal(4, lst.Where(a => a.name == "00" + a.id1).Count());
|
||||||
@ -203,27 +203,27 @@ INSERT INTO ""tbiou022""(""name"") VALUES('00001'), ('00002'), ('00003'), ('0000
|
|||||||
fsql.Delete<tbiou04>().Where("1=1").ExecuteAffrows();
|
fsql.Delete<tbiou04>().Where("1=1").ExecuteAffrows();
|
||||||
var iou = fsql.InsertOrUpdate<tbiou04>().SetSource(new tbiou04 { id = 1, name = "01" });
|
var iou = fsql.InsertOrUpdate<tbiou04>().SetSource(new tbiou04 { id = 1, name = "01" });
|
||||||
var sql = iou.ToSql();
|
var sql = iou.ToSql();
|
||||||
Assert.Equal(@"REPLACE INTO ""tbiou04""(""id"", ""name"", ""version"", ""CreateTime"") VALUES(1, '01', 0, datetime(current_timestamp,'localtime'))", sql);
|
Assert.Equal(@"INSERT OR REPLACE INTO ""tbiou04""(""id"", ""name"", ""version"", ""CreateTime"") VALUES(1, '01', 0, datetime(current_timestamp,'localtime'))", sql);
|
||||||
Assert.Equal(1, iou.ExecuteAffrows());
|
Assert.Equal(1, iou.ExecuteAffrows());
|
||||||
|
|
||||||
iou = fsql.InsertOrUpdate<tbiou04>().SetSource(new tbiou04 { id = 1, name = "011" });
|
iou = fsql.InsertOrUpdate<tbiou04>().SetSource(new tbiou04 { id = 1, name = "011" });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"REPLACE INTO ""tbiou04""(""id"", ""name"", ""version"", ""CreateTime"") VALUES(1, '011', 0, datetime(current_timestamp,'localtime'))", sql);
|
Assert.Equal(@"INSERT OR REPLACE INTO ""tbiou04""(""id"", ""name"", ""version"", ""CreateTime"") VALUES(1, '011', 0, datetime(current_timestamp,'localtime'))", sql);
|
||||||
Assert.Equal(1, iou.ExecuteAffrows());
|
Assert.Equal(1, iou.ExecuteAffrows());
|
||||||
|
|
||||||
iou = fsql.InsertOrUpdate<tbiou04>().SetSource(new tbiou04 { id = 2, name = "02" });
|
iou = fsql.InsertOrUpdate<tbiou04>().SetSource(new tbiou04 { id = 2, name = "02" });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"REPLACE INTO ""tbiou04""(""id"", ""name"", ""version"", ""CreateTime"") VALUES(2, '02', 0, datetime(current_timestamp,'localtime'))", sql);
|
Assert.Equal(@"INSERT OR REPLACE INTO ""tbiou04""(""id"", ""name"", ""version"", ""CreateTime"") VALUES(2, '02', 0, datetime(current_timestamp,'localtime'))", sql);
|
||||||
Assert.Equal(1, iou.ExecuteAffrows());
|
Assert.Equal(1, iou.ExecuteAffrows());
|
||||||
|
|
||||||
iou = fsql.InsertOrUpdate<tbiou04>().SetSource(new[] { new tbiou04 { id = 1, name = "01" }, new tbiou04 { id = 2, name = "02" }, new tbiou04 { id = 3, name = "03" }, new tbiou04 { id = 4, name = "04" } });
|
iou = fsql.InsertOrUpdate<tbiou04>().SetSource(new[] { new tbiou04 { id = 1, name = "01" }, new tbiou04 { id = 2, name = "02" }, new tbiou04 { id = 3, name = "03" }, new tbiou04 { id = 4, name = "04" } });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"REPLACE INTO ""tbiou04""(""id"", ""name"", ""version"", ""CreateTime"") VALUES(1, '01', 0, datetime(current_timestamp,'localtime')), (2, '02', 0, datetime(current_timestamp,'localtime')), (3, '03', 0, datetime(current_timestamp,'localtime')), (4, '04', 0, datetime(current_timestamp,'localtime'))", sql);
|
Assert.Equal(@"INSERT OR REPLACE INTO ""tbiou04""(""id"", ""name"", ""version"", ""CreateTime"") VALUES(1, '01', 0, datetime(current_timestamp,'localtime')), (2, '02', 0, datetime(current_timestamp,'localtime')), (3, '03', 0, datetime(current_timestamp,'localtime')), (4, '04', 0, datetime(current_timestamp,'localtime'))", sql);
|
||||||
Assert.Equal(4, iou.ExecuteAffrows());
|
Assert.Equal(4, iou.ExecuteAffrows());
|
||||||
|
|
||||||
iou = fsql.InsertOrUpdate<tbiou04>().SetSource(new[] { new tbiou04 { id = 1, name = "001" }, new tbiou04 { id = 2, name = "002" }, new tbiou04 { id = 3, name = "003" }, new tbiou04 { id = 4, name = "004" } });
|
iou = fsql.InsertOrUpdate<tbiou04>().SetSource(new[] { new tbiou04 { id = 1, name = "001" }, new tbiou04 { id = 2, name = "002" }, new tbiou04 { id = 3, name = "003" }, new tbiou04 { id = 4, name = "004" } });
|
||||||
sql = iou.ToSql();
|
sql = iou.ToSql();
|
||||||
Assert.Equal(@"REPLACE INTO ""tbiou04""(""id"", ""name"", ""version"", ""CreateTime"") VALUES(1, '001', 0, datetime(current_timestamp,'localtime')), (2, '002', 0, datetime(current_timestamp,'localtime')), (3, '003', 0, datetime(current_timestamp,'localtime')), (4, '004', 0, datetime(current_timestamp,'localtime'))", sql);
|
Assert.Equal(@"INSERT OR REPLACE INTO ""tbiou04""(""id"", ""name"", ""version"", ""CreateTime"") VALUES(1, '001', 0, datetime(current_timestamp,'localtime')), (2, '002', 0, datetime(current_timestamp,'localtime')), (3, '003', 0, datetime(current_timestamp,'localtime')), (4, '004', 0, datetime(current_timestamp,'localtime'))", sql);
|
||||||
Assert.Equal(4, iou.ExecuteAffrows());
|
Assert.Equal(4, iou.ExecuteAffrows());
|
||||||
var lst = fsql.Select<tbiou04>().Where(a => new[] { 1, 2, 3, 4 }.Contains(a.id)).ToList();
|
var lst = fsql.Select<tbiou04>().Where(a => new[] { 1, 2, 3, 4 }.Contains(a.id)).ToList();
|
||||||
Assert.Equal(4, lst.Where(a => a.name == "00" + a.id).Count());
|
Assert.Equal(4, lst.Where(a => a.name == "00" + a.id).Count());
|
||||||
|
@ -509,10 +509,6 @@ namespace FreeSql.Internal
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
trytb.Indexes = indexesDict.Values.ToArray();
|
trytb.Indexes = indexesDict.Values.ToArray();
|
||||||
trytb.ColumnsByPosition = columnsList.Where(a => a.Attribute.Position > 0).OrderBy(a => a.Attribute.Position)
|
|
||||||
.Concat(columnsList.Where(a => a.Attribute.Position == 0))
|
|
||||||
.Concat(columnsList.Where(a => a.Attribute.Position < 0).OrderBy(a => a.Attribute.Position)).ToArray();
|
|
||||||
trytb.ColumnsByCanUpdateDbUpdateValue = columnsList.Where(a => a.Attribute.CanUpdate == true && string.IsNullOrEmpty(a.DbUpdateValue) == false).ToArray();
|
|
||||||
|
|
||||||
trytb.Primarys = trytb.Columns.Values.Where(a => a.Attribute.IsPrimary == true).ToArray();
|
trytb.Primarys = trytb.Columns.Values.Where(a => a.Attribute.IsPrimary == true).ToArray();
|
||||||
if (trytb.Primarys.Any() == false)
|
if (trytb.Primarys.Any() == false)
|
||||||
@ -547,6 +543,7 @@ namespace FreeSql.Internal
|
|||||||
}
|
}
|
||||||
foreach (var col in trytb.Columns.Values)
|
foreach (var col in trytb.Columns.Values)
|
||||||
{
|
{
|
||||||
|
if (col.Attribute.IsPrimary == false && col.Attribute.IsIdentity) col.Attribute.CanUpdate = false;
|
||||||
var ltp = @"\(([^\)]+)\)";
|
var ltp = @"\(([^\)]+)\)";
|
||||||
col.DbTypeText = Regex.Replace(col.Attribute.DbType.Replace("NOT NULL", "").Replace(" NULL", "").Trim(), ltp, "");
|
col.DbTypeText = Regex.Replace(col.Attribute.DbType.Replace("NOT NULL", "").Replace(" NULL", "").Trim(), ltp, "");
|
||||||
var m = Regex.Match(col.Attribute.DbType, ltp);
|
var m = Regex.Match(col.Attribute.DbType, ltp);
|
||||||
@ -582,6 +579,10 @@ namespace FreeSql.Internal
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
trytb.IsRereadSql = trytb.Columns.Where(a => string.IsNullOrWhiteSpace(a.Value.Attribute.RereadSql) == false).Any();
|
trytb.IsRereadSql = trytb.Columns.Where(a => string.IsNullOrWhiteSpace(a.Value.Attribute.RereadSql) == false).Any();
|
||||||
|
trytb.ColumnsByPosition = columnsList.Where(a => a.Attribute.Position > 0).OrderBy(a => a.Attribute.Position)
|
||||||
|
.Concat(columnsList.Where(a => a.Attribute.Position == 0))
|
||||||
|
.Concat(columnsList.Where(a => a.Attribute.Position < 0).OrderBy(a => a.Attribute.Position)).ToArray();
|
||||||
|
trytb.ColumnsByCanUpdateDbUpdateValue = columnsList.Where(a => a.Attribute.CanUpdate == true && string.IsNullOrEmpty(a.DbUpdateValue) == false).ToArray();
|
||||||
tbc.AddOrUpdate(entity, trytb, (oldkey, oldval) => trytb);
|
tbc.AddOrUpdate(entity, trytb, (oldkey, oldval) => trytb);
|
||||||
|
|
||||||
#region 查找导航属性的关系、virtual 属性延时加载,动态产生新的重写类
|
#region 查找导航属性的关系、virtual 属性延时加载,动态产生新的重写类
|
||||||
|
Loading…
x
Reference in New Issue
Block a user