HasQueryFilter supporting any other type than string?

[ghost]

If I use the type int as query filter (HasQueryFilter) I get the below exception when trying to list entries that were added on table successfully. Anything i do wrong or is this a bug?

Exception message:
System.ArgumentException: Expression of type 'System.Int32' cannot be used for parameter of type 'System.Object' of method 'Void AddParameter(System.String, System.Object)'
Parameter name: arg1

below code doesn't work.

modelBuilder.Entity<Tenant>().Property<int>("TenantId").HasField("tenantId").Metadata.IsReadOnlyAfterSave = true;
modelBuilder.Entity<Tenant>().HasQueryFilter(b => EF.Property<int>(b, "TenantId") == tenantId);

modelBuilder.Entity<ServiceAccount>().Property<int>("TenantId").HasField("tenantId").Metadata.IsReadOnlyAfterSave = true;
modelBuilder.Entity<ServiceAccount>().HasQueryFilter(b => EF.Property<int>(b, "TenantId") == tenantId);

But with string type of TenantId then it works

modelBuilder.Entity<Tenant>().Property<string>("TenantId").HasField("tenantId").Metadata.IsReadOnlyAfterSave = true;
modelBuilder.Entity<Tenant>().HasQueryFilter(b => EF.Property<string>(b, "TenantId") == tenantId);

modelBuilder.Entity<ServiceAccount>().Property<string>("TenantId").HasField("tenantId").Metadata.IsReadOnlyAfterSave = true;
modelBuilder.Entity<ServiceAccount>().HasQueryFilter(b => EF.Property<string>(b, "TenantId") == tenantId);

Exception message:
System.ArgumentException: Expression of type 'System.Int32' cannot be used for parameter of type 'System.Object' of method 'Void AddParameter(System.String, System.Object)'
Parameter name: arg1

public override int SaveChanges()
{
   ChangeTracker.DetectChanges();

   foreach (var item in ChangeTracker.Entries().Where(e => e.State == EntityState.Added && e.Metadata.GetProperties().Any(p => p.Name == "TenantId")))
    {
        item.CurrentValues["TenantId"] = tenantId;
    }
    return base.SaveChanges();
}

 public void CanCreateServiceAccountForTenant()
        {
            var optionsBuilder = new DbContextOptionsBuilder<OnBoardingStore>();
            optionsBuilder.UseSqlServer(@"Data Source=(localdb)\mssqllocaldb;Initial Catalog=Test1;Integrated Security=True;Connect Timeout=15;Encrypt=False;TrustServerCertificate=True;ApplicationIntent=ReadWrite;MultiSubnetFailover=False");

            using (var db = new OnBoardingStore(optionsBuilder.Options, "1"))
            {
                db.Database.EnsureCreated();
                db.Add(new Tenant() { DisplayName = "ABC" });
                db.Add(new ServiceAccount { DisplayName = "Service Account 1" });
                var saved = db.SaveChanges();
                Assert.IsTrue(saved == 2);
            }

            using (var db = new OnBoardingStore(optionsBuilder.Options, "2"))
            {
                db.Database.EnsureCreated();
                db.Add(new Tenant() { DisplayName = "ABC" });
                db.Add(new ServiceAccount { DisplayName = "Service Account 1" });
                var saved = db.SaveChanges();
                Assert.IsTrue(saved == 2);
            }

            using (var db = new OnBoardingStore(optionsBuilder.Options, "1"))
            {
                var tenants = db.Tenants.ToListAsync().GetAwaiter().GetResult();
                var serviceAccounts = db.ServiceAccounts.ToListAsync().GetAwaiter().GetResult();
                Assert.IsTrue(tenants.Count == 1);
                Assert.IsTrue(serviceAccounts.Count == 1);
            }
        }

[ajcvickers]

@anpete Moving this out of preview2 since it doesn't need to be done for that milestone. However, if you get to this while preview2 is still open, then please merge there.

[anpete]

Going to try 🤞