Menu
▾
▴
[Nhibernate-commit] SF.net SVN: nhibernate:[5757] trunk/nhibernate/src/NHibernate.Test/ NHSpecificTest
|
From: <pa...@us...> - 2011-04-25 05:55:59
|
Revision: 5757
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5757&view=rev
Author: patearl
Date: 2011-04-25 05:55:52 +0000 (Mon, 25 Apr 2011)
Log Message:
-----------
Tests: Fixed many tests for PostgreSQL.
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/Futures/FutureQueryFixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/Futures/LinqFutureFixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/ManyToOneFilters20Behaviour/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/ManyToOneFilters20Behaviour/Mappings.hbm.xml
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1444/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1891/FormulaEscaping.hbm.xml
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1895/Mappings.hbm.xml
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1941/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1978/Mappings.hbm.xml
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/Futures/FutureQueryFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/Futures/FutureQueryFixture.cs 2011-04-25 03:36:53 UTC (rev 5756)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/Futures/FutureQueryFixture.cs 2011-04-25 05:55:52 UTC (rev 5757)
@@ -1,4 +1,5 @@
-using NHibernate.Impl;
+using NHibernate.Driver;
+using NHibernate.Impl;
using NUnit.Framework;
namespace NHibernate.Test.NHSpecificTest.Futures
@@ -121,7 +122,8 @@
var events = logSpy.Appender.GetEvents();
Assert.AreEqual(1, events.Length);
var wholeLog = logSpy.GetWholeLog();
- Assert.True(wholeLog.Contains("@p0 = 1 [Type: Int32 (0)], @p1 = 2 [Type: Int32 (0)]"));
+ string paramPrefix = ((DriverBase) Sfi.ConnectionProvider.Driver).NamedPrefix;
+ Assert.True(wholeLog.Contains(paramPrefix + "p0 = 1 [Type: Int32 (0)], " + paramPrefix + "p1 = 2 [Type: Int32 (0)]"));
}
}
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/Futures/LinqFutureFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/Futures/LinqFutureFixture.cs 2011-04-25 03:36:53 UTC (rev 5756)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/Futures/LinqFutureFixture.cs 2011-04-25 05:55:52 UTC (rev 5757)
@@ -1,4 +1,5 @@
-using NHibernate.Impl;
+using NHibernate.Driver;
+using NHibernate.Impl;
using NUnit.Framework;
using NHibernate.Linq;
using System.Linq;
@@ -155,7 +156,8 @@
var events = logSpy.Appender.GetEvents();
Assert.AreEqual(1, events.Length);
var wholeLog = logSpy.GetWholeLog();
- Assert.True(wholeLog.Contains("@p0 = 1 [Type: Int32 (0)], @p1 = 2 [Type: Int32 (0)]"));
+ string paramPrefix = ((DriverBase)Sfi.ConnectionProvider.Driver).NamedPrefix;
+ Assert.True(wholeLog.Contains(paramPrefix + "p0 = 1 [Type: Int32 (0)], " + paramPrefix + "p1 = 2 [Type: Int32 (0)]"));
}
}
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/ManyToOneFilters20Behaviour/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/ManyToOneFilters20Behaviour/Fixture.cs 2011-04-25 03:36:53 UTC (rev 5756)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/ManyToOneFilters20Behaviour/Fixture.cs 2011-04-25 05:55:52 UTC (rev 5757)
@@ -29,9 +29,9 @@
private static void enableFilters(ISession s)
{
IFilter f = s.EnableFilter("activeChild");
- f.SetParameter("active", 1);
+ f.SetParameter("active", true);
IFilter f2 = s.EnableFilter("alwaysValid");
- f2.SetParameter("always", 1);
+ f2.SetParameter("always", true);
}
protected override void OnTearDown()
@@ -178,7 +178,7 @@
using (ISession s = OpenSession())
{
IFilter f = s.EnableFilter("active");
- f.SetParameter("active", 1);
+ f.SetParameter("active", true);
IList<Parent> resCriteria = joinGraphUsingCriteria(s);
IList<Parent> resHql = joinGraphUsingHql(s);
@@ -209,7 +209,7 @@
using (ISession s = OpenSession())
{
IFilter f = s.EnableFilter("active");
- f.SetParameter("active", 1);
+ f.SetParameter("active", true);
IList<Parent> resCriteria = s.CreateCriteria(typeof(Parent)).SetFetchMode("Children", FetchMode.Join).List<Parent>();
IList<Parent> resHql = s.CreateQuery("select p from Parent p join fetch p.Children").List<Parent>();
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/ManyToOneFilters20Behaviour/Mappings.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/ManyToOneFilters20Behaviour/Mappings.hbm.xml 2011-04-25 03:36:53 UTC (rev 5756)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/ManyToOneFilters20Behaviour/Mappings.hbm.xml 2011-04-25 05:55:52 UTC (rev 5757)
@@ -41,15 +41,15 @@
</class>
<filter-def name="activeChild" use-many-to-one="false">
- <filter-param name="active" type="int"/>
+ <filter-param name="active" type="bool"/>
</filter-def>
<filter-def name="active" use-many-to-one="false">
- <filter-param name="active" type="int"/>
+ <filter-param name="active" type="bool"/>
</filter-def>
<filter-def name="alwaysValid">
- <filter-param name="always" type="int"/>
+ <filter-param name="always" type="bool"/>
</filter-def>
</hibernate-mapping>
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1444/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1444/Fixture.cs 2011-04-25 03:36:53 UTC (rev 5756)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1444/Fixture.cs 2011-04-25 05:55:52 UTC (rev 5757)
@@ -1,4 +1,5 @@
using NHibernate.Cfg;
+using NHibernate.Driver;
using NUnit.Framework;
namespace NHibernate.Test.NHSpecificTest.NH1444
@@ -22,7 +23,8 @@
.SetParameter("filternull", !filter.HasValue)
.SetParameter("filterval", filter.HasValue ? filter.Value : 0).List<xchild>();
var message = ls.GetWholeLog();
- Assert.That(message, Is.StringContaining("xchild0_.ParentId=xparent1_.Id and (@p0=1 or xparent1_.A<@p1)"));
+ string paramPrefix = ((DriverBase) Sfi.ConnectionProvider.Driver).NamedPrefix;
+ Assert.That(message, Is.StringContaining("xchild0_.ParentId=xparent1_.Id and (" + paramPrefix + "p0=" + Dialect.ToBooleanValueString(true) + " or xparent1_.A<" + paramPrefix + "p1)"));
}
}
}
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/Fixture.cs 2011-04-25 03:36:53 UTC (rev 5756)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/Fixture.cs 2011-04-25 05:55:52 UTC (rev 5757)
@@ -1,3 +1,4 @@
+using System.Text.RegularExpressions;
using NHibernate.Cfg;
using NHibernate.Dialect;
using NHibernate.Dialect.Function;
@@ -18,15 +19,20 @@
[TestFixture]
public class Fixture : BugTestCase
{
+ private bool _OrignalDialectIsMsSql2005Dialect;
+
protected override bool AppliesTo(Dialect.Dialect dialect)
{
- return dialect is MsSql2005Dialect;
+ return _OrignalDialectIsMsSql2005Dialect;
}
protected override void Configure(Configuration configuration)
{
base.Configure(configuration);
+ // Ugly hack.
+ _OrignalDialectIsMsSql2005Dialect = Regex.IsMatch(configuration.GetProperty("dialect"), "MsSql200(5|8)Dialect");
+
configuration.SetProperty("dialect", "NHibernate.Test.NHSpecificTest.NH1849.CustomDialect, NHibernate.Test");
}
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1891/FormulaEscaping.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1891/FormulaEscaping.hbm.xml 2011-04-25 03:36:53 UTC (rev 5756)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1891/FormulaEscaping.hbm.xml 2011-04-25 05:55:52 UTC (rev 5757)
@@ -12,6 +12,6 @@
<id name="Id" column="id">
<generator class="guid.comb" />
</id>
- <property name="Name" />
+ <property name="Name" column="`Name`" />
</class>
</hibernate-mapping>
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1895/Mappings.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1895/Mappings.hbm.xml 2011-04-25 03:36:53 UTC (rev 5756)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1895/Mappings.hbm.xml 2011-04-25 05:55:52 UTC (rev 5757)
@@ -2,7 +2,7 @@
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="NHibernate.Test"
namespace="NHibernate.Test.NHSpecificTest.NH1895"
default-lazy="false">
- <class name="Order" table="[Order]">
+ <class name="Order" table="`Order`">
<id name="Id" type="guid" column="O_Id">
<generator class="assigned" />
</id>
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1941/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1941/Fixture.cs 2011-04-25 03:36:53 UTC (rev 5756)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1941/Fixture.cs 2011-04-25 05:55:52 UTC (rev 5757)
@@ -1,4 +1,5 @@
using System;
+using NHibernate.Driver;
using NUnit.Framework;
namespace NHibernate.Test.NHSpecificTest.NH1941
@@ -18,6 +19,7 @@
[Test]
public void CanOverrideStringEnumGetValue()
{
+ string paramPrefix = ((DriverBase) Sfi.ConnectionProvider.Driver).NamedPrefix;
using (ISession s = OpenSession())
using (ITransaction tx = s.BeginTransaction())
{
@@ -27,7 +29,7 @@
s.Save(person);
string log = ls.GetWholeLog();
- Assert.IsTrue(log.Contains("@p0 = 'M'"));
+ Assert.IsTrue(log.Contains(paramPrefix + "p0 = 'M'"));
}
using (SqlLogSpy ls = new SqlLogSpy())
@@ -40,7 +42,7 @@
Assert.That(person, Is.Null);
string log = ls.GetWholeLog();
- Assert.IsTrue(log.Contains("@p0 = 'F'"));
+ Assert.IsTrue(log.Contains(paramPrefix + "p0 = 'F'"));
}
tx.Rollback();
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1978/Mappings.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1978/Mappings.hbm.xml 2011-04-25 03:36:53 UTC (rev 5756)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1978/Mappings.hbm.xml 2011-04-25 05:55:52 UTC (rev 5757)
@@ -13,7 +13,7 @@
<column name="Plan401kID" sql-type="int" not-null="false" />
</many-to-one>
</class>
- <class name="_401k" lazy="true" table="[401k]">
+ <class name="_401k" lazy="true" table="`401k`">
<id name="ID" type="Int32" unsaved-value="0">
<generator class="native" />
</id>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
