diff --git a/Main/Source/Effort.EF6.Net40/Properties/AssemblyInfo.cs b/Main/Source/Effort.EF6.Net40/Properties/AssemblyInfo.cs
index 82653a77..af6a15c8 100644
--- a/Main/Source/Effort.EF6.Net40/Properties/AssemblyInfo.cs
+++ b/Main/Source/Effort.EF6.Net40/Properties/AssemblyInfo.cs
@@ -12,5 +12,5 @@
[assembly: ComVisible(false)]
[assembly: Guid("896d3ca3-a5bd-4aac-b384-8488ad59ee87")]
-[assembly: AssemblyVersion("2.2.15")]
-[assembly: AssemblyFileVersion("2.2.15")]
\ No newline at end of file
+[assembly: AssemblyVersion("2.2.16")]
+[assembly: AssemblyFileVersion("2.2.16")]
\ No newline at end of file
diff --git a/Main/Source/Effort.EF6.Net45/Properties/AssemblyInfo.cs b/Main/Source/Effort.EF6.Net45/Properties/AssemblyInfo.cs
index e0bbb05b..634c9dd4 100644
--- a/Main/Source/Effort.EF6.Net45/Properties/AssemblyInfo.cs
+++ b/Main/Source/Effort.EF6.Net45/Properties/AssemblyInfo.cs
@@ -13,8 +13,8 @@
[assembly: ComVisible(false)]
[assembly: Guid("810b876c-4c73-4f0b-9fff-019fe4f30182")]
-[assembly: AssemblyVersion("2.2.15")]
-[assembly: AssemblyFileVersion("2.2.15")]
+[assembly: AssemblyVersion("2.2.16")]
+[assembly: AssemblyFileVersion("2.2.16")]
//[assembly: InternalsVisibleTo("Effort.Test")]
//[assembly: InternalsVisibleTo("Effort.Extra.EF6.Tests")]
diff --git a/Main/Source/Effort.EF6.NetStandard21/Effort.EF6.NetStandard21.csproj b/Main/Source/Effort.EF6.NetStandard21/Effort.EF6.NetStandard21.csproj
index 6d106048..8f143773 100644
--- a/Main/Source/Effort.EF6.NetStandard21/Effort.EF6.NetStandard21.csproj
+++ b/Main/Source/Effort.EF6.NetStandard21/Effort.EF6.NetStandard21.csproj
@@ -4,7 +4,7 @@
netstandard2.1
true
KeyPair.snk
- 2.2.15
+ 2.2.16
Effort
Effort
diff --git a/Main/Source/Effort.Net40/Properties/AssemblyInfo.cs b/Main/Source/Effort.Net40/Properties/AssemblyInfo.cs
index c134a17b..0278f96d 100644
--- a/Main/Source/Effort.Net40/Properties/AssemblyInfo.cs
+++ b/Main/Source/Effort.Net40/Properties/AssemblyInfo.cs
@@ -13,8 +13,8 @@
[assembly: ComVisible(false)]
[assembly: Guid("779ecf7b-0379-419d-bc4d-286a8ec08f6d")]
-[assembly: AssemblyVersion("2.2.15")]
-[assembly: AssemblyFileVersion("2.2.15")]
+[assembly: AssemblyVersion("2.2.16")]
+[assembly: AssemblyFileVersion("2.2.16")]
//[assembly: InternalsVisibleTo("Effort.Test")]
[assembly: InternalsVisibleTo("Effort.Test, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")]
diff --git a/Main/Source/Effort.Net45/Properties/AssemblyInfo.cs b/Main/Source/Effort.Net45/Properties/AssemblyInfo.cs
index a6b424ec..d6b03cfa 100644
--- a/Main/Source/Effort.Net45/Properties/AssemblyInfo.cs
+++ b/Main/Source/Effort.Net45/Properties/AssemblyInfo.cs
@@ -13,8 +13,8 @@
[assembly: ComVisible(false)]
[assembly: Guid("aa6b4a10-01c1-4cc0-8009-4a7c6aa28585")]
-[assembly: AssemblyVersion("2.2.15")]
-[assembly: AssemblyFileVersion("2.2.15")]
+[assembly: AssemblyVersion("2.2.16")]
+[assembly: AssemblyFileVersion("2.2.16")]
//[assembly: InternalsVisibleTo("Effort.Extra.Tests")]
[assembly: InternalsVisibleTo("Effort.Extra.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")]
diff --git a/Main/Source/lab/Effort.Lab.EF6/Form_General_Jon.cs b/Main/Source/lab/Effort.Lab.EF6/Form_General_Jon.cs
index 4594e3cd..17c5d50f 100644
--- a/Main/Source/lab/Effort.Lab.EF6/Form_General_Jon.cs
+++ b/Main/Source/lab/Effort.Lab.EF6/Form_General_Jon.cs
@@ -11,6 +11,7 @@
using System.Threading.Tasks;
using System.Windows.Forms;
using Effort.DataLoaders;
+using Effort.Provider;
namespace Effort.Lab.EF6
{
@@ -25,38 +26,10 @@ public Form_General_Jon()
{
using (var db = new EntityDbContext(effortConnection))
{
- {
- var set = db.Tests;
+ db.Tests.Add(new Test() { Name = "z", Generated="z2" });
+ db.SaveChanges();
-
- // Throws exception
- var bitMask = 1;
- var query = (from entity in set
- where (entity.Bitvalues & bitMask) == bitMask
- select entity).ToList();
-
- // Works fine
- var query2 = (from entity in set
- where (entity.Bitvalues & 1) == 1
- select entity).ToList();
- }
- {
- //db.Database.CreateIfNotExists();
- //effortConnection.IsCaseSensitive = false;
- //db.Tests.Add(new Test {Name = "aa"});
- //db.SaveChanges();
- //// Simple case-insensitive equality works
- //var results1 = db.Tests.Where(p => p.Name == "AA").ToList();
- //Console.WriteLine($"results1 count = {results1.Count}");
- //// However case-insensitive StartsWith does not work (works with SQL server)
- //var results2 = db.Tests.Where(p => p.Name.StartsWith("A")).ToList();
- //Console.WriteLine($"results2 count = {results2.Count}");
- //// StartsWith will work as long as it can be case-sensitive.
- //var results3 = db.Tests.Where(p => p.Name.StartsWith("a")).ToList();
- //Console.WriteLine($"results3 count = {results3.Count}");
- }
-
- Console.ReadLine();
+ var list = db.Tests.AsNoTracking().ToList();
}
}
}
@@ -64,8 +37,21 @@ public Form_General_Jon()
public class EntityDbContext : DbContext
{
+ public bool IsEffort = false;
+
public EntityDbContext(DbConnection dbConnection) : base(dbConnection, false)
{
+ IsEffort = dbConnection is EffortConnection;
+ }
+
+ protected override void OnModelCreating(DbModelBuilder modelBuilder)
+ {
+ if(IsEffort)
+ {
+ modelBuilder.Entity().Property(x => x.Generated).HasDatabaseGeneratedOption(DatabaseGeneratedOption.None);
+ }
+
+ base.OnModelCreating(modelBuilder);
}
public virtual DbSet Tests { get; set; }
@@ -75,7 +61,8 @@ public class Test
{
public int Id { get; set; }
public string Name { get; set; }
+ [DatabaseGenerated(DatabaseGeneratedOption.Computed)]
+ public string Generated { get; set; }
- public int Bitvalues { get; set; }
}
}
\ No newline at end of file
diff --git a/Main/Source/lab/Effort.Lab.EF6/Program.cs b/Main/Source/lab/Effort.Lab.EF6/Program.cs
index fb99c35d..de49b2e5 100644
--- a/Main/Source/lab/Effort.Lab.EF6/Program.cs
+++ b/Main/Source/lab/Effort.Lab.EF6/Program.cs
@@ -14,7 +14,7 @@ static class Program
[STAThread]
static void Main()
{
- new Form_Request_SetIdentity();
+ new Form_General_Jon();
}
}
}