tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-04-22 10:42:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/dotnetcore/FreeSql

Browse Source
This commit is contained in:
2881099 2022-12-06 18:03:51 +08:00
commit 1515cf412d
3 changed files with 572 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
FreeSql.Tests/FreeSql.Tests/ClickHouse/ClickHouseTest2.cs Normal file
View File

@ -0,0 +1,27 @@
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Text;
using System.Linq;
using System.Collections;
using System.Diagnostics;
using System.ComponentModel.DataAnnotations;
using FreeSql.DataAnnotations;
using Xunit;
namespace FreeSql.Tests.ClickHouse
{
public class ClickHouseTest2
{
private static IFreeSql fsql = new FreeSqlBuilder().UseConnectionString(DataType.ClickHouse,
"Host=127.0.0.1;Port=8123;Database=test;Compress=True;Min Pool Size=1")
.UseMonitorCommand(cmd => Console.WriteLine($"线程：{cmd.CommandText}\r\n"))
.UseNoneCommandParameter(true)
.Build();
[Fact]
public void CodeFirst()
{
fsql.CodeFirst.SyncStructure(typeof(CollectDataEntityUpdate01));
}
}
}

237
FreeSql.Tests/FreeSql.Tests/ClickHouse/CollectDataEntity2.cs Normal file
View File

@ -0,0 +1,237 @@
using FreeSql.DataAnnotations;
using Newtonsoft.Json;
using System;
using System.ComponentModel;
namespace FreeSql.Tests.ClickHouse
{
/// <summary>
/// 实时数据
/// </summary>
[Index("idx_{tablename}_01", nameof(Guid), true)]
[Index("idx_{tablename}_02", nameof(TenantId), true)]
//复合索引
[Index("idx_{tablename}_03", $"{nameof(CreatedUserId)},{nameof(Version)}", false)]
[Table(OldName = "CollectDataEntityUpdate")]
public partial class CollectDataEntityUpdate01
{
/// <summary>
/// Guid
/// </summary>
[Column(StringLength = 50)]
public string Guid
{
get; set;
}
/// <summary>
/// 租户Id
/// </summary>
[Description("租户Id")]
[Column(CanUpdate = false)]
public virtual long? TenantId
{
get; set;
}
/// <summary>
/// 版本
/// </summary>
[Description("版本")]
[Column(IsVersion = false)]
public long Version
{
get; set;
}
/// <summary>
/// 是否删除
/// </summary>
[Description("是否删除")]
[Column()]
public bool IsDeleted { get; set; } = false;
/// <summary>
/// 创建者Id
/// </summary>
[Description("创建者Id")]
[Column(CanUpdate = false)]
public long? CreatedUserId
{
get; set;
}
/// <summary>
/// 创建者
/// </summary>
[Description("创建者")]
[Column(CanUpdate = false, StringLength = 50, OldName = "CreatedUserNameUpdate")]
public string CreatedUserNameUpdate01
{
get; set;
}
/// <summary>
/// 创建时间
/// </summary>
[Description("创建时间")]
[Column(CanUpdate = false, ServerTime = DateTimeKind.Local)]
public DateTime? CreatedTime
{
get; set;
}
/// <summary>
/// 修改者Id
/// </summary>
[Description("修改者Id")]
[Column(CanInsert = false)]
public long? ModifiedUserId
{
get; set;
}
/// <summary>
/// 修改者
/// </summary>
[Description("修改者")]
[Column(CanInsert = false, StringLength = 50)]
public string ModifiedUserName
{
get; set;
}
/// <summary>
/// 修改时间
/// </summary>
[Description("修改时间")]
[Column(CanInsert = false, ServerTime = DateTimeKind.Local)]
public DateTime? ModifiedTime
{
get; set;
}
/// <summary>
/// 数据标识
/// </summary>
[Description("数据标识")]
[Column(CanInsert = false, StringLength = 2)]
public string DataFlag
{
get; set;
}
/// <summary>
/// 主键Id
/// </summary>
[Description("主键Id")]
[Column(Position = 1, IsPrimary = true)]
public long Id
{
get; set;
}
/// <summary>
/// 设备编号
/// </summary>
[Column(StringLength = 50)]
public string EquipmentCode
{
get; set;
}
/// <summary>
/// 数据编号，如为空使用默认数据
/// </summary>
[Column(StringLength = 50)]
public string PropertyCode
{
get; set;
}
/// <summary>
/// 数据名称，如为空使用默认数据
/// </summary>
[Column(StringLength = 50)]
public string PropertyName
{
get; set;
}
/// <summary>
/// 数值或状态是否变更
/// </summary>
public bool IsValueOrStateChanged
{
get; set;
}
/// <summary>
/// 采集数值
/// </summary>
[Column(StringLength = 18)]
public decimal? NumericValue
{
get; set;
}
/// <summary>
/// 备注
/// </summary>
[Column(StringLength = 200)]
public string Remark
{
get; set;
}
/// <summary>
/// 服务标记
/// </summary>
[Column(StringLength = 20)]
public string ServiceFlag
{
get; set;
}
/// <summary>
/// 状态
/// </summary>
[Column(StringLength = 50)]
public string StrState
{
get; set;
}
/// <summary>
/// 文本数值
/// </summary>
[Column(StringLength = 50)]
public string StrValue
{
get; set;
}
/// <summary>
/// 单位
/// </summary>
[Column(StringLength = 10)]
public string UnitStr
{
get; set;
}
/// <summary>
/// 采集时间
/// </summary>
public DateTime CollectTime
{
get; set;
}
public string FieldKey
{
get
{
return EquipmentCode + "_" + PropertyCode;
}
}
}
}

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

@ -12,43 +12,76 @@ using ClickHouse.Client.ADO;
namespace FreeSql.ClickHouse namespace FreeSql.ClickHouse
{ {
class ClickHouseCodeFirst : Internal.CommonProvider.CodeFirstProvider class ClickHouseCodeFirst : Internal.CommonProvider.CodeFirstProvider
{ {
public ClickHouseCodeFirst(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression) : base(orm,
public ClickHouseCodeFirst(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression) : base(orm, commonUtils, commonExpression) { } commonUtils, commonExpression)
{
}
static object _dicCsToDbLock = new object(); static object _dicCsToDbLock = new object();
static Dictionary<string, CsToDb<DbType>> _dicCsToDb = new Dictionary<string, CsToDb<DbType>>() { static Dictionary<string, CsToDb<DbType>> _dicCsToDb = new Dictionary<string, CsToDb<DbType>>()
{ typeof(bool).FullName, CsToDb.New(DbType.SByte, "Int8","Int8", null, false, false) },{ typeof(bool?).FullName, CsToDb.New(DbType.SByte, "Int8","Nullable(Int8)", null, true, null) }, {
{ typeof(bool).FullName, CsToDb.New(DbType.SByte, "Int8", "Int8", null, false, false) },
{ typeof(bool?).FullName, CsToDb.New(DbType.SByte, "Int8", "Nullable(Int8)", null, true, null) },
{ typeof(sbyte).FullName, CsToDb.New(DbType.SByte, "Int8", "Int8", false, false, 0) },{ typeof(sbyte?).FullName, CsToDb.New(DbType.SByte, "Int8", "Nullable(Int8)", false, true, null) }, { typeof(sbyte).FullName, CsToDb.New(DbType.SByte, "Int8", "Int8", false, false, 0) },
{ typeof(short).FullName, CsToDb.New(DbType.Int16, "Int16","Int16", false, false, 0) },{ typeof(short?).FullName, CsToDb.New(DbType.Int16, "Int16", "Nullable(Int16)", false, true, null) }, { typeof(sbyte?).FullName, CsToDb.New(DbType.SByte, "Int8", "Nullable(Int8)", false, true, null) },
{ typeof(int).FullName, CsToDb.New(DbType.Int32, "Int32", "Int32", false, false, 0) },{ typeof(int?).FullName, CsToDb.New(DbType.Int32, "Int32", "Nullable(Int32)", false, true, null) }, { typeof(short).FullName, CsToDb.New(DbType.Int16, "Int16", "Int16", false, false, 0) },
{ typeof(long).FullName, CsToDb.New(DbType.Int64, "Int64","Int64", false, false, 0) },{ typeof(long?).FullName, CsToDb.New(DbType.Int64, "Int64","Nullable(Int64)", false, true, null) }, { typeof(short?).FullName, CsToDb.New(DbType.Int16, "Int16", "Nullable(Int16)", false, true, null) },
{ typeof(int).FullName, CsToDb.New(DbType.Int32, "Int32", "Int32", false, false, 0) },
{ typeof(int?).FullName, CsToDb.New(DbType.Int32, "Int32", "Nullable(Int32)", false, true, null) },
{ typeof(long).FullName, CsToDb.New(DbType.Int64, "Int64", "Int64", false, false, 0) },
{ typeof(long?).FullName, CsToDb.New(DbType.Int64, "Int64", "Nullable(Int64)", false, true, null) },
{ typeof(byte).FullName, CsToDb.New(DbType.Byte, "UInt8","UInt8", true, false, 0) },{ typeof(byte?).FullName, CsToDb.New(DbType.Byte, "UInt8","Nullable(UInt8)", true, true, null) }, { typeof(byte).FullName, CsToDb.New(DbType.Byte, "UInt8", "UInt8", true, false, 0) },
{ typeof(ushort).FullName, CsToDb.New(DbType.UInt16, "UInt16","UInt16", true, false, 0) },{ typeof(ushort?).FullName, CsToDb.New(DbType.UInt16, "UInt16", "Nullable(UInt16)", true, true, null) }, { typeof(byte?).FullName, CsToDb.New(DbType.Byte, "UInt8", "Nullable(UInt8)", true, true, null) },
{ typeof(uint).FullName, CsToDb.New(DbType.UInt32, "UInt32", "UInt32", true, false, 0) },{ typeof(uint?).FullName, CsToDb.New(DbType.UInt32, "UInt32", "Nullable(UInt32)", true, true, null) }, { typeof(ushort).FullName, CsToDb.New(DbType.UInt16, "UInt16", "UInt16", true, false, 0) },
{ typeof(ulong).FullName, CsToDb.New(DbType.UInt64, "UInt64", "UInt64", true, false, 0) },{ typeof(ulong?).FullName, CsToDb.New(DbType.UInt64, "UInt64", "Nullable(UInt64)", true, true, null) }, { typeof(ushort?).FullName, CsToDb.New(DbType.UInt16, "UInt16", "Nullable(UInt16)", true, true, null) },
{ typeof(uint).FullName, CsToDb.New(DbType.UInt32, "UInt32", "UInt32", true, false, 0) },
{ typeof(uint?).FullName, CsToDb.New(DbType.UInt32, "UInt32", "Nullable(UInt32)", true, true, null) },
{ typeof(ulong).FullName, CsToDb.New(DbType.UInt64, "UInt64", "UInt64", true, false, 0) },
{ typeof(ulong?).FullName, CsToDb.New(DbType.UInt64, "UInt64", "Nullable(UInt64)", true, true, null) },
{ typeof(double).FullName, CsToDb.New(DbType.Double, "Float64", "Float64", false, false, 0) },{ typeof(double?).FullName, CsToDb.New(DbType.Double, "Float64", "Nullable(Float64)", false, true, null) }, { typeof(double).FullName, CsToDb.New(DbType.Double, "Float64", "Float64", false, false, 0) },
{ typeof(float).FullName, CsToDb.New(DbType.Single, "Float32","Float32", false, false, 0) },{ typeof(float?).FullName, CsToDb.New(DbType.Single, "Float32","Nullable(Float32)", false, true, null) }, { typeof(double?).FullName, CsToDb.New(DbType.Double, "Float64", "Nullable(Float64)", false, true, null) },
{ typeof(decimal).FullName, CsToDb.New(DbType.Decimal, "Decimal128(19)","Decimal128(19)", false, false, 0) },{ typeof(decimal?).FullName, CsToDb.New(DbType.Decimal, "Nullable(Decimal128(19))","Nullable(Decimal128(19))", false, true, null) }, { typeof(float).FullName, CsToDb.New(DbType.Single, "Float32", "Float32", false, false, 0) },
{ typeof(float?).FullName, CsToDb.New(DbType.Single, "Float32", "Nullable(Float32)", false, true, null) },
{
typeof(decimal).FullName,
CsToDb.New(DbType.Decimal, "Decimal(38, 19)", "Decimal(38, 19)", false, false, 0) //Nullable(Decimal(38, 19))
},
{
typeof(decimal?).FullName,
CsToDb.New(DbType.Decimal, "Nullable(Decimal(38, 19))", "Nullable(Decimal(38, 19))", false, true, null)
},
{ typeof(DateTime).FullName, CsToDb.New(DbType.DateTime, "DateTime('Asia/Shanghai')", "DateTime('Asia/Shanghai')", false, false, new DateTime(1970,1,1)) },{ typeof(DateTime?).FullName, CsToDb.New(DbType.DateTime, "DateTime('Asia/Shanghai')", "Nullable(DateTime('Asia/Shanghai'))", false, true, null) }, {
typeof(DateTime).FullName,
CsToDb.New(DbType.DateTime, "DateTime('Asia/Shanghai')", "DateTime('Asia/Shanghai')", false, false,
new DateTime(1970, 1, 1))
},
{
typeof(DateTime?).FullName,
CsToDb.New(DbType.DateTime, "DateTime('Asia/Shanghai')", "Nullable(DateTime('Asia/Shanghai'))", false,
true, null)
},
{ typeof(string).FullName, CsToDb.New(DbType.String, "String", "String", false, null, "") }, { typeof(string).FullName, CsToDb.New(DbType.String, "String", "String", false, null, "") },
{ typeof(char).FullName, CsToDb.New(DbType.String, "String", "String", false, false, "") },{ typeof(char?).FullName, CsToDb.New(DbType.Single, "String","Nullable(String)", false, true, null) }, { typeof(char).FullName, CsToDb.New(DbType.String, "String", "String", false, false, "") },
{ typeof(Guid).FullName, CsToDb.New(DbType.String, "String", "String", false, false, Guid.Empty) },{ typeof(Guid?).FullName, CsToDb.New(DbType.String, "String", "Nullable(String)", false, true, null) }, { typeof(char?).FullName, CsToDb.New(DbType.Single, "String", "Nullable(String)", false, true, null) },
{ typeof(Guid).FullName, CsToDb.New(DbType.String, "String", "String", false, false, Guid.Empty) },
{ typeof(Guid?).FullName, CsToDb.New(DbType.String, "String", "Nullable(String)", false, true, null) },
}; };
public override DbInfoResult GetDbInfo(Type type) public override DbInfoResult GetDbInfo(Type type)
{ {
if (_dicCsToDb.TryGetValue(type.FullName, out var trydc)) return new DbInfoResult((int)trydc.type, trydc.dbtype, trydc.dbtypeFull, trydc.isnullable, trydc.defaultValue); if (_dicCsToDb.TryGetValue(type.FullName, out var trydc))
if (type.IsArray) return null; return new DbInfoResult((int)trydc.type, trydc.dbtype, trydc.dbtypeFull, trydc.isnullable,
trydc.defaultValue);
if (type.IsArray)
return null;
return null; return null;
} }
@ -65,19 +98,25 @@ namespace FreeSql.ClickHouse
var sb = new StringBuilder(); var sb = new StringBuilder();
foreach (var obj in objects) foreach (var obj in objects)
{ {
if (sb.Length > 0) sb.Append("\r\n"); if (sb.Length > 0)
sb.Append("\r\n");
var tb = _commonUtils.GetTableByEntity(obj.entityType); var tb = _commonUtils.GetTableByEntity(obj.entityType);
if (tb == null) throw new Exception(CoreStrings.S_Type_IsNot_Migrable(obj.entityType.FullName)); if (tb == null)
if (tb.Columns.Any() == false) throw new Exception(CoreStrings.S_Type_IsNot_Migrable_0Attributes(obj.entityType.FullName)); throw new Exception(CoreStrings.S_Type_IsNot_Migrable(obj.entityType.FullName));
if (tb.Columns.Any() == false)
throw new Exception(CoreStrings.S_Type_IsNot_Migrable_0Attributes(obj.entityType.FullName));
var tbname = _commonUtils.SplitTableName(tb.DbName); var tbname = _commonUtils.SplitTableName(tb.DbName);
if (tbname?.Length == 1) tbname = new[] { database, tbname[0] }; if (tbname?.Length == 1)
tbname = new[] { database, tbname[0] };
var tboldname = _commonUtils.SplitTableName(tb.DbOldName); //旧表名 var tboldname = _commonUtils.SplitTableName(tb.DbOldName); //旧表名
if (tboldname?.Length == 1) tboldname = new[] { database, tboldname[0] }; if (tboldname?.Length == 1)
tboldname = new[] { database, tboldname[0] };
if (string.IsNullOrEmpty(obj.tableName) == false) if (string.IsNullOrEmpty(obj.tableName) == false)
{ {
var tbtmpname = _commonUtils.SplitTableName(obj.tableName); var tbtmpname = _commonUtils.SplitTableName(obj.tableName);
if (tbtmpname?.Length == 1) tbtmpname = new[] { database, tbtmpname[0] }; if (tbtmpname?.Length == 1)
tbtmpname = new[] { database, tbtmpname[0] };
if (tbname[0] != tbtmpname[0] || tbname[1] != tbtmpname[1]) if (tbname[0] != tbtmpname[0] || tbname[1] != tbtmpname[1])
{ {
tbname = tbtmpname; tbname = tbtmpname;
@ -85,20 +124,32 @@ namespace FreeSql.ClickHouse
} }
} }
if (string.Compare(tbname[0], database, true) != 0 && LocalExecuteScalar(database, _commonUtils.FormatSql(" select 1 from system.databases d where name={0}", tbname[0])) == null) //创建数据库 if (string.Compare(tbname[0], database, true) != 0 && LocalExecuteScalar(database,
sb.Append($"CREATE DATABASE IF NOT EXISTS ").Append(_commonUtils.QuoteSqlName(tbname[0])).Append(" ENGINE=Ordinary;\r\n"); _commonUtils.FormatSql(" select 1 from system.databases d where name={0}", tbname[0])) ==
null) //创建数据库
sb.Append($"CREATE DATABASE IF NOT EXISTS ").Append(_commonUtils.QuoteSqlName(tbname[0]))
.Append(" ENGINE=Ordinary;\r\n");
var sbalter = new StringBuilder(); var sbalter = new StringBuilder();
var istmpatler = false; //创建临时表，导入数据，删除旧表，修改 var istmpatler = false; //创建临时表，导入数据，删除旧表，修改
if (LocalExecuteScalar(tbname[0], _commonUtils.FormatSql(" SELECT 1 FROM system.tables t WHERE database ={0} and name ={1}", tbname)) == null) if (LocalExecuteScalar(tbname[0],
{ //表不存在 _commonUtils.FormatSql(" SELECT 1 FROM system.tables t WHERE database ={0} and name ={1}",
tbname)) == null)
{
//表不存在
if (tboldname != null) if (tboldname != null)
{ {
if (string.Compare(tboldname[0], tbname[0], true) != 0 && LocalExecuteScalar(database, _commonUtils.FormatSql(" select 1 from system.databases where name={0}", tboldname[0])) == null || if (string.Compare(tboldname[0], tbname[0], true) != 0 && LocalExecuteScalar(database,
LocalExecuteScalar(tboldname[0], _commonUtils.FormatSql(" SELECT 1 FROM system.tables WHERE database={0} and name={1}", tboldname)) == null) _commonUtils.FormatSql(" select 1 from system.databases where name={0}",
tboldname[0])) == null ||
LocalExecuteScalar(tboldname[0],
_commonUtils.FormatSql(
" SELECT 1 FROM system.tables WHERE database={0} and name={1}", tboldname)) ==
null)
//数据库或表不存在 //数据库或表不存在
tboldname = null; tboldname = null;
} }
if (tboldname == null) if (tboldname == null)
{ {
//创建表 //创建表
@ -106,24 +157,34 @@ namespace FreeSql.ClickHouse
sb.Append("CREATE TABLE IF NOT EXISTS ").Append(createTableName).Append(" ( "); sb.Append("CREATE TABLE IF NOT EXISTS ").Append(createTableName).Append(" ( ");
foreach (var tbcol in tb.ColumnsByPosition) foreach (var tbcol in tb.ColumnsByPosition)
{ {
tbcol.Attribute.DbType = tbcol.Attribute.DbType.Replace(" NOT NULL", ""); //如果这里是主键就是不为Nullable
sb.Append(" \r\n ").Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(" ").Append(tbcol.Attribute.DbType); tbcol.Attribute.DbType =
if (string.IsNullOrEmpty(tbcol.Comment) == false) sb.Append(" COMMENT ").Append(_commonUtils.FormatSql("{0}", tbcol.Comment)); CkNullableAdapter(tbcol.Attribute.DbType, tbcol.Attribute.IsPrimary);
tbcol.Attribute.DbType = CkIntAdapter(tbcol.Attribute.DbType);
sb.Append(" \r\n ").Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(" ")
.Append(tbcol.Attribute.DbType);
if (string.IsNullOrEmpty(tbcol.Comment) == false)
sb.Append(" COMMENT ").Append(_commonUtils.FormatSql("{0}", tbcol.Comment));
sb.Append(","); sb.Append(",");
} }
foreach (var uk in tb.Indexes) foreach (var uk in tb.Indexes)
{ {
sb.Append(" \r\n "); sb.Append(" \r\n ");
sb.Append("INDEX ").Append(_commonUtils.QuoteSqlName(ReplaceIndexName(uk.Name, tbname[1]))); sb.Append("INDEX ")
.Append(_commonUtils.QuoteSqlName(ReplaceIndexName(uk.Name, tbname[1])));
sb.Append(" (");
foreach (var tbcol in uk.Columns) foreach (var tbcol in uk.Columns)
{ {
sb.Append(" ");
sb.Append(_commonUtils.QuoteSqlName(tbcol.Column.Attribute.Name)); sb.Append(_commonUtils.QuoteSqlName(tbcol.Column.Attribute.Name));
sb.Append(", ");
}
sb.Remove(sb.Length - 2, 2).Append(") ");
sb.Append("TYPE set(8192) GRANULARITY 5,"); sb.Append("TYPE set(8192) GRANULARITY 5,");
} }
sb.Remove(sb.Length - 2, 2);
}
sb.Remove(sb.Length - 1, 1); sb.Remove(sb.Length - 1, 1);
sb.Append("\r\n) "); sb.Append("\r\n) ");
sb.Append("\r\nENGINE = MergeTree()"); sb.Append("\r\nENGINE = MergeTree()");
@ -132,7 +193,8 @@ namespace FreeSql.ClickHouse
{ {
sb.Append(" \r\nORDER BY ( "); sb.Append(" \r\nORDER BY ( ");
var ls = new StringBuilder(); var ls = new StringBuilder();
foreach (var tbcol in tb.Primarys) ls.Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(", "); foreach (var tbcol in tb.Primarys)
ls.Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(", ");
sb.Append(ls); sb.Append(ls);
sb.Remove(sb.Length - 2, 2); sb.Remove(sb.Length - 2, 2);
sb.Append(" )"); sb.Append(" )");
@ -140,15 +202,20 @@ namespace FreeSql.ClickHouse
sb.Append(ls); sb.Append(ls);
sb.Remove(sb.Length - 2, 2).Append(","); sb.Remove(sb.Length - 2, 2).Append(",");
} }
sb.Remove(sb.Length - 1, 1); sb.Remove(sb.Length - 1, 1);
//if (string.IsNullOrEmpty(tb.Comment) == false) //if (string.IsNullOrEmpty(tb.Comment) == false)
// sb.Append(" Comment=").Append(_commonUtils.FormatSql("{0}", tb.Comment)); // sb.Append(" Comment=").Append(_commonUtils.FormatSql("{0}", tb.Comment));
sb.Append(" SETTINGS index_granularity = 8192;\r\n"); sb.Append(" SETTINGS index_granularity = 8192;\r\n");
continue; continue;
} }
//如果新表，旧表在一个数据库下，直接修改表名 //如果新表，旧表在一个数据库下，直接修改表名
if (string.Compare(tbname[0], tboldname[0], true) == 0) if (string.Compare(tbname[0], tboldname[0], true) == 0)
sbalter.Append("ALTER TABLE ").Append(_commonUtils.QuoteSqlName(tboldname[0], tboldname[1])).Append(" RENAME TO ").Append(_commonUtils.QuoteSqlName(tbname[0], tbname[1])).Append(";\r\n"); sbalter.Append("RENAME TABLE ")
.Append(_commonUtils.QuoteSqlName(tboldname[0], tboldname[1]))
.Append(" TO ").Append(_commonUtils.QuoteSqlName(tbname[0], tbname[1]))
.Append(";\r\n");
else else
{ {
//如果新表，旧表不在一起，创建新表，导入数据，删除旧表 //如果新表，旧表不在一起，创建新表，导入数据，删除旧表
@ -178,64 +245,162 @@ where a.database in ({0}) and a.table in ({1})", tboldname ?? tbname);
{ {
column = string.Concat(a[0]), column = string.Concat(a[0]),
sqlType = (string)a[1], sqlType = (string)a[1],
is_nullable = string.Concat(a[2]) == "1", is_nullable = a[1]?.ToString().Contains("Nullable"),
is_identity = false, is_identity = false,
comment = string.Concat(a[3]), comment = string.Concat(a[3]),
is_primary = string.Concat(a[6]) == "1", is_primary = string.Concat(a[6]) == "1",
}; };
}, StringComparer.CurrentCultureIgnoreCase); }, StringComparer.CurrentCultureIgnoreCase);
if (istmpatler == false) if (istmpatler == false)
{ {
var existsPrimary = tbstruct.Any(o => o.Value.is_primary); var existsPrimary = tbstruct.Any(o => o.Value.is_primary);
//对比列
foreach (var tbcol in tb.ColumnsByPosition) foreach (var tbcol in tb.ColumnsByPosition)
{ {
if (tbstruct.TryGetValue(tbcol.Attribute.Name, out var tbstructcol) || //表中有这个字段
string.IsNullOrEmpty(tbcol.Attribute.OldName) == false && tbstruct.TryGetValue(tbcol.Attribute.OldName, out tbstructcol)) var condition1 = tbstruct.TryGetValue(tbcol.Attribute.Name, out var tbstructcol);
var condition2 = string.IsNullOrEmpty(tbcol.Attribute.OldName) == false;
if (condition1 ||
condition2 && tbstruct.TryGetValue(tbcol.Attribute.OldName, out tbstructcol))
{ {
var isCommentChanged = tbstructcol.comment != (tbcol.Comment ?? ""); var isCommentChanged = tbstructcol.comment != (tbcol.Comment ?? "");
if (tbcol.Attribute.DbType.StartsWith(tbstructcol.sqlType, StringComparison.CurrentCultureIgnoreCase) == false || var ckDbType = CkNullableAdapter(tbcol.Attribute.DbType, tbcol.Attribute.IsPrimary);
tbcol.Attribute.IsNullable != tbstructcol.is_nullable || isCommentChanged) ckDbType = CkIntAdapter(ckDbType);
sbalter.Append("ALTER TABLE ").Append(_commonUtils.QuoteSqlName($"{tbname[0]}.{tbname[1]}")).Append(" MODIFY COLUMN ").Append(_commonUtils.QuoteSqlName(tbstructcol.column)).Append(tbcol.Attribute.IsNullable ? $"Nullable({tbcol.Attribute.DbType.Split(' ').First()})":tbcol.Attribute.DbType.Split(' ').First()).Append(";\r\n"); var typeCondition1 = RemoveSpaceComparison(tbstructcol.sqlType, ckDbType) == false;
if(isCommentChanged) sbalter.Append("ALTER TABLE ").Append(_commonUtils.QuoteSqlName($"{tbname[0]}.{tbname[1]}")).Append(" COMMENT COLUMN ").Append(_commonUtils.QuoteSqlName(tbstructcol.column)).Append(_commonUtils.FormatSql("{0}", tbcol.Comment ?? "")).Append(";\r\n"); var typeCondition2 = tbcol.Attribute.IsNullable != tbstructcol.is_nullable;
if (typeCondition1 || typeCondition1 || isCommentChanged)
{
sbalter.Append("ALTER TABLE ")
.Append(_commonUtils.QuoteSqlName($"{tbname[0]}.{tbname[1]}"))
.Append(" MODIFY COLUMN ").Append(_commonUtils.QuoteSqlName(tbstructcol.column))
.Append(tbcol.Attribute.IsNullable &&
tbcol.Attribute.DbType.Contains("Nullable") == false
? $"Nullable({tbcol.Attribute.DbType.Split(' ').First()})"
: tbcol.Attribute.DbType.Split(' ').First())
.Append(";\r\n");
}
if (isCommentChanged)
sbalter.Append("ALTER TABLE ")
.Append(_commonUtils.QuoteSqlName($"{tbname[0]}.{tbname[1]}"))
.Append(" COMMENT COLUMN ")
.Append(_commonUtils.QuoteSqlName(tbstructcol.column))
.Append(_commonUtils.FormatSql("{0}", tbcol.Comment ?? "")).Append(";\r\n");
if (string.Compare(tbstructcol.column, tbcol.Attribute.OldName, true) == 0) if (string.Compare(tbstructcol.column, tbcol.Attribute.OldName, true) == 0)
sbalter.Append("ALTER TABLE ").Append(_commonUtils.QuoteSqlName($"{tbname[0]}.{tbname[1]}")).Append(" COLUMN ").Append(_commonUtils.QuoteSqlName(tbstructcol.column)).Append(" TO ").Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(";\r\n"); sbalter.Append("ALTER TABLE ")
.Append(_commonUtils.QuoteSqlName($"{tbname[0]}.{tbname[1]}"))
.Append(" RENAME COLUMN ").Append(_commonUtils.QuoteSqlName(tbstructcol.column))
.Append(" TO ").Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name))
.Append(";\r\n");
continue; continue;
} }
//添加列 //添加列
sbalter.Append("ALTER TABLE ").Append(_commonUtils.QuoteSqlName(tbname[0], tbname[1])).Append(" ADD ").Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(" ").Append(tbcol.Attribute.DbType); sbalter.Append("ALTER TABLE ").Append(_commonUtils.QuoteSqlName(tbname[0], tbname[1]))
if (tbcol.Attribute.IsNullable == false && tbcol.DbDefaultValue != "NULL" && tbcol.Attribute.IsIdentity == false) sbalter.Append(" DEFAULT ").Append(tbcol.DbDefaultValue); .Append(" ADD Column ").Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(" ")
if (string.IsNullOrEmpty(tbcol.Comment) == false) sbalter.Append(" COMMENT ").Append(_commonUtils.FormatSql("{0}", tbcol.Comment ?? "")); .Append(tbcol.Attribute.DbType);
if (tbcol.Attribute.IsNullable == false && tbcol.DbDefaultValue != "NULL" &&
tbcol.Attribute.IsIdentity == false)
sbalter.Append(" DEFAULT ").Append(tbcol.DbDefaultValue);
if (string.IsNullOrEmpty(tbcol.Comment) == false)
sbalter.Append(" COMMENT ").Append(_commonUtils.FormatSql("{0}", tbcol.Comment ?? ""));
sbalter.Append(";\r\n"); sbalter.Append(";\r\n");
} }
var indexSelectSql = _commonUtils.FormatSql(
@"SELECT name,expr FROM system.data_skipping_indices WHERE database={0}",
tboldname ?? tbname);
var indexCollect = _orm.Ado.Query<ClickHouseTableIndex>(CommandType.Text, indexSelectSql);
//对比索引
foreach (var uk in tb.Indexes)
{
if (string.IsNullOrEmpty(uk.Name) || uk.Columns.Any() == false)
continue;
var ukname = ReplaceIndexName(uk.Name, tbname[1]);
//先判断表中有没此字段的索引
if (indexCollect.Any(c =>
RemoveSpaceComparison(c.expr,
string.Join(',', uk.Columns.Select(i => i.Column.CsName)))))
{
//有这个字段的索引，但是名称不一样 修改名 , ClickHouse不支持修改列
//if (!indexCollect.Where(c => c.name == uk.Name).Any())
//{
//
// sbalter.Append("ALTER TABLE ")
// .Append(_commonUtils.QuoteSqlName(tbname[0], tbname[1]))
// .Append(" DROP INDEX ").Append(ukname).Append(" ").Append(";\r\n");
// //添加
// sbalter.Append("ALTER TABLE ")
// .Append(_commonUtils.QuoteSqlName(tbname[0], tbname[1]))
// .Append(" ADD INDEX ").Append(ukname).Append(" (");
// foreach (var tbcol in uk.Columns)
// {
// sbalter.Append(_commonUtils.QuoteSqlName(tbcol.Column.Attribute.Name));
// sbalter.Append(", ");
// }
// sbalter.Remove(sbalter.Length - 2, 2).Append(") TYPE set(8192) GRANULARITY 5")
// .Append(";\r\n");
//}
}
else
{
//创建索引
sbalter.Append("ALTER TABLE ").Append(_commonUtils.QuoteSqlName(tbname[0], tbname[1]))
.Append(" ADD INDEX ").Append(ukname).Append(" (");
foreach (var tbcol in uk.Columns)
{
sbalter.Append(_commonUtils.QuoteSqlName(tbcol.Column.Attribute.Name));
sbalter.Append(", ");
} }
sbalter.Remove(sbalter.Length - 2, 2).Append(") TYPE set(8192) GRANULARITY 5")
.Append(";\r\n");
}
}
}
if (istmpatler == false)
{
sb.Append(sbalter);
Console.WriteLine(sb.ToString());
continue;
}
//创建临时表，数据导进临时表，然后删除原表，将临时表改名为原表名 //创建临时表，数据导进临时表，然后删除原表，将临时表改名为原表名
var tablename = tboldname == null ? _commonUtils.QuoteSqlName(tbname[0], tbname[1]) : _commonUtils.QuoteSqlName(tboldname[0], tboldname[1]); var tablename = tboldname == null
? _commonUtils.QuoteSqlName(tbname[0], tbname[1])
: _commonUtils.QuoteSqlName(tboldname[0], tboldname[1]);
var tmptablename = _commonUtils.QuoteSqlName(tbname[0], $"FreeSqlTmp_{tbname[1]}"); var tmptablename = _commonUtils.QuoteSqlName(tbname[0], $"FreeSqlTmp_{tbname[1]}");
//创建临时表 //创建临时表
sb.Append("CREATE TABLE IF NOT EXISTS ").Append(tmptablename).Append(" ( "); sb.Append("CREATE TABLE IF NOT EXISTS ").Append(tmptablename).Append(" ( ");
foreach (var tbcol in tb.ColumnsByPosition) foreach (var tbcol in tb.ColumnsByPosition)
{ {
tbcol.Attribute.DbType = tbcol.Attribute.DbType.Replace(" NOT NULL", ""); tbcol.Attribute.DbType = tbcol.Attribute.DbType.Replace(" NOT NULL", "");
sb.Append(" \r\n ").Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(" ").Append(tbcol.Attribute.DbType); sb.Append(" \r\n ").Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(" ")
if (string.IsNullOrEmpty(tbcol.Comment) == false) sb.Append(" COMMENT ").Append(_commonUtils.FormatSql("{0}", tbcol.Comment)); .Append(tbcol.Attribute.DbType);
if (string.IsNullOrEmpty(tbcol.Comment) == false)
sb.Append(" COMMENT ").Append(_commonUtils.FormatSql("{0}", tbcol.Comment));
sb.Append(","); sb.Append(",");
} }
foreach (var uk in tb.Indexes) foreach (var uk in tb.Indexes)
{ {
sb.Append(" \r\n "); sb.Append(" \r\n ");
sb.Append("INDEX ").Append(_commonUtils.QuoteSqlName(ReplaceIndexName(uk.Name, tbname[1]))).Append("("); sb.Append("INDEX ").Append(_commonUtils.QuoteSqlName(ReplaceIndexName(uk.Name, tbname[1])))
.Append("(");
foreach (var tbcol in uk.Columns) foreach (var tbcol in uk.Columns)
{ {
sb.Append(_commonUtils.QuoteSqlName(tbcol.Column.Attribute.Name)); sb.Append(_commonUtils.QuoteSqlName(tbcol.Column.Attribute.Name));
sb.Append("TYPE set(8192) GRANULARITY 5, "); sb.Append("TYPE set(8192) GRANULARITY 5, ");
} }
sb.Remove(sb.Length - 2, 2).Append("),"); sb.Remove(sb.Length - 2, 2).Append("),");
} }
sb.Remove(sb.Length - 1, 1); sb.Remove(sb.Length - 1, 1);
sb.Append("\r\n) "); sb.Append("\r\n) ");
sb.Append("\r\nENGINE = MergeTree()"); sb.Append("\r\nENGINE = MergeTree()");
@ -244,7 +409,8 @@ where a.database in ({0}) and a.table in ({1})", tboldname ?? tbname);
{ {
sb.Append(" \r\nORDER BY ( "); sb.Append(" \r\nORDER BY ( ");
var ls = new StringBuilder(); var ls = new StringBuilder();
foreach (var tbcol in tb.Primarys) ls.Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(", "); foreach (var tbcol in tb.Primarys)
ls.Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(", ");
sb.Append(ls); sb.Append(ls);
sb.Remove(sb.Length - 2, 2); sb.Remove(sb.Length - 2, 2);
sb.Append(" )"); sb.Append(" )");
@ -252,6 +418,7 @@ where a.database in ({0}) and a.table in ({1})", tboldname ?? tbname);
sb.Append(ls); sb.Append(ls);
sb.Remove(sb.Length - 2, 2).Append(","); sb.Remove(sb.Length - 2, 2).Append(",");
} }
sb.Remove(sb.Length - 1, 1); sb.Remove(sb.Length - 1, 1);
//if (string.IsNullOrEmpty(tb.Comment) == false) //if (string.IsNullOrEmpty(tb.Comment) == false)
// sb.Append(" Comment=").Append(_commonUtils.FormatSql("{0}", tb.Comment)); // sb.Append(" Comment=").Append(_commonUtils.FormatSql("{0}", tb.Comment));
@ -262,25 +429,32 @@ where a.database in ({0}) and a.table in ({1})", tboldname ?? tbname);
{ {
var insertvalue = "NULL"; var insertvalue = "NULL";
if (tbstruct.TryGetValue(tbcol.Attribute.Name, out var tbstructcol) || if (tbstruct.TryGetValue(tbcol.Attribute.Name, out var tbstructcol) ||
string.IsNullOrEmpty(tbcol.Attribute.OldName) == false && tbstruct.TryGetValue(tbcol.Attribute.OldName, out tbstructcol)) string.IsNullOrEmpty(tbcol.Attribute.OldName) == false &&
tbstruct.TryGetValue(tbcol.Attribute.OldName, out tbstructcol))
{ {
insertvalue = _commonUtils.QuoteSqlName(tbstructcol.column); insertvalue = _commonUtils.QuoteSqlName(tbstructcol.column);
if (tbcol.Attribute.DbType.StartsWith(tbstructcol.sqlType, StringComparison.CurrentCultureIgnoreCase) == false) if (tbcol.Attribute.DbType.StartsWith(tbstructcol.sqlType,
StringComparison.CurrentCultureIgnoreCase) == false)
{ {
//insertvalue = $"cast({insertvalue} as {tbcol.Attribute.DbType.Split(' ').First()})"; //insertvalue = $"cast({insertvalue} as {tbcol.Attribute.DbType.Split(' ').First()})";
} }
if (tbcol.Attribute.IsNullable != tbstructcol.is_nullable) if (tbcol.Attribute.IsNullable != tbstructcol.is_nullable)
insertvalue = $"ifnull({insertvalue},{tbcol.DbDefaultValue})"; insertvalue = $"ifnull({insertvalue},{tbcol.DbDefaultValue})";
} }
else if (tbcol.Attribute.IsNullable == false) else if (tbcol.Attribute.IsNullable == false)
if (tbcol.DbDefaultValue != "NULL") if (tbcol.DbDefaultValue != "NULL")
insertvalue = tbcol.DbDefaultValue; insertvalue = tbcol.DbDefaultValue;
sb.Append(insertvalue).Append(", "); sb.Append(insertvalue).Append(", ");
} }
sb.Remove(sb.Length - 2, 2).Append(" FROM ").Append(tablename).Append(";\r\n"); sb.Remove(sb.Length - 2, 2).Append(" FROM ").Append(tablename).Append(";\r\n");
sb.Append("DROP TABLE ").Append(tablename).Append(";\r\n"); sb.Append("DROP TABLE ").Append(tablename).Append(";\r\n");
sb.Append("RENAME TABLE ").Append(tmptablename).Append(" TO ").Append(_commonUtils.QuoteSqlName(tbname[0], tbname[1])).Append(";\r\n"); sb.Append("RENAME TABLE ").Append(tmptablename).Append(" TO ")
.Append(_commonUtils.QuoteSqlName(tbname[0], tbname[1])).Append(";\r\n");
} }
return sb.Length == 0 ? null : sb.ToString(); return sb.Length == 0 ? null : sb.ToString();
} }
finally finally
@ -299,7 +473,8 @@ where a.database in ({0}) and a.table in ({1})", tboldname ?? tbname);
object LocalExecuteScalar(string db, string sql) object LocalExecuteScalar(string db, string sql)
{ {
if (string.Compare(database, db) != 0) conn.Value.ChangeDatabase(db); if (string.Compare(database, db) != 0)
conn.Value.ChangeDatabase(db);
try try
{ {
using (var cmd = conn.Value.CreateCommand()) using (var cmd = conn.Value.CreateCommand())
@ -311,17 +486,65 @@ where a.database in ({0}) and a.table in ({1})", tboldname ?? tbname);
} }
finally finally
{ {
if (string.Compare(database, db) != 0) conn.Value.ChangeDatabase(database); if (string.Compare(database, db) != 0)
conn.Value.ChangeDatabase(database);
} }
} }
string CkNullableAdapter(string dbType, bool isPrimary)
{
return isPrimary
? dbType.Replace("Nullable(", "").Replace(") NOT NULL", "")
: dbType.Replace(" NOT NULL", "");
}
string CkIntAdapter(string dbType)
{
var result = dbType;
if (dbType.ToLower().Contains("int64"))
{
if (dbType.Contains("Nullable"))
{
result = "Nullable(Int64)";
}
else
{
result = "Int64";
}
}
else if (dbType.ToLower().Contains("int"))
{
if (dbType.Contains("Nullable"))
{
result = "Nullable(Int32)";
}
else
{
result = "Int32";
}
}
return result;
}
//去除空格后比较
bool RemoveSpaceComparison(string a, string b)
{
a = Regex.Replace(a, @"\s", "").ToLower();
b = Regex.Replace(b, @"\s", "").ToLower();
return a == b;
}
} }
public override int ExecuteDDLStatements(string ddl) public override int ExecuteDDLStatements(string ddl)
{ {
if (string.IsNullOrEmpty(ddl)) return 0; if (string.IsNullOrEmpty(ddl))
var scripts = ddl.Split(new string[] { ";\r\n" }, StringSplitOptions.None).Where(a => string.IsNullOrEmpty(a.Trim()) == false).ToArray(); return 0;
var scripts = ddl.Split(new string[] { ";\r\n" }, StringSplitOptions.None)
.Where(a => string.IsNullOrEmpty(a.Trim()) == false).ToArray();
if (scripts.Any() == false) return 0; if (scripts.Any() == false)
return 0;
var affrows = 0; var affrows = 0;
foreach (var script in scripts) foreach (var script in scripts)
@ -329,4 +552,16 @@ where a.database in ({0}) and a.table in ({1})", tboldname ?? tbname);
return affrows; return affrows;
} }
} }
internal class ClickHouseTableIndex
{
public string name
{
get; set;
}
public string expr
{
get; set;
}
}
} }