[Nhibernate-commit] SF.net SVN: nhibernate:[5770] trunk/nhibernate

[<ric...@us...>]

Revision: 5770
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5770&view=rev
Author:   ricbrown
Date:     2011-04-27 09:49:57 +0000 (Wed, 27 Apr 2011)

Log Message:
-----------
Added test-dialect for Firebird to allow defaulting to embedded client.

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate.Test/GeneratedTest/ComponentOwner.hbm.xml
    trunk/nhibernate/src/NHibernate.Test/Generatedkeys/Select/MyEntity.hbm.xml
    trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
    trunk/nhibernate/teamcity.build

Added Paths:
-----------
    trunk/nhibernate/src/NHibernate.Test/DialectTest/FirebirdClientDialect.cs

Added: trunk/nhibernate/src/NHibernate.Test/DialectTest/FirebirdClientDialect.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/DialectTest/FirebirdClientDialect.cs	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/DialectTest/FirebirdClientDialect.cs	2011-04-27 09:49:57 UTC (rev 5770)
@@ -0,0 +1,14 @@
+using NHibernate.Cfg;
+using NHibernate.Dialect;
+
+namespace NHibernate.Test.DialectTest
+{
+	public class FirebirdClientDialect : FirebirdDialect
+	{
+		public FirebirdClientDialect() : base()
+		{
+			// overrides default driver to allow tests to run using embedded client
+			DefaultProperties[Environment.ConnectionDriver] = "NHibernate.Driver.FirebirdClientDriver";
+		}
+	}
+}

Modified: trunk/nhibernate/src/NHibernate.Test/GeneratedTest/ComponentOwner.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/GeneratedTest/ComponentOwner.hbm.xml	2011-04-26 22:15:51 UTC (rev 5769)
+++ trunk/nhibernate/src/NHibernate.Test/GeneratedTest/ComponentOwner.hbm.xml	2011-04-27 09:49:57 UTC (rev 5770)
@@ -70,6 +70,7 @@
 			<![CDATA[DROP TRIGGER t_iu_part_gen_comp]]>
 		</drop>
 		<dialect-scope name="NHibernate.Dialect.FirebirdDialect"/>
+		<dialect-scope name="NHibernate.Test.DialectTest.FirebirdClientDialect"/>
 	</database-object>
 
 </hibernate-mapping>
\ No newline at end of file

Modified: trunk/nhibernate/src/NHibernate.Test/Generatedkeys/Select/MyEntity.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Generatedkeys/Select/MyEntity.hbm.xml	2011-04-26 22:15:51 UTC (rev 5769)
+++ trunk/nhibernate/src/NHibernate.Test/Generatedkeys/Select/MyEntity.hbm.xml	2011-04-27 09:49:57 UTC (rev 5770)
@@ -21,6 +21,7 @@
 DROP GENERATOR MYGENERATOR;
 		</drop>
 		<dialect-scope name="NHibernate.Dialect.FirebirdDialect"/>
+		<dialect-scope name="NHibernate.Test.DialectTest.FirebirdClientDialect"/>
 	</database-object>
 	
 	<database-object>
@@ -36,8 +37,9 @@
         <drop>
 DROP TRIGGER my_entity_BI;
 		</drop>
-        <dialect-scope name="NHibernate.Dialect.FirebirdDialect"/>
-    </database-object>
+		<dialect-scope name="NHibernate.Dialect.FirebirdDialect"/>
+		<dialect-scope name="NHibernate.Test.DialectTest.FirebirdClientDialect"/>
+	</database-object>
 
 	<database-object>
 		<create>

Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj	2011-04-26 22:15:51 UTC (rev 5769)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj	2011-04-27 09:49:57 UTC (rev 5770)
@@ -211,6 +211,7 @@
     <Compile Include="Criteria\MaterialResource.cs" />
     <Compile Include="Criteria\ProjectionsTest.cs" />
     <Compile Include="Criteria\Reptile.cs" />
+    <Compile Include="DialectTest\FirebirdClientDialect.cs" />
     <Compile Include="DialectTest\MsSqlCe40DialectFixture.cs" />
     <Compile Include="DriverTest\DbProviderFactoryDriveConnectionCommandProviderTest.cs" />
     <Compile Include="DriverTest\ReflectionBasedDriverTest.cs" />

Modified: trunk/nhibernate/teamcity.build
===================================================================
--- trunk/nhibernate/teamcity.build	2011-04-26 22:15:51 UTC (rev 5769)
+++ trunk/nhibernate/teamcity.build	2011-04-27 09:49:57 UTC (rev 5770)
@@ -35,7 +35,7 @@
 
 	<target name="setup-teamcity-firebird32">
 		<property name="nhibernate.connection.driver_class"				value="NHibernate.Driver.FirebirdClientDriver" />
-		<property name="nhibernate.dialect"												value="NHibernate.Dialect.FirebirdDialect" />
+		<property name="nhibernate.dialect"												value="NHibernate.Test.DialectTest.FirebirdClientDialect, NHibernate.Test" />
 		<property name="nhibernate.connection.connection_string"	value="Database=NHibernate.fdb;ServerType=1;UserID=SYSDBA" />
 		<copy todir="${bin.dir}">
 			<fileset basedir="${root.dir}/lib/teamcity/firebird/x86">
@@ -51,7 +51,7 @@
 		<property name="nunit-console" value="${tools.dir}/NUnit/nunit-console.exe" />
 		<property name="nunit.found" value="true" />
 		<property name="nhibernate.connection.driver_class"				value="NHibernate.Driver.FirebirdClientDriver" />
-		<property name="nhibernate.dialect"												value="NHibernate.Dialect.FirebirdDialect" />
+		<property name="nhibernate.dialect"												value="NHibernate.Test.DialectTest.FirebirdClientDialect, NHibernate.Test" />
 		<property name="nhibernate.connection.connection_string"	value="Database=NHibernate.fdb;ServerType=1;UserID=SYSDBA" />
 		<copy todir="${bin.dir}">
 			<fileset basedir="${root.dir}/lib/teamcity/firebird/x64">


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.