[ksqlDB.RestApi.Client] - KSqlVisitors KSqlQueryMetadata ctor argument

tomasfabian · tomasfabian · commit 92fb0357d6cd · 2021-10-28T15:02:10.000+02:00
diff --git a/Tests/ksqlDB.RestApi.Client.Tests/KSql/Query/Functions/KSqlInvocationFunctionsTests.cs b/Tests/ksqlDB.RestApi.Client.Tests/KSql/Query/Functions/KSqlInvocationFunctionsTests.cs
@@ -24,7 +24,7 @@ public override void TestInitialize()
       base.TestInitialize();
 
       StringBuilder = new StringBuilder();
-      ClassUnderTest = new KSqlInvocationFunctionVisitor(StringBuilder);
+      ClassUnderTest = new KSqlInvocationFunctionVisitor(StringBuilder, new KSqlQueryMetadata());
     }
 
     class Tweets
diff --git a/Tests/ksqlDB.RestApi.Client.Tests/KSql/Query/Functions/LambdaVisitorTests.cs b/Tests/ksqlDB.RestApi.Client.Tests/KSql/Query/Functions/LambdaVisitorTests.cs
@@ -20,7 +20,7 @@ public override void TestInitialize()
     {
       base.TestInitialize();
       
-      ClassUnderTest = new LambdaVisitor(new StringBuilder());
+      ClassUnderTest = new LambdaVisitor(new StringBuilder(), new KSqlQueryMetadata());
     }
     
     [TestMethod]
diff --git a/Tests/ksqlDB.RestApi.Client.Tests/KSql/Query/KSqlVisitorTests.cs b/Tests/ksqlDB.RestApi.Client.Tests/KSql/Query/KSqlVisitorTests.cs
@@ -24,7 +24,7 @@ public override void TestInitialize()
     {
       base.TestInitialize();
 
-      ClassUnderTest = new KSqlVisitor();
+      ClassUnderTest = new KSqlVisitor(new KSqlQueryMetadata());
     }
 
     #region Constants
diff --git a/Tests/ksqlDB.RestApi.Client.Tests/KSql/Query/Visitors/AggregationFunctionExpressionTests.cs b/Tests/ksqlDB.RestApi.Client.Tests/KSql/Query/Visitors/AggregationFunctionExpressionTests.cs
@@ -22,7 +22,7 @@ public override void TestInitialize()
       base.TestInitialize();
 
       StringBuilder = new StringBuilder();
-      ClassUnderTest = new AggregationFunctionVisitor(StringBuilder, useTableAlias: false);
+      ClassUnderTest = new AggregationFunctionVisitor(StringBuilder, new KSqlQueryMetadata());
     }
 
     [TestMethod]
diff --git a/Tests/ksqlDB.RestApi.Client.Tests/KSql/Query/Visitors/KSqlFunctionVisitorCollectionsTests.cs b/Tests/ksqlDB.RestApi.Client.Tests/KSql/Query/Visitors/KSqlFunctionVisitorCollectionsTests.cs
@@ -25,7 +25,7 @@ public override void TestInitialize()
       base.TestInitialize();
 
       StringBuilder = new StringBuilder();
-      ClassUnderTest = new KSqlFunctionVisitor(StringBuilder, useTableAlias: false);
+      ClassUnderTest = new KSqlFunctionVisitor(StringBuilder, new KSqlQueryMetadata());
     }
 
     #region Collection functions
diff --git a/Tests/ksqlDB.RestApi.Client.Tests/KSql/Query/Visitors/KSqlFunctionVisitorDateAndTimeTests.cs b/Tests/ksqlDB.RestApi.Client.Tests/KSql/Query/Visitors/KSqlFunctionVisitorDateAndTimeTests.cs
@@ -23,7 +23,7 @@ public override void TestInitialize()
       base.TestInitialize();
 
       StringBuilder = new StringBuilder();
-      ClassUnderTest = new KSqlFunctionVisitor(StringBuilder, useTableAlias: false);
+      ClassUnderTest = new KSqlFunctionVisitor(StringBuilder, new KSqlQueryMetadata());
     }
 
     #region Date and time functions
diff --git a/Tests/ksqlDB.RestApi.Client.Tests/KSql/Query/Visitors/KSqlFunctionVisitorNumericTests.cs b/Tests/ksqlDB.RestApi.Client.Tests/KSql/Query/Visitors/KSqlFunctionVisitorNumericTests.cs
@@ -25,7 +25,7 @@ public override void TestInitialize()
       base.TestInitialize();
 
       StringBuilder = new StringBuilder();
-      ClassUnderTest = new KSqlFunctionVisitor(StringBuilder, useTableAlias: false);
+      ClassUnderTest = new KSqlFunctionVisitor(StringBuilder, new KSqlQueryMetadata());
       
       KSqlDBContextOptions.NumberFormatInfo = new System.Globalization.NumberFormatInfo
                                               {
diff --git a/Tests/ksqlDB.RestApi.Client.Tests/KSql/Query/Visitors/KSqlFunctionVisitorStringTests.cs b/Tests/ksqlDB.RestApi.Client.Tests/KSql/Query/Visitors/KSqlFunctionVisitorStringTests.cs
@@ -23,7 +23,7 @@ public override void TestInitialize()
       base.TestInitialize();
 
       StringBuilder = new StringBuilder();
-      ClassUnderTest = new KSqlFunctionVisitor(StringBuilder, useTableAlias: false);
+      ClassUnderTest = new KSqlFunctionVisitor(StringBuilder, new KSqlQueryMetadata());
     }
     
     #region String functions
diff --git a/Tests/ksqlDB.RestApi.Client.Tests/KSql/Query/Visitors/KSqlFunctionVisitorTests.cs b/Tests/ksqlDB.RestApi.Client.Tests/KSql/Query/Visitors/KSqlFunctionVisitorTests.cs
@@ -23,7 +23,7 @@ public override void TestInitialize()
       base.TestInitialize();
 
       StringBuilder = new StringBuilder();
-      ClassUnderTest = new KSqlFunctionVisitor(StringBuilder, useTableAlias: false);
+      ClassUnderTest = new KSqlFunctionVisitor(StringBuilder, new KSqlQueryMetadata());
     }
 
     #region Nulls
diff --git a/Tests/ksqlDB.RestApi.Client.Tests/KSql/Query/Visitors/OperatorBetweenKSqlVisitorTests.cs b/Tests/ksqlDB.RestApi.Client.Tests/KSql/Query/Visitors/OperatorBetweenKSqlVisitorTests.cs
@@ -4,6 +4,7 @@
 using FluentAssertions;
 using ksqlDB.Api.Client.Tests.Models;
 using ksqlDB.RestApi.Client.KSql.Query.Operators;
+using ksqlDB.RestApi.Client.KSql.Query.Visitors;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using UnitTests;
 
@@ -20,7 +21,7 @@ public void Visit_Between()
       StringBuilder stringBuilder = new();
 
       //Act
-      new OperatorBetweenKSqlVisitor(stringBuilder).Visit(expression);
+      new OperatorBetweenKSqlVisitor(stringBuilder, new KSqlQueryMetadata()).Visit(expression);
       var ksql = stringBuilder.ToString();
 
       //Assert
@@ -35,7 +36,7 @@ public void Visit_NotBetween()
       StringBuilder stringBuilder = new();
 
       //Act
-      new OperatorBetweenKSqlVisitor(stringBuilder).Visit(expression);
+      new OperatorBetweenKSqlVisitor(stringBuilder, new KSqlQueryMetadata()).Visit(expression);
       var ksql = stringBuilder.ToString();
 
       //Assert
diff --git a/ksqlDb.RestApi.Client/KSql/Query/KSqlQueryGenerator.cs b/ksqlDb.RestApi.Client/KSql/Query/KSqlQueryGenerator.cs
@@ -4,6 +4,7 @@
 using System.Linq.Expressions;
 using System.Reflection;
 using ksqlDB.RestApi.Client.Infrastructure.Extensions;
+using ksqlDb.RestApi.Client.KSql.Entities;
 using ksqlDB.RestApi.Client.KSql.Linq;
 using ksqlDB.RestApi.Client.KSql.Linq.PullQueries;
 using ksqlDB.RestApi.Client.KSql.Linq.Statements;
@@ -19,7 +20,8 @@ internal class KSqlQueryGenerator : ExpressionVisitor, IKSqlQueryGenerator
     private readonly KSqlDBContextOptions options;
     private static readonly IPluralize EnglishPluralizationService = new Pluralizer();
 
-    private KSqlVisitor kSqlVisitor = new();
+    private KSqlVisitor kSqlVisitor;
+    private KSqlQueryMetadata queryMetadata;
 
     public bool ShouldEmitChanges { get; set; } = true;
 
@@ -30,21 +32,29 @@ public KSqlQueryGenerator(KSqlDBContextOptions options)
 
     public string BuildKSql(Expression expression, QueryContext queryContext)
     {
-      kSqlVisitor = new KSqlVisitor();
+      queryMetadata = new KSqlQueryMetadata();
+
+      kSqlVisitor = new KSqlVisitor(queryMetadata);
       whereClauses = new Queue<Expression>();
-      joinTables = new List<(MethodInfo, IEnumerable<Expression>, LambdaExpression)>();
+      joins = new List<(MethodInfo, IEnumerable<Expression>, LambdaExpression)>();
 
       Visit(expression);
 
       string finalFromItemName = InterceptFromItemName(queryContext.FromItemName ?? fromItemName);
 
       queryContext.AutoOffsetReset = autoOffsetReset;
-    
-      if (joinTables.Any())
+      
+      queryMetadata.FromItemType = fromTableType;
+
+      if (joins.Any())
       {
-        var joinsVisitor = new KSqlJoinsVisitor(kSqlVisitor.StringBuilder, options, new QueryContext { FromItemName = finalFromItemName }, fromTableType);
+        queryMetadata.Joins = joins.Select(c => c.Item2.ToArray()[0].Type.GenericTypeArguments[0]).Append(queryMetadata.FromItemType)
+          .Select(c => new FromItem { Type = c })
+          .ToArray();
+        
+        var joinsVisitor = new KSqlJoinsVisitor(kSqlVisitor.StringBuilder, options, new QueryContext { FromItemName = finalFromItemName }, queryMetadata);
 
-        joinsVisitor.VisitJoinTable(joinTables);
+        joinsVisitor.VisitJoinTable(joins);
       }
       else
       {
@@ -111,7 +121,7 @@ private void TryGenerateWindowAggregation()
       if (windowedBy == null)
         return;
 
-      new KSqlWindowsVisitor(kSqlVisitor.StringBuilder).Visit(windowedBy);
+      new KSqlWindowsVisitor(kSqlVisitor.StringBuilder, queryMetadata).Visit(windowedBy);
     }
 
     protected virtual string InterceptFromItemName(string value)
@@ -238,7 +248,7 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
       {
         var joinTable = methodCallExpression.Arguments.Skip(1);
 
-        joinTables.Add((methodInfo, joinTable, selectManyGroupJoin));
+        joins.Add((methodInfo, joinTable, selectManyGroupJoin));
         
         selectManyGroupJoin = null;
 
@@ -259,7 +269,7 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
         case nameof(QbservableExtensions.FullOuterJoin):
           var joinTable = methodCallExpression.Arguments.Skip(1);
         
-          joinTables.Add((methodInfo, joinTable, null));
+          joins.Add((methodInfo, joinTable, null));
 
           VisitChained(methodCallExpression);
           break;
@@ -285,7 +295,7 @@ protected void VisitChained(MethodCallExpression methodCallExpression)
     private LambdaExpression groupBy;
     private LambdaExpression selectManyGroupJoin;
     private LambdaExpression having;
-    private List<(MethodInfo, IEnumerable<Expression>, LambdaExpression)> joinTables;
+    private List<(MethodInfo, IEnumerable<Expression>, LambdaExpression)> joins;
 
     protected static Expression StripQuotes(Expression expression)
     {
diff --git a/ksqlDb.RestApi.Client/KSql/Query/Operators/OperatorBetweenKSqlVisitor.cs b/ksqlDb.RestApi.Client/KSql/Query/Operators/OperatorBetweenKSqlVisitor.cs
@@ -6,8 +6,8 @@ namespace ksqlDB.RestApi.Client.KSql.Query.Operators
 {
   internal class OperatorBetweenKSqlVisitor : KSqlVisitor
   {
-    public OperatorBetweenKSqlVisitor(StringBuilder stringBuilder)
-      : base(stringBuilder, useTableAlias: false)
+    public OperatorBetweenKSqlVisitor(StringBuilder stringBuilder, KSqlQueryMetadata queryMetadata)
+      : base(stringBuilder, queryMetadata)
     {
     }
 
diff --git a/ksqlDb.RestApi.Client/KSql/Query/Visitors/AggregationFunctionVisitor.cs b/ksqlDb.RestApi.Client/KSql/Query/Visitors/AggregationFunctionVisitor.cs
@@ -9,8 +9,8 @@ namespace ksqlDB.RestApi.Client.KSql.Query.Visitors
 {
   internal class AggregationFunctionVisitor : KSqlVisitor
   {
-    public AggregationFunctionVisitor(StringBuilder stringBuilder, bool useTableAlias)
-      : base(stringBuilder, useTableAlias)
+    public AggregationFunctionVisitor(StringBuilder stringBuilder, KSqlQueryMetadata queryMetadata)
+      : base(stringBuilder, queryMetadata)
     {
     }
 
diff --git a/ksqlDb.RestApi.Client/KSql/Query/Visitors/KSqlFunctionLambdaVisitor.cs b/ksqlDb.RestApi.Client/KSql/Query/Visitors/KSqlFunctionLambdaVisitor.cs
@@ -5,8 +5,8 @@ namespace ksqlDB.RestApi.Client.KSql.Query.Visitors
 {
   internal class KSqlFunctionLambdaVisitor : KSqlFunctionVisitor
   {
-    public KSqlFunctionLambdaVisitor(StringBuilder stringBuilder) 
-      : base(stringBuilder, useTableAlias: false)
+    public KSqlFunctionLambdaVisitor(StringBuilder stringBuilder, KSqlQueryMetadata queryMetadata) 
+      : base(stringBuilder, queryMetadata)
     {
     }
     
diff --git a/ksqlDb.RestApi.Client/KSql/Query/Visitors/KSqlFunctionVisitor.cs b/ksqlDb.RestApi.Client/KSql/Query/Visitors/KSqlFunctionVisitor.cs
@@ -8,8 +8,8 @@ namespace ksqlDB.RestApi.Client.KSql.Query.Visitors
 {
   internal class KSqlFunctionVisitor : KSqlVisitor
   {
-    public KSqlFunctionVisitor(StringBuilder stringBuilder, bool useTableAlias)
-      : base(stringBuilder, useTableAlias)
+    public KSqlFunctionVisitor(StringBuilder stringBuilder, KSqlQueryMetadata queryMetadata)
+      : base(stringBuilder, queryMetadata)
     {
     }
 
diff --git a/ksqlDb.RestApi.Client/KSql/Query/Visitors/KSqlInvocationFunctionVisitor.cs b/ksqlDb.RestApi.Client/KSql/Query/Visitors/KSqlInvocationFunctionVisitor.cs
@@ -9,11 +9,13 @@ namespace ksqlDB.RestApi.Client.KSql.Query.Visitors
   internal class KSqlInvocationFunctionVisitor : KSqlVisitor
   {
     private readonly StringBuilder stringBuilder;
+    private readonly KSqlQueryMetadata queryMetadata;
 
-    public KSqlInvocationFunctionVisitor(StringBuilder stringBuilder)
-      : base(stringBuilder, useTableAlias: false)
+    public KSqlInvocationFunctionVisitor(StringBuilder stringBuilder, KSqlQueryMetadata queryMetadata)
+      : base(stringBuilder, queryMetadata)
     {
       this.stringBuilder = stringBuilder ?? throw new ArgumentNullException(nameof(stringBuilder));
+      this.queryMetadata = queryMetadata ?? throw new ArgumentNullException(nameof(queryMetadata));
     }
 
     private static bool isNestedInvocationFunction;
@@ -66,7 +68,7 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
 
     private void VisitArgument(Expression expression)
     {
-      new LambdaVisitor(stringBuilder).Visit(expression);
+      new LambdaVisitor(stringBuilder, queryMetadata).Visit(expression);
     }
   }
 }
diff --git a/ksqlDb.RestApi.Client/KSql/Query/Visitors/KSqlJoinSelectFieldsVisitor.cs b/ksqlDb.RestApi.Client/KSql/Query/Visitors/KSqlJoinSelectFieldsVisitor.cs
@@ -7,8 +7,8 @@ namespace ksqlDB.RestApi.Client.KSql.Query.Visitors
 {
   internal sealed class KSqlJoinSelectFieldsVisitor : KSqlVisitor
   {
-    internal KSqlJoinSelectFieldsVisitor(StringBuilder stringBuilder)
-      : base(stringBuilder, useTableAlias: true)
+    internal KSqlJoinSelectFieldsVisitor(StringBuilder stringBuilder, KSqlQueryMetadata queryMetadata)
+      : base(stringBuilder, queryMetadata)
     {
     }
 
diff --git a/ksqlDb.RestApi.Client/KSql/Query/Visitors/KSqlJoinsVisitor.cs b/ksqlDb.RestApi.Client/KSql/Query/Visitors/KSqlJoinsVisitor.cs
@@ -5,7 +5,6 @@
 using System.Reflection;
 using System.Text;
 using ksqlDB.RestApi.Client.Infrastructure.Extensions;
-using ksqlDb.RestApi.Client.KSql.Entities;
 using ksqlDB.RestApi.Client.KSql.Linq;
 using ksqlDB.RestApi.Client.KSql.Query.Context;
 using Pluralize.NET;
@@ -16,14 +15,14 @@ internal class KSqlJoinsVisitor : KSqlVisitor
   {
     private readonly KSqlDBContextOptions contextOptions;
     private readonly QueryContext queryContext;
-    private readonly Type type;
+    private readonly KSqlQueryMetadata queryMetadata;
 
-    public KSqlJoinsVisitor(StringBuilder stringBuilder, KSqlDBContextOptions contextOptions, QueryContext queryContext, Type type)
-      : base(stringBuilder, useTableAlias: false)
+    public KSqlJoinsVisitor(StringBuilder stringBuilder, KSqlDBContextOptions contextOptions, QueryContext queryContext, KSqlQueryMetadata queryMetadata)
+      : base(stringBuilder, queryMetadata)
     {
       this.contextOptions = contextOptions ?? throw new ArgumentNullException(nameof(contextOptions));
       this.queryContext = queryContext ?? throw new ArgumentNullException(nameof(queryContext));
-      this.type = type ?? throw new ArgumentNullException(nameof(type));
+      this.queryMetadata = queryMetadata ?? throw new ArgumentNullException(nameof(queryMetadata));
     }
 
     private readonly Dictionary<string, string> aliasDictionary = new();
@@ -61,16 +60,10 @@ private PropertyInfo GetPropertyType(Type type)
       return propertyInfo;
     }
 
-    private FromItem[] fromItems;
-
     internal void VisitJoinTable(IEnumerable<(MethodInfo, IEnumerable<Expression>, LambdaExpression)> joins)
     {
       bool isFirst = true;
 
-      fromItems = joins.Select(c => c.Item2.ToArray()[0].Type.GenericTypeArguments[0]).Append(type)
-        .Select(c => new FromItem { Type = c })
-        .ToArray();
-
       foreach (var join in joins)
       {
         var (methodInfo, e, groupJoin) = join;
@@ -104,9 +97,9 @@ internal void VisitJoinTable(IEnumerable<(MethodInfo, IEnumerable<Expression>, L
 
           var body = groupJoin != null ? groupJoin.Body : lambdaExpression.Body;
 
-          new KSqlTransparentIdentifierJoinSelectFieldsVisitor(StringBuilder, fromItems).Visit(body);
+          new KSqlTransparentIdentifierJoinSelectFieldsVisitor(StringBuilder, queryMetadata).Visit(body);
 
-          var fromItemAlias = fromItems.Where(c => c.Type == type && !string.IsNullOrEmpty(c.Alias)).Select(c => c.Alias).FirstOrDefault();
+          var fromItemAlias = queryMetadata.Joins.Where(c => c.Type == queryMetadata.FromItemType && !string.IsNullOrEmpty(c.Alias)).Select(c => c.Alias).FirstOrDefault();
           
           outerItemAlias = fromItemAlias ?? outerItemAlias;
 
@@ -124,7 +117,7 @@ internal void VisitJoinTable(IEnumerable<(MethodInfo, IEnumerable<Expression>, L
 
         var itemType = join.Item2.First().Type.GetGenericArguments()[0];
         
-        var joinItemAlias = fromItems.Where(c => c.Type == itemType && !string.IsNullOrEmpty(c.Alias)).Select(c => c.Alias).FirstOrDefault();
+        var joinItemAlias = queryMetadata.Joins.Where(c => c.Type == itemType && !string.IsNullOrEmpty(c.Alias)).Select(c => c.Alias).FirstOrDefault();
 
         itemAlias = joinItemAlias ?? itemAlias;
 
@@ -160,9 +153,9 @@ protected override Expression VisitMember(MemberExpression memberExpression)
         return memberExpression;
       }
 
-      var fromItem = fromItems.FirstOrDefault(c => c.Type == memberExpression.Member.DeclaringType);
+      var fromItem = queryMetadata.Joins.FirstOrDefault(c => c.Type == memberExpression.Member.DeclaringType);
 
-      if (fromItems != null && memberExpression.Expression.NodeType == ExpressionType.MemberAccess)
+      if (queryMetadata.Joins != null && memberExpression.Expression.NodeType == ExpressionType.MemberAccess)
       {
         Append(memberExpression.Member.Name);
       }
diff --git a/ksqlDb.RestApi.Client/KSql/Query/Visitors/KSqlQueryMetadata.cs b/ksqlDb.RestApi.Client/KSql/Query/Visitors/KSqlQueryMetadata.cs
@@ -0,0 +1,11 @@
+﻿using System;
+using ksqlDb.RestApi.Client.KSql.Entities;
+
+namespace ksqlDB.RestApi.Client.KSql.Query.Visitors
+{
+  internal sealed record KSqlQueryMetadata
+  {
+    public Type FromItemType { get; set; }
+    public FromItem[] Joins { get; set; }
+  }
+}
diff --git a/ksqlDb.RestApi.Client/KSql/Query/Visitors/KSqlTransparentIdentifierJoinSelectFieldsVisitor.cs b/ksqlDb.RestApi.Client/KSql/Query/Visitors/KSqlTransparentIdentifierJoinSelectFieldsVisitor.cs
diff --git a/ksqlDb.RestApi.Client/KSql/Query/Visitors/KSqlVisitor.cs b/ksqlDb.RestApi.Client/KSql/Query/Visitors/KSqlVisitor.cs
diff --git a/ksqlDb.RestApi.Client/KSql/Query/Visitors/KSqlWindowBoundsVisitor.cs b/ksqlDb.RestApi.Client/KSql/Query/Visitors/KSqlWindowBoundsVisitor.cs
diff --git a/ksqlDb.RestApi.Client/KSql/Query/Visitors/KSqlWindowsVisitor.cs b/ksqlDb.RestApi.Client/KSql/Query/Visitors/KSqlWindowsVisitor.cs
diff --git a/ksqlDb.RestApi.Client/KSql/Query/Visitors/LambdaVisitor.cs b/ksqlDb.RestApi.Client/KSql/Query/Visitors/LambdaVisitor.cs
diff --git a/ksqlDb.RestApi.Client/KSql/Query/Visitors/StringVisitor.cs b/ksqlDb.RestApi.Client/KSql/Query/Visitors/StringVisitor.cs

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public override void TestInitialize()`
`24`	`24`	`base.TestInitialize();`
`25`	`25`
`26`	`26`	`StringBuilder = new StringBuilder();`
`27`		`- ClassUnderTest = new KSqlInvocationFunctionVisitor(StringBuilder);`
	`27`	`+ ClassUnderTest = new KSqlInvocationFunctionVisitor(StringBuilder, new KSqlQueryMetadata());`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`class Tweets`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public override void TestInitialize()`
`20`	`20`	`{`
`21`	`21`	`base.TestInitialize();`
`22`	`22`
`23`		`- ClassUnderTest = new LambdaVisitor(new StringBuilder());`
	`23`	`+ ClassUnderTest = new LambdaVisitor(new StringBuilder(), new KSqlQueryMetadata());`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`[TestMethod]`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public override void TestInitialize()`
`22`	`22`	`base.TestInitialize();`
`23`	`23`
`24`	`24`	`StringBuilder = new StringBuilder();`
`25`		`- ClassUnderTest = new AggregationFunctionVisitor(StringBuilder, useTableAlias: false);`
	`25`	`+ ClassUnderTest = new AggregationFunctionVisitor(StringBuilder, new KSqlQueryMetadata());`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`[TestMethod]`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public override void TestInitialize()`
`25`	`25`	`base.TestInitialize();`
`26`	`26`
`27`	`27`	`StringBuilder = new StringBuilder();`
`28`		`- ClassUnderTest = new KSqlFunctionVisitor(StringBuilder, useTableAlias: false);`
	`28`	`+ ClassUnderTest = new KSqlFunctionVisitor(StringBuilder, new KSqlQueryMetadata());`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`#region Collection functions`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public override void TestInitialize()`
`23`	`23`	`base.TestInitialize();`
`24`	`24`
`25`	`25`	`StringBuilder = new StringBuilder();`
`26`		`- ClassUnderTest = new KSqlFunctionVisitor(StringBuilder, useTableAlias: false);`
	`26`	`+ ClassUnderTest = new KSqlFunctionVisitor(StringBuilder, new KSqlQueryMetadata());`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`#region Date and time functions`