From: <dar...@us...> - 2009-02-09 00:22:51
|
Revision: 4081 http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4081&view=rev Author: darioquintana Date: 2009-02-09 00:22:45 +0000 (Mon, 09 Feb 2009) Log Message: ----------- passing for PostgreSQL: the type for a System.Boolean is 'boolean' instead of 'int' Modified Paths: -------------- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1490/Fixture.cs trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj Added Paths: ----------- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1490/MappingsFilterAsBoolean.hbm.xml Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1490/Fixture.cs =================================================================== --- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1490/Fixture.cs 2009-02-09 00:14:43 UTC (rev 4080) +++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1490/Fixture.cs 2009-02-09 00:22:45 UTC (rev 4081) @@ -1,4 +1,5 @@ using System.Collections.Generic; +using NHibernate.Dialect; using NUnit.Framework; using NUnit.Framework.SyntaxHelpers; @@ -7,6 +8,17 @@ [TestFixture] public class Fixture : BugTestCase { + protected override System.Collections.IList Mappings + { + get + { + if (Dialect is PostgreSQLDialect) + return new[] { "NHSpecificTest.NH1490.MappingsFilterAsBoolean.hbm.xml" }; + + return base.Mappings; + } + } + [Test] public void Can_Translate_Correctly_Without_Filter() { @@ -59,7 +71,11 @@ { s.DisableFilter("onlyActive"); IFilter fltr = s.EnableFilter("onlyActive"); - fltr.SetParameter("activeFlag", 1); + + if (Dialect is PostgreSQLDialect) + fltr.SetParameter("activeFlag", true); + else + fltr.SetParameter("activeFlag", 1); // Customer is parametrized IQuery query = s.CreateQuery("from Customer c where c.Name = :customerName"); @@ -97,7 +113,11 @@ { s.DisableFilter("onlyActive"); IFilter fltr = s.EnableFilter("onlyActive"); - fltr.SetParameter("activeFlag", 1); + if (Dialect is PostgreSQLDialect) + fltr.SetParameter("activeFlag", true); + else + fltr.SetParameter("activeFlag", 1); + // related entity Customer.Category is parametrized IQuery query = s.CreateQuery("from Customer c where c.Category.Name = :catName"); query.SetParameter("catName", "User"); Copied: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1490/MappingsFilterAsBoolean.hbm.xml (from rev 4079, trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1490/Mappings.hbm.xml) =================================================================== --- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1490/MappingsFilterAsBoolean.hbm.xml (rev 0) +++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1490/MappingsFilterAsBoolean.hbm.xml 2009-02-09 00:22:45 UTC (rev 4081) @@ -0,0 +1,30 @@ +<?xml version="1.0"?> +<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" + assembly="NHibernate.Test" + namespace="NHibernate.Test.NHSpecificTest.NH1490"> + + <class name="Customer" table="Customer"> + <id name="Id" column="Id"> + <generator class="native" /> + </id> + <property name="Name" not-null="true" /> + <property name="IsActive" not-null="true" /> + <many-to-one name="Category" lazy="false" column="Category_Id" /> + + <filter name="onlyActive" condition=":activeFlag = IsActive" /> + </class> + + <class name="Category" table="Category" mutable="true"> + <id name="Id" column="Id"> + <generator class="native" /> + </id> + <property name="Name" not-null="true" /> + <property name="IsActive" not-null="true" /> + + <filter name="onlyActive" condition=":activeFlag = IsActive" /> + </class> + + <filter-def name="onlyActive"> + <filter-param name="activeFlag" type="boolean"/> + </filter-def> +</hibernate-mapping> \ No newline at end of file Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj =================================================================== --- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-02-09 00:14:43 UTC (rev 4080) +++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-02-09 00:22:45 UTC (rev 4081) @@ -1657,6 +1657,7 @@ <EmbeddedResource Include="Cascade\JobBatch.hbm.xml" /> <EmbeddedResource Include="Deletetransient\Person.hbm.xml" /> <Content Include="DynamicEntity\package.html" /> + <EmbeddedResource Include="NHSpecificTest\NH1490\MappingsFilterAsBoolean.hbm.xml" /> <EmbeddedResource Include="NHSpecificTest\NH1293\MappingsFilterAsBoolean.hbm.xml" /> <EmbeddedResource Include="SqlTest\Custom\MySQL\MySQLEmployment.hbm.xml" /> <EmbeddedResource Include="SqlTest\Custom\Oracle\Mappings.hbm.xml" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |