Skip to content

Commit b8e4a3f

Browse files
Camel-RDCamel-RD
committed
fixes
1 parent 7a80ede commit b8e4a3f

File tree

3 files changed

+85
-81
lines changed

3 files changed

+85
-81
lines changed

‎src/FirebirdSql.EntityFrameworkCore.Firebird.Tests/EndToEndUsingSP/DeleteTestsUsingSP.cs‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ protected override void OnTestModelCreating(ModelBuilder modelBuilder)
4040
insertEntityConf.Property(x => x.Name).HasColumnName("NAME");
4141
insertEntityConf.ToTable("TEST_DELETE_USP");
4242
modelBuilder.Entity<DeleteEntity>().DeleteUsingStoredProcedure("SP_TEST_DELETE",
43-
storedProcedureBuilder =>
44-
{
45-
storedProcedureBuilder.HasOriginalValueParameter(x => x.Id);
46-
storedProcedureBuilder.HasRowsAffectedResultColumn();
47-
});
43+
storedProcedureBuilder =>
44+
{
45+
storedProcedureBuilder.HasOriginalValueParameter(x => x.Id);
46+
storedProcedureBuilder.HasRowsAffectedResultColumn();
47+
});
4848
}
4949
}
5050
class DeleteEntity
@@ -105,12 +105,12 @@ protected override void OnTestModelCreating(ModelBuilder modelBuilder)
105105
.IsRowVersion();
106106
insertEntityConf.ToTable("TEST_DELETE_CONCURRENCY_USP");
107107
modelBuilder.Entity<ConcurrencyDeleteEntity>().DeleteUsingStoredProcedure("SP_TEST_DELETE_CONCURRENCY",
108-
storedProcedureBuilder =>
109-
{
110-
storedProcedureBuilder.HasOriginalValueParameter(x => x.Id);
111-
storedProcedureBuilder.HasOriginalValueParameter(x => x.Stamp);
112-
storedProcedureBuilder.HasRowsAffectedResultColumn();
113-
});
108+
storedProcedureBuilder =>
109+
{
110+
storedProcedureBuilder.HasOriginalValueParameter(x => x.Id);
111+
storedProcedureBuilder.HasOriginalValueParameter(x => x.Stamp);
112+
storedProcedureBuilder.HasRowsAffectedResultColumn();
113+
});
114114
}
115115
}
116116
class ConcurrencyDeleteEntity
@@ -137,7 +137,8 @@ create or alter procedure sp_test_delete_concurrency (
137137
begin
138138
delete from test_delete_concurrency_usp where id = :pid and stamp = :pstamp;
139139
rowcount = row_count;
140-
if (rowcount > 0) then suspend;
140+
if (rowcount > 0) then
141+
suspend;
141142
end
142143
""";
143144
await db.Database.ExecuteSqlRawAsync(sp);

‎src/FirebirdSql.EntityFrameworkCore.Firebird.Tests/EndToEndUsingSP/InsertTestsUsingSP.cs‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ protected override void OnTestModelCreating(ModelBuilder modelBuilder)
3939
insertEntityConf.Property(x => x.Name).HasColumnName("NAME");
4040
insertEntityConf.ToTable("TEST_INSERT_USP");
4141
modelBuilder.Entity<InsertEntity>().InsertUsingStoredProcedure("SP_TEST_INSERT",
42-
storedProcedureBuilder =>
43-
{
44-
storedProcedureBuilder.HasParameter(x => x.Id);
45-
storedProcedureBuilder.HasParameter(x => x.Name);
46-
storedProcedureBuilder.HasResultColumn(x => x.Id);
47-
});
42+
storedProcedureBuilder =>
43+
{
44+
storedProcedureBuilder.HasParameter(x => x.Id);
45+
storedProcedureBuilder.HasParameter(x => x.Name);
46+
storedProcedureBuilder.HasResultColumn(x => x.Id);
47+
});
4848
}
4949
}
5050
class InsertEntity
@@ -94,11 +94,11 @@ protected override void OnTestModelCreating(ModelBuilder modelBuilder)
9494
insertEntityConf.Property(x => x.Name).HasColumnName("NAME");
9595
insertEntityConf.ToTable("TEST_INSERT_IDENTITY_USP");
9696
modelBuilder.Entity<IdentityInsertEntity>().InsertUsingStoredProcedure("SP_TEST_INSERT_IDENTITY",
97-
storedProcedureBuilder =>
98-
{
99-
storedProcedureBuilder.HasParameter(x => x.Name);
100-
storedProcedureBuilder.HasResultColumn(x => x.Id);
101-
});
97+
storedProcedureBuilder =>
98+
{
99+
storedProcedureBuilder.HasParameter(x => x.Name);
100+
storedProcedureBuilder.HasResultColumn(x => x.Id);
101+
});
102102
}
103103
}
104104
class IdentityInsertEntity
@@ -152,11 +152,11 @@ protected override void OnTestModelCreating(ModelBuilder modelBuilder)
152152
insertEntityConf.Property(x => x.Name).HasColumnName("NAME");
153153
insertEntityConf.ToTable("TEST_INSERT_SEQUENCE_USP");
154154
modelBuilder.Entity<SequenceInsertEntity>().InsertUsingStoredProcedure("SP_TEST_INSERT_SEQUENCE",
155-
storedProcedureBuilder =>
156-
{
157-
storedProcedureBuilder.HasParameter(x => x.Name);
158-
storedProcedureBuilder.HasResultColumn(x => x.Id);
159-
});
155+
storedProcedureBuilder =>
156+
{
157+
storedProcedureBuilder.HasParameter(x => x.Name);
158+
storedProcedureBuilder.HasResultColumn(x => x.Id);
159+
});
160160
}
161161
}
162162
class SequenceInsertEntity
@@ -211,11 +211,11 @@ protected override void OnTestModelCreating(ModelBuilder modelBuilder)
211211
.ValueGeneratedOnAdd();
212212
insertEntityConf.ToTable("TEST_INSERT_DEVAULTVALUES_USP");
213213
modelBuilder.Entity<DefaultValuesInsertEntity>().InsertUsingStoredProcedure("SP_TEST_INSERT_DEFAULTVALUES",
214-
storedProcedureBuilder =>
215-
{
216-
storedProcedureBuilder.HasResultColumn(x => x.Id);
217-
storedProcedureBuilder.HasResultColumn(x => x.Name);
218-
});
214+
storedProcedureBuilder =>
215+
{
216+
storedProcedureBuilder.HasResultColumn(x => x.Id);
217+
storedProcedureBuilder.HasResultColumn(x => x.Name);
218+
});
219219
}
220220
}
221221
class DefaultValuesInsertEntity
@@ -273,13 +273,13 @@ protected override void OnTestModelCreating(ModelBuilder modelBuilder)
273273
.ValueGeneratedOnAddOrUpdate();
274274
insertEntityConf.ToTable("TEST_INSERT_2COMPUTED_USP");
275275
modelBuilder.Entity<TwoComputedInsertEntity>().InsertUsingStoredProcedure("SP_TEST_INSERT_2COMPUTED",
276-
storedProcedureBuilder =>
277-
{
278-
storedProcedureBuilder.HasParameter(x => x.Name);
279-
storedProcedureBuilder.HasResultColumn(x => x.Id);
280-
storedProcedureBuilder.HasResultColumn(x => x.Computed1);
281-
storedProcedureBuilder.HasResultColumn(x => x.Computed2);
282-
});
276+
storedProcedureBuilder =>
277+
{
278+
storedProcedureBuilder.HasParameter(x => x.Name);
279+
storedProcedureBuilder.HasResultColumn(x => x.Id);
280+
storedProcedureBuilder.HasResultColumn(x => x.Computed1);
281+
storedProcedureBuilder.HasResultColumn(x => x.Computed2);
282+
});
283283
}
284284
}
285285
class TwoComputedInsertEntity

‎src/FirebirdSql.EntityFrameworkCore.Firebird.Tests/EndToEndUsingSP/UpdateTestsUsingSP.cs‎

Lines changed: 44 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ protected override void OnTestModelCreating(ModelBuilder modelBuilder)
4141
insertEntityConf.Property(x => x.Bar).HasColumnName("BAR");
4242
insertEntityConf.ToTable("TEST_UPDATE_USP");
4343
modelBuilder.Entity<UpdateEntity>().UpdateUsingStoredProcedure("SP_TEST_UPDATE",
44-
storedProcedureBuilder =>
45-
{
46-
storedProcedureBuilder.HasOriginalValueParameter(x => x.Id);
47-
storedProcedureBuilder.HasParameter(x => x.Foo);
48-
storedProcedureBuilder.HasParameter(x => x.Bar);
49-
storedProcedureBuilder.HasRowsAffectedResultColumn();
50-
});
44+
storedProcedureBuilder =>
45+
{
46+
storedProcedureBuilder.HasOriginalValueParameter(x => x.Id);
47+
storedProcedureBuilder.HasParameter(x => x.Foo);
48+
storedProcedureBuilder.HasParameter(x => x.Bar);
49+
storedProcedureBuilder.HasRowsAffectedResultColumn();
50+
});
5151
}
5252
}
5353
class UpdateEntity
@@ -88,7 +88,6 @@ pbar varchar(20))
8888
.FirstAsync();
8989
Assert.AreEqual("test", value.Foo);
9090
Assert.AreEqual("test", value.Bar);
91-
//Assert.AreNotEqual("test", value.Bar); //this has to fail
9291
}
9392
}
9493

@@ -110,13 +109,13 @@ protected override void OnTestModelCreating(ModelBuilder modelBuilder)
110109
.ValueGeneratedOnAddOrUpdate();
111110
insertEntityConf.ToTable("TEST_UPDATE_COMPUTED_USP");
112111
modelBuilder.Entity<ComputedUpdateEntity>().UpdateUsingStoredProcedure("SP_TEST_UPDATE_COMPUTED",
113-
storedProcedureBuilder =>
114-
{
115-
storedProcedureBuilder.HasOriginalValueParameter(x => x.Id);
116-
storedProcedureBuilder.HasParameter(x => x.Foo);
117-
storedProcedureBuilder.HasParameter(x => x.Bar);
118-
storedProcedureBuilder.HasResultColumn(x => x.Computed);
119-
});
112+
storedProcedureBuilder =>
113+
{
114+
storedProcedureBuilder.HasOriginalValueParameter(x => x.Id);
115+
storedProcedureBuilder.HasParameter(x => x.Foo);
116+
storedProcedureBuilder.HasParameter(x => x.Bar);
117+
storedProcedureBuilder.HasResultColumn(x => x.Computed);
118+
});
120119
}
121120
}
122121
class ComputedUpdateEntity
@@ -144,7 +143,8 @@ pbar varchar(20))
144143
update test_update_computed_usp set foo = :pfoo, bar = :pbar
145144
where id = :pid
146145
returning computed into :rcomputed;
147-
if (row_count > 0) then suspend;
146+
if (row_count > 0) then
147+
suspend;
148148
end
149149
""";
150150
await db.Database.ExecuteSqlRawAsync(sp);
@@ -173,13 +173,13 @@ protected override void OnTestModelCreating(ModelBuilder modelBuilder)
173173
.IsRowVersion();
174174
insertEntityConf.ToTable("TEST_UPDATE_CONCURRENCY_USP");
175175
modelBuilder.Entity<ConcurrencyUpdateEntity>().UpdateUsingStoredProcedure("SP_TEST_UPDATE_CONCURRENCY",
176-
storedProcedureBuilder =>
177-
{
178-
storedProcedureBuilder.HasOriginalValueParameter(x => x.Id);
179-
storedProcedureBuilder.HasParameter(x => x.Foo);
180-
storedProcedureBuilder.HasOriginalValueParameter(x => x.Stamp);
181-
storedProcedureBuilder.HasResultColumn(x => x.Stamp);
182-
});
176+
storedProcedureBuilder =>
177+
{
178+
storedProcedureBuilder.HasOriginalValueParameter(x => x.Id);
179+
storedProcedureBuilder.HasParameter(x => x.Foo);
180+
storedProcedureBuilder.HasOriginalValueParameter(x => x.Stamp);
181+
storedProcedureBuilder.HasResultColumn(x => x.Stamp);
182+
});
183183
}
184184
}
185185
class ConcurrencyUpdateEntity
@@ -206,7 +206,8 @@ pfoo varchar(20),
206206
update test_update_concurrency_usp set foo = :pfoo, stamp = current_timestamp
207207
where id = :pid and stamp = :pstamp
208208
returning stamp into :rstamp;
209-
if (row_count > 0) then suspend;
209+
if (row_count > 0) then
210+
suspend;
210211
end
211212
""";
212213
await db.Database.ExecuteSqlRawAsync(sp);
@@ -234,13 +235,13 @@ protected override void OnTestModelCreating(ModelBuilder modelBuilder)
234235
.IsConcurrencyToken();
235236
insertEntityConf.ToTable("TEST_UPDATE_CONCURRENCY_NG_USP");
236237
modelBuilder.Entity<ConcurrencyUpdateNoGeneratedEntity>().UpdateUsingStoredProcedure("SP_TEST_UPDATE_CONCURRENCY_NG",
237-
storedProcedureBuilder =>
238-
{
239-
storedProcedureBuilder.HasOriginalValueParameter(x => x.Id);
240-
storedProcedureBuilder.HasParameter(x => x.Foo);
241-
storedProcedureBuilder.HasOriginalValueParameter(x => x.Stamp);
242-
storedProcedureBuilder.HasRowsAffectedResultColumn();
243-
});
238+
storedProcedureBuilder =>
239+
{
240+
storedProcedureBuilder.HasOriginalValueParameter(x => x.Id);
241+
storedProcedureBuilder.HasParameter(x => x.Foo);
242+
storedProcedureBuilder.HasOriginalValueParameter(x => x.Stamp);
243+
storedProcedureBuilder.HasRowsAffectedResultColumn();
244+
});
244245
}
245246
}
246247
class ConcurrencyUpdateNoGeneratedEntity
@@ -267,7 +268,8 @@ pfoo varchar(20),
267268
update test_update_concurrency_ng_usp set foo = :pfoo, stamp = current_timestamp
268269
where id = :pid and stamp = :pstamp;
269270
rowcount = row_count;
270-
if (rowcount > 0) then suspend;
271+
if (rowcount > 0) then
272+
suspend;
271273
end
272274
""";
273275
await db.Database.ExecuteSqlRawAsync(sp);
@@ -299,14 +301,14 @@ protected override void OnTestModelCreating(ModelBuilder modelBuilder)
299301
.ValueGeneratedOnAddOrUpdate();
300302
insertEntityConf.ToTable("TEST_UPDATE_2COMPUTED_USP");
301303
modelBuilder.Entity<TwoComputedUpdateEntity>().UpdateUsingStoredProcedure("SP_TEST_UPDATE_2COMPUTED",
302-
storedProcedureBuilder =>
303-
{
304-
storedProcedureBuilder.HasOriginalValueParameter(x => x.Id);
305-
storedProcedureBuilder.HasParameter(x => x.Foo);
306-
storedProcedureBuilder.HasParameter(x => x.Bar);
307-
storedProcedureBuilder.HasResultColumn(x => x.Computed1);
308-
storedProcedureBuilder.HasResultColumn(x => x.Computed2);
309-
});
304+
storedProcedureBuilder =>
305+
{
306+
storedProcedureBuilder.HasOriginalValueParameter(x => x.Id);
307+
storedProcedureBuilder.HasParameter(x => x.Foo);
308+
storedProcedureBuilder.HasParameter(x => x.Bar);
309+
storedProcedureBuilder.HasResultColumn(x => x.Computed1);
310+
storedProcedureBuilder.HasResultColumn(x => x.Computed2);
311+
});
310312
}
311313
}
312314
class TwoComputedUpdateEntity
@@ -337,7 +339,8 @@ rcomputed2 varchar(50))
337339
update test_update_2computed_usp set foo = :pfoo, bar = :pbar
338340
where id = :pid
339341
returning computed1, computed2 into :rcomputed1, :rcomputed2;
340-
if (row_count > 0) then suspend;
342+
if (row_count > 0) then
343+
suspend;
341344
end
342345
""";
343346
await db.Database.ExecuteSqlRawAsync(sp);

0 commit comments

Comments
 (0)