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

- 增加 DbFirst DbColumnInfo Position 属性，字段默认位置；

Browse Source
This commit is contained in:
28810 2020-04-21 16:29:16 +08:00
parent d29a6f596b
commit c09173e8a3
14 changed files with 205 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
FreeSql/DatabaseModel/DBColumnInfo.cs
View File

@ -52,5 +52,9 @@ namespace FreeSql.DatabaseModel
/// 数据库默认值
/// </summary>
public string DefaultValue { get; set; }
/// <summary>
/// 字段位置
/// </summary>
public int Position { get; set; }
}
}

296
FreeSql/FreeSql.xml
View File

@ -445,6 +445,11 @@
数据库默认值
</summary>
</member>
<member name="P:FreeSql.DatabaseModel.DbColumnInfo.Position">
<summary>
字段位置
</summary>
</member>
<member name="P:FreeSql.DatabaseModel.DbEnumInfo.Name">
<summary>
枚举类型标识
@ -2305,137 +2310,6 @@
<param name="parms"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.ExecuteReaderAsync(System.Func{System.Data.Common.DbDataReader,System.Threading.Tasks.Task},System.Data.CommandType,System.String,System.Data.Common.DbParameter[])">
<summary>
查询，若使用读写分离，查询【从库】条件cmdText.StartsWith("SELECT ")，否则查询【主库】
</summary>
<param name="readerHander"></param>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteReaderAsync(System.Func{System.Data.Common.DbDataReader,System.Threading.Tasks.Task},System.String,System.Object)">
<summary>
查询，ExecuteReaderAsync(dr => {}, "select * from user where age > ?age", new { age = 25 })
</summary>
<param name="cmdText"></param>
<param name="parms"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteArrayAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[])">
<summary>
查询
</summary>
<param name="cmdText"></param>
<param name="cmdParms"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteArrayAsync(System.String,System.Object)">
<summary>
查询，ExecuteArrayAsync("select * from user where age > ?age", new { age = 25 })
</summary>
<param name="cmdText"></param>
<param name="parms"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.ExecuteDataSetAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[])">
<summary>
查询
</summary>
<param name="cmdText"></param>
<param name="cmdParms"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteDataSetAsync(System.String,System.Object)">
<summary>
查询，ExecuteDataSetAsync("select * from user where age > ?age; select 2", new { age = 25 })
</summary>
<param name="cmdText"></param>
<param name="parms"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.ExecuteDataTableAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[])">
<summary>
查询
</summary>
<param name="cmdText"></param>
<param name="cmdParms"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteDataTableAsync(System.String,System.Object)">
<summary>
查询，ExecuteDataTableAsync("select * from user where age > ?age", new { age = 25 })
</summary>
<param name="cmdText"></param>
<param name="parms"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.ExecuteNonQueryAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[])">
<summary>
在【主库】执行
</summary>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteNonQueryAsync(System.String,System.Object)">
<summary>
在【主库】执行，ExecuteNonQueryAsync("delete from user where age > ?age", new { age = 25 })
</summary>
<param name="cmdText"></param>
<param name="parms"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.ExecuteScalarAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[])">
<summary>
在【主库】执行
</summary>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteScalarAsync(System.String,System.Object)">
<summary>
在【主库】执行，ExecuteScalarAsync("select 1 from user where age > ?age", new { age = 25 })
</summary>
<param name="cmdText"></param>
<param name="parms"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.QueryAsync``1(System.Data.CommandType,System.String,System.Data.Common.DbParameter[])">
<summary>
执行SQL返回对象集合，QueryAsync&lt;User&gt;("select * from user where age > ?age", new SqlParameter { ParameterName = "age", Value = 25 })
</summary>
<typeparam name="T"></typeparam>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.QueryAsync``1(System.String,System.Object)">
<summary>
执行SQL返回对象集合，QueryAsync&lt;User&gt;("select * from user where age > ?age", new { age = 25 })
</summary>
<typeparam name="T"></typeparam>
<param name="cmdText"></param>
<param name="parms"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.QueryAsync``2(System.Data.CommandType,System.String,System.Data.Common.DbParameter[])">
<summary>
执行SQL返回对象集合，Query&lt;User&gt;("select * from user where age > ?age; select * from address", new SqlParameter { ParameterName = "age", Value = 25 })
</summary>
<typeparam name="T1"></typeparam>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.QueryAsync``2(System.String,System.Object)">
<summary>
执行SQL返回对象集合，Query&lt;User&gt;("select * from user where age > ?age; select * from address", new { age = 25 })
</summary>
<typeparam name="T1"></typeparam>
<param name="cmdText"></param>
<param name="parms"></param>
<returns></returns>
</member>
<member name="E:FreeSql.IAop.ParseExpression">
<summary>
可自定义解析表达式
@ -2956,6 +2830,166 @@
<param name="timeout">超时</param>
<returns></returns>
</member>
<member name="M:FreeSql.Internal.ObjectPool.IObjectPool`1.Return(FreeSql.Internal.ObjectPool.Object{`0},System.Boolean)">
<summary>
使用完毕后，归还资源
</summary>
<param name="obj">对象</param>
<param name="isReset">是否重新创建</param>
</member>
<member name="P:FreeSql.Internal.ObjectPool.IPolicy`1.Name">
<summary>
名称
</summary>
</member>
<member name="P:FreeSql.Internal.ObjectPool.IPolicy`1.PoolSize">
<summary>
池容量
</summary>
</member>
<member name="P:FreeSql.Internal.ObjectPool.IPolicy`1.SyncGetTimeout">
<summary>
默认获取超时设置
</summary>
</member>
<member name="P:FreeSql.Internal.ObjectPool.IPolicy`1.IdleTimeout">
<summary>
空闲时间，获取时若超出，则重新创建
</summary>
</member>
<member name="P:FreeSql.Internal.ObjectPool.IPolicy`1.AsyncGetCapacity">
<summary>
异步获取排队队列大小，小于等于0不生效
</summary>
</member>
<member name="P:FreeSql.Internal.ObjectPool.IPolicy`1.IsThrowGetTimeoutException">
<summary>
获取超时后，是否抛出异常
</summary>
</member>
<member name="P:FreeSql.Internal.ObjectPool.IPolicy`1.IsAutoDisposeWithSystem">
<summary>
监听 AppDomain.CurrentDomain.ProcessExit/Console.CancelKeyPress 事件自动释放
</summary>
</member>
ry>
获取c#值
</summary>
<param name="column"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IDbFirst.GetCsType(FreeSql.DatabaseModel.DbColumnInfo)">
<summary>
获取c#类型，int、long
</summary>
<param name="column"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IDbFirst.GetCsTypeInfo(FreeSql.DatabaseModel.DbColumnInfo)">
<summary>
获取c#类型对象
</summary>
<param name="column"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IDbFirst.GetDataReaderMethod(FreeSql.DatabaseModel.DbColumnInfo)">
<summary>
获取ado.net读取方法, GetBoolean、GetInt64
</summary>
<param name="column"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IDbFirst.GetCsStringify(FreeSql.DatabaseModel.DbColumnInfo)">
<summary>
序列化
</summary>
<param name="column"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IDbFirst.GetCsParse(FreeSql.DatabaseModel.DbColumnInfo)">
<summary>
反序列化
</summary>
<param name="column"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IDbFirst.GetEnumsByDatabase(System.String[])">
<summary>
获取数据库枚举类型，适用 PostgreSQL
</summary>
<param name="database"></param>
<returns></returns>
</member>
<member name="M:FreeSql.Internal.CommonProvider.InsertProvider`1.IgnoreCanInsert">
<summary>
AsType, Ctor, ClearData 三处地方需要重新加载
</summary>
</member>
<member name="M:FreeSql.Internal.CommonProvider.UpdateProvider`1.IgnoreCanUpdate">
<summary>
AsType, Ctor, ClearData 三处地方需要重新加载
</summary>
</member>
<member name="M:FreeSql.Internal.CommonUtils.GetProperyCommentBySummary(System.Type)">
<summary>
通过属性的注释文本，通过 xml 读取
</summary>
<param name="type"></param>
<returns>Dict：key=属性名，value=注释</returns>
</member>
<member name="M:FreeSql.Internal.GlobalFilter.Apply``1(System.String,System.Linq.Expressions.Expression{System.Func{``0,System.Boolean}})">
<summary>
创建一个过滤器
</summary>
<typeparam name="TEntity"></typeparam>
<param name="name">名字</param>
<param name="where">表达式</param>
<returns></returns>
</member>
<member name="P:FreeSql.Internal.Model.TableRef.RefMiddleEntityType">
<summary>
中间表，多对多
</summary>
</member>
<member name="P:FreeSql.Internal.ObjectPool.IObjectPool`1.IsAvailable">
<summary>
是否可用
</summary>
</member>
<member name="P:FreeSql.Internal.ObjectPool.IObjectPool`1.UnavailableException">
<summary>
不可用错误
</summary>
</member>
<member name="P:FreeSql.Internal.ObjectPool.IObjectPool`1.UnavailableTime">
<summary>
不可用时间
</summary>
</member>
<member name="M:FreeSql.Internal.ObjectPool.IObjectPool`1.SetUnavailable(System.Exception)">
<summary>
将对象池设置为不可用，后续 Get/GetAsync 均会报错，同时启动后台定时检查服务恢复可用
</summary>
<param name="exception"></param>
<returns>由【可用】变成【不可用】时返回true，否则返回false</returns>
</member>
<member name="P:FreeSql.Internal.ObjectPool.IObjectPool`1.Statistics">
<summary>
统计对象池中的对象
</summary>
</member>
<member name="P:FreeSql.Internal.ObjectPool.IObjectPool`1.StatisticsFullily">
<summary>
统计对象池中的对象（完整)
</summary>
</member>
<member name="M:FreeSql.Internal.ObjectPool.IObjectPool`1.Get(System.Nullable{System.TimeSpan})">
<summary>
获取资源
</summary>
<param name="timeout">超时</param>
<returns></returns>
</member>
<member name="M:FreeSql.Internal.ObjectPool.IObjectPool`1.GetAsync">
<summary>
获取资源

4
Providers/FreeSql.Provider.Dameng/DamengDbFirst.cs
View File

@ -330,6 +330,7 @@ where a.owner in ({1}) and {0}
ds2item[8] = string.Concat(row[10]);
ds2.Add(ds2item);
}
var position = 0;
foreach (var row in ds2)
{
string table_id = string.Concat(row[0]);
@ -359,7 +360,8 @@ where a.owner in ({1}) and {0}
DbTypeTextFull = sqlType,
Table = loc2[table_id],
Coment = comment,
DefaultValue = defaultValue
DefaultValue = defaultValue,
Position = ++position
});
loc3[table_id][column].DbType = this.GetDbType(loc3[table_id][column]);
loc3[table_id][column].CsType = this.GetCsTypeInfo(loc3[table_id][column]);

4
Providers/FreeSql.Provider.MySql/MySqlDbFirst.cs
View File

@ -246,6 +246,7 @@ where a.table_schema in ({1}) and {0}
ds = _orm.Ado.ExecuteArray(CommandType.Text, sql);
if (ds == null) return loc1;
var position = 0;
foreach (var row in ds)
{
string table_id = string.Concat(row[0]);
@ -275,7 +276,8 @@ where a.table_schema in ({1}) and {0}
DbTypeTextFull = sqlType,
Table = loc2[table_id],
Coment = comment,
DefaultValue = defaultValue
DefaultValue = defaultValue,
Position = ++position
});
loc3[table_id][column].DbType = this.GetDbType(loc3[table_id][column]);
loc3[table_id][column].CsType = this.GetCsTypeInfo(loc3[table_id][column]);

4
Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengDbFirst.cs
View File

@ -330,6 +330,7 @@ where a.owner in ({1}) and {0}
ds2item[8] = string.Concat(row[10]);
ds2.Add(ds2item);
}
var position = 0;
foreach (var row in ds2)
{
string table_id = string.Concat(row[0]);
@ -359,7 +360,8 @@ where a.owner in ({1}) and {0}
DbTypeTextFull = sqlType,
Table = loc2[table_id],
Coment = comment,
DefaultValue = defaultValue
DefaultValue = defaultValue,
Position = ++position
});
loc3[table_id][column].DbType = this.GetDbType(loc3[table_id][column]);
loc3[table_id][column].CsType = this.GetCsTypeInfo(loc3[table_id][column]);

4
Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlDbFirst.cs
View File

@ -216,6 +216,7 @@ where a.table_schema in ({1}) and {0}
ds = _orm.Ado.ExecuteArray(CommandType.Text, sql);
if (ds == null) return loc1;
var position = 0;
foreach (var row in ds)
{
string table_id = string.Concat(row[0]);
@ -245,7 +246,8 @@ where a.table_schema in ({1}) and {0}
DbTypeTextFull = sqlType,
Table = loc2[table_id],
Coment = comment,
DefaultValue = defaultValue
DefaultValue = defaultValue,
Position = ++position
});
loc3[table_id][column].DbType = this.GetDbType(loc3[table_id][column]);
loc3[table_id][column].CsType = this.GetCsTypeInfo(loc3[table_id][column]);

4
Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleDbFirst.cs
View File

@ -303,6 +303,7 @@ where a.owner in ({1}) and {0}
ds2item[8] = string.Concat(row[10]);
ds2.Add(ds2item);
}
var position = 0;
foreach (var row in ds2)
{
string table_id = string.Concat(row[0]);
@ -332,7 +333,8 @@ where a.owner in ({1}) and {0}
DbTypeTextFull = sqlType,
Table = loc2[table_id],
Coment = comment,
DefaultValue = defaultValue
DefaultValue = defaultValue,
Position = ++position
});
loc3[table_id][column].DbType = this.GetDbType(loc3[table_id][column]);
loc3[table_id][column].CsType = this.GetCsTypeInfo(loc3[table_id][column]);

4
Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLDbFirst.cs
View File

@ -228,6 +228,7 @@ where {loc8.ToString().Replace("a.table_name", "ns.nspname || '.' || c.relname")
ds = _orm.Ado.ExecuteArray(CommandType.Text, sql);
if (ds == null) return loc1;
var position = 0;
foreach (object[] row in ds)
{
var object_id = string.Concat(row[0]);
@ -275,7 +276,8 @@ where {loc8.ToString().Replace("a.table_name", "ns.nspname || '.' || c.relname")
DbTypeTextFull = sqlType,
Table = loc2[object_id],
Coment = comment,
DefaultValue = defaultValue
DefaultValue = defaultValue,
Position = ++position
});
loc3[object_id][column].DbType = this.GetDbType(loc3[object_id][column]);
loc3[object_id][column].CsType = this.GetCsTypeInfo(loc3[object_id][column]);

4
Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerDbFirst.cs
View File

@ -268,6 +268,7 @@ from sys.parameters", loc88.ToString().Replace("a.table_name", "a.object_id"), "
ds = _orm.Ado.ExecuteArray(CommandType.Text, sql);
if (ds == null) return loc1;
var position = 0;
foreach (object[] row in ds)
{
var table_id = string.Concat(row[0]);
@ -293,7 +294,8 @@ from sys.parameters", loc88.ToString().Replace("a.table_name", "a.object_id"), "
DbTypeTextFull = sqlType,
Table = loc2[object_id],
Coment = comment,
DefaultValue = defaultValue
DefaultValue = defaultValue,
Position = ++position
});
loc3[object_id][column].DbType = this.GetDbType(loc3[object_id][column]);
loc3[object_id][column].CsType = this.GetCsTypeInfo(loc3[object_id][column]);

4
Providers/FreeSql.Provider.Oracle/OracleDbFirst.cs
View File

@ -303,6 +303,7 @@ where a.owner in ({1}) and {0}
ds2item[8] = string.Concat(row[10]);
ds2.Add(ds2item);
}
var position = 0;
foreach (var row in ds2)
{
string table_id = string.Concat(row[0]);
@ -332,7 +333,8 @@ where a.owner in ({1}) and {0}
DbTypeTextFull = sqlType,
Table = loc2[table_id],
Coment = comment,
DefaultValue = defaultValue
DefaultValue = defaultValue,
Position = ++position
});
loc3[table_id][column].DbType = this.GetDbType(loc3[table_id][column]);
loc3[table_id][column].CsType = this.GetCsTypeInfo(loc3[table_id][column]);

4
Providers/FreeSql.Provider.PostgreSQL/PostgreSQLDbFirst.cs
View File

@ -338,6 +338,7 @@ where {loc8.ToString().Replace("a.table_name", "ns.nspname || '.' || c.relname")
ds = _orm.Ado.ExecuteArray(CommandType.Text, sql);
if (ds == null) return loc1;
var position = 0;
foreach (object[] row in ds)
{
var object_id = string.Concat(row[0]);
@ -385,7 +386,8 @@ where {loc8.ToString().Replace("a.table_name", "ns.nspname || '.' || c.relname")
DbTypeTextFull = sqlType,
Table = loc2[object_id],
Coment = comment,
DefaultValue = defaultValue
DefaultValue = defaultValue,
Position = ++position
});
loc3[object_id][column].DbType = this.GetDbType(loc3[object_id][column]);
loc3[object_id][column].CsType = this.GetCsTypeInfo(loc3[object_id][column]);

4
Providers/FreeSql.Provider.SqlServer/SqlServerDbFirst.cs
View File

@ -271,6 +271,7 @@ from sys.parameters", loc88.ToString().Replace("a.table_name", "a.object_id"), "
ds = _orm.Ado.ExecuteArray(CommandType.Text, sql);
if (ds == null) return loc1;
var position = 0;
foreach (object[] row in ds)
{
var table_id = string.Concat(row[0]);
@ -296,7 +297,8 @@ from sys.parameters", loc88.ToString().Replace("a.table_name", "a.object_id"), "
DbTypeTextFull = sqlType,
Table = loc2[object_id],
Coment = comment,
DefaultValue = defaultValue
DefaultValue = defaultValue,
Position = ++position
});
loc3[object_id][column].DbType = this.GetDbType(loc3[object_id][column]);
loc3[object_id][column].CsType = this.GetCsTypeInfo(loc3[object_id][column]);

8
Providers/FreeSql.Provider.Sqlite/SqliteDbFirst.cs
View File

@ -159,7 +159,7 @@ namespace FreeSql.Sqlite
if (database == null || database.Any() == false) database = GetDatabases().ToArray();
if (database.Any() == false) return loc1;
Action<object[]> addColumn = row =>
Action<object[], int> addColumn = (row, position) =>
{
string table_id = string.Concat(row[0]);
string column = string.Concat(row[1]);
@ -185,7 +185,8 @@ namespace FreeSql.Sqlite
DbTypeTextFull = sqlType,
Table = loc2[table_id],
Coment = comment,
DefaultValue = defaultValue
DefaultValue = defaultValue,
Position = position
});
loc3[table_id][column].DbType = this.GetDbType(loc3[table_id][column]);
loc3[table_id][column].CsType = this.GetCsTypeInfo(loc3[table_id][column]);
@ -247,6 +248,7 @@ from {db}.sqlite_master where type = 'table'";
{
var dsql = string.Concat(row[5]);
var cols = _orm.Ado.ExecuteArray(CommandType.Text, $"PRAGMA \"{db}\".table_info(\"{table}\")");
var position = 0;
foreach (var col in cols)
{
var col_name = string.Concat(col[1]);
@ -268,7 +270,7 @@ from {db}.sqlite_master where type = 'table'";
ds2item[7] = string.Concat(col[5]) == "1" ? 1 : 0;
ds2item[8] = "";
ds2item[9] = string.Concat(col[4]);
addColumn(ds2item);
addColumn(ds2item, ++position);
}
var fks = _orm.Ado.ExecuteArray(CommandType.Text, $"PRAGMA \"{db}\".foreign_key_list(\"{table}\")");

2
readme.md
View File

@ -204,7 +204,7 @@ Elapsed: 00:00:00.6495301; Query Entity Counts: 131072; ORM: Dapper
## Donation
L*y 58元、花花 88元、麦兜很乖 50元、网络来者 2000元、John 99.99元、alex 666元、bacongao 36元、无名 100元、Eternity 188元、无名 10元、⌒.Helper~..oO 66元、习惯与被习惯 100元
L*y 58元、花花 88元、麦兜很乖 50元、网络来者 2000元、John 99.99元、alex 666元、bacongao 36元、无名 100元、Eternity 188元、无名 10元、⌒.Helper~..oO 66元、习惯与被习惯 100元、无名 100元
> Thank you for your donation