Skip to content

Commit c4918d3

Browse files
maikebingmaikebing
committed
Merge branch 'dev'
2 parents da42075 + 20d4a33 commit c4918d3

File tree

9 files changed

+26
-21
lines changed

9 files changed

+26
-21
lines changed

‎.github/workflows/dotnet.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Setup .NET
2323
uses: actions/setup-dotnet@v3
2424
with:
25-
dotnet-version: 7.0.x
25+
dotnet-version: 8.0.x
2626
- name: Restore dependencies
2727
run: dotnet restore EFCore.Taos.sln
2828
- name: Build

‎EFCore.Taos.sln

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,12 @@ EndProject
1212
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{61AA7587-946B-4B2F-92C9-73D0BA670B97}"
1313
ProjectSection(SolutionItems) = preProject
1414
appveyor.yml = appveyor.yml
15+
.workflow\BranchPipeline.yml = .workflow\BranchPipeline.yml
16+
.github\workflows\dotnet.yml = .github\workflows\dotnet.yml
1517
LICENSE = LICENSE
1618
docs\logo.png = docs\logo.png
19+
.workflow\MasterPipeline.yml = .workflow\MasterPipeline.yml
20+
.workflow\PRPipeline.yml = .workflow\PRPipeline.yml
1721
README.md = README.md
1822
taos.cfg = taos.cfg
1923
docs\taos_ch.png = docs\taos_ch.png

‎src/EFCore.Taos.Core/Query/Internal/TaosQuerySqlGenerator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ protected override Expression VisitExtension(Expression extensionExpression)
9292

9393

9494
return exp;
95-
}
95+
}
9696

9797
private Expression VisitTaosMatchExpression(TaosMatchExpression matchExpression)
9898
{

‎src/EntityFrameworkCore.Taos.Tests/SqModelTest.cs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
using IoTSharp.Data.Taos;
1+
using Carbunql.Analysis;
2+
using IoTSharp.Data.Taos;
23
using Microsoft.VisualStudio.TestTools.UnitTesting;
3-
using SqModel.Analysis;
44
using System;
55
using System.Collections.Generic;
66
using System.Linq;
@@ -20,17 +20,17 @@ public void TestExecuteBulkInsert_Json()
2020
,station_uid,longitude,latitude,mn,dev_code,pol_name,pol_unit,pol_id FROM st_pmcm WHERE point_code = @p1;";
2121
const string SQLDemo3 = "SELECT * FROM bytable WHERE t1 = @t1 AND t2 LIKE @t11 LIMIT @t3;";
2222
// const string SQLDemo4 = "INSERT INTO t_status USING st_status (status_key) TAGS ('s1') (status_time, val) VALUES (@x1, @x2);";
23-
var s1 = SqlParser.Parse(SQLDemo1);
23+
var s1 = SelectQueryParser.Parse(SQLDemo1);
2424
Assert.AreEqual(0, ((int?)s1.Parameters?.Count).GetValueOrDefault());
25-
var s2 = SqlParser.Parse(SQLDemo2);
25+
var s2 = SelectQueryParser.Parse(SQLDemo2);
2626
Assert.AreEqual(5, ((int?)s2.Parameters?.Count).GetValueOrDefault());
2727

2828
Assert.AreEqual("@p1", s2.Parameters?.Keys.ToArray()[0]);
2929

3030
var pn2 = s2.Parameters;
3131
Assert.AreEqual(1, pn2.Count);
3232
Assert.AreEqual("@p1", pn2.Keys.ToArray()[0]);
33-
var s3 = SqlParser.Parse(SQLDemo3);
33+
var s3 = SelectQueryParser.Parse(SQLDemo3);
3434
Assert.AreEqual(7, s3.Parameters?.Count);
3535
Assert.AreEqual("@t1", s3.Parameters?.ToArray()[1].Key);
3636
Assert.AreEqual("@t11", s3.Parameters?.ToArray()[3].Key);
@@ -57,7 +57,8 @@ public void TestExecuteBulkInsert_Json()
5757
//Assert.AreEqual(2, pn4.Length);
5858
//Assert.AreEqual("@x1", pn4[0]);
5959
//Assert.AreEqual("@x2", pn4[1]);
60-
var s5 = SqlParser.Parse("insert into #subtable using stable tags($t1,$t2,$t3,$t4,$t5,$t6,$t7,$t8,$t9,$t10,$t11,$t12,$t13) values (@t1,@t2,@t3,@t4,@t5,@t6,@t7,@t8,@t9,@t10,@t11,@t12,@t13,@t14)");
60+
61+
var s5 = SelectQueryParser.Parse("insert into #subtable using stable tags($t1,$t2,$t3,$t4,$t5,$t6,$t7,$t8,$t9,$t10,$t11,$t12,$t13) values (@t1,@t2,@t3,@t4,@t5,@t6,@t7,@t8,@t9,@t10,@t11,@t12,@t13,@t14)");
6162
Assert.AreEqual(14, s5.Parameters?.Count);
6263
Assert.AreEqual("#subtable", s5.Parameters?.ToArray()[0].Key);
6364
Assert.AreEqual(13, s5.Parameters?.Count(k=>k.Key.StartsWith('$')));

‎src/Example/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
22

3-
FROM mcr.microsoft.com/dotnet/runtime:7.0-bullseye-slim AS base
4-
MAINTAINER Yanhong Ma 2023
5-
RUN echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bullseye main contrib non-free" > /etc/apt/sources.list && \
6-
echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bullseye-updates main contrib non-free" >> /etc/apt/sources.list && \
7-
echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bullseye-backports main contrib non-free" >> /etc/apt/sources.list && \
3+
FROM mcr.microsoft.com/dotnet/runtime:8.0-bookworm-slim AS base
4+
MAINTAINER Yanhong Ma 2024
5+
RUN echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm main contrib non-free" > /etc/apt/sources.list && \
6+
echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm-updates main contrib non-free" >> /etc/apt/sources.list && \
7+
echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm-backports main contrib non-free" >> /etc/apt/sources.list && \
88
apt-get -y -q update && apt-get install -y --no-install-recommends -q apt-utils lsof net-tools wget curl iputils-ping inetutils-tools && \
99
apt-get autoremove -y && apt-get clean && apt-get autoclean && rm /var/cache/apt/* -rf && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
1010
RUN curl -o TDengine-client.tar.gz "https://www.taosdata.com/assets-download/3.0/TDengine-client-3.2.1.0-Linux-x64.tar.gz" && \
@@ -13,7 +13,7 @@ RUN curl -o TDengine-client.tar.gz "https://www.taosdata.com/assets-download/3.0
1313
rm $(pwd) -rf
1414
WORKDIR /app
1515

16-
FROM mcr.microsoft.com/dotnet/sdk:7.0-bullseye-slim AS build
16+
FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim AS build
1717
WORKDIR /src
1818

1919
COPY ["src/Example/Example.csproj", "src/Example/"]

‎src/IoTSharp.Data.Taos/IoTSharp.Data.Taos.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
IoTSharp.Data.Taos.TaosParameter
1717
IoTSharp.Data.Taos.TaosTransaction
1818
</Description>
19-
<TargetFrameworks>net6;net7;net4.6;netstandard2.0</TargetFrameworks>
19+
<TargetFrameworks>net6;net7;net8;net4.6;netstandard2.0</TargetFrameworks>
2020
<LangVersion>10</LangVersion>
2121
<PackageTags>Taos;Data;ADO.NET;Entity Framework,;EF; Core;Data O/RM,;entity-framework-core;TDengine;IoTSharp</PackageTags>
2222
<Authors>Yanhong Ma</Authors>
@@ -56,7 +56,7 @@
5656
</ItemGroup>
5757

5858
<ItemGroup>
59-
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
59+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
6060
</ItemGroup>
6161
<ItemGroup Condition="'$(TargetFramework)' == 'net4.6'">
6262
<PackageReference Include="System.Net.Http" Version="4.3.4" />

‎src/IoTSharp.Data.Taos/Protocols/TDWebSocket/TaosWebSocket.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ private bool _open_ws(TaosConnectionStringBuilder builder)
447447

448448
private bool _ws_conn(TaosConnectionStringBuilder builder, ClientWebSocket _client)
449449
{
450-
var rep = WSExecute<WSConnRsp, WSConnReq>(_client, new WSActionReq<WSConnReq>() { Action = "conn", Args = new WSConnReq() { user = builder.Username, password = builder.Password, req_id = 0, db = builder.DataBase } });
450+
var rep = WSExecute<WSConnRsp, WSConnReq>(_client, new WSActionReq<WSConnReq>() { Action = "conn", Args = new WSConnReq() { user = builder.Username, password = builder.Password, req_id = 0 } });
451451
if (rep.code == 899)
452452
{
453453
rep = WSExecute<WSConnRsp, WSConnReq>(_client, new WSActionReq<WSConnReq>() { Action = "conn", Args = new WSConnReq() { user = builder.Username, password = builder.Password, req_id = 0 } });

‎src/IoTSharp.HealthChecks.Taos/IoTSharp.HealthChecks.Taos.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6</TargetFramework>
4+
<TargetFramework>net8</TargetFramework>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<Version>1.0.1</Version>
77
<PackageLicenseExpression></PackageLicenseExpression>
@@ -17,8 +17,8 @@
1717
</PropertyGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.3" />
21-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="6.0.3" />
20+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.0" />
21+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="8.0.0" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

‎src/ORMExample/ORMExample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

0 commit comments

Comments
 (0)