Skip to content

Commit ff7756c

Browse files
authored
fix issue when #nullable disable was used (#3081)
fixes #3080
1 parent a1edd6d commit ff7756c

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

src/Core/RevEng.Core.80/Routines/Procedures/PostgresStoredProcedureScaffolder.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,15 @@ protected override void GenerateProcedure(Routine procedure, RoutineModel model,
126126

127127
if (procedure.HasValidResultSet && (procedure.Results.Count == 0 || procedure.Results[0].Count == 0))
128128
{
129+
var asyncExec = fullExec;
130+
131+
if (useNullableReferences)
132+
{
133+
asyncExec = asyncExec.Replace(" cancellationToken", " cancellationToken ?? CancellationToken.None", StringComparison.OrdinalIgnoreCase);
134+
}
135+
129136
Sb.AppendLine(useAsyncCalls
130-
? $"var _ = await _context.Database.ExecuteSqlRawAsync({fullExec.Replace(" cancellationToken", " cancellationToken ?? CancellationToken.None", StringComparison.OrdinalIgnoreCase)});"
137+
? $"var _ = await _context.Database.ExecuteSqlRawAsync({asyncExec});"
131138
: $"var _ = _context.Database.ExecuteSqlRaw({fullExec});");
132139
}
133140
else

src/Core/RevEng.Core.80/Routines/Procedures/SqlServerStoredProcedureScaffolder.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,15 @@ protected override void GenerateProcedure(Routine procedure, RoutineModel model,
134134

135135
if (procedure.HasValidResultSet && (procedure.Results.Count == 0 || procedure.Results[0].Count == 0))
136136
{
137+
var asyncExec = fullExec;
138+
139+
if (useNullableReferences)
140+
{
141+
asyncExec = asyncExec.Replace(" cancellationToken", " cancellationToken ?? CancellationToken.None", StringComparison.OrdinalIgnoreCase);
142+
}
143+
137144
Sb.AppendLine(useAsyncCalls
138-
? $"var _ = await _context.Database.ExecuteSqlRawAsync({fullExec.Replace(" cancellationToken", " cancellationToken ?? CancellationToken.None", StringComparison.OrdinalIgnoreCase)});"
145+
? $"var _ = await _context.Database.ExecuteSqlRawAsync({asyncExec});"
139146
: $"var _ = _context.Database.ExecuteSqlRaw({fullExec});");
140147
}
141148
else

0 commit comments

Comments
 (0)