Skip to content

Commit 1206e51

Browse files
rojiroji
authored
Various code style/cleanup (#3261)
1 parent 69fac7b commit 1206e51

File tree

95 files changed

+796
-695
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+796
-695
lines changed

‎src/EFCore.PG.NTS/Infrastructure/Internal/NetTopologySuiteDataSourceConfigurationPlugin.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
using Npgsql.EntityFrameworkCore.PostgreSQL.Internal;
2-
31
namespace Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure.Internal;
42

53
/// <summary>

‎src/EFCore.PG.NTS/Query/ExpressionTranslators/Internal/NpgsqlNetTopologySuiteAggregateMethodCallTranslatorPlugin.cs‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ public NpgsqlNetTopologySuiteAggregateMethodCallTranslatorPlugin(
2828
throw new ArgumentException($"Must be an {nameof(NpgsqlSqlExpressionFactory)}", nameof(sqlExpressionFactory));
2929
}
3030

31-
Translators = new IAggregateMethodCallTranslator[]
32-
{
31+
Translators =
32+
[
3333
new NpgsqlNetTopologySuiteAggregateMethodTranslator(npgsqlSqlExpressionFactory, typeMappingSource)
34-
};
34+
];
3535
}
3636

3737
/// <summary>
@@ -103,19 +103,18 @@ public NpgsqlNetTopologySuiteAggregateMethodTranslator(
103103
// https://postgis.net/docs/ST_ConvexHull.html
104104
return _sqlExpressionFactory.Function(
105105
"ST_ConvexHull",
106-
new[]
107-
{
106+
[
108107
_sqlExpressionFactory.AggregateFunction(
109108
"ST_Collect",
110-
new[] { sqlExpression },
109+
[sqlExpression],
111110
source,
112111
nullable: true,
113-
argumentsPropagateNullability: new[] { false },
112+
argumentsPropagateNullability: [false],
114113
typeof(Geometry),
115114
GetMapping())
116-
},
115+
],
117116
nullable: true,
118-
argumentsPropagateNullability: new[] { true },
117+
argumentsPropagateNullability: [true],
119118
typeof(Geometry),
120119
GetMapping());
121120
}
@@ -127,10 +126,10 @@ public NpgsqlNetTopologySuiteAggregateMethodTranslator(
127126
return _sqlExpressionFactory.Convert(
128127
_sqlExpressionFactory.AggregateFunction(
129128
"ST_Extent",
130-
new[] { sqlExpression },
129+
[sqlExpression],
131130
source,
132131
nullable: true,
133-
argumentsPropagateNullability: new[] { false },
132+
argumentsPropagateNullability: [false],
134133
typeof(Geometry),
135134
GetMapping()),
136135
typeof(Geometry), GetMapping());
@@ -140,10 +139,10 @@ public NpgsqlNetTopologySuiteAggregateMethodTranslator(
140139
{
141140
return _sqlExpressionFactory.AggregateFunction(
142141
method == UnionMethod ? "ST_Union" : "ST_Collect",
143-
new[] { sqlExpression },
142+
[sqlExpression],
144143
source,
145144
nullable: true,
146-
argumentsPropagateNullability: new[] { false },
145+
argumentsPropagateNullability: [false],
147146
typeof(Geometry),
148147
GetMapping());
149148
}

‎src/EFCore.PG.NTS/Query/ExpressionTranslators/Internal/NpgsqlNetTopologySuiteMemberTranslatorPlugin.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public NpgsqlNetTopologySuiteMemberTranslatorPlugin(
2020
IRelationalTypeMappingSource typeMappingSource,
2121
ISqlExpressionFactory sqlExpressionFactory)
2222
{
23-
Translators = new IMemberTranslator[] { new NpgsqlGeometryMemberTranslator(sqlExpressionFactory, typeMappingSource), };
23+
Translators = [new NpgsqlGeometryMemberTranslator(sqlExpressionFactory, typeMappingSource)];
2424
}
2525

2626
/// <summary>

‎src/EFCore.PG.NTS/Query/ExpressionTranslators/Internal/NpgsqlNetTopologySuiteMethodCallTranslatorPlugin.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public NpgsqlNetTopologySuiteMethodCallTranslatorPlugin(
2727
throw new ArgumentException($"Must be an {nameof(NpgsqlSqlExpressionFactory)}", nameof(sqlExpressionFactory));
2828
}
2929

30-
Translators = new IMethodCallTranslator[] { new NpgsqlGeometryMethodTranslator(npgsqlSqlExpressionFactory, typeMappingSource), };
30+
Translators = [new NpgsqlGeometryMethodTranslator(npgsqlSqlExpressionFactory, typeMappingSource)];
3131
}
3232

3333
/// <summary>
@@ -90,15 +90,15 @@ public NpgsqlGeometryMethodTranslator(
9090
{
9191
nameof(NpgsqlNetTopologySuiteDbFunctionsExtensions.Transform) => _sqlExpressionFactory.Function(
9292
"ST_Transform",
93-
new[] { arguments[1], arguments[2] },
93+
[arguments[1], arguments[2]],
9494
nullable: true,
9595
argumentsPropagateNullability: TrueArrays[2],
9696
method.ReturnType,
9797
arguments[1].TypeMapping),
9898

9999
nameof(NpgsqlNetTopologySuiteDbFunctionsExtensions.Force2D) => _sqlExpressionFactory.Function(
100100
"ST_Force2D",
101-
new[] { arguments[1] },
101+
[arguments[1]],
102102
nullable: true,
103103
TrueArrays[1],
104104
method.ReturnType,
@@ -110,9 +110,9 @@ public NpgsqlGeometryMethodTranslator(
110110
arguments[2]),
111111

112112
nameof(NpgsqlNetTopologySuiteDbFunctionsExtensions.Distance) =>
113-
TranslateGeometryMethod(arguments[1], method, new[] { arguments[2], arguments[3] }),
113+
TranslateGeometryMethod(arguments[1], method, [arguments[2], arguments[3]]),
114114
nameof(NpgsqlNetTopologySuiteDbFunctionsExtensions.IsWithinDistance) =>
115-
TranslateGeometryMethod(arguments[1], method, new[] { arguments[2], arguments[3], arguments[4] }),
115+
TranslateGeometryMethod(arguments[1], method, [arguments[2], arguments[3], arguments[4]]),
116116

117117
_ => null
118118
};
@@ -147,7 +147,7 @@ public NpgsqlGeometryMethodTranslator(
147147
{
148148
return _sqlExpressionFactory.Function(
149149
"ST_GeometryN",
150-
new[] { instance, OneBased(arguments[0]) },
150+
[instance, OneBased(arguments[0])],
151151
nullable: true,
152152
argumentsPropagateNullability: TrueArrays[2],
153153
method.ReturnType,

‎src/EFCore.PG.NodaTime/Query/Internal/NpgsqlNodaTimeAggregateMethodCallTranslatorPlugin.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ public NpgsqlNodaTimeAggregateMethodCallTranslatorPlugin(
2525
throw new ArgumentException($"Must be an {nameof(NpgsqlSqlExpressionFactory)}", nameof(sqlExpressionFactory));
2626
}
2727

28-
Translators = new IAggregateMethodCallTranslator[]
29-
{
28+
Translators =
29+
[
3030
new NpgsqlNodaTimeAggregateMethodTranslator(npgsqlSqlExpressionFactory, typeMappingSource)
31-
};
31+
];
3232
}
3333

3434
/// <summary>
@@ -87,19 +87,19 @@ public NpgsqlNodaTimeAggregateMethodTranslator(
8787
return method.Name switch
8888
{
8989
nameof(NpgsqlNodaTimeDbFunctionsExtensions.Sum) => _sqlExpressionFactory.AggregateFunction(
90-
"sum", new[] { sqlExpression }, source, nullable: true, argumentsPropagateNullability: FalseArrays[1],
90+
"sum", [sqlExpression], source, nullable: true, argumentsPropagateNullability: FalseArrays[1],
9191
returnType: sqlExpression.Type, sqlExpression.TypeMapping),
9292

9393
nameof(NpgsqlNodaTimeDbFunctionsExtensions.Average) => _sqlExpressionFactory.AggregateFunction(
94-
"avg", new[] { sqlExpression }, source, nullable: true, argumentsPropagateNullability: FalseArrays[1],
94+
"avg", [sqlExpression], source, nullable: true, argumentsPropagateNullability: FalseArrays[1],
9595
returnType: sqlExpression.Type, sqlExpression.TypeMapping),
9696

9797
nameof(NpgsqlNodaTimeDbFunctionsExtensions.RangeAgg) => _sqlExpressionFactory.AggregateFunction(
98-
"range_agg", new[] { sqlExpression }, source, nullable: true, argumentsPropagateNullability: FalseArrays[1],
98+
"range_agg", [sqlExpression], source, nullable: true, argumentsPropagateNullability: FalseArrays[1],
9999
returnType: method.ReturnType, _typeMappingSource.FindMapping(method.ReturnType)),
100100

101101
nameof(NpgsqlNodaTimeDbFunctionsExtensions.RangeIntersectAgg) => _sqlExpressionFactory.AggregateFunction(
102-
"range_intersect_agg", new[] { sqlExpression }, source, nullable: true, argumentsPropagateNullability: FalseArrays[1],
102+
"range_intersect_agg", [sqlExpression], source, nullable: true, argumentsPropagateNullability: FalseArrays[1],
103103
returnType: sqlExpression.Type, sqlExpression.TypeMapping),
104104

105105
_ => null

‎src/EFCore.PG.NodaTime/Query/Internal/NpgsqlNodaTimeMemberTranslatorPlugin.cs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ public NpgsqlNodaTimeMemberTranslatorPlugin(
2121
IRelationalTypeMappingSource typeMappingSource,
2222
ISqlExpressionFactory sqlExpressionFactory)
2323
{
24-
Translators = new IMemberTranslator[]
25-
{
26-
new NpgsqlNodaTimeMemberTranslator(typeMappingSource, (NpgsqlSqlExpressionFactory)sqlExpressionFactory),
27-
};
24+
Translators =
25+
[
26+
new NpgsqlNodaTimeMemberTranslator(typeMappingSource, (NpgsqlSqlExpressionFactory)sqlExpressionFactory)
27+
];
2828
}
2929

3030
/// <summary>
@@ -196,7 +196,7 @@ SqlExpression TranslateDurationTotalMember(SqlExpression instance, double diviso
196196
return _sqlExpressionFactory.Not(
197197
_sqlExpressionFactory.Function(
198198
"lower_inf",
199-
new[] { instance },
199+
[instance],
200200
nullable: true,
201201
argumentsPropagateNullability: TrueArrays[1],
202202
typeof(bool)));
@@ -207,7 +207,7 @@ SqlExpression TranslateDurationTotalMember(SqlExpression instance, double diviso
207207
return _sqlExpressionFactory.Not(
208208
_sqlExpressionFactory.Function(
209209
"upper_inf",
210-
new[] { instance },
210+
[instance],
211211
nullable: true,
212212
argumentsPropagateNullability: TrueArrays[1],
213213
typeof(bool)));
@@ -223,7 +223,7 @@ SqlExpression TranslateDurationTotalMember(SqlExpression instance, double diviso
223223
SqlExpression Lower()
224224
=> _sqlExpressionFactory.Function(
225225
"lower",
226-
new[] { instance },
226+
[instance],
227227
nullable: true,
228228
argumentsPropagateNullability: TrueArrays[1],
229229
typeof(Interval),
@@ -232,7 +232,7 @@ SqlExpression Lower()
232232
SqlExpression Upper()
233233
=> _sqlExpressionFactory.Function(
234234
"upper",
235-
new[] { instance },
235+
[instance],
236236
nullable: true,
237237
argumentsPropagateNullability: TrueArrays[1],
238238
typeof(Interval),
@@ -270,7 +270,7 @@ SqlExpression Upper()
270270
SqlExpression Lower()
271271
=> _sqlExpressionFactory.Function(
272272
"lower",
273-
new[] { instance },
273+
[instance],
274274
nullable: true,
275275
argumentsPropagateNullability: TrueArrays[1],
276276
typeof(LocalDate),
@@ -279,7 +279,7 @@ SqlExpression Lower()
279279
SqlExpression Upper()
280280
=> _sqlExpressionFactory.Function(
281281
"upper",
282-
new[] { instance },
282+
[instance],
283283
nullable: true,
284284
argumentsPropagateNullability: TrueArrays[1],
285285
typeof(LocalDate),
@@ -304,7 +304,7 @@ SqlExpression Upper()
304304
"DayOfWeek" when GetDatePartExpression(instance, "dow", true) is var getValueExpression
305305
=> _sqlExpressionFactory.Case(
306306
getValueExpression,
307-
new[] { new CaseWhenClause(_sqlExpressionFactory.Constant(0), _sqlExpressionFactory.Constant(7)) },
307+
[new CaseWhenClause(_sqlExpressionFactory.Constant(0), _sqlExpressionFactory.Constant(7))],
308308
getValueExpression),
309309

310310
// PG allows converting a timestamp directly to date, truncating the time; but given a timestamptz, it performs a time zone
@@ -350,7 +350,7 @@ private SqlExpression GetDatePartExpressionDouble(
350350
{
351351
var result = _sqlExpressionFactory.Function(
352352
"date_part",
353-
new[] { _sqlExpressionFactory.Constant(partName), instance },
353+
[_sqlExpressionFactory.Constant(partName), instance],
354354
nullable: true,
355355
argumentsPropagateNullability: TrueArrays[2],
356356
typeof(double));
@@ -359,7 +359,7 @@ private SqlExpression GetDatePartExpressionDouble(
359359
{
360360
result = _sqlExpressionFactory.Function(
361361
"floor",
362-
new[] { result },
362+
[result],
363363
nullable: true,
364364
argumentsPropagateNullability: TrueArrays[1],
365365
typeof(double));

‎src/EFCore.PG.NodaTime/Query/Internal/NpgsqlNodaTimeMethodCallTranslatorPlugin.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ public NpgsqlNodaTimeMethodCallTranslatorPlugin(
2323
IRelationalTypeMappingSource typeMappingSource,
2424
ISqlExpressionFactory sqlExpressionFactory)
2525
{
26-
Translators = new IMethodCallTranslator[]
27-
{
28-
new NpgsqlNodaTimeMethodCallTranslator(typeMappingSource, (NpgsqlSqlExpressionFactory)sqlExpressionFactory),
29-
};
26+
Translators =
27+
[
28+
new NpgsqlNodaTimeMethodCallTranslator(typeMappingSource, (NpgsqlSqlExpressionFactory)sqlExpressionFactory)
29+
];
3030
}
3131

3232
/// <summary>
@@ -336,8 +336,8 @@ public NpgsqlNodaTimeMethodCallTranslator(
336336
static PgFunctionExpression IntervalPart(string datePart, SqlExpression parameter)
337337
=> PgFunctionExpression.CreateWithNamedArguments(
338338
"make_interval",
339-
new[] { parameter },
340-
new[] { datePart },
339+
[parameter],
340+
[datePart],
341341
nullable: true,
342342
argumentsPropagateNullability: TrueArrays[1],
343343
builtIn: true,

‎src/EFCore.PG.NodaTime/Storage/Internal/IntervalRangeMapping.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
// ReSharper disable once CheckNamespace
1+
22

33
using System.Text;
44
using NodaTime.Text;
5+
// ReSharper disable once CheckNamespace
56
using Npgsql.EntityFrameworkCore.PostgreSQL.Storage.Internal.Mapping;
67

78
// ReSharper disable once CheckNamespace

‎src/EFCore.PG.NodaTime/Storage/Internal/LegacyTimestampInstantMapping.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,9 @@ protected override string GenerateNonNullSqlLiteral(object value)
8888
/// doing so can result in application failures when updating to a new Entity Framework Core release.
8989
/// </summary>
9090
protected override string GenerateEmbeddedNonNullSqlLiteral(object value)
91-
=> $@"""{GenerateLiteralCore(value)}""";
91+
=> $"""
92+
"{GenerateLiteralCore(value)}"
93+
""";
9294

9395
private string GenerateLiteralCore(object value)
9496
{

‎src/EFCore.PG.NodaTime/Storage/Internal/PeriodIntervalMapping.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,9 @@ protected override string GenerateNonNullSqlLiteral(object value)
9494
/// doing so can result in application failures when updating to a new Entity Framework Core release.
9595
/// </summary>
9696
protected override string GenerateEmbeddedNonNullSqlLiteral(object value)
97-
=> $@"""{GenerateLiteralCore(value)}""";
97+
=> $"""
98+
"{GenerateLiteralCore(value)}"
99+
""";
98100

99101
private string GenerateLiteralCore(object value)
100102
=> PeriodPattern.NormalizingIso.Format((Period)value);

0 commit comments

Comments
 (0)