Skip to content

Commit ba95ae6

Browse files
committed
Undo obsolete change
1 parent 5017569 commit ba95ae6

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

src/NHibernate.Test/CfgTest/Loquacious/LambdaConfigurationFixture.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
using NHibernate.Bytecode;
44
using NHibernate.Cache;
55
using NHibernate.Cfg;
6-
using NHibernate.Cfg.Loquacious;
76
using NHibernate.Dialect;
87
using NHibernate.Driver;
98
using NHibernate.Hql.Ast.ANTLR;
109
using NHibernate.Linq.Functions;
1110
using NHibernate.Type;
1211
using NUnit.Framework;
1312
using NHibernate.Exceptions;
13+
using NHibernate.MultiTenancy;
1414

1515
namespace NHibernate.Test.CfgTest.Loquacious
1616
{
@@ -64,6 +64,7 @@ public void FullConfiguration()
6464
db.HqlToSqlSubstitutions = "true 1, false 0, yes 'Y', no 'N'";
6565
db.SchemaAction = SchemaAutoAction.Validate;
6666
db.ThrowOnSchemaUpdate = true;
67+
db.MultiTenancy = MultiTenancyStrategy.Database;
6768
});
6869

6970
Assert.That(configure.Properties[Environment.SessionFactoryName], Is.EqualTo("SomeName"));
@@ -109,7 +110,8 @@ public void FullConfiguration()
109110
Assert.That(configure.Properties[Environment.Hbm2ddlAuto], Is.EqualTo("validate"));
110111
Assert.That(configure.Properties[Environment.Hbm2ddlThrowOnUpdate], Is.EqualTo("true"));
111112
Assert.That(configure.Properties[Environment.LinqToHqlGeneratorsRegistry], Is.EqualTo(typeof(DefaultLinqToHqlGeneratorsRegistry).AssemblyQualifiedName));
112-
113+
Assert.That(configure.Properties[Environment.MultiTenancy], Is.EqualTo(nameof(MultiTenancyStrategy.Database)));
114+
113115
// Keywords import and auto-validation require a valid connection string, disable them before checking
114116
// the session factory can be built.
115117
configure.SetProperty(Environment.Hbm2ddlKeyWords, "none");

src/NHibernate/Cfg/Loquacious/IDbIntegrationConfigurationProperties.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,5 @@ public interface IDbIntegrationConfigurationProperties
4444
SchemaAutoAction SchemaAction { set; }
4545

4646
void QueryModelRewriterFactory<TFactory>() where TFactory : IQueryModelRewriterFactory;
47-
48-
//TODO 6.0: Uncomment. Or even better consider dropping all configuration interfaces and use classes directly
49-
//MultiTenancy.MultiTenancyStrategy MultiTenancy { set; }
5047
}
5148
}

0 commit comments

Comments
 (0)