some spurious cleanup

Author: mikeblas

JankSQL/Expressions/ExpressionOperand.cs

@@ -66,34 +66,16 @@ internal static ExpressionOperand CreateFromByteStream(Stream stream)
             if (representsNull != 0)
                 return ExpressionOperand.NullLiteral();
 
-            ExpressionOperand ret;
-
-            switch (nodeType)
+            ExpressionOperand ret = nodeType switch
             {
-                case ExpressionOperandType.BOOLEAN:
-                    ret = ExpressionOperandBoolean.FromByteStream(stream);
-                    break;
-
-                case ExpressionOperandType.INTEGER:
-                    ret = ExpressionOperandInteger.FromByteStream(stream);
-                    break;
-
-                case ExpressionOperandType.VARCHAR:
-                    ret = ExpressionOperandVARCHAR.FromByteStream(stream);
-                    break;
-
-                case ExpressionOperandType.BOOKMARK:
-                    ret = ExpressionOperandBookmark.FromByteStream(stream);
-                    break;
-
-                case ExpressionOperandType.DECIMAL:
-                    ret = ExpressionOperandDecimal.FromByteStream(stream);
-                    break;
-
-                default:
-                    throw new NotSupportedException($"unknown nodeType {nodeType}");
-            }
-
+                ExpressionOperandType.BOOLEAN => ExpressionOperandBoolean.FromByteStream(stream),
+                ExpressionOperandType.INTEGER => ExpressionOperandInteger.FromByteStream(stream),
+                ExpressionOperandType.VARCHAR => ExpressionOperandVARCHAR.FromByteStream(stream),
+                ExpressionOperandType.BOOKMARK => ExpressionOperandBookmark.FromByteStream(stream),
+                ExpressionOperandType.DECIMAL => ExpressionOperandDecimal.FromByteStream(stream),
+                ExpressionOperandType.DATETIME => ExpressionOperandDateTime.FromByteStream(stream),
+                _ => throw new NotSupportedException($"unknown nodeType {nodeType}"),
+            };
             return ret;
         }
 

JankSQL/Expressions/Functions/FunctionCast.cs

@@ -19,27 +19,14 @@ internal override void Evaluate(Engines.IEngine engine, IRowValueAccessor? acces
 
             try
             {
-                switch (targetType)
+                result = targetType switch
                 {
-                    case ExpressionOperandType.INTEGER:
-                        result = ExpressionOperand.IntegerFromInt(op.AsInteger());
-                        break;
-
-                    case ExpressionOperandType.VARCHAR:
-                        result = ExpressionOperand.VARCHARFromString(op.AsString());
-                        break;
-
-                    case ExpressionOperandType.DECIMAL:
-                        result = ExpressionOperand.DecimalFromDouble(op.AsDouble());
-                        break;
-
-                    case ExpressionOperandType.DATETIME:
-                        result = ExpressionOperand.DateTimeFromDateTime(op.AsDateTime());
-                        break;
-
-                    default:
-                        throw new NotImplementedException($"type {targetType} not supported by CAST");
-                }
+                    ExpressionOperandType.INTEGER => ExpressionOperand.IntegerFromInt(op.AsInteger()),
+                    ExpressionOperandType.VARCHAR => ExpressionOperand.VARCHARFromString(op.AsString()),
+                    ExpressionOperandType.DECIMAL => ExpressionOperand.DecimalFromDouble(op.AsDouble()),
+                    ExpressionOperandType.DATETIME => ExpressionOperand.DateTimeFromDateTime(op.AsDateTime()),
+                    _ => throw new NotImplementedException($"type {targetType} not supported by CAST"),
+                };
             }
             catch (FormatException)
             {