Skip to content

Commit cedaecb

Browse files
committed
Disable metadata pooling
1 parent 4b33db0 commit cedaecb

File tree

2 files changed

+5
-24
lines changed

2 files changed

+5
-24
lines changed

src/NHibernate.Test/TestCase.cs

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -316,25 +316,6 @@ protected virtual DebugSessionFactory BuildSessionFactory()
316316

317317
private void Cleanup()
318318
{
319-
switch (Sfi?.ConnectionProvider.Driver)
320-
{
321-
// Clear connection pool for Oracle to avoid problem that was manifested with https://github.com/nhibernate/nhibernate-core/pull/1517:
322-
// As it seems Oracle can cache returned types for query for given connection.
323-
// So exception can be thrown if two tests execute same query but with different types in result (like for Entity.Id int and Entity.Id Guid)
324-
case OracleClientDriver oraSysData:
325-
case OracleDataClientDriver oraUnmanaged:
326-
case OracleManagedDataClientDriver oraManaged:
327-
using (var con = Sfi.ConnectionProvider.GetConnection())
328-
using (var cmd = con.CreateCommand())
329-
{
330-
cmd.CommandText = @"BEGIN DBMS_RESULT_CACHE.FLUSH; END;";
331-
cmd.Connection = con;
332-
cmd.ExecuteNonQuery();
333-
}
334-
335-
break;
336-
}
337-
338319
Sfi?.Close();
339320
_sessionFactory = null;
340321
cfg = null;

teamcity.build

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,15 +116,15 @@
116116
<target name="setup-teamcity-oracle">
117117
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.OracleClientDriver" />
118118
<property name="nhibernate.dialect" value="NHibernate.Dialect.Oracle10gDialect" />
119-
<property name="nhibernate.connection.connection_string" value="User ID=nhibernate;Password=nhibernate;Data Source=XE" />
119+
<property name="nhibernate.connection.connection_string" value="User ID=nhibernate;Password=nhibernate;Data Source=XE;Metadata Pooling=false;Self Tuning=false;" />
120120
<property name="NHibernate.Test.IgnoreFail" value="true" />
121121
<property name="teamcity.last.result" value="${root.dir}/lib/teamcity/oracle/NHibernate.Test.last-results.xml" />
122122
</target>
123123

124124
<target name="setup-teamcity-oracle32">
125125
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.OracleDataClientDriver" />
126126
<property name="nhibernate.dialect" value="NHibernate.Dialect.Oracle10gDialect" />
127-
<property name="nhibernate.connection.connection_string" value="User ID=nhibernate;Password=nhibernate;Data Source=(DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = localhost)(PORT = 1521)) (CONNECT_DATA = (SERVER = DEDICATED) (SERVICE_NAME = XE)))" />
127+
<property name="nhibernate.connection.connection_string" value="User ID=nhibernate;Password=nhibernate;Metadata Pooling=false;Self Tuning=false;Data Source=(DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = localhost)(PORT = 1521)) (CONNECT_DATA = (SERVER = DEDICATED) (SERVICE_NAME = XE)))" />
128128
<!-- Teamcity Oracle test database is configured with a non-Unicode encoding -->
129129
<property name="nhibernate.oracle.use_n_prefixed_types_for_unicode" value="true" />
130130
<copy todir="${bin.dir}">
@@ -140,7 +140,7 @@
140140
<property name="nunit-x64" value="true" />
141141
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.OracleDataClientDriver" />
142142
<property name="nhibernate.dialect" value="NHibernate.Dialect.Oracle10gDialect" />
143-
<property name="nhibernate.connection.connection_string" value="User ID=nhibernate;Password=nhibernate;Data Source=(DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = localhost)(PORT = 1521)) (CONNECT_DATA = (SERVER = DEDICATED) (SERVICE_NAME = XE)))" />
143+
<property name="nhibernate.connection.connection_string" value="User ID=nhibernate;Password=nhibernate;Metadata Pooling=false;Self Tuning=false;Data Source=(DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = localhost)(PORT = 1521)) (CONNECT_DATA = (SERVER = DEDICATED) (SERVICE_NAME = XE)))" />
144144
<!-- Teamcity Oracle test database is configured with a non-Unicode encoding -->
145145
<property name="nhibernate.oracle.use_n_prefixed_types_for_unicode" value="true" />
146146
<copy todir="${bin.dir}">
@@ -155,7 +155,7 @@
155155
<target name="setup-teamcity-oracle-managed32">
156156
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.OracleManagedDataClientDriver" />
157157
<property name="nhibernate.dialect" value="NHibernate.Dialect.Oracle10gDialect" />
158-
<property name="nhibernate.connection.connection_string" value="User ID=nhibernate;Password=nhibernate;Data Source=(DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = localhost)(PORT = 1521)) (CONNECT_DATA = (SERVER = DEDICATED) (SERVICE_NAME = XE)))" />
158+
<property name="nhibernate.connection.connection_string" value="User ID=nhibernate;Password=nhibernate;Metadata Pooling=false;Self Tuning=false;Data Source=(DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = localhost)(PORT = 1521)) (CONNECT_DATA = (SERVER = DEDICATED) (SERVICE_NAME = XE)))" />
159159
<!-- Teamcity Oracle test database is configured with a non-Unicode encoding -->
160160
<property name="nhibernate.oracle.use_n_prefixed_types_for_unicode" value="true" />
161161
</target>
@@ -164,7 +164,7 @@
164164
<property name="nunit-x64" value="true" />
165165
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.OracleManagedDataClientDriver" />
166166
<property name="nhibernate.dialect" value="NHibernate.Dialect.Oracle10gDialect" />
167-
<property name="nhibernate.connection.connection_string" value="User ID=nhibernate;Password=nhibernate;Data Source=(DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = localhost)(PORT = 1521)) (CONNECT_DATA = (SERVER = DEDICATED) (SERVICE_NAME = XE)))" />
167+
<property name="nhibernate.connection.connection_string" value="User ID=nhibernate;Password=nhibernate;Metadata Pooling=false;Self Tuning=false;Data Source=(DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = localhost)(PORT = 1521)) (CONNECT_DATA = (SERVER = DEDICATED) (SERVICE_NAME = XE)))" />
168168
<!-- Teamcity Oracle test database is configured with a non-Unicode encoding -->
169169
<property name="nhibernate.oracle.use_n_prefixed_types_for_unicode" value="true" />
170170
</target>

0 commit comments

Comments
 (0)