Support Unicode in Oracle tests

Author: fredericDelaporte

build-common/common-project.xml

@@ -141,7 +141,7 @@
 				<namespace prefix="hbm" uri="urn:nhibernate-configuration-2.2" />
 			</namespaces>
 		</xmlpoke>
-		
+
 		<!-- Make sure the property exists - it's only set for some scenarios. -->
 		<property name="nhibernate.odbc.explicit_datetime_scale" value="" unless="${property::exists('nhibernate.odbc.explicit_datetime_scale')}"/>
 		<xmlpoke file="${app.config}"
@@ -151,6 +151,26 @@
 				<namespace prefix="hbm" uri="urn:nhibernate-configuration-2.2" />
 			</namespaces>
 		</xmlpoke>
+
+		<!-- Make sure the property exists - it's only set for some scenarios. -->
+		<property name="nhibernate.oracle.use_n_prefixed_types_for_unicode" value="" unless="${property::exists('nhibernate.oracle.use_n_prefixed_types_for_unicode')}"/>
+		<xmlpoke file="${app.config}"
+			xpath="//*/hbm:property[@name='oracle.use_n_prefixed_types_for_unicode']"
+			value="${nhibernate.oracle.use_n_prefixed_types_for_unicode}">
+			<namespaces>
+				<namespace prefix="hbm" uri="urn:nhibernate-configuration-2.2" />
+			</namespaces>
+		</xmlpoke>
+
+		<!-- Make sure the property exists - it's only set for some scenarios. -->
+		<property name="nhibernate.query.default_cast_length" value="" unless="${property::exists('nhibernate.query.default_cast_length')}"/>
+		<xmlpoke file="${app.config}"
+			xpath="//*/hbm:property[@name='query.default_cast_length']"
+			value="${nhibernate.query.default_cast_length}">
+			<namespaces>
+				<namespace prefix="hbm" uri="urn:nhibernate-configuration-2.2" />
+			</namespaces>
+		</xmlpoke>
 	</target>
 
 	<target name="common.remove-connection-settings-from-app-config">

build-common/teamcity-hibernate.cfg.xml

@@ -24,5 +24,7 @@
 			<property name="adonet.wrap_result_sets">false</property>
 
 			<property name="odbc.explicit_datetime_scale"></property>
+			<property name="oracle.use_n_prefixed_types_for_unicode"></property>
+			<property name="query.default_cast_length"></property>
 		</session-factory>
 	</hibernate-configuration>

lib/teamcity/oracle/oracle_installation.txt

@@ -7,8 +7,9 @@ Installation steps for Oracle for NH TeamCity:
 
 2.  Run the installer ...
 3.  Choose any HTTP port for the listener if asked (it may automatically choose the default 8080 if available);
-4.  Choose the ASCII character set. You will have to ensure nhibernate.oracle.use_n_prefixed_types_for_unicode
-    parameter is set to true; Choosing instead the Unicode character set will cause some NHibernate tests to fail.
+4.  Choose the ASCII character set. You will have to ensure oracle.use_n_prefixed_types_for_unicode
+    parameter is set to true and that query.default_cast_length is set to 2000. Choosing instead the Unicode
+    character set will cause some NHibernate tests to fail.
 5.  Enter 'password' as the password for the SYS and SYSTEM accounts;
 6.  The setup should install Oracle on the machine.
 

src/NHibernate.Config.Templates/Oracle-Managed.cfg.xml

@@ -14,5 +14,12 @@ for your own use before compile tests in VisualStudio.
 		<property name="show_sql">false</property>
 		<property name="dialect">NHibernate.Dialect.Oracle10gDialect</property>
 		<property name="query.substitutions">true 1, false 0, yes 'Y', no 'N'</property>
+		<!-- If your database setup use an ASCII charset, switch following property to true. -->
+		<property name="oracle.use_n_prefixed_types_for_unicode">false</property>
+		<!-- Depending on your database setup, the default cast length of 4000 may be too big.
+		     By example, if previous setting is true, NHibernate may try to use nvarchar2(4000),
+		     which will be rejected if its underlying charset is UTF16 and the database
+		     MAX_STRING_SIZE is not extended. In such case, reduce it to 2000. -->
+		<property name="query.default_cast_length"></property>
 	</session-factory>
 </hibernate-configuration>

src/NHibernate.Config.Templates/Oracle.cfg.xml

@@ -14,5 +14,12 @@ for your own use before compile tests in VisualStudio.
 		<property name="show_sql">false</property>
 		<property name="dialect">NHibernate.Dialect.OracleDialect</property>
 		<property name="query.substitutions">true 1, false 0, yes 'Y', no 'N'</property>
+		<!-- If your database setup use an ASCII charset, switch following property to true. -->
+		<property name="oracle.use_n_prefixed_types_for_unicode">false</property>
+		<!-- Depending on your database setup, the default cast length of 4000 may be too big.
+		     By example, if previous setting is true, NHibernate may try to use nvarchar2(4000),
+		     which will be rejected if its underlying charset is UTF16 and the database
+		     MAX_STRING_SIZE is not extended. In such case, reduce it to 2000. -->
+		<property name="query.default_cast_length"></property>
 	</session-factory>
 </hibernate-configuration>

teamcity.build

@@ -127,6 +127,9 @@
 		<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)))" />
 		<!-- Teamcity Oracle test database is configured with a non-Unicode encoding -->
 		<property name="nhibernate.oracle.use_n_prefixed_types_for_unicode" value="true" />
+		<!-- The default value of 4000 is too big for nvarchar2 with default database settings.
+		     nvarchar2 may be used due to use_n_prefixed_types_for_unicode -->
+		<property name="nhibernate.query.default_cast_length" value="2000" />
 		<copy todir="${bin.dir}">
 			<fileset basedir="${root.dir}/lib/teamcity/oracle/x86">
 				<include name="*.dll"/>
@@ -143,6 +146,9 @@
 		<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)))" />
 		<!-- Teamcity Oracle test database is configured with a non-Unicode encoding -->
 		<property name="nhibernate.oracle.use_n_prefixed_types_for_unicode" value="true" />
+		<!-- The default value of 4000 is too big for nvarchar2 with default database settings.
+		     nvarchar2 may be used due to use_n_prefixed_types_for_unicode -->
+		<property name="nhibernate.query.default_cast_length" value="2000" />
 		<copy todir="${bin.dir}">
 			<fileset basedir="${root.dir}/lib/teamcity/oracle/x64">
 				<include name="*.dll"/>
@@ -158,6 +164,9 @@
 		<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)))" />
 		<!-- Teamcity Oracle test database is configured with a non-Unicode encoding -->
 		<property name="nhibernate.oracle.use_n_prefixed_types_for_unicode" value="true" />
+		<!-- The default value of 4000 is too big for nvarchar2 with default database settings.
+		     nvarchar2 may be used due to use_n_prefixed_types_for_unicode -->
+		<property name="nhibernate.query.default_cast_length" value="2000" />
 	</target>
 
 	<target name="setup-teamcity-oracle-managed64">
@@ -167,6 +176,9 @@
 		<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)))" />
 		<!-- Teamcity Oracle test database is configured with a non-Unicode encoding -->
 		<property name="nhibernate.oracle.use_n_prefixed_types_for_unicode" value="true" />
+		<!-- The default value of 4000 is too big for nvarchar2 with default database settings.
+		     nvarchar2 may be used due to use_n_prefixed_types_for_unicode -->
+		<property name="nhibernate.query.default_cast_length" value="2000" />
 	</target>
 
 	<target name="setup-teamcity-mysql">