lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-09-21 02:58:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #985 from BurakCinar07/SqlSugar5

Browse Source 
Postgresql Fixes.
This commit is contained in:
果糖网
2021-12-29 21:55:02 +08:00
committed by GitHub
parent 6fbea446b9 b088fa856e
commit 157c5c6c04
7 changed files with 37 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -208,3 +208,4 @@ FakesAssemblies/
GeneratedArtifacts/ GeneratedArtifacts/
_Pvt_Extensions/ _Pvt_Extensions/
ModelManifest.xml ModelManifest.xml
Src/Asp.NetCore2/SqlSeverTest/.idea/

5
Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/DeleteProvider/DeleteableProvider.cs
View File

@@ -520,10 +520,13 @@ namespace SqlSugar
item.Columns = new List<DiffLogColumnInfo>(); item.Columns = new List<DiffLogColumnInfo>();
foreach (DataColumn col in dt.Columns) foreach (DataColumn col in dt.Columns)
{ {
var sugarColumn = this.EntityInfo.Columns.Where(it => it.DbColumnName != null).First(it =>
it.DbColumnName.Equals(col.ColumnName, StringComparison.CurrentCultureIgnoreCase));
DiffLogColumnInfo addItem = new DiffLogColumnInfo(); DiffLogColumnInfo addItem = new DiffLogColumnInfo();
addItem.Value = row[col.ColumnName]; addItem.Value = row[col.ColumnName];
addItem.ColumnName = col.ColumnName; addItem.ColumnName = col.ColumnName;
addItem.ColumnDescription = this.EntityInfo.Columns.Where(it=>it.DbColumnName!=null).First(it => it.DbColumnName.Equals(col.ColumnName, StringComparison.CurrentCultureIgnoreCase)).ColumnDescription; addItem.IsPrimaryKey = sugarColumn.IsPrimarykey;
addItem.ColumnDescription = sugarColumn.ColumnDescription;
item.Columns.Add(addItem); item.Columns.Add(addItem);
} }
result.Add(item); result.Add(item);

25
Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs
View File

@@ -825,11 +825,13 @@ namespace SqlSugar
item.Columns = new List<DiffLogColumnInfo>(); item.Columns = new List<DiffLogColumnInfo>();
foreach (DataColumn col in dt2.Columns) foreach (DataColumn col in dt2.Columns)
{ {
var sugarColumn = this.EntityInfo.Columns.Where(it => it.DbColumnName != null).FirstOrDefault(it =>
it.DbColumnName.Equals(col.ColumnName, StringComparison.CurrentCultureIgnoreCase));
DiffLogColumnInfo addItem = new DiffLogColumnInfo(); DiffLogColumnInfo addItem = new DiffLogColumnInfo();
addItem.Value = row[col.ColumnName]; addItem.Value = row[col.ColumnName];
addItem.ColumnName = col.ColumnName; addItem.ColumnName = col.ColumnName;
addItem.ColumnDescription = this.EntityInfo.Columns.Where(it => it.DbColumnName != null).FirstOrDefault(it => it.DbColumnName.Equals(col.ColumnName, StringComparison.CurrentCultureIgnoreCase))?.ColumnDescription; addItem.IsPrimaryKey = sugarColumn?.IsPrimarykey ?? false;
addItem.ColumnDescription = sugarColumn?.ColumnDescription;
item.Columns.Add(addItem); item.Columns.Add(addItem);
} }
result.Add(item); result.Add(item);
@@ -846,7 +848,16 @@ namespace SqlSugar
if (identity != null && identity > 0 && GetIdentityKeys().HasValue()) if (identity != null && identity > 0 && GetIdentityKeys().HasValue())
{ {
var fieldName = GetIdentityKeys().Last(); var fieldName = GetIdentityKeys().Last();
cons.Add(new ConditionalModel() { ConditionalType = ConditionalType.Equal, FieldName = fieldName, FieldValue = identity.ToString() });
if (this.Context.CurrentConnectionConfig.DbType == DbType.PostgreSQL)
{
var fieldObjectType = this.EntityInfo.Columns.FirstOrDefault(x => x.DbColumnName == fieldName)
.PropertyInfo.PropertyType;
cons.Add(new ConditionalModel() { ConditionalType = ConditionalType.Equal, FieldName = fieldName, FieldValue = identity.ToString(),
FieldValueConvertFunc = it => UtilMethods.ChangeType2(it, fieldObjectType) });
}
else
cons.Add(new ConditionalModel() { ConditionalType = ConditionalType.Equal, FieldName = fieldName, FieldValue = identity.ToString() });
} }
else else
{ {
@@ -880,10 +891,13 @@ namespace SqlSugar
item.Columns = new List<DiffLogColumnInfo>(); item.Columns = new List<DiffLogColumnInfo>();
foreach (DataColumn col in dt.Columns) foreach (DataColumn col in dt.Columns)
{ {
var sugarColumn = this.EntityInfo.Columns.Where(it => it.DbColumnName != null).First(it =>
it.DbColumnName.Equals(col.ColumnName, StringComparison.CurrentCultureIgnoreCase));
DiffLogColumnInfo addItem = new DiffLogColumnInfo(); DiffLogColumnInfo addItem = new DiffLogColumnInfo();
addItem.Value = row[col.ColumnName]; addItem.Value = row[col.ColumnName];
addItem.ColumnName = col.ColumnName; addItem.ColumnName = col.ColumnName;
addItem.ColumnDescription = this.EntityInfo.Columns.Where(it => it.DbColumnName != null).First(it => it.DbColumnName.Equals(col.ColumnName, StringComparison.CurrentCultureIgnoreCase)).ColumnDescription; addItem.IsPrimaryKey = sugarColumn.IsPrimarykey;
addItem.ColumnDescription = sugarColumn.ColumnDescription;
item.Columns.Add(addItem); item.Columns.Add(addItem);
} }
result.Add(item); result.Add(item);
@@ -899,7 +913,8 @@ namespace SqlSugar
{ {
ColumnDescription = it.ColumnDescription, ColumnDescription = it.ColumnDescription,
ColumnName = it.DbColumnName, ColumnName = it.DbColumnName,
Value = it.PropertyInfo.GetValue(this.InsertObjs.Last(), null) Value = it.PropertyInfo.GetValue(this.InsertObjs.Last(), null),
IsPrimaryKey = it.IsPrimarykey
}).ToList(); }).ToList();
return new List<DiffLogTableInfo>() { diffTable }; return new List<DiffLogTableInfo>() { diffTable };
} }

5
Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/UpdateProvider/UpdateableProvider.cs
View File

@@ -856,10 +856,13 @@ namespace SqlSugar
item.Columns = new List<DiffLogColumnInfo>(); item.Columns = new List<DiffLogColumnInfo>();
foreach (DataColumn col in dt.Columns) foreach (DataColumn col in dt.Columns)
{ {
var sugarColumn = this.EntityInfo.Columns.Where(it => it.DbColumnName != null).First(it =>
it.DbColumnName.Equals(col.ColumnName, StringComparison.CurrentCultureIgnoreCase));
DiffLogColumnInfo addItem = new DiffLogColumnInfo(); DiffLogColumnInfo addItem = new DiffLogColumnInfo();
addItem.Value = row[col.ColumnName]; addItem.Value = row[col.ColumnName];
addItem.ColumnName = col.ColumnName; addItem.ColumnName = col.ColumnName;
addItem.ColumnDescription = this.EntityInfo.Columns.Where(it => it.DbColumnName != null).First(it => it.DbColumnName.Equals(col.ColumnName, StringComparison.CurrentCultureIgnoreCase)).ColumnDescription; addItem.IsPrimaryKey = sugarColumn.IsPrimarykey;
addItem.ColumnDescription = sugarColumn.ColumnDescription;
item.Columns.Add(addItem); item.Columns.Add(addItem);
} }
result.Add(item); result.Add(item);

5
Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Entities/DiffLogModel.cs
View File

@@ -21,10 +21,11 @@ namespace SqlSugar
public string TableDescription { get; set; } public string TableDescription { get; set; }
public List<DiffLogColumnInfo> Columns { get; set; } public List<DiffLogColumnInfo> Columns { get; set; }
} }
public class DiffLogColumnInfo { public class DiffLogColumnInfo
{
public string ColumnName { get; set; } public string ColumnName { get; set; }
public string ColumnDescription { get; set; } public string ColumnDescription { get; set; }
public object Value { get; set; } public object Value { get; set; }
public bool IsPrimaryKey { get; set; }
} }
} }

4
Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Realization/PostgreSQL/Insertable/PostgreSQLInserttable.cs
View File

@@ -16,6 +16,7 @@ namespace SqlSugar
string sql = InsertBuilder.ToSqlString().Replace("$PrimaryKey",this.SqlBuilder.GetTranslationColumnName(GetIdentityKeys().FirstOrDefault())); string sql = InsertBuilder.ToSqlString().Replace("$PrimaryKey",this.SqlBuilder.GetTranslationColumnName(GetIdentityKeys().FirstOrDefault()));
RestoreMapping(); RestoreMapping();
var result = Ado.GetScalar(sql, InsertBuilder.Parameters == null ? null : InsertBuilder.Parameters.ToArray()).ObjToInt(); var result = Ado.GetScalar(sql, InsertBuilder.Parameters == null ? null : InsertBuilder.Parameters.ToArray()).ObjToInt();
After(sql, result);
return result; return result;
} }
public override async Task<int> ExecuteReturnIdentityAsync() public override async Task<int> ExecuteReturnIdentityAsync()
@@ -26,6 +27,7 @@ namespace SqlSugar
RestoreMapping(); RestoreMapping();
var obj = await Ado.GetScalarAsync(sql, InsertBuilder.Parameters == null ? null : InsertBuilder.Parameters.ToArray()); var obj = await Ado.GetScalarAsync(sql, InsertBuilder.Parameters == null ? null : InsertBuilder.Parameters.ToArray());
var result = obj.ObjToInt(); var result = obj.ObjToInt();
After(sql, result);
return result; return result;
} }
public override KeyValuePair<string, List<SugarParameter>> ToSql() public override KeyValuePair<string, List<SugarParameter>> ToSql()
@@ -41,6 +43,7 @@ namespace SqlSugar
string sql = InsertBuilder.ToSqlString().Replace("$PrimaryKey", this.SqlBuilder.GetTranslationColumnName(GetIdentityKeys().FirstOrDefault())); string sql = InsertBuilder.ToSqlString().Replace("$PrimaryKey", this.SqlBuilder.GetTranslationColumnName(GetIdentityKeys().FirstOrDefault()));
RestoreMapping(); RestoreMapping();
var result = Convert.ToInt64(Ado.GetScalar(sql, InsertBuilder.Parameters == null ? null : InsertBuilder.Parameters.ToArray()) ?? "0"); var result = Convert.ToInt64(Ado.GetScalar(sql, InsertBuilder.Parameters == null ? null : InsertBuilder.Parameters.ToArray()) ?? "0");
After(sql, result);
return result; return result;
} }
public override async Task<long> ExecuteReturnBigIdentityAsync() public override async Task<long> ExecuteReturnBigIdentityAsync()
@@ -50,6 +53,7 @@ namespace SqlSugar
string sql = InsertBuilder.ToSqlString().Replace("$PrimaryKey", this.SqlBuilder.GetTranslationColumnName(GetIdentityKeys().FirstOrDefault())); string sql = InsertBuilder.ToSqlString().Replace("$PrimaryKey", this.SqlBuilder.GetTranslationColumnName(GetIdentityKeys().FirstOrDefault()));
RestoreMapping(); RestoreMapping();
var result = Convert.ToInt64(await Ado.GetScalarAsync(sql, InsertBuilder.Parameters == null ? null : InsertBuilder.Parameters.ToArray()) ?? "0"); var result = Convert.ToInt64(await Ado.GetScalarAsync(sql, InsertBuilder.Parameters == null ? null : InsertBuilder.Parameters.ToArray()) ?? "0");
After(sql, result);
return result; return result;
} }

2
Src/Asp.NetCore2/SqlSeverTest/SqlSugar/SqlSugar.csproj
View File

@@ -23,7 +23,7 @@
<PackageReference Include="Microsoft.Data.Sqlite" Version="2.2.4" /> <PackageReference Include="Microsoft.Data.Sqlite" Version="2.2.4" />
<PackageReference Include="MySql.Data" Version="8.0.21" /> <PackageReference Include="MySql.Data" Version="8.0.21" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<PackageReference Include="Npgsql" Version="4.1.3.1" /> <PackageReference Include="Npgsql" Version="6.0.2" />
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.1" /> <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.1" />
<PackageReference Include="Oscar.Data.SqlClient" Version="4.0.4" /> <PackageReference Include="Oscar.Data.SqlClient" Version="4.0.4" />
<PackageReference Include="SqlSugarCore.Dm" Version="1.0.0" /> <PackageReference Include="SqlSugarCore.Dm" Version="1.0.0" />