From 2a98d064299bcf1c7e3e06636cbf8d634cf6a018 Mon Sep 17 00:00:00 2001 From: Evgenii Kozlov Date: Tue, 19 Nov 2024 11:44:36 +0100 Subject: [PATCH] DROID-3076 Protocol | Enhancement | MW 0.37.0-alpha05 (#1812) --- gradle/libs.versions.toml | 2 +- protocol/src/main/proto/commands.proto | 2 +- protocol/src/main/proto/models.proto | 17 +++++++++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index be64c02d76..93abc00c82 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -middlewareVersion = "v0.37.0-alpha04" +middlewareVersion = "v0.37.0-alpha05" kotlinVersion = '2.0.21' kspVersion = "2.0.21-1.0.25" diff --git a/protocol/src/main/proto/commands.proto b/protocol/src/main/proto/commands.proto index eae000a242..570d85fc0c 100644 --- a/protocol/src/main/proto/commands.proto +++ b/protocol/src/main/proto/commands.proto @@ -1811,7 +1811,7 @@ message Rpc { repeated string keys = 7; bool returnMeta = 8; // add ResultMeta to each result bool returnMetaRelationDetails = 9; // add relation option details to meta - bool returnHTMLHighlightsInsteadOfRanges = 10; + bool returnHTMLHighlightsInsteadOfRanges = 10; //DEPRECATED } message Response { diff --git a/protocol/src/main/proto/models.proto b/protocol/src/main/proto/models.proto index c71f5c1b8d..b1cc771f06 100644 --- a/protocol/src/main/proto/models.proto +++ b/protocol/src/main/proto/models.proto @@ -389,6 +389,7 @@ message Block { bool dateIncludeTime = 5; TimeFormat timeFormat = 6; DateFormat dateFormat = 7; + FormulaType formula = 8; enum DateFormat { MonthAbbrBeforeDay = 0; // Jul 30, 2020 @@ -402,6 +403,22 @@ message Block { Format12 = 0; Format24 = 1; } + + enum FormulaType { + None = 0; + Count = 1; + CountDistinct = 2; + CountEmpty = 3; + CountNotEmpty = 4; + PercentEmpty = 5; + PercentNotEmpty = 6; + MathSum = 7; + MathAverage = 8; + MathMedian = 9; + MathMin = 10; + MathMax = 11; + Range = 12; + } } message Sort {