Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Camel-RD
Camel-RD committed Aug 30, 2024
1 parent 7a80ede commit b8e4a3f
Show file tree
Hide file tree
Showing 3 changed files with 85 additions and 81 deletions.
25 changes: 13 additions & 12 deletions src/FirebirdSql.EntityFrameworkCore.Firebird.Tests/EndToEndUsingSP/DeleteTestsUsingSP.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ protected override void OnTestModelCreating(ModelBuilder modelBuilder)
insertEntityConf.Property(x => x.Name).HasColumnName("NAME");
insertEntityConf.ToTable("TEST_DELETE_USP");
modelBuilder.Entity<DeleteEntity>().DeleteUsingStoredProcedure("SP_TEST_DELETE",
storedProcedureBuilder =>
{
storedProcedureBuilder.HasOriginalValueParameter(x => x.Id);
storedProcedureBuilder.HasRowsAffectedResultColumn();
});
storedProcedureBuilder =>
{
storedProcedureBuilder.HasOriginalValueParameter(x => x.Id);
storedProcedureBuilder.HasRowsAffectedResultColumn();
});
}
}
class DeleteEntity
Expand Down Expand Up @@ -105,12 +105,12 @@ protected override void OnTestModelCreating(ModelBuilder modelBuilder)
.IsRowVersion();
insertEntityConf.ToTable("TEST_DELETE_CONCURRENCY_USP");
modelBuilder.Entity<ConcurrencyDeleteEntity>().DeleteUsingStoredProcedure("SP_TEST_DELETE_CONCURRENCY",
storedProcedureBuilder =>
{
storedProcedureBuilder.HasOriginalValueParameter(x => x.Id);
storedProcedureBuilder.HasOriginalValueParameter(x => x.Stamp);
storedProcedureBuilder.HasRowsAffectedResultColumn();
});
storedProcedureBuilder =>
{
storedProcedureBuilder.HasOriginalValueParameter(x => x.Id);
storedProcedureBuilder.HasOriginalValueParameter(x => x.Stamp);
storedProcedureBuilder.HasRowsAffectedResultColumn();
});
}
}
class ConcurrencyDeleteEntity
Expand All @@ -137,7 +137,8 @@ create or alter procedure sp_test_delete_concurrency (
begin
delete from test_delete_concurrency_usp where id = :pid and stamp = :pstamp;
rowcount = row_count;
if (rowcount > 0) then suspend;
if (rowcount > 0) then
suspend;
end
""";
await db.Database.ExecuteSqlRawAsync(sp);
Expand Down
56 changes: 28 additions & 28 deletions src/FirebirdSql.EntityFrameworkCore.Firebird.Tests/EndToEndUsingSP/InsertTestsUsingSP.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ protected override void OnTestModelCreating(ModelBuilder modelBuilder)
insertEntityConf.Property(x => x.Name).HasColumnName("NAME");
insertEntityConf.ToTable("TEST_INSERT_USP");
modelBuilder.Entity<InsertEntity>().InsertUsingStoredProcedure("SP_TEST_INSERT",
storedProcedureBuilder =>
{
storedProcedureBuilder.HasParameter(x => x.Id);
storedProcedureBuilder.HasParameter(x => x.Name);
storedProcedureBuilder.HasResultColumn(x => x.Id);
});
storedProcedureBuilder =>
{
storedProcedureBuilder.HasParameter(x => x.Id);
storedProcedureBuilder.HasParameter(x => x.Name);
storedProcedureBuilder.HasResultColumn(x => x.Id);
});
}
}
class InsertEntity
Expand Down Expand Up @@ -94,11 +94,11 @@ protected override void OnTestModelCreating(ModelBuilder modelBuilder)
insertEntityConf.Property(x => x.Name).HasColumnName("NAME");
insertEntityConf.ToTable("TEST_INSERT_IDENTITY_USP");
modelBuilder.Entity<IdentityInsertEntity>().InsertUsingStoredProcedure("SP_TEST_INSERT_IDENTITY",
storedProcedureBuilder =>
{
storedProcedureBuilder.HasParameter(x => x.Name);
storedProcedureBuilder.HasResultColumn(x => x.Id);
});
storedProcedureBuilder =>
{
storedProcedureBuilder.HasParameter(x => x.Name);
storedProcedureBuilder.HasResultColumn(x => x.Id);
});
}
}
class IdentityInsertEntity
Expand Down Expand Up @@ -152,11 +152,11 @@ protected override void OnTestModelCreating(ModelBuilder modelBuilder)
insertEntityConf.Property(x => x.Name).HasColumnName("NAME");
insertEntityConf.ToTable("TEST_INSERT_SEQUENCE_USP");
modelBuilder.Entity<SequenceInsertEntity>().InsertUsingStoredProcedure("SP_TEST_INSERT_SEQUENCE",
storedProcedureBuilder =>
{
storedProcedureBuilder.HasParameter(x => x.Name);
storedProcedureBuilder.HasResultColumn(x => x.Id);
});
storedProcedureBuilder =>
{
storedProcedureBuilder.HasParameter(x => x.Name);
storedProcedureBuilder.HasResultColumn(x => x.Id);
});
}
}
class SequenceInsertEntity
Expand Down Expand Up @@ -211,11 +211,11 @@ protected override void OnTestModelCreating(ModelBuilder modelBuilder)
.ValueGeneratedOnAdd();
insertEntityConf.ToTable("TEST_INSERT_DEVAULTVALUES_USP");
modelBuilder.Entity<DefaultValuesInsertEntity>().InsertUsingStoredProcedure("SP_TEST_INSERT_DEFAULTVALUES",
storedProcedureBuilder =>
{
storedProcedureBuilder.HasResultColumn(x => x.Id);
storedProcedureBuilder.HasResultColumn(x => x.Name);
});
storedProcedureBuilder =>
{
storedProcedureBuilder.HasResultColumn(x => x.Id);
storedProcedureBuilder.HasResultColumn(x => x.Name);
});
}
}
class DefaultValuesInsertEntity
Expand Down Expand Up @@ -273,13 +273,13 @@ protected override void OnTestModelCreating(ModelBuilder modelBuilder)
.ValueGeneratedOnAddOrUpdate();
insertEntityConf.ToTable("TEST_INSERT_2COMPUTED_USP");
modelBuilder.Entity<TwoComputedInsertEntity>().InsertUsingStoredProcedure("SP_TEST_INSERT_2COMPUTED",
storedProcedureBuilder =>
{
storedProcedureBuilder.HasParameter(x => x.Name);
storedProcedureBuilder.HasResultColumn(x => x.Id);
storedProcedureBuilder.HasResultColumn(x => x.Computed1);
storedProcedureBuilder.HasResultColumn(x => x.Computed2);
});
storedProcedureBuilder =>
{
storedProcedureBuilder.HasParameter(x => x.Name);
storedProcedureBuilder.HasResultColumn(x => x.Id);
storedProcedureBuilder.HasResultColumn(x => x.Computed1);
storedProcedureBuilder.HasResultColumn(x => x.Computed2);
});
}
}
class TwoComputedInsertEntity
Expand Down
85 changes: 44 additions & 41 deletions src/FirebirdSql.EntityFrameworkCore.Firebird.Tests/EndToEndUsingSP/UpdateTestsUsingSP.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ protected override void OnTestModelCreating(ModelBuilder modelBuilder)
insertEntityConf.Property(x => x.Bar).HasColumnName("BAR");
insertEntityConf.ToTable("TEST_UPDATE_USP");
modelBuilder.Entity<UpdateEntity>().UpdateUsingStoredProcedure("SP_TEST_UPDATE",
storedProcedureBuilder =>
{
storedProcedureBuilder.HasOriginalValueParameter(x => x.Id);
storedProcedureBuilder.HasParameter(x => x.Foo);
storedProcedureBuilder.HasParameter(x => x.Bar);
storedProcedureBuilder.HasRowsAffectedResultColumn();
});
storedProcedureBuilder =>
{
storedProcedureBuilder.HasOriginalValueParameter(x => x.Id);
storedProcedureBuilder.HasParameter(x => x.Foo);
storedProcedureBuilder.HasParameter(x => x.Bar);
storedProcedureBuilder.HasRowsAffectedResultColumn();
});
}
}
class UpdateEntity
Expand Down Expand Up @@ -88,7 +88,6 @@ pbar varchar(20))
.FirstAsync();
Assert.AreEqual("test", value.Foo);
Assert.AreEqual("test", value.Bar);
//Assert.AreNotEqual("test", value.Bar); //this has to fail
}
}

Expand All @@ -110,13 +109,13 @@ protected override void OnTestModelCreating(ModelBuilder modelBuilder)
.ValueGeneratedOnAddOrUpdate();
insertEntityConf.ToTable("TEST_UPDATE_COMPUTED_USP");
modelBuilder.Entity<ComputedUpdateEntity>().UpdateUsingStoredProcedure("SP_TEST_UPDATE_COMPUTED",
storedProcedureBuilder =>
{
storedProcedureBuilder.HasOriginalValueParameter(x => x.Id);
storedProcedureBuilder.HasParameter(x => x.Foo);
storedProcedureBuilder.HasParameter(x => x.Bar);
storedProcedureBuilder.HasResultColumn(x => x.Computed);
});
storedProcedureBuilder =>
{
storedProcedureBuilder.HasOriginalValueParameter(x => x.Id);
storedProcedureBuilder.HasParameter(x => x.Foo);
storedProcedureBuilder.HasParameter(x => x.Bar);
storedProcedureBuilder.HasResultColumn(x => x.Computed);
});
}
}
class ComputedUpdateEntity
Expand Down Expand Up @@ -144,7 +143,8 @@ pbar varchar(20))
update test_update_computed_usp set foo = :pfoo, bar = :pbar
where id = :pid
returning computed into :rcomputed;
if (row_count > 0) then suspend;
if (row_count > 0) then
suspend;
end
""";
await db.Database.ExecuteSqlRawAsync(sp);
Expand Down Expand Up @@ -173,13 +173,13 @@ protected override void OnTestModelCreating(ModelBuilder modelBuilder)
.IsRowVersion();
insertEntityConf.ToTable("TEST_UPDATE_CONCURRENCY_USP");
modelBuilder.Entity<ConcurrencyUpdateEntity>().UpdateUsingStoredProcedure("SP_TEST_UPDATE_CONCURRENCY",
storedProcedureBuilder =>
{
storedProcedureBuilder.HasOriginalValueParameter(x => x.Id);
storedProcedureBuilder.HasParameter(x => x.Foo);
storedProcedureBuilder.HasOriginalValueParameter(x => x.Stamp);
storedProcedureBuilder.HasResultColumn(x => x.Stamp);
});
storedProcedureBuilder =>
{
storedProcedureBuilder.HasOriginalValueParameter(x => x.Id);
storedProcedureBuilder.HasParameter(x => x.Foo);
storedProcedureBuilder.HasOriginalValueParameter(x => x.Stamp);
storedProcedureBuilder.HasResultColumn(x => x.Stamp);
});
}
}
class ConcurrencyUpdateEntity
Expand All @@ -206,7 +206,8 @@ pfoo varchar(20),
update test_update_concurrency_usp set foo = :pfoo, stamp = current_timestamp
where id = :pid and stamp = :pstamp
returning stamp into :rstamp;
if (row_count > 0) then suspend;
if (row_count > 0) then
suspend;
end
""";
await db.Database.ExecuteSqlRawAsync(sp);
Expand Down Expand Up @@ -234,13 +235,13 @@ protected override void OnTestModelCreating(ModelBuilder modelBuilder)
.IsConcurrencyToken();
insertEntityConf.ToTable("TEST_UPDATE_CONCURRENCY_NG_USP");
modelBuilder.Entity<ConcurrencyUpdateNoGeneratedEntity>().UpdateUsingStoredProcedure("SP_TEST_UPDATE_CONCURRENCY_NG",
storedProcedureBuilder =>
{
storedProcedureBuilder.HasOriginalValueParameter(x => x.Id);
storedProcedureBuilder.HasParameter(x => x.Foo);
storedProcedureBuilder.HasOriginalValueParameter(x => x.Stamp);
storedProcedureBuilder.HasRowsAffectedResultColumn();
});
storedProcedureBuilder =>
{
storedProcedureBuilder.HasOriginalValueParameter(x => x.Id);
storedProcedureBuilder.HasParameter(x => x.Foo);
storedProcedureBuilder.HasOriginalValueParameter(x => x.Stamp);
storedProcedureBuilder.HasRowsAffectedResultColumn();
});
}
}
class ConcurrencyUpdateNoGeneratedEntity
Expand All @@ -267,7 +268,8 @@ pfoo varchar(20),
update test_update_concurrency_ng_usp set foo = :pfoo, stamp = current_timestamp
where id = :pid and stamp = :pstamp;
rowcount = row_count;
if (rowcount > 0) then suspend;
if (rowcount > 0) then
suspend;
end
""";
await db.Database.ExecuteSqlRawAsync(sp);
Expand Down Expand Up @@ -299,14 +301,14 @@ protected override void OnTestModelCreating(ModelBuilder modelBuilder)
.ValueGeneratedOnAddOrUpdate();
insertEntityConf.ToTable("TEST_UPDATE_2COMPUTED_USP");
modelBuilder.Entity<TwoComputedUpdateEntity>().UpdateUsingStoredProcedure("SP_TEST_UPDATE_2COMPUTED",
storedProcedureBuilder =>
{
storedProcedureBuilder.HasOriginalValueParameter(x => x.Id);
storedProcedureBuilder.HasParameter(x => x.Foo);
storedProcedureBuilder.HasParameter(x => x.Bar);
storedProcedureBuilder.HasResultColumn(x => x.Computed1);
storedProcedureBuilder.HasResultColumn(x => x.Computed2);
});
storedProcedureBuilder =>
{
storedProcedureBuilder.HasOriginalValueParameter(x => x.Id);
storedProcedureBuilder.HasParameter(x => x.Foo);
storedProcedureBuilder.HasParameter(x => x.Bar);
storedProcedureBuilder.HasResultColumn(x => x.Computed1);
storedProcedureBuilder.HasResultColumn(x => x.Computed2);
});
}
}
class TwoComputedUpdateEntity
Expand Down Expand Up @@ -337,7 +339,8 @@ rcomputed2 varchar(50))
update test_update_2computed_usp set foo = :pfoo, bar = :pbar
where id = :pid
returning computed1, computed2 into :rcomputed1, :rcomputed2;
if (row_count > 0) then suspend;
if (row_count > 0) then
suspend;
end
""";
await db.Database.ExecuteSqlRawAsync(sp);
Expand Down

0 comments on commit b8e4a3f

Please sign in to comment.