Menu
▾
▴
[Nhibernate-commit] SF.net SVN: nhibernate:[3752] trunk/nhibernate/src/NHibernate
|
From: <fab...@us...> - 2008-09-08 04:52:07
|
Revision: 3752
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3752&view=rev
Author: fabiomaulo
Date: 2008-09-08 04:52:17 +0000 (Mon, 08 Sep 2008)
Log Message:
-----------
Merge (NH-1434, NH-1435, NH-1436, NH-1437, NH-1438, NH-1439 (by David Bachmann with little change))
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Dialect/PostgreSQL81Dialect.cs
trunk/nhibernate/src/NHibernate/Mapping/Table.cs
trunk/nhibernate/src/NHibernate.Test/Criteria/ProjectionsTest.cs
trunk/nhibernate/src/NHibernate.Test/Legacy/FooBarTest.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1179/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1250/PolymorphicJoinFetchFixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1408/Mappings.hbm.xml
Modified: trunk/nhibernate/src/NHibernate/Dialect/PostgreSQL81Dialect.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Dialect/PostgreSQL81Dialect.cs 2008-09-08 04:26:20 UTC (rev 3751)
+++ trunk/nhibernate/src/NHibernate/Dialect/PostgreSQL81Dialect.cs 2008-09-08 04:52:17 UTC (rev 3752)
@@ -68,11 +68,12 @@
/// <summary>
/// PostgreSQL supports <c>serial</c> and <c>serial4</c> type for 4 bytes integer auto increment column.
/// <c>bigserial</c> or <c>serial8</c> can be used for 8 bytes integer auto increment column.
- /// This dialect uses <c>serial</c>
/// </summary>
- public override string IdentityColumnString
+ /// <returns><c>bigserial</c> if <paramref name="type"/> equal Int64,
+ /// <c>serial</c> otherwise</returns>
+ public override string GetIdentityColumnString(DbType type)
{
- get { return "serial"; }
+ return (type == DbType.Int64) ? "bigserial" : "serial";
}
/// <summary>
@@ -105,4 +106,4 @@
get { return true; }
}
}
-}
\ No newline at end of file
+}
Modified: trunk/nhibernate/src/NHibernate/Mapping/Table.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/Table.cs 2008-09-08 04:26:20 UTC (rev 3751)
+++ trunk/nhibernate/src/NHibernate/Mapping/Table.cs 2008-09-08 04:52:17 UTC (rev 3752)
@@ -441,7 +441,7 @@
buf.Append(col.GetSqlType(dialect, p));
}
buf.Append(' ')
- .Append(dialect.IdentityColumnString);
+ .Append(dialect.GetIdentityColumnString(col.GetSqlTypeCode(p).DbType));
}
else
{
Modified: trunk/nhibernate/src/NHibernate.Test/Criteria/ProjectionsTest.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Criteria/ProjectionsTest.cs 2008-09-08 04:26:20 UTC (rev 3751)
+++ trunk/nhibernate/src/NHibernate.Test/Criteria/ProjectionsTest.cs 2008-09-08 04:52:17 UTC (rev 3752)
@@ -143,7 +143,7 @@
using (ISession session = sessions.OpenSession())
{
IList<Student> list = session.CreateCriteria(typeof(Student))
- .Add(Expression.Like(Projections.Id(), "2", MatchMode.Start))
+ .Add(Expression.Like(Projections.Property("Name"), "aye", MatchMode.Start))
.List<Student>();
Assert.AreEqual(27L, list[0].StudentNumber);
}
@@ -155,7 +155,7 @@
using (ISession session = sessions.OpenSession())
{
IList<Student> list = session.CreateCriteria(typeof(Student))
- .Add(Expression.InsensitiveLike(Projections.Id(), "2", MatchMode.Start))
+ .Add(Expression.InsensitiveLike(Projections.Property("Name"), "AYE", MatchMode.Start))
.List<Student>();
Assert.AreEqual(27L, list[0].StudentNumber);
}
@@ -344,4 +344,4 @@
}
-}
\ No newline at end of file
+}
Modified: trunk/nhibernate/src/NHibernate.Test/Legacy/FooBarTest.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Legacy/FooBarTest.cs 2008-09-08 04:26:20 UTC (rev 3751)
+++ trunk/nhibernate/src/NHibernate.Test/Legacy/FooBarTest.cs 2008-09-08 04:52:17 UTC (rev 3752)
@@ -2467,22 +2467,22 @@
s.CreateQuery("select count(*) from Bar as bar where 'abc' in elements(bar.Baz.FooArray)").List();
s.CreateQuery("select count(*) from Bar as bar where 1 in indices(bar.Baz.FooArray)").List();
s.CreateQuery(
- "select count(*) from Bar as bar, bar.Component.Glarch.ProxyArray as g where g.id in indices(bar.Baz.FooArray)").
+ "select count(*) from Bar as bar, bar.Component.Glarch.ProxyArray as g where cast(g.id as Int32) in indices(bar.Baz.FooArray)").
List();
s.CreateQuery(
- "select max( elements(bar.Baz.FooArray) ) from Bar as bar, bar.Component.Glarch.ProxyArray as g where g.id in indices(bar.Baz.FooArray)")
+ "select max( elements(bar.Baz.FooArray) ) from Bar as bar, bar.Component.Glarch.ProxyArray as g where cast(g.id as Int32) in indices(bar.Baz.FooArray)")
.List();
s.CreateQuery(
- "select count(*) from Bar as bar where 1 in (from bar.Component.Glarch.ProxyArray g where g.Name='foo')").List();
+ "select count(*) from Bar as bar where '1' in (from bar.Component.Glarch.ProxyArray g where g.Name='foo')").List();
s.CreateQuery(
- "select count(*) from Bar as bar where 1 in (from g in bar.Component.Glarch.ProxyArray.elements where g.Name='foo')")
+ "select count(*) from Bar as bar where '1' in (from g in bar.Component.Glarch.ProxyArray.elements where g.Name='foo')")
.List();
// TODO: figure out why this is throwing an ORA-1722 error
if (!(Dialect is Oracle9Dialect))
{
s.CreateQuery(
- "select count(*) from Bar as bar left outer join bar.Component.Glarch.ProxyArray as pg where 1 in (from g in bar.Component.Glarch.ProxyArray)")
+ "select count(*) from Bar as bar left outer join bar.Component.Glarch.ProxyArray as pg where '1' in (from g in bar.Component.Glarch.ProxyArray)")
.List();
}
}
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1179/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1179/Fixture.cs 2008-09-08 04:26:20 UTC (rev 3751)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1179/Fixture.cs 2008-09-08 04:52:17 UTC (rev 3752)
@@ -40,7 +40,7 @@
{
s.EnableFilter("RelatedClass_Valued").SetParameter("forValue", 2);
IQuery q =
- s.CreateQuery("select mc.Description, count(mc.Id) from MainClass mc join mc.Related r group by mc.Description");
+ s.CreateQuery("select mc.Description, count(mc.Id) from MainClass mc join mc.Related r group by mc.Description order by mc.Description");
IList l = q.List();
Assert.AreEqual(2, l.Count);
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1250/PolymorphicJoinFetchFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1250/PolymorphicJoinFetchFixture.cs 2008-09-08 04:26:20 UTC (rev 3751)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1250/PolymorphicJoinFetchFixture.cs 2008-09-08 04:52:17 UTC (rev 3752)
@@ -1,3 +1,4 @@
+using NHibernate.Dialect;
using NUnit.Framework;
namespace NHibernate.Test.NHSpecificTest.NH1250
@@ -15,8 +16,12 @@
get { return "NH1250"; }
}
+ protected override bool AppliesTo(Dialect.Dialect dialect)
+ {
+ return dialect is MsSql2000Dialect;
+ }
+
[Test]
-
public void FetchUsingICriteria()
{
using (ISession s = OpenSession())
@@ -30,7 +35,6 @@
}
[Test]
-
public void FetchUsingIQuery()
{
using (ISession s = OpenSession())
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1408/Mappings.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1408/Mappings.hbm.xml 2008-09-08 04:26:20 UTC (rev 3751)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1408/Mappings.hbm.xml 2008-09-08 04:52:17 UTC (rev 3752)
@@ -17,9 +17,7 @@
<one-to-many class="DbResourceKey" />
</bag>
- <property name="RawValue" type="StringClob">
- <column name="Value" sql-type="ntext" not-null="true" />
- </property>
+ <property name="RawValue" type="string" column="Value" not-null="true"/>
<subclass name="StringDbResource" discriminator-value="string" />
<subclass name="IntDbResource" discriminator-value="int" />
@@ -38,4 +36,4 @@
<property name="Key0" column="Key0" type="String(25)" index="RES_KEY0_IDX" />
<property name="Key1" column="Key1" type="String(25)" index="RES_KEY1_IDX" />
</class>
-</hibernate-mapping>
\ No newline at end of file
+</hibernate-mapping>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
