tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-11-04 17:20:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

update to net8.0

Browse Source
This commit is contained in:
2881099
2023-11-15 14:55:16 +08:00
parent bf07ae275f
commit b99c5f4a62
63 changed files with 246 additions and 491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Providers/FreeSql.Provider.ClickHouse/ClickHouseCodeFirst.cs
View File

@@ -322,7 +322,7 @@ where a.database in ({0}) and a.table in ({1})", tboldname ?? tbname);
//先判断表中有没此字段的索引
if (indexCollect.Any(c =>
RemoveSpaceComparison(c.expr,
string.Join(',', uk.Columns.Select(i => i.Column.CsName)))))
string.Join(",", uk.Columns.Select(i => i.Column.CsName)))))
{
//有这个字段的索引，但是名称不一样 修改名 , ClickHouse不支持修改列
//if (!indexCollect.Where(c => c.name == uk.Name).Any())
@@ -507,22 +507,17 @@ where a.database in ({0}) and a.table in ({1})", tboldname ?? tbname);
}
}
string CkNullablePrimaryAdapter(string dbType, bool isPrimary)
{
return isPrimary
? dbType.Replace("Nullable(", "").Replace(")", "")
: dbType.Replace(" NOT NULL", "");
}
string CkNullableAdapter(string dbType, bool isPrimary)
{
return isPrimary switch
if (isPrimary)
{
true when dbType.Contains("Nullable") => dbType.Replace("Nullable(", "")
.Replace(")", "")
.Replace(" NOT NULL", ""),
true => dbType,
_ => dbType.Replace(" NOT NULL", "")
};
if (dbType.Contains("Nullable"))
return dbType.Replace("Nullable(", "")
.Replace(")", "")
.Replace(" NOT NULL", "");
return dbType;
}
return dbType.Replace(" NOT NULL", "");
}

19
Providers/FreeSql.Provider.ClickHouse/Curd/ClickHouseInsert.cs
View File

@@ -60,12 +60,14 @@ namespace FreeSql.ClickHouse.Curd
var data = ToDataTable();
using (var conn = _orm.Ado.MasterPool.Get())
{
using var bulkCopyInterface = new ClickHouseBulkCopy(conn.Value as ClickHouseConnection)
using (var bulkCopyInterface = new ClickHouseBulkCopy(conn.Value as ClickHouseConnection)
{
DestinationTableName = data.TableName,
BatchSize = _source.Count
};
bulkCopyInterface.WriteToServerAsync(data, default).Wait();
})
{
bulkCopyInterface.WriteToServerAsync(data, default).Wait();
}
}
return affrows;
}
@@ -95,7 +97,8 @@ namespace FreeSql.ClickHouse.Curd
{
v = item.GetValue(u);
}
dic.TryAdd(item.Name, v);
if (dic.ContainsKey(item.Name) == false)
dic.Add(item.Name, v);
}
return dic;
}
@@ -170,12 +173,14 @@ namespace FreeSql.ClickHouse.Curd
var data = ToDataTable();
using (var conn = await _orm.Ado.MasterPool.GetAsync())
{
using var bulkCopyInterface = new ClickHouseBulkCopy(conn.Value as ClickHouseConnection)
using (var bulkCopyInterface = new ClickHouseBulkCopy(conn.Value as ClickHouseConnection)
{
DestinationTableName = data.TableName,
BatchSize = _source.Count
};
await bulkCopyInterface.WriteToServerAsync(data, default);
})
{
await bulkCopyInterface.WriteToServerAsync(data, default);
}
}
return affrows;
}

3
Providers/FreeSql.Provider.ClickHouse/FreeSql.Provider.ClickHouse.csproj
View File

@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!--;netcoreapp2.2;net472-->
<TargetFrameworks>netstandard2.1</TargetFrameworks>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>FreeSql;ncc;YeXiangQin;ChenBo</Authors>
@@ -20,9 +19,11 @@
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.2.803-preview20231114</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>
<ItemGroup>
<None Include="../../readme.md" Pack="true" PackagePath="\"/>
<None Include="../../logo.png" Pack="true" PackagePath="\" />
</ItemGroup>