Function rename

DarkWanderer · May 12, 2020 · a313ab4 · a313ab4
1 parent aa1e07b
commit a313ab4
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 20 deletions.
diff --git a/ClickHouse.Client/Types/ArrayType.cs b/ClickHouse.Client/Types/ArrayType.cs
@@ -17,11 +17,11 @@ internal class ArrayType : ParameterizedType
 
         public override string Name => "Array";
 
-        public override ParameterizedType Parse(SyntaxTreeNode node, Func<SyntaxTreeNode, ClickHouseType> typeResolverFunc)
+        public override ParameterizedType Parse(SyntaxTreeNode node, Func<SyntaxTreeNode, ClickHouseType> parseClickHouseTypeFunc)
         {
             return new ArrayType
             {
-                UnderlyingType = typeResolverFunc(node.SingleChild),
+                UnderlyingType = parseClickHouseTypeFunc(node.SingleChild),
             };
         }
 

diff --git a/ClickHouse.Client/Types/DateTime64Type.cs b/ClickHouse.Client/Types/DateTime64Type.cs
@@ -15,7 +15,7 @@ internal class DateTime64Type : DateTimeType
 
         public override string ToString() => TimeZone == null ? $"DateTime64({Scale})" : $"DateTime64({Scale}, {TimeZone.Id})";
 
-        public override ParameterizedType Parse(SyntaxTreeNode node, Func<SyntaxTreeNode, ClickHouseType> typeResolverFunc)
+        public override ParameterizedType Parse(SyntaxTreeNode node, Func<SyntaxTreeNode, ClickHouseType> parseClickHouseTypeFunc)
         {
             var scale = int.Parse(node.ChildNodes[0].Value);
             var timeZone = DateTimeZone.Utc;

diff --git a/ClickHouse.Client/Types/DateTimeType.cs b/ClickHouse.Client/Types/DateTimeType.cs
@@ -54,7 +54,7 @@ public DateTime ToUtc(DateTime dateTime)
 
         public override string ToString() => TimeZone == null ? $"{Name}" : $"{Name}({TimeZone.Id})";
 
-        public override ParameterizedType Parse(SyntaxTreeNode node, Func<SyntaxTreeNode, ClickHouseType> typeResolverFunc)
+        public override ParameterizedType Parse(SyntaxTreeNode node, Func<SyntaxTreeNode, ClickHouseType> parseClickHouseTypeFunc)
         {
             var timeZoneName = node.ChildNodes.Count > 0 ? node.SingleChild.Value.Trim('\'') : string.Empty;
             var timeZone = DateTimeZoneProviders.Tzdb.GetZoneOrNull(timeZoneName) ?? DateTimeZone.Utc;

diff --git a/ClickHouse.Client/Types/Decimal128Type.cs b/ClickHouse.Client/Types/Decimal128Type.cs
@@ -16,7 +16,7 @@ public Decimal128Type()
 
         public override string Name => "Decimal128";
 
-        public override ParameterizedType Parse(SyntaxTreeNode node, Func<SyntaxTreeNode, ClickHouseType> typeResolverFunc)
+        public override ParameterizedType Parse(SyntaxTreeNode node, Func<SyntaxTreeNode, ClickHouseType> parseClickHouseTypeFunc)
         {
             return new Decimal128Type
             {

diff --git a/ClickHouse.Client/Types/Decimal32Type.cs b/ClickHouse.Client/Types/Decimal32Type.cs
@@ -16,7 +16,7 @@ public Decimal32Type()
 
         public override int Size => 4;
 
-        public override ParameterizedType Parse(SyntaxTreeNode node, Func<SyntaxTreeNode, ClickHouseType> typeResolverFunc)
+        public override ParameterizedType Parse(SyntaxTreeNode node, Func<SyntaxTreeNode, ClickHouseType> parseClickHouseTypeFunc)
         {
             return new Decimal32Type
             {

diff --git a/ClickHouse.Client/Types/Decimal64Type.cs b/ClickHouse.Client/Types/Decimal64Type.cs
@@ -16,7 +16,7 @@ public Decimal64Type()
 
         public override string Name => "Decimal64";
 
-        public override ParameterizedType Parse(SyntaxTreeNode node, Func<SyntaxTreeNode, ClickHouseType> typeResolverFunc)
+        public override ParameterizedType Parse(SyntaxTreeNode node, Func<SyntaxTreeNode, ClickHouseType> parseClickHouseTypeFunc)
         {
             return new Decimal64Type
             {

diff --git a/ClickHouse.Client/Types/DecimalType.cs b/ClickHouse.Client/Types/DecimalType.cs
@@ -30,7 +30,7 @@ internal class DecimalType : ParameterizedType
 
         public override Type FrameworkType => typeof(decimal);
 
-        public override ParameterizedType Parse(SyntaxTreeNode node, Func<SyntaxTreeNode, ClickHouseType> typeResolverFunc)
+        public override ParameterizedType Parse(SyntaxTreeNode node, Func<SyntaxTreeNode, ClickHouseType> parseClickHouseTypeFunc)
         {
             var precision = int.Parse(node.ChildNodes[0].Value);
             var scale = int.Parse(node.ChildNodes[1].Value);

diff --git a/ClickHouse.Client/Types/EnumType.cs b/ClickHouse.Client/Types/EnumType.cs
@@ -16,7 +16,7 @@ internal class EnumType : ParameterizedType
 
         public override ClickHouseTypeCode TypeCode => ClickHouseTypeCode.Enum8;
 
-        public override ParameterizedType Parse(SyntaxTreeNode node, Func<SyntaxTreeNode, ClickHouseType> typeResolverFunc)
+        public override ParameterizedType Parse(SyntaxTreeNode node, Func<SyntaxTreeNode, ClickHouseType> parseClickHouseTypeFunc)
         {
             var parameters = node.ChildNodes
                 .Select(cn => cn.Value)

diff --git a/ClickHouse.Client/Types/FixedStringType.cs b/ClickHouse.Client/Types/FixedStringType.cs
@@ -14,7 +14,7 @@ internal class FixedStringType : ParameterizedType
 
         public override string Name => "FixedString";
 
-        public override ParameterizedType Parse(SyntaxTreeNode node, Func<SyntaxTreeNode, ClickHouseType> typeResolverFunc)
+        public override ParameterizedType Parse(SyntaxTreeNode node, Func<SyntaxTreeNode, ClickHouseType> parseClickHouseTypeFunc)
         {
             return new FixedStringType
             {

diff --git a/ClickHouse.Client/Types/LowCardinalityType.cs b/ClickHouse.Client/Types/LowCardinalityType.cs
@@ -14,11 +14,11 @@ internal class LowCardinalityType : ParameterizedType
 
         public override Type FrameworkType => UnderlyingType.FrameworkType;
 
-        public override ParameterizedType Parse(SyntaxTreeNode node, Func<SyntaxTreeNode, ClickHouseType> typeResolverFunc)
+        public override ParameterizedType Parse(SyntaxTreeNode node, Func<SyntaxTreeNode, ClickHouseType> parseClickHouseTypeFunc)
         {
             return new LowCardinalityType
             {
-                UnderlyingType = typeResolverFunc(node.SingleChild),
+                UnderlyingType = parseClickHouseTypeFunc(node.SingleChild),
             };
         }
 

diff --git a/ClickHouse.Client/Types/NestedType.cs b/ClickHouse.Client/Types/NestedType.cs
@@ -9,11 +9,11 @@ internal class NestedType : TupleType
     {
         public override ClickHouseTypeCode TypeCode => ClickHouseTypeCode.Nested;
 
-        public override ParameterizedType Parse(SyntaxTreeNode node, Func<SyntaxTreeNode, ClickHouseType> typeResolverFunc)
+        public override ParameterizedType Parse(SyntaxTreeNode node, Func<SyntaxTreeNode, ClickHouseType> parseClickHouseTypeFunc)
         {
             return new NestedType
             {
-                UnderlyingTypes = node.ChildNodes.Select(typeResolverFunc).ToArray(),
+                UnderlyingTypes = node.ChildNodes.Select(parseClickHouseTypeFunc).ToArray(),
             };
         }
 

diff --git a/ClickHouse.Client/Types/NullableType.cs b/ClickHouse.Client/Types/NullableType.cs
@@ -21,11 +21,11 @@ public override Type FrameworkType
 
         public override string Name => "Nullable";
 
-        public override ParameterizedType Parse(SyntaxTreeNode node, Func<SyntaxTreeNode, ClickHouseType> typeResolverFunc)
+        public override ParameterizedType Parse(SyntaxTreeNode node, Func<SyntaxTreeNode, ClickHouseType> parseClickHouseTypeFunc)
         {
             return new NullableType
             {
-                UnderlyingType = typeResolverFunc(node.SingleChild),
+                UnderlyingType = parseClickHouseTypeFunc(node.SingleChild),
             };
         }
 

diff --git a/ClickHouse.Client/Types/ParameterizedType.cs b/ClickHouse.Client/Types/ParameterizedType.cs
@@ -7,6 +7,6 @@ internal abstract class ParameterizedType : ClickHouseType
     {
         public virtual string Name => TypeCode.ToString();
 
-        public abstract ParameterizedType Parse(SyntaxTreeNode typeName, Func<SyntaxTreeNode, ClickHouseType> typeResolverFunc);
+        public abstract ParameterizedType Parse(SyntaxTreeNode typeName, Func<SyntaxTreeNode, ClickHouseType> parseClickHouseTypeFunc);
     }
 }
diff --git a/ClickHouse.Client/Types/TupleType.cs b/ClickHouse.Client/Types/TupleType.cs
@@ -63,11 +63,11 @@ public ITuple MakeTuple(params object[] values)
 
         public override Type FrameworkType => frameworkType;
 
-        public override ParameterizedType Parse(SyntaxTreeNode node, Func<SyntaxTreeNode, ClickHouseType> typeResolverFunc)
+        public override ParameterizedType Parse(SyntaxTreeNode node, Func<SyntaxTreeNode, ClickHouseType> parseClickHouseTypeFunc)
         {
             return new TupleType
             {
-                UnderlyingTypes = node.ChildNodes.Select(typeResolverFunc).ToArray(),
+                UnderlyingTypes = node.ChildNodes.Select(parseClickHouseTypeFunc).ToArray(),
             };
         }
 

diff --git a/ClickHouse.Client/Types/TypeConverter.cs b/ClickHouse.Client/Types/TypeConverter.cs
@@ -97,7 +97,7 @@ public static ClickHouseType ParseClickHouseType(string type)
             return ParseClickHouseType(node);
         }
 
-        public static ClickHouseType ParseClickHouseType(SyntaxTreeNode node)
+        internal static ClickHouseType ParseClickHouseType(SyntaxTreeNode node)
         {
             if (
                 node.ChildNodes.Count == 0 &&