lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-08-01 10:10:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #848 from yaoguoba/SqlSugar5

Browse Source 
Support Unique Index
This commit is contained in:
sunkaixuan 2020-11-02 17:50:35 +08:00 committed by GitHub
commit 39d5b851a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 68 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Src/Asp.Net/SqlSugar/Abstract/DbMaintenanceProvider/Methods.cs
View File

@ -302,9 +302,9 @@ namespace SqlSugar
this.Context.Ado.ExecuteCommand(sql);
return true;
}
public virtual bool CreateIndex(string tableName, string[] columnNames)
public virtual bool CreateIndex(string tableName, string[] columnNames, bool isUnique=false)
{
string sql = string.Format(CreateIndexSql,tableName,string.Join(",",columnNames), string.Join("_", columnNames));
string sql = string.Format(CreateIndexSql,tableName,string.Join(",",columnNames), string.Join("_", columnNames), isUnique ? "UNIQUE" : "");
this.Context.Ado.ExecuteCommand(sql);
return true;
}

1
Src/Asp.Net/SqlSugar/Abstract/EntityMaintenance/EntityMaintenance.cs
View File

@ -193,6 +193,7 @@ namespace SqlSugar
column.NoSerialize = sugarColumn.NoSerialize;
column.DefaultValue = sugarColumn.DefaultValue;
column.IndexGroupNameList = sugarColumn.IndexGroupNameList;
column.UIndexGroupNameList = sugarColumn.UIndexGroupNameList;
column.IsOnlyIgnoreUpdate = sugarColumn.IsOnlyIgnoreUpdate;
column.IsArray = sugarColumn.IsArray;
}

1
Src/Asp.Net/SqlSugar/Entities/EntityColumnInfo.cs
View File

@ -33,6 +33,7 @@ namespace SqlSugar
public bool IsJson { get; set; }
public bool NoSerialize { get; set; }
public string[] IndexGroupNameList { get; set; }
public string[] UIndexGroupNameList { get; set; }
public bool IsArray { get; set; }
}
}

2
Src/Asp.Net/SqlSugar/Entities/Mapping/SugarMappingAttribute.cs
View File

@ -171,6 +171,8 @@ namespace SqlSugar
set { _IndexGroupNameList = value; }
}
public string[] UIndexGroupNameList { get; set; }
private bool _IsArray;
public bool IsArray
{

2
Src/Asp.Net/SqlSugar/Interface/IDbMaintenance.cs
View File

@ -28,7 +28,7 @@ namespace SqlSugar
#region DDL
bool AddDefaultValue(string tableName,string columnName,string defaultValue);
bool CreateIndex(string tableName, string [] columnNames);
bool CreateIndex(string tableName, string [] columnNames, bool isUnique=false);
bool DropTable(string tableName);
bool TruncateTable(string tableName);
bool TruncateTable<T>();

76
Src/Asp.Net/SqlSugar/Realization/Dm/DbMaintenance/DmDbMaintenance.cs
View File

@ -62,7 +62,7 @@ namespace SqlSugar
{
get
{
return "CREATE INDEX Index_{0}_{2} ON {0}({1})";
return "CREATE {3} INDEX Index_{0}_{2} ON {0}({1})";
}
}
protected override string AddDefaultValueSql
@ -271,9 +271,9 @@ namespace SqlSugar
}
return base.AddColumn(tableName, columnInfo);
}
public override bool CreateIndex(string tableName, string[] columnNames)
public override bool CreateIndex(string tableName, string[] columnNames, bool isUnique = false)
{
string sql = string.Format(CreateIndexSql, tableName, string.Join(",", columnNames), string.Join("_", columnNames.Select(it => (it + "abc").Substring(0, 3))));
string sql = string.Format(CreateIndexSql, tableName, string.Join(",", columnNames), string.Join("_", columnNames.Select(it => (it + "abc").Substring(0, 3))), isUnique ? "UNIQUE" : "");
this.Context.Ado.ExecuteCommand(sql);
return true;
}
@ -348,11 +348,11 @@ namespace SqlSugar
return GetColumnInfosByTableName(tableName);
else
return this.Context.Utilities.GetReflectionInoCacheInstance().GetOrCreate(cacheKey,
() =>
{
return GetColumnInfosByTableName(tableName);
() =>
{
return GetColumnInfosByTableName(tableName);
});
});
}
private List<DbColumnInfo> GetColumnInfosByTableName(string tableName)
@ -360,7 +360,7 @@ namespace SqlSugar
string sql = "select * from " + SqlBuilder.GetTranslationTableName(tableName) + " WHERE 1=2 ";
var oldIsEnableLog = this.Context.Ado.IsEnableLogEvent;
this.Context.Ado.IsEnableLogEvent = false;
using (DbDataReader reader = (DbDataReader)this.Context.Ado.GetDataReader(sql))
using(DbDataReader reader = (DbDataReader) this.Context.Ado.GetDataReader(sql))
{
this.Context.Ado.IsEnableLogEvent = oldIsEnableLog;
List<DbColumnInfo> result = new List<DbColumnInfo>();
@ -371,8 +371,8 @@ namespace SqlSugar
{
TableName = tableName,
DataType = row["DataType"].ToString().Replace("System.", "").Trim(),
IsNullable = (bool)row["AllowDBNull"],
IsIdentity = (bool)row["IsIdentity"],
IsNullable = (bool) row["AllowDBNull"],
IsIdentity = (bool) row["IsIdentity"],
ColumnDescription = GetFieldComment(tableName, row["ColumnName"].ToString()),
DbColumnName = row["ColumnName"].ToString(),
//DefaultValue = row["defaultValue"].ToString(),
@ -391,32 +391,32 @@ namespace SqlSugar
string cacheKey = "DbMaintenanceProvider.GetPrimaryKeyByTableNames." + this.SqlBuilder.GetNoTranslationColumnName(tableName).ToLower();
cacheKey = GetCacheKey(cacheKey);
return this.Context.Utilities.GetReflectionInoCacheInstance().GetOrCreate(cacheKey,
() =>
{
var oldIsEnableLog = this.Context.Ado.IsEnableLogEvent;
this.Context.Ado.IsEnableLogEvent = false;
string sql = @" select distinct cu.COLUMN_name KEYNAME from user_cons_columns cu, user_constraints au
() =>
{
var oldIsEnableLog = this.Context.Ado.IsEnableLogEvent;
this.Context.Ado.IsEnableLogEvent = false;
string sql = @" select distinct cu.COLUMN_name KEYNAME from user_cons_columns cu, user_constraints au
where cu.constraint_name = au.constraint_name
and au.constraint_type = 'P' and au.table_name = '" + tableName.ToUpper() + @"'";
var pks = this.Context.Ado.SqlQuery<string>(sql);
this.Context.Ado.IsEnableLogEvent = oldIsEnableLog;
return pks;
});
var pks = this.Context.Ado.SqlQuery<string>(sql);
this.Context.Ado.IsEnableLogEvent = oldIsEnableLog;
return pks;
});
}
public string GetTableComment(string tableName)
{
string cacheKey = "DbMaintenanceProvider.GetTableComment." + tableName;
var comments = this.Context.Utilities.GetReflectionInoCacheInstance().GetOrCreate(cacheKey,
() =>
{
string sql = "SELECT COMMENTS FROM USER_TAB_COMMENTS WHERE TABLE_NAME =@tableName ORDER BY TABLE_NAME";
var oldIsEnableLog = this.Context.Ado.IsEnableLogEvent;
this.Context.Ado.IsEnableLogEvent = false;
var pks = this.Context.Ado.SqlQuery<string>(sql, new { tableName = tableName.ToUpper() });
this.Context.Ado.IsEnableLogEvent = oldIsEnableLog;
return pks;
});
() =>
{
string sql = "SELECT COMMENTS FROM USER_TAB_COMMENTS WHERE TABLE_NAME =@tableName ORDER BY TABLE_NAME";
var oldIsEnableLog = this.Context.Ado.IsEnableLogEvent;
this.Context.Ado.IsEnableLogEvent = false;
var pks = this.Context.Ado.SqlQuery<string>(sql, new { tableName = tableName.ToUpper() });
this.Context.Ado.IsEnableLogEvent = oldIsEnableLog;
return pks;
});
return comments.HasValue() ? comments.First() : "";
}
@ -424,15 +424,15 @@ namespace SqlSugar
{
string cacheKey = "DbMaintenanceProvider.GetFieldComment." + tableName;
var comments = this.Context.Utilities.GetReflectionInoCacheInstance().GetOrCreate(cacheKey,
() =>
{
string sql = "SELECT TVNAME AS TableName, COLNAME,COMMENT$ AS ColumnDescription from SYSCOLUMNCOMMENTS WHERE TVNAME='"+ tableName.ToUpper() + "' ORDER BY TVNAME";
var oldIsEnableLog = this.Context.Ado.IsEnableLogEvent;
this.Context.Ado.IsEnableLogEvent = false;
var pks = this.Context.Ado.SqlQuery<DbColumnInfo>(sql);
this.Context.Ado.IsEnableLogEvent = oldIsEnableLog;
return pks;
});
() =>
{
string sql = "SELECT TVNAME AS TableName, COLNAME,COMMENT$ AS ColumnDescription from SYSCOLUMNCOMMENTS WHERE TVNAME='" + tableName.ToUpper() + "' ORDER BY TVNAME";
var oldIsEnableLog = this.Context.Ado.IsEnableLogEvent;
this.Context.Ado.IsEnableLogEvent = false;
var pks = this.Context.Ado.SqlQuery<DbColumnInfo>(sql);
this.Context.Ado.IsEnableLogEvent = oldIsEnableLog;
return pks;
});
return comments.HasValue() ? comments.First(it => it.DbColumnName.Equals(filedName, StringComparison.CurrentCultureIgnoreCase)).ColumnDescription : "";
}
@ -462,4 +462,4 @@ namespace SqlSugar
}
#endregion
}
}
}

2
Src/Asp.Net/SqlSugar/Realization/MySql/DbMaintenance/MySqlDbMaintenance.cs
View File

@ -250,7 +250,7 @@ namespace SqlSugar
{
get
{
return "CREATE INDEX Index_{0}_{2} ON {0} ({1})";
return "CREATE {3} INDEX Index_{0}_{2} ON {0} ({1})";
}
}

6
Src/Asp.Net/SqlSugar/Realization/Oracle/DbMaintenance/OracleDbMaintenance.cs
View File

@ -62,7 +62,7 @@ namespace SqlSugar
{
get
{
return "CREATE INDEX Index_{0}_{2} ON {0}({1})";
return "CREATE {3} INDEX Index_{0}_{2} ON {0}({1})";
}
}
protected override string AddDefaultValueSql
@ -271,9 +271,9 @@ namespace SqlSugar
}
return base.AddColumn(tableName,columnInfo);
}
public override bool CreateIndex(string tableName, string[] columnNames)
public override bool CreateIndex(string tableName, string[] columnNames, bool isUnique=false)
{
string sql = string.Format(CreateIndexSql, tableName, string.Join(",", columnNames), string.Join("_", columnNames.Select(it=>(it+"abc").Substring(0,3))));
string sql = string.Format(CreateIndexSql, tableName, string.Join(",", columnNames), string.Join("_", columnNames.Select(it=>(it+"abc").Substring(0,3))), isUnique ? "UNIQUE" : "");
this.Context.Ado.ExecuteCommand(sql);
return true;
}

2
Src/Asp.Net/SqlSugar/Realization/PostgreSQL/DbMaintenance/PostgreSQLDbMaintenance.cs
View File

@ -178,7 +178,7 @@ namespace SqlSugar
{
get
{
return "CREATE INDEX Index_{0}_{2} ON {0} ({1})";
return "CREATE {3} INDEX Index_{0}_{2} ON {0} ({1})";
}
}
protected override string AddDefaultValueSql

2
Src/Asp.Net/SqlSugar/Realization/SqlServer/DbMaintenance/SqlServerDbMaintenance.cs
View File

@ -249,7 +249,7 @@ namespace SqlSugar
{
get
{
return "CREATE NONCLUSTERED INDEX Index_{0}_{2} ON {0}({1})";
return "CREATE {3} NONCLUSTERED INDEX Index_{0}_{2} ON {0}({1})";
}
}
protected override string AddDefaultValueSql

4
Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/DbMaintenanceProvider/Methods.cs
View File

@ -302,9 +302,9 @@ namespace SqlSugar
this.Context.Ado.ExecuteCommand(sql);
return true;
}
public virtual bool CreateIndex(string tableName, string[] columnNames)
public virtual bool CreateIndex(string tableName, string[] columnNames, bool isUnique = false)
{
string sql = string.Format(CreateIndexSql,tableName,string.Join(",",columnNames), string.Join("_", columnNames));
string sql = string.Format(CreateIndexSql,tableName,string.Join(",",columnNames), string.Join("_", columnNames), isUnique ? "UNIQUE" : "");
this.Context.Ado.ExecuteCommand(sql);
return true;
}

1
Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/EntityMaintenance/EntityMaintenance.cs
View File

@ -193,6 +193,7 @@ namespace SqlSugar
column.NoSerialize = sugarColumn.NoSerialize;
column.DefaultValue = sugarColumn.DefaultValue;
column.IndexGroupNameList = sugarColumn.IndexGroupNameList;
column.UIndexGroupNameList = sugarColumn.UIndexGroupNameList;
column.IsOnlyIgnoreUpdate = sugarColumn.IsOnlyIgnoreUpdate;
column.IsArray = sugarColumn.IsArray;
}

1
Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Entities/EntityColumnInfo.cs
View File

@ -33,6 +33,7 @@ namespace SqlSugar
public bool IsJson { get; set; }
public bool NoSerialize { get; set; }
public string[] IndexGroupNameList { get; set; }
public string[] UIndexGroupNameList { get; set; }
public bool IsArray { get; set; }
}
}

2
Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Entities/Mapping/SugarMappingAttribute.cs
View File

@ -171,6 +171,8 @@ namespace SqlSugar
set { _IndexGroupNameList = value; }
}
public string[] UIndexGroupNameList { get; set; }
private bool _IsArray;
public bool IsArray
{

2
Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Interface/IDbMaintenance.cs
View File

@ -28,7 +28,7 @@ namespace SqlSugar
#region DDL
bool AddDefaultValue(string tableName,string columnName,string defaultValue);
bool CreateIndex(string tableName, string [] columnNames);
bool CreateIndex(string tableName, string [] columnNames, bool isUnique=false);
bool DropTable(string tableName);
bool TruncateTable(string tableName);
bool TruncateTable<T>();

6
Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Realization/Dm/DbMaintenance/DmDbMaintenance.cs
View File

@ -62,7 +62,7 @@ namespace SqlSugar
{
get
{
return "CREATE INDEX Index_{0}_{2} ON {0}({1})";
return "CREATE {3} INDEX Index_{0}_{2} ON {0}({1})";
}
}
protected override string AddDefaultValueSql
@ -271,9 +271,9 @@ namespace SqlSugar
}
return base.AddColumn(tableName, columnInfo);
}
public override bool CreateIndex(string tableName, string[] columnNames)
public override bool CreateIndex(string tableName, string[] columnNames, bool isUnique = false)
{
string sql = string.Format(CreateIndexSql, tableName, string.Join(",", columnNames), string.Join("_", columnNames.Select(it => (it + "abc").Substring(0, 3))));
string sql = string.Format(CreateIndexSql, tableName, string.Join(",", columnNames), string.Join("_", columnNames.Select(it => (it + "abc").Substring(0, 3))), isUnique ? "UNIQUE" : "");
this.Context.Ado.ExecuteCommand(sql);
return true;
}

2
Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Realization/Kdbndp/DbMaintenance/KdbndpDbMaintenance.cs
View File

@ -178,7 +178,7 @@ namespace SqlSugar
{
get
{
return "CREATE INDEX Index_{0}_{2} ON {0} ({1})";
return "CREATE {3} INDEX Index_{0}_{2} ON {0} ({1})";
}
}
protected override string AddDefaultValueSql

2
Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Realization/MySql/DbMaintenance/MySqlDbMaintenance.cs
View File

@ -250,7 +250,7 @@ namespace SqlSugar
{
get
{
return "CREATE INDEX Index_{0}_{2} ON {0} ({1})";
return "CREATE {3} INDEX Index_{0}_{2} ON {0} ({1})";
}
}

6
Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Realization/Oracle/DbMaintenance/OracleDbMaintenance.cs
View File

@ -62,7 +62,7 @@ namespace SqlSugar
{
get
{
return "CREATE INDEX Index_{0}_{2} ON {0}({1})";
return "CREATE {3} INDEX Index_{0}_{2} ON {0}({1})";
}
}
protected override string AddDefaultValueSql
@ -271,9 +271,9 @@ namespace SqlSugar
}
return base.AddColumn(tableName,columnInfo);
}
public override bool CreateIndex(string tableName, string[] columnNames)
public override bool CreateIndex(string tableName, string[] columnNames, bool isUnique=false)
{
string sql = string.Format(CreateIndexSql, tableName, string.Join(",", columnNames), string.Join("_", columnNames.Select(it=>(it+"abc").Substring(0,3))));
string sql = string.Format(CreateIndexSql, tableName, string.Join(",", columnNames), string.Join("_", columnNames.Select(it=>(it+"abc").Substring(0,3))), isUnique ? "UNIQUE" : "");
this.Context.Ado.ExecuteCommand(sql);
return true;
}

2
Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Realization/PostgreSQL/DbMaintenance/PostgreSQLDbMaintenance.cs
View File

@ -178,7 +178,7 @@ namespace SqlSugar
{
get
{
return "CREATE INDEX Index_{0}_{2} ON {0} ({1})";
return "CREATE {3} INDEX Index_{0}_{2} ON {0} ({1})";
}
}
protected override string AddDefaultValueSql

2
Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Realization/SqlServer/DbMaintenance/SqlServerDbMaintenance.cs
View File

@ -249,7 +249,7 @@ namespace SqlSugar
{
get
{
return "CREATE NONCLUSTERED INDEX Index_{0}_{2} ON {0}({1})";
return "CREATE {3} NONCLUSTERED INDEX Index_{0}_{2} ON {0}({1})";
}
}
protected override string AddDefaultValueSql