Skip to content

Commit

Permalink
Static analysis: use char instead of string literals
Browse files Browse the repository at this point in the history
Part of #26805
  • Loading branch information
ajcvickers committed Dec 6, 2021
1 parent 57d1ec9 commit 2a3a576
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 17 deletions.
6 changes: 3 additions & 3 deletions src/EFCore.Design/Design/Internal/CSharpHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -428,9 +428,9 @@ private static string EnsureDecimalPlaces(double number)
return $"double.{nameof(double.PositiveInfinity)}";
}

return !literal.Contains("E")
&& !literal.Contains("e")
&& !literal.Contains(".")
return !literal.Contains('E')
&& !literal.Contains('e')
&& !literal.Contains('.')
? literal + ".0"
: literal;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ protected virtual void GenerateKey(
.Append(entityTypeBuilderName)
.Append(primary ? ".HasKey(" : ".HasAlternateKey(")
.Append(string.Join(", ", key.Properties.Select(p => Code.Literal(p.Name))))
.Append(")")
.Append(')')
.ToString();

stringBuilder
Expand Down Expand Up @@ -990,7 +990,7 @@ protected virtual void GenerateForeignKey(
}
}

foreignKeyBuilderNameStringBuilder.Append(")");
foreignKeyBuilderNameStringBuilder.Append(')');

var foreignKeyBuilderName = foreignKeyBuilderNameStringBuilder.ToString();

Expand Down
6 changes: 3 additions & 3 deletions src/EFCore.Relational/Storage/DoubleTypeMapping.cs
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ protected override string GenerateNonNullSqlLiteral(object value)
var doubleValue = Convert.ToDouble(value);
var literal = doubleValue.ToString("G17", CultureInfo.InvariantCulture);

return !literal.Contains("E")
&& !literal.Contains("e")
&& !literal.Contains(".")
return !literal.Contains('E')
&& !literal.Contains('e')
&& !literal.Contains('.')
&& !double.IsNaN(doubleValue)
&& !double.IsInfinity(doubleValue)
? literal + ".0"
Expand Down
2 changes: 1 addition & 1 deletion src/EFCore.Relational/Update/UpdateSqlGenerator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ protected virtual void AppendInsertCommandHeader(
operations,
SqlGenerationHelper,
(sb, o, helper) => helper.DelimitIdentifier(sb, o.ColumnName))
.Append(")");
.Append(')');
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2581,7 +2581,7 @@ void EnablePeriod(string table, string? schema, string periodStartColumnName, st
.Append(Dependencies.SqlGenerationHelper.DelimitIdentifier(periodStartColumnName))
.Append(", ")
.Append(Dependencies.SqlGenerationHelper.DelimitIdentifier(periodEndColumnName))
.Append(")")
.Append(')')
.ToString();

if (options.HasFlag(MigrationsSqlGenerationOptions.Idempotent))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ protected override string GenerateNonNullSqlLiteral(object value)
var literal = base.GenerateNonNullSqlLiteral(value);

var doubleValue = Convert.ToDouble(value);
return !literal.Contains("E")
&& !literal.Contains("e")
return !literal.Contains('E')
&& !literal.Contains('e')
&& !double.IsNaN(doubleValue)
&& !double.IsInfinity(doubleValue)
? literal + "E0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ void AddConcatOperatorIfNeeded()
builder.Append(" AS ");
if (IsUnicode)
{
builder.Append("n");
builder.Append('n');
}

builder.Append("varchar(max))");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -263,18 +263,18 @@ private void AppendMergeCommandHeader(
}

commandStringBuilder
.Append(")")
.Append(')')
.AppendLine(" ON 1=0")
.AppendLine("WHEN NOT MATCHED THEN");

commandStringBuilder
.Append("INSERT ")
.Append("(")
.Append('(')
.AppendJoin(
writeOperations,
SqlGenerationHelper,
(sb, o, helper) => helper.DelimitIdentifier(sb, o.ColumnName))
.Append(")");
.Append(')');

AppendValuesHeader(commandStringBuilder, writeOperations);
commandStringBuilder
Expand Down
2 changes: 1 addition & 1 deletion src/dotnet-ef/Exe.cs
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ private static string ToArguments(IReadOnlyList<string> args)
{
if (pendingBackslashes == 1)
{
builder.Append("\\");
builder.Append('\\');
}
else
{
Expand Down

0 comments on commit 2a3a576

Please sign in to comment.