From 45f06c3025f160a3549c0b12c8684dbb54bc5222 Mon Sep 17 00:00:00 2001
From: 28810 <28810@YEXIANGQIN>
Date: Sat, 23 May 2020 00:50:24 +0800
Subject: [PATCH] update internal code
---
Extensions/FreeSql.Generator/ConsoleApp.cs | 18 +++++++++---------
.../FreeSql.Generator/RazorContentManager.cs | 2 ++
.../DbContext/DbContextScopedFreeSql.cs | 11 ++++++-----
FreeSql/Interface/IFreeSql.cs | 1 +
4 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/Extensions/FreeSql.Generator/ConsoleApp.cs b/Extensions/FreeSql.Generator/ConsoleApp.cs
index 5ffb8fdb..cf65031c 100644
--- a/Extensions/FreeSql.Generator/ConsoleApp.cs
+++ b/Extensions/FreeSql.Generator/ConsoleApp.cs
@@ -257,15 +257,15 @@ new Colorful.Formatter("推荐在实体类目录创建 gen.bat，双击它重新
RazorEngine.Engine.Razor.Run(razorId, sw, null, model);
StringBuilder plus = new StringBuilder();
- plus.AppendLine("//------------------------------------------------------------------------------");
- plus.AppendLine("// ");
- plus.AppendLine("// 此代码由工具 FreeSql.Generator 生成。");
- plus.AppendLine("// 运行时版本:" + Environment.Version.ToString());
- plus.AppendLine("// Website: https://github.com/2881099/FreeSql");
- plus.AppendLine("// 对此文件的更改可能会导致不正确的行为，并且如果");
- plus.AppendLine("// 重新生成代码，这些更改将会丢失。");
- plus.AppendLine("// ");
- plus.AppendLine("//------------------------------------------------------------------------------");
+ //plus.AppendLine("//------------------------------------------------------------------------------");
+ //plus.AppendLine("// ");
+ //plus.AppendLine("// 此代码由工具 FreeSql.Generator 生成。");
+ //plus.AppendLine("// 运行时版本:" + Environment.Version.ToString());
+ //plus.AppendLine("// Website: https://github.com/2881099/FreeSql");
+ //plus.AppendLine("// 对此文件的更改可能会导致不正确的行为，并且如果");
+ //plus.AppendLine("// 重新生成代码，这些更改将会丢失。");
+ //plus.AppendLine("// ");
+ //plus.AppendLine("//------------------------------------------------------------------------------");
plus.Append(sw.ToString());
plus.AppendLine();
diff --git a/Extensions/FreeSql.Generator/RazorContentManager.cs b/Extensions/FreeSql.Generator/RazorContentManager.cs
index e881aa80..a5d9de6b 100644
--- a/Extensions/FreeSql.Generator/RazorContentManager.cs
+++ b/Extensions/FreeSql.Generator/RazorContentManager.cs
@@ -50,6 +50,7 @@ switch (gen.fsql.Ado.DataType) {
break;
}
}
+
namespace @gen.NameSpace {
@if (string.IsNullOrEmpty(gen.table.Comment) == false) {
@@ -133,6 +134,7 @@ switch (gen.fsql.Ado.DataType) {
break;
}
}
+
namespace @gen.NameSpace {
@if (string.IsNullOrEmpty(gen.table.Comment) == false) {
diff --git a/FreeSql.DbContext/DbContext/DbContextScopedFreeSql.cs b/FreeSql.DbContext/DbContext/DbContextScopedFreeSql.cs
index d82d4224..3aef53e4 100644
--- a/FreeSql.DbContext/DbContext/DbContextScopedFreeSql.cs
+++ b/FreeSql.DbContext/DbContext/DbContextScopedFreeSql.cs
@@ -37,7 +37,7 @@ namespace FreeSql
{
var db = _resolveDbContext?.Invoke();
db?.FlushCommand();
- var select = _originalFsql.Select().WithTransaction(_resolveUnitOfWork()?.GetOrBeginTransaction(false));
+ var select = _originalFsql.Select().WithTransaction(_resolveUnitOfWork?.Invoke()?.GetOrBeginTransaction(false));
if (db?.Options.EnableGlobalFilter == false) select.DisableGlobalFilter();
return select;
}
@@ -47,7 +47,7 @@ namespace FreeSql
{
var db = _resolveDbContext?.Invoke();
db?.FlushCommand();
- var delete = _originalFsql.Delete().WithTransaction(_resolveUnitOfWork()?.GetOrBeginTransaction());
+ var delete = _originalFsql.Delete().WithTransaction(_resolveUnitOfWork?.Invoke()?.GetOrBeginTransaction());
if (db?.Options.EnableGlobalFilter == false) delete.DisableGlobalFilter();
return delete;
}
@@ -57,7 +57,7 @@ namespace FreeSql
{
var db = _resolveDbContext?.Invoke();
db?.FlushCommand();
- var update = _originalFsql.Update().WithTransaction(_resolveUnitOfWork()?.GetOrBeginTransaction());
+ var update = _originalFsql.Update().WithTransaction(_resolveUnitOfWork?.Invoke()?.GetOrBeginTransaction());
if (db?.Options.NoneParameter != null) update.NoneParameter(db.Options.NoneParameter.Value);
if (db?.Options.EnableGlobalFilter == false) update.DisableGlobalFilter();
return update;
@@ -68,7 +68,7 @@ namespace FreeSql
{
var db = _resolveDbContext?.Invoke();
db?.FlushCommand();
- var insert = _originalFsql.Insert().WithTransaction(_resolveUnitOfWork()?.GetOrBeginTransaction());
+ var insert = _originalFsql.Insert().WithTransaction(_resolveUnitOfWork?.Invoke()?.GetOrBeginTransaction());
if (db?.Options.NoneParameter != null) insert.NoneParameter(db.Options.NoneParameter.Value);
return insert;
}
@@ -76,11 +76,12 @@ namespace FreeSql
public IInsert Insert(T1[] source) where T1 : class => Insert().AppendData(source);
public IInsert Insert(List source) where T1 : class => Insert().AppendData(source);
public IInsert Insert(IEnumerable source) where T1 : class => Insert().AppendData(source);
+
public IInsertOrUpdate InsertOrUpdate() where T1 : class
{
var db = _resolveDbContext?.Invoke();
db?.FlushCommand();
- return _originalFsql.InsertOrUpdate().WithTransaction(_resolveUnitOfWork()?.GetOrBeginTransaction());
+ return _originalFsql.InsertOrUpdate().WithTransaction(_resolveUnitOfWork?.Invoke()?.GetOrBeginTransaction());
}
}
}
diff --git a/FreeSql/Interface/IFreeSql.cs b/FreeSql/Interface/IFreeSql.cs
index 72230929..e2e973a9 100644
--- a/FreeSql/Interface/IFreeSql.cs
+++ b/FreeSql/Interface/IFreeSql.cs
@@ -52,6 +52,7 @@ public interface IFreeSql : IDisposable
/// Oracle: merge into
/// Sqlite: replace into
/// Dameng: merge into
+ /// 注意：还可以使用 FreeSql.Repository 的 InsertOrUpdate 方法
///
///
///