Update version to 2.5.1 and enhance query handling

- Updated project version from 2.5.0 to 2.5.1.
- Added `GetResultQueryWithBlocks` method in `QueryMetadata` for processing query strings with specified block names.
- Introduced regex replacements in `TSqListener` to remove `EBLOCKFILTER` tags from `ResultQuery`.
- Updated test cases in `FiltersTests` to reflect query structure changes and added assertions for the new method.

Author: Matheus Ribeiro

MetaSql.Parser.Core/MetaSql.Parser.csproj

@@ -10,9 +10,9 @@
     <RepositoryUrl>https://github.com/mrsixx/MetaSql.Parser/</RepositoryUrl>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
     <PackageTags>parser;sql;metadata;ansi;metasql;grammar;customsql</PackageTags>
-    <AssemblyVersion>2.5.0</AssemblyVersion>
-    <FileVersion>2.5.0</FileVersion>
-    <Version>2.5.0</Version>
+    <AssemblyVersion>2.5.1</AssemblyVersion>
+    <FileVersion>2.5.1</FileVersion>
+    <Version>2.5.1</Version>
   </PropertyGroup>
 
   <ItemGroup>

MetaSql.Parser.Core/QueryMetadata.cs

@@ -4,6 +4,7 @@
 using System.Runtime.Serialization;
 using System.Text;
 using MetaSql.Parser.Models;
+using System.Text.RegularExpressions;
 
 namespace MetaSql.Parser
 {
@@ -21,6 +22,36 @@ public class QueryMetadata
 
         public List<QueryExecute> Executes { get; }
 
+
+        /// <summary>
+        /// Retorna a query com os blocos de filtros desejados.
+        /// </summary>
+        /// <param name="names"></param>
+        /// <returns></returns>
+        public string GetResultQueryWithBlocks(params string[] names)
+        {
+            string pattern = @"<(?<tag>\w+)>(?<content>.*?)</\k<tag>>";
+            var regex = new Regex(pattern, RegexOptions.Singleline);
+
+            // Substitui cada bloco conforme a lógica
+            return regex.Replace(ResultQuery, match =>
+            {
+                string tagName = match.Groups["tag"].Value;
+                string content = match.Groups["content"].Value;
+
+                // Se o nome do filtro estiver na lista, mantém o conteúdo e remove as tags
+                if (Array.Exists(names, name => name.Equals(tagName, StringComparison.OrdinalIgnoreCase)))
+                {
+                    return content;
+                }
+
+                // Caso contrário, remove o bloco inteiro
+                return string.Empty;
+            });
+        }
+
+
+
         public QueryMetadata()
         {
             Tables = new List<QueryTable>();

MetaSql.Parser.Core/TSqListener.cs

@@ -95,6 +95,8 @@ public override void ExitSelect_statement([NotNull] TSqlParser.Select_statementC
             //remove efilters
             Metadata.ResultQuery = Regex.Replace(Metadata.ResultQuery, "(?<=EFILTER)(.*)(?=;)", String.Empty, RegexOptions.IgnoreCase);
             Metadata.ResultQuery = Regex.Replace(Metadata.ResultQuery, "EFILTER;", String.Empty, RegexOptions.IgnoreCase);
+            Metadata.ResultQuery = Regex.Replace(Metadata.ResultQuery, "(?<=EBLOCKFILTER)(.*)(?=;)", String.Empty, RegexOptions.IgnoreCase);
+            Metadata.ResultQuery = Regex.Replace(Metadata.ResultQuery, "EBLOCKFILTER;", String.Empty, RegexOptions.IgnoreCase);
 
             //remove elookups
             Metadata.ResultQuery = Regex.Replace(Metadata.ResultQuery, "(?<=ELOOKUP)(.*)(?=;)", String.Empty, RegexOptions.IgnoreCase);

MetaSql.Parser.Tests/FiltersTests.cs

@@ -417,10 +417,11 @@ and a.cgeraos <> -1
 
 
             var resultQuery =
-                @"select extract(month from a.cdata) as mes, extract(year from a.cdata) as ano, extract(month from a.cdata) || '/' || extract(year from a.cdata) as data, sum(a.cpfinal) as total_venda from arqos a join vendedor v on (v.ccodigo = a.codvend1) where (1 = 1) and a.cdata BETWEEN DATEADD(YEAR, -2, CURRENT_DATE) AND CURRENT_DATE <filtroVendedor> AND v.ccodigo IN (&filtroVendedor) </filtroVendedor> and a.cgeraos <> -1 group by 1,2,3 order by 1,2";
+                @"select extract(month from a.cdata) as mes, extract(year from a.cdata) as ano, extract(month from a.cdata) || '/' || extract(year from a.cdata) as data, sum(a.cpfinal) as total_venda from arqos a join vendedor v on (v.ccodigo = a.codvend1) where (1 = 1) and a.cdata BETWEEN DATEADD(YEAR, -2, CURRENT_DATE) AND CURRENT_DATE <filtroVendedor> AND v.ccodigo IN (@filtroVendedor) </filtroVendedor> and a.cgeraos <> -1 group by 1,2,3 order by 1,2";
 
             var metadata = _queryParser.ExtractQueryMetadata(query);
 
+            Assert.Equal(resultQuery, metadata.ResultQuery);
             Assert.Single(metadata.Filters);
             Assert.Contains(metadata.Filters,
                 filter => filter.Name == "filtroVendedor"
@@ -433,6 +434,19 @@ and a.cgeraos <> -1
                               Block: true
                           }
                           && defaultValue.Equals("a.codvend1"));
+
+            var resultQueryWithBlock =
+                @"select extract(month from a.cdata) as mes, extract(year from a.cdata) as ano, extract(month from a.cdata) || '/' || extract(year from a.cdata) as data, sum(a.cpfinal) as total_venda from arqos a join vendedor v on (v.ccodigo = a.codvend1) where (1 = 1) and a.cdata BETWEEN DATEADD(YEAR, -2, CURRENT_DATE) AND CURRENT_DATE  AND v.ccodigo IN (@filtroVendedor)  and a.cgeraos <> -1 group by 1,2,3 order by 1,2";
+            resultQuery = metadata.GetResultQueryWithBlocks("filtroVendedor");
+
+            Assert.Equal(resultQuery, resultQueryWithBlock);
+            var resultQueryWithoutBlock =
+                @"select extract(month from a.cdata) as mes, extract(year from a.cdata) as ano, extract(month from a.cdata) || '/' || extract(year from a.cdata) as data, sum(a.cpfinal) as total_venda from arqos a join vendedor v on (v.ccodigo = a.codvend1) where (1 = 1) and a.cdata BETWEEN DATEADD(YEAR, -2, CURRENT_DATE) AND CURRENT_DATE  and a.cgeraos <> -1 group by 1,2,3 order by 1,2";
+            resultQuery = metadata.GetResultQueryWithBlocks();
+
+            Assert.Equal(resultQuery, resultQueryWithoutBlock);
+
+
         }
     }
 }