Menu
▾
▴
[Nhibernate-commit] SF.net SVN: nhibernate:[4080] trunk/nhibernate/src/NHibernate.Test
|
From: <dar...@us...> - 2009-02-09 00:15:07
|
Revision: 4080
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4080&view=rev
Author: darioquintana
Date: 2009-02-09 00:14:43 +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/NH1293/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1293/Mappings.hbm.xml
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1293/MappingsFilterAsBoolean.hbm.xml
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1293/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1293/Fixture.cs 2009-02-08 23:48:01 UTC (rev 4079)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1293/Fixture.cs 2009-02-09 00:14:43 UTC (rev 4080)
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using NHibernate.Criterion;
+using NHibernate.Dialect;
using NUnit.Framework;
namespace NHibernate.Test.NHSpecificTest.NH1293
@@ -8,6 +9,17 @@
[TestFixture]
public class Fixture : BugTestCase
{
+ protected override System.Collections.IList Mappings
+ {
+ get
+ {
+ if (Dialect is PostgreSQLDialect)
+ return new[] {"NHSpecificTest.NH1293.MappingsFilterAsBoolean.hbm.xml"};
+
+ return base.Mappings;
+ }
+ }
+
[Test]
public void Criteria_Does_Not_Equal_To_HQL()
{
@@ -29,8 +41,12 @@
{
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);
+
// with HQL, Category.IsActive=true filter applied, result count=2
IQuery hqlQuery = s.CreateQuery("from Customer c where c.Category.Name = ?");
hqlQuery.SetParameter(0, "User"); // note using positional parameters because of NH-1490
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1293/Mappings.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1293/Mappings.hbm.xml 2009-02-08 23:48:01 UTC (rev 4079)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1293/Mappings.hbm.xml 2009-02-09 00:14:43 UTC (rev 4080)
@@ -5,24 +5,24 @@
<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" />
+ <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">
+
+ <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">
+ <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="int"/>
</filter-def>
-
+
</hibernate-mapping>
\ No newline at end of file
Copied: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1293/MappingsFilterAsBoolean.hbm.xml (from rev 4079, trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1293/Mappings.hbm.xml)
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1293/MappingsFilterAsBoolean.hbm.xml (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1293/MappingsFilterAsBoolean.hbm.xml 2009-02-09 00:14:43 UTC (rev 4080)
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="NHibernate.Test" namespace="NHibernate.Test.NHSpecificTest.NH1293">
+ <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-08 23:48:01 UTC (rev 4079)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-02-09 00:14:43 UTC (rev 4080)
@@ -1657,6 +1657,7 @@
<EmbeddedResource Include="Cascade\JobBatch.hbm.xml" />
<EmbeddedResource Include="Deletetransient\Person.hbm.xml" />
<Content Include="DynamicEntity\package.html" />
+ <EmbeddedResource Include="NHSpecificTest\NH1293\MappingsFilterAsBoolean.hbm.xml" />
<EmbeddedResource Include="SqlTest\Custom\MySQL\MySQLEmployment.hbm.xml" />
<EmbeddedResource Include="SqlTest\Custom\Oracle\Mappings.hbm.xml" />
<EmbeddedResource Include="SqlTest\Custom\Oracle\StoredProcedures.hbm.xml" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
