Skip to content

Commit b147f06

Browse files
committed
Better FbTestDbContext.
1 parent d8de581 commit b147f06

File tree

4 files changed

+46
-24
lines changed

4 files changed

+46
-24
lines changed

Provider/src/FirebirdSql.EntityFrameworkCore.Firebird.Tests/EndToEnd/DeleteTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ public DeleteContext(string connectionString)
3232
: base(connectionString)
3333
{ }
3434

35-
protected override void OnModelCreating(ModelBuilder modelBuilder)
35+
protected override void OnTestModelCreating(ModelBuilder modelBuilder)
3636
{
37-
base.OnModelCreating(modelBuilder);
37+
base.OnTestModelCreating(modelBuilder);
3838

3939
var insertEntityConf = modelBuilder.Entity<DeleteEntity>();
4040
insertEntityConf.Property(x => x.Id).HasColumnName("ID");
@@ -77,9 +77,9 @@ public ConcurrencyDeleteContext(string connectionString)
7777
: base(connectionString)
7878
{ }
7979

80-
protected override void OnModelCreating(ModelBuilder modelBuilder)
80+
protected override void OnTestModelCreating(ModelBuilder modelBuilder)
8181
{
82-
base.OnModelCreating(modelBuilder);
82+
base.OnTestModelCreating(modelBuilder);
8383

8484
var insertEntityConf = modelBuilder.Entity<ConcurrencyDeleteEntity>();
8585
insertEntityConf.Property(x => x.Id).HasColumnName("ID");

Provider/src/FirebirdSql.EntityFrameworkCore.Firebird.Tests/EndToEnd/InsertTests.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ public InsertContext(string connectionString)
3030
: base(connectionString)
3131
{ }
3232

33-
protected override void OnModelCreating(ModelBuilder modelBuilder)
33+
protected override void OnTestModelCreating(ModelBuilder modelBuilder)
3434
{
35-
base.OnModelCreating(modelBuilder);
35+
base.OnTestModelCreating(modelBuilder);
3636

3737
var insertEntityConf = modelBuilder.Entity<InsertEntity>();
3838
insertEntityConf.Property(x => x.Id).HasColumnName("ID");
@@ -64,9 +64,9 @@ public IdentityInsertContext(string connectionString)
6464
: base(connectionString)
6565
{ }
6666

67-
protected override void OnModelCreating(ModelBuilder modelBuilder)
67+
protected override void OnTestModelCreating(ModelBuilder modelBuilder)
6868
{
69-
base.OnModelCreating(modelBuilder);
69+
base.OnTestModelCreating(modelBuilder);
7070

7171
var insertEntityConf = modelBuilder.Entity<IdentityInsertEntity>();
7272
insertEntityConf.Property(x => x.Id).HasColumnName("ID")
@@ -102,9 +102,9 @@ public SequenceInsertContext(string connectionString)
102102
: base(connectionString)
103103
{ }
104104

105-
protected override void OnModelCreating(ModelBuilder modelBuilder)
105+
protected override void OnTestModelCreating(ModelBuilder modelBuilder)
106106
{
107-
base.OnModelCreating(modelBuilder);
107+
base.OnTestModelCreating(modelBuilder);
108108

109109
var insertEntityConf = modelBuilder.Entity<SequenceInsertEntity>();
110110
insertEntityConf.Property(x => x.Id).HasColumnName("ID")
@@ -140,9 +140,9 @@ public DefaultValuesInsertContext(string connectionString)
140140
: base(connectionString)
141141
{ }
142142

143-
protected override void OnModelCreating(ModelBuilder modelBuilder)
143+
protected override void OnTestModelCreating(ModelBuilder modelBuilder)
144144
{
145-
base.OnModelCreating(modelBuilder);
145+
base.OnTestModelCreating(modelBuilder);
146146

147147
var insertEntityConf = modelBuilder.Entity<DefaultValuesInsertEntity>();
148148
insertEntityConf.Property(x => x.Id).HasColumnName("ID")
@@ -180,9 +180,9 @@ public TwoComputedInsertContext(string connectionString)
180180
: base(connectionString)
181181
{ }
182182

183-
protected override void OnModelCreating(ModelBuilder modelBuilder)
183+
protected override void OnTestModelCreating(ModelBuilder modelBuilder)
184184
{
185-
base.OnModelCreating(modelBuilder);
185+
base.OnTestModelCreating(modelBuilder);
186186

187187
var insertEntityConf = modelBuilder.Entity<TwoComputedInsertEntity>();
188188
insertEntityConf.Property(x => x.Id).HasColumnName("ID")

Provider/src/FirebirdSql.EntityFrameworkCore.Firebird.Tests/EndToEnd/UpdateTests.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ public UpdateContext(string connectionString)
3030
: base(connectionString)
3131
{ }
3232

33-
protected override void OnModelCreating(ModelBuilder modelBuilder)
33+
protected override void OnTestModelCreating(ModelBuilder modelBuilder)
3434
{
35-
base.OnModelCreating(modelBuilder);
35+
base.OnTestModelCreating(modelBuilder);
3636

3737
var insertEntityConf = modelBuilder.Entity<UpdateEntity>();
3838
insertEntityConf.Property(x => x.Id).HasColumnName("ID");
@@ -73,9 +73,9 @@ public ComputedUpdateContext(string connectionString)
7373
: base(connectionString)
7474
{ }
7575

76-
protected override void OnModelCreating(ModelBuilder modelBuilder)
76+
protected override void OnTestModelCreating(ModelBuilder modelBuilder)
7777
{
78-
base.OnModelCreating(modelBuilder);
78+
base.OnTestModelCreating(modelBuilder);
7979

8080
var insertEntityConf = modelBuilder.Entity<ComputedUpdateEntity>();
8181
insertEntityConf.Property(x => x.Id).HasColumnName("ID");
@@ -114,9 +114,9 @@ public ConcurrencyUpdateContext(string connectionString)
114114
: base(connectionString)
115115
{ }
116116

117-
protected override void OnModelCreating(ModelBuilder modelBuilder)
117+
protected override void OnTestModelCreating(ModelBuilder modelBuilder)
118118
{
119-
base.OnModelCreating(modelBuilder);
119+
base.OnTestModelCreating(modelBuilder);
120120

121121
var insertEntityConf = modelBuilder.Entity<ConcurrencyUpdateEntity>();
122122
insertEntityConf.Property(x => x.Id).HasColumnName("ID");
@@ -153,9 +153,9 @@ public ConcurrencyUpdateNoGeneratedContext(string connectionString)
153153
: base(connectionString)
154154
{ }
155155

156-
protected override void OnModelCreating(ModelBuilder modelBuilder)
156+
protected override void OnTestModelCreating(ModelBuilder modelBuilder)
157157
{
158-
base.OnModelCreating(modelBuilder);
158+
base.OnTestModelCreating(modelBuilder);
159159

160160
var insertEntityConf = modelBuilder.Entity<ConcurrencyUpdateNoGeneratedEntity>();
161161
insertEntityConf.Property(x => x.Id).HasColumnName("ID");
@@ -192,9 +192,9 @@ public TwoComputedUpdateContext(string connectionString)
192192
: base(connectionString)
193193
{ }
194194

195-
protected override void OnModelCreating(ModelBuilder modelBuilder)
195+
protected override void OnTestModelCreating(ModelBuilder modelBuilder)
196196
{
197-
base.OnModelCreating(modelBuilder);
197+
base.OnTestModelCreating(modelBuilder);
198198

199199
var insertEntityConf = modelBuilder.Entity<TwoComputedUpdateEntity>();
200200
insertEntityConf.Property(x => x.Id).HasColumnName("ID");

Provider/src/FirebirdSql.EntityFrameworkCore.Firebird.Tests/EntityFrameworkCoreTestsBase.cs

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
//$Authors = Jiri Cincura (jiri@cincura.net)
1717

1818
using System;
19+
using System.Linq;
1920
using FirebirdSql.Data.FirebirdClient;
2021
using FirebirdSql.Data.TestsBase;
2122
using FirebirdSql.EntityFrameworkCore.Firebird.Extensions;
@@ -52,5 +53,26 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
5253

5354
optionsBuilder.UseFirebird(_connectionString);
5455
}
56+
57+
protected override void OnModelCreating(ModelBuilder modelBuilder)
58+
{
59+
base.OnModelCreating(modelBuilder);
60+
OnTestModelCreating(modelBuilder);
61+
AfterModelCreated(modelBuilder);
62+
}
63+
64+
protected virtual void OnTestModelCreating(ModelBuilder modelBuilder)
65+
{ }
66+
67+
protected virtual void AfterModelCreated(ModelBuilder modelBuilder)
68+
{
69+
foreach (var entity in modelBuilder.Model.GetEntityTypes())
70+
{
71+
foreach (var property in entity.GetProperties().Where(x => x.ClrType == typeof(string)))
72+
{
73+
property.SetMaxLength(100);
74+
}
75+
}
76+
}
5577
}
5678
}

0 commit comments

Comments
 (0)