diff --git a/.circleci/config.yml b/.circleci/config.yml index d2cc971c9..925d13c90 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -146,6 +146,12 @@ jobs: - image: *default-dotnet-image steps: - checkout + - run: | + sed -i '/netcoreapp3.1;net5.0;net6.0;net7.0<\/TargetFrameworks>/c\'net7.0'<\/TargetFramework>' Client.Core.Test/Client.Core.Test.csproj + sed -i '/netcoreapp3.1;net5.0;net6.0;net7.0<\/TargetFrameworks>/c\'net7.0'<\/TargetFramework>' Client.Test/Client.Test.csproj + sed -i '/netcoreapp3.1;net5.0;net6.0;net7.0<\/TargetFrameworks>/c\'net7.0'<\/TargetFramework>' Client.Legacy.Test/Client.Legacy.Test.csproj + sed -i '/netcoreapp3.1;net5.0;net6.0;net7.0<\/TargetFrameworks>/c\'net7.0'<\/TargetFramework>' Client.Linq.Test/Client.Linq.Test.csproj + sed -i '/netcoreapp3.1;net5.0;net6.0;net7.0<\/TargetFrameworks>/c\'net7.0'<\/TargetFramework>' Examples/Examples.csproj - run: name: Check compilation warnings command: | diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f5a24419..9cc935bf5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ ## 4.12.0 [unreleased] +### Bug Fixes +- [#510](https://github.com/influxdata/influxdb-client-csharp/pull/510): Passing aggregation function to AggregateWindow for LINQ queries + ### Dependencies Update dependencies: diff --git a/Client.Linq.Test/InfluxDBQueryVisitorTest.cs b/Client.Linq.Test/InfluxDBQueryVisitorTest.cs index 93a5ccf1c..12ca8160e 100644 --- a/Client.Linq.Test/InfluxDBQueryVisitorTest.cs +++ b/Client.Linq.Test/InfluxDBQueryVisitorTest.cs @@ -1039,6 +1039,22 @@ where s.Timestamp.AggregateWindow(TimeSpan.FromSeconds(20), TimeSpan.FromSeconds Assert.AreEqual("mean", (fnAssignment.Init as Identifier)?.Name); } + [Test] + public void AggregateWindowCustomFunction() + { + var query = from s in InfluxDBQueryable.Queryable("my-bucket", "my-org", _queryApi) + where s.Timestamp.AggregateWindow(TimeSpan.FromSeconds(20), TimeSpan.FromSeconds(40), "min") + where s.Value == 5 + select s; + + var visitor = BuildQueryVisitor(query); + var ast = visitor.BuildFluxAST(); + + var fnAssignment = ((OptionStatement)ast.Body[4]).Assignment as VariableAssignment; + Assert.AreEqual("p5", fnAssignment?.Id.Name); + Assert.AreEqual("min", (fnAssignment.Init as Identifier)?.Name); + } + [Test] public void AggregateWindowFluxQuery() { diff --git a/Client.Linq/Internal/QueryExpressionTreeVisitor.cs b/Client.Linq/Internal/QueryExpressionTreeVisitor.cs index d1f7816b4..f3a4a65ca 100644 --- a/Client.Linq/Internal/QueryExpressionTreeVisitor.cs +++ b/Client.Linq/Internal/QueryExpressionTreeVisitor.cs @@ -180,7 +180,7 @@ protected override Expression VisitMethodCall(MethodCallExpression expression) // var fn = ((ConstantExpression)expression.Arguments[3]).Value as string; Arguments.CheckNonEmptyString(fn, "fn"); - var fnVariable = _context.Variables.AddNamedVariable(new Identifier("Identifier", "mean")); + var fnVariable = _context.Variables.AddNamedVariable(new Identifier("Identifier", fn)); _context.QueryAggregator.AddAggregateWindow(everyVariable, periodVariable, fnVariable); pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy