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

- 优化 QuestDB 类型映射，表达式函数解析，新增 QuestFunc 函数解析；

Browse Source
This commit is contained in:
2881099
2023-06-28 16:09:19 +08:00
parent 40a7eb4854
commit ac9c986914
8 changed files with 488 additions and 483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Examples/base_entity/Program.cs
View File

@ -590,7 +590,7 @@ namespace base_entity
//.UseNameConvert(FreeSql.Internal.NameConvertType.ToUpper)
//.UseConnectionString(FreeSql.DataType.OdbcDameng, "Driver={DM8 ODBC DRIVER};Server=127.0.0.1:5236;Persist Security Info=False;Trusted_Connection=Yes;UID=USER1;PWD=123456789")
.UseConnectionString(DataType.QuestDb, "host=localhost;port=8812;username=admin;password=quest;database=qdb;ServerCompatibilityMode=NoTypeLoading;")
.UseMonitorCommand(cmd =>
{
Console.WriteLine(cmd.CommandText + "\r\n");
@ -602,6 +602,27 @@ namespace base_entity
BaseEntity.Initialization(fsql, () => _asyncUow.Value);
#endregion
var qr1 = fsql.SelectLongSequence(10, () => new
{
rndstr = QuestFunc.rnd_str(10, 5, 10, 0),
rnddate = QuestFunc.rnd_date(QuestFunc.to_date("2020", "yyyy"), QuestFunc.to_date("2023", "yyyy"))
})
.From<User1>()
.InnerJoin((a, b) => a.rndstr == b.Username).ToList();
var now_to_timezone = "";
var timeOffset = (int)TimeZone.CurrentTimeZone.GetUtcOffset(DateTime.Now).TotalMinutes;
if (timeOffset == 0) now_to_timezone = "systimestamp()";
else
{
var absTimeOffset = Math.Abs(timeOffset);
now_to_timezone = $"to_timezone(systimestamp(),'{(timeOffset > 0 ? '+' : '-')}{(absTimeOffset / 60).ToString().PadLeft(2, '0')}:{(absTimeOffset % 60).ToString().PadLeft(2, '0')}')";
}
if (now_to_timezone != "to_timezone(systimestamp(),'+08:00')") throw new Exception("questdb DateTime.Now 时差计算错误");
fsql.Insert(new[]
{
new pgjson_copy001{ json = JObject.FromObject(new {x=1,y=2 })},
@ -996,7 +1017,12 @@ var sql11111 = fsql.Select<Class1111>()
var arguments = callExp.Arguments;
var Function = new Func<string, Expression[], Type, string>((dbfunc, args, returnType) =>
{
return $"{dbfunc}({string.Join(", ", args.Select(a => e.FreeParse(a)))})";
var inputArgs = string.Join(", ", args.Select(a =>
{
//var testParse = fsql.Aop.ParseExpressionHandler(fsql, new FreeSql.Aop.ParseExpressionEventArgs(a, e.FreeParse, e.Tables));
return e.FreeParse(a);
}));
return $"{dbfunc}({inputArgs})";
});
e.Result = callExp.Method.Name switch
{

1
Examples/base_entity/base_entity.csproj
View File

@ -31,6 +31,7 @@
<ProjectReference Include="..\..\Providers\FreeSql.Provider.Odbc\FreeSql.Provider.Odbc.csproj" />
<ProjectReference Include="..\..\Providers\FreeSql.Provider.Oracle\FreeSql.Provider.Oracle.csproj" />
<ProjectReference Include="..\..\Providers\FreeSql.Provider.PostgreSQL\FreeSql.Provider.PostgreSQL.csproj" />
<ProjectReference Include="..\..\Providers\FreeSql.Provider.QuestDb\FreeSql.Provider.QuestDb.csproj" />
<ProjectReference Include="..\..\Providers\FreeSql.Provider.Sqlite\FreeSql.Provider.Sqlite.csproj" />
<ProjectReference Include="..\..\Providers\FreeSql.Provider.SqlServer\FreeSql.Provider.SqlServer.csproj" />
</ItemGroup>