Menu
▾
▴
[Nhibernate-commit] SF.net SVN: nhibernate:[3783] branches/2.0.x/nhibernate/src/NHibernate
|
From: <te...@us...> - 2008-09-26 20:18:27
|
Revision: 3783
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3783&view=rev
Author: tehlike
Date: 2008-09-26 20:18:17 +0000 (Fri, 26 Sep 2008)
Log Message:
-----------
-Synchronizing with 2.0 project
-Fix for NH1499 by adding meaningful exception message
Modified Paths:
--------------
branches/2.0.x/nhibernate/src/NHibernate/Criterion/SubqueryExpression.cs
branches/2.0.x/nhibernate/src/NHibernate/NHibernate-3.5.csproj
branches/2.0.x/nhibernate/src/NHibernate.Test/NHibernate.Test-3.5.csproj
Added Paths:
-----------
branches/2.0.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/
branches/2.0.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Document.cs
branches/2.0.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Fixture.cs
branches/2.0.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Mappings.hbm.xml
branches/2.0.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Person.cs
Modified: branches/2.0.x/nhibernate/src/NHibernate/Criterion/SubqueryExpression.cs
===================================================================
--- branches/2.0.x/nhibernate/src/NHibernate/Criterion/SubqueryExpression.cs 2008-09-26 20:07:14 UTC (rev 3782)
+++ branches/2.0.x/nhibernate/src/NHibernate/Criterion/SubqueryExpression.cs 2008-09-26 20:18:17 UTC (rev 3783)
@@ -107,9 +107,16 @@
this.criteriaImpl.EntityOrClassName,
criteriaQuery.GenerateSQLAlias(),
criteriaQuery);
-
- parameters = innerQuery.GetQueryParameters();
- types = innerQuery.ProjectedTypes;
+
+ if (innerQuery.HasProjection)
+ {
+ parameters = innerQuery.GetQueryParameters();
+ types = innerQuery.ProjectedTypes;
+ }
+ else
+ {
+ types = null;
+ }
}
}
}
Modified: branches/2.0.x/nhibernate/src/NHibernate/NHibernate-3.5.csproj
===================================================================
--- branches/2.0.x/nhibernate/src/NHibernate/NHibernate-3.5.csproj 2008-09-26 20:07:14 UTC (rev 3782)
+++ branches/2.0.x/nhibernate/src/NHibernate/NHibernate-3.5.csproj 2008-09-26 20:18:17 UTC (rev 3783)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{5909BFE7-93CF-4E5F-BE22-6293368AF01D}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -1027,6 +1027,7 @@
<Compile Include="Type\AnsiCharType.cs" />
<Compile Include="Type\AnyType.cs" />
<Compile Include="Type\AbstractCharType.cs" />
+ <Compile Include="Type\ClassMetaType.cs" />
<Compile Include="Type\CollectionType.cs" />
<Compile Include="Type\CustomCollectionType.cs" />
<Compile Include="Type\EmbeddedComponentType.cs" />
Added: branches/2.0.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Document.cs
===================================================================
--- branches/2.0.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Document.cs (rev 0)
+++ branches/2.0.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Document.cs 2008-09-26 20:18:17 UTC (rev 3783)
@@ -0,0 +1,27 @@
+namespace NHibernate.Test.NHSpecificTest.NH1499
+{
+ public class Document
+ {
+ private int id;
+ private Person person;
+ private string title;
+
+ public virtual int Id
+ {
+ get { return id; }
+ set { id = value; }
+ }
+
+ public virtual string Title
+ {
+ get { return title; }
+ set { title = value; }
+ }
+
+ public virtual Person Person
+ {
+ get { return person; }
+ set { person = value; }
+ }
+ }
+}
Added: branches/2.0.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Fixture.cs
===================================================================
--- branches/2.0.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Fixture.cs (rev 0)
+++ branches/2.0.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Fixture.cs 2008-09-26 20:18:17 UTC (rev 3783)
@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+
+using NHibernate.Criterion;
+
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH1499
+{
+ [TestFixture]
+ public class Fixture : BugTestCase
+ {
+ protected override void OnSetUp()
+ {
+ Person john = new Person();
+ john.Name = "John";
+
+ Document doc1 = new Document();
+ doc1.Person = john;
+ doc1.Title = "John's Doc";
+ Document doc2 = new Document();
+ doc2.Title = "Spec";
+
+ using (ISession session = OpenSession())
+ using (ITransaction tx = session.BeginTransaction())
+ {
+ session.Save(john);
+ session.Save(doc1);
+ session.Save(doc2);
+
+ tx.Commit();
+ }
+ }
+
+ protected override void OnTearDown()
+ {
+ using (ISession session = OpenSession())
+ using (ITransaction tx = session.BeginTransaction())
+ {
+ session.Delete("from Person");
+ session.Delete("from Document");
+ tx.Commit();
+ }
+ }
+ [Test]
+ [ExpectedException(typeof(QueryException))]
+ public void CheckIfDetachedCriteriaCanBeUsedOnPropertyRestriction()
+ {
+ using (ISession session = OpenSession())
+ using (ITransaction tx = session.BeginTransaction())
+ {
+ DetachedCriteria detached = DetachedCriteria.For(typeof(Person))
+ .Add(Property.ForName("Name").Eq("John"));
+ ICriteria criteria = session.CreateCriteria(typeof(Document))
+ .Add(Restrictions.Or(
+ Property.ForName("Title").Eq("Spec"),
+ Property.ForName("Person").Eq(detached)
+ ));
+ IList<Document> results = criteria.List<Document>();
+ }
+ }
+
+
+ }
+}
Added: branches/2.0.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Mappings.hbm.xml
===================================================================
--- branches/2.0.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Mappings.hbm.xml (rev 0)
+++ branches/2.0.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Mappings.hbm.xml 2008-09-26 20:18:17 UTC (rev 3783)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+ assembly="NHibernate.Test"
+ namespace="NHibernate.Test.NHSpecificTest.NH1499">
+ <class name="Document">
+ <id name="Id">
+ <generator class="native"/>
+ </id>
+ <many-to-one name="Person" column="PersonID"/>
+ <property name="Title"/>
+ </class>
+
+ <class name="Person">
+ <id name="Id">
+ <generator class="native" />
+ </id>
+ <property name="Name"/>
+ </class>
+</hibernate-mapping>
Added: branches/2.0.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Person.cs
===================================================================
--- branches/2.0.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Person.cs (rev 0)
+++ branches/2.0.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Person.cs 2008-09-26 20:18:17 UTC (rev 3783)
@@ -0,0 +1,20 @@
+namespace NHibernate.Test.NHSpecificTest.NH1499
+{
+ public class Person
+ {
+ private int id;
+ private string name;
+
+ public virtual int Id
+ {
+ get { return id; }
+ set { id = value; }
+ }
+
+ public virtual string Name
+ {
+ get { return name; }
+ set { name = value; }
+ }
+ }
+}
Modified: branches/2.0.x/nhibernate/src/NHibernate.Test/NHibernate.Test-3.5.csproj
===================================================================
--- branches/2.0.x/nhibernate/src/NHibernate.Test/NHibernate.Test-3.5.csproj 2008-09-26 20:07:14 UTC (rev 3782)
+++ branches/2.0.x/nhibernate/src/NHibernate.Test/NHibernate.Test-3.5.csproj 2008-09-26 20:18:17 UTC (rev 3783)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{7AEE5B37-C552-4E59-9B6F-88755BCB5070}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -163,6 +163,10 @@
<Compile Include="FilterTest\Product.cs" />
<Compile Include="FilterTest\Salesperson.cs" />
<Compile Include="FilterTest\TestClass.cs" />
+ <Compile Include="Generatedkeys\Identity\IdentityGeneratedKeysTest.cs" />
+ <Compile Include="Generatedkeys\Identity\MyChild.cs" />
+ <Compile Include="Generatedkeys\Identity\MyEntity.cs" />
+ <Compile Include="Generatedkeys\Identity\MySibling.cs" />
<Compile Include="GeneratedTest\AbstractGeneratedPropertyTest.cs" />
<Compile Include="GeneratedTest\Component.cs" />
<Compile Include="GeneratedTest\ComponentOwner.cs" />
@@ -269,12 +273,20 @@
<Compile Include="NHSpecificTest\BasicTimeFixture.cs" />
<Compile Include="NHSpecificTest\BugTestCase.cs" />
<Compile Include="NHSpecificTest\CollectionFixture.cs" />
+ <Compile Include="NHSpecificTest\NH1077\A.cs" />
+ <Compile Include="NHSpecificTest\NH1077\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1101\Domain.cs" />
+ <Compile Include="NHSpecificTest\NH1101\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1144\Classes.cs" />
<Compile Include="NHSpecificTest\NH1144\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1290\AuxType.cs" />
<Compile Include="NHSpecificTest\NH1290\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1300\Domain.cs" />
+ <Compile Include="NHSpecificTest\NH1300\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1301\Domain.cs" />
<Compile Include="NHSpecificTest\NH1301\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1304\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1304\Funny.cs" />
<Compile Include="NHSpecificTest\NH1313\A.cs" />
<Compile Include="NHSpecificTest\NH1313\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1324\Fixture.cs" />
@@ -329,8 +341,43 @@
<Compile Include="NHSpecificTest\NH1230\FooIdentity.cs" />
<Compile Include="NHSpecificTest\NH1230\PreSaveDoVeto.cs" />
<Compile Include="NHSpecificTest\NH1326\Person.cs" />
+ <Compile Include="NHSpecificTest\NH1332\A.cs" />
+ <Compile Include="NHSpecificTest\NH1332\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1347\A.cs" />
<Compile Include="NHSpecificTest\NH1347\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1355\Category.cs" />
+ <Compile Include="NHSpecificTest\NH1355\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1355\UserTypeTimestamp.cs" />
+ <Compile Include="NHSpecificTest\NH1362\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1362\Model.cs" />
+ <Compile Include="NHSpecificTest\NH1383\Domain.cs" />
+ <Compile Include="NHSpecificTest\NH1383\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1399\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1403\Female.cs" />
+ <Compile Include="NHSpecificTest\NH1403\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1403\Hobby.cs" />
+ <Compile Include="NHSpecificTest\NH1403\Male.cs" />
+ <Compile Include="NHSpecificTest\NH1403\Person.cs" />
+ <Compile Include="NHSpecificTest\NH1405\Column.cs" />
+ <Compile Include="NHSpecificTest\NH1405\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1408\DbResource.cs" />
+ <Compile Include="NHSpecificTest\NH1408\DbResourceKey.cs" />
+ <Compile Include="NHSpecificTest\NH1408\DetachedSubCriteriaTest.cs" />
+ <Compile Include="NHSpecificTest\NH1408\Entity.cs" />
+ <Compile Include="NHSpecificTest\NH1413\Foo.cs" />
+ <Compile Include="NHSpecificTest\NH1413\PagingTest.cs" />
+ <Compile Include="NHSpecificTest\NH1419\Blog.cs" />
+ <Compile Include="NHSpecificTest\NH1419\Entry.cs" />
+ <Compile Include="NHSpecificTest\NH1419\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1464\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1483\BaseClass.cs" />
+ <Compile Include="NHSpecificTest\NH1483\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1483\SubClass.cs" />
+ <Compile Include="NHSpecificTest\NH1488\Domain.cs" />
+ <Compile Include="NHSpecificTest\NH1488\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1499\Document.cs" />
+ <Compile Include="NHSpecificTest\NH1499\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1499\Person.cs" />
<Compile Include="NHSpecificTest\NH280\Fixture.cs" />
<Compile Include="NHSpecificTest\NH280\Foo.cs" />
<Compile Include="NHSpecificTest\NH1018\Employee.cs" />
@@ -341,6 +388,8 @@
<Compile Include="NHSpecificTest\NH1080\Domain.cs" />
<Compile Include="NHSpecificTest\NH1080\Fixture.cs" />
<Compile Include="NHSpecificTest\NH364\Invoice.cs" />
+ <Compile Include="NHSpecificTest\NH693\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH693\Something.cs" />
<Compile Include="NHSpecificTest\NH883\Cat.cs" />
<Compile Include="NHSpecificTest\NH883\Fixture.cs" />
<Compile Include="NHSpecificTest\Docs\Associations\BiM21\Address.cs" />
@@ -557,6 +606,16 @@
<Compile Include="NHSpecificTest\UserTypeFixture.cs" />
<Compile Include="NHSpecificTest\VersionTest.cs" />
<Compile Include="ObjectAssertion.cs" />
+ <Compile Include="Ondelete\Address.cs" />
+ <Compile Include="Ondelete\Child.cs" />
+ <Compile Include="Ondelete\EFG.cs" />
+ <Compile Include="Ondelete\Employee.cs" />
+ <Compile Include="Ondelete\JoinedSubclassFixture.cs" />
+ <Compile Include="Ondelete\OnDeleteFixture.cs" />
+ <Compile Include="Ondelete\Parent.cs" />
+ <Compile Include="Ondelete\ParentChildFixture.cs" />
+ <Compile Include="Ondelete\Person.cs" />
+ <Compile Include="Ondelete\Salesperson.cs" />
<Compile Include="PropertyRef\A.cs" />
<Compile Include="PropertyRef\B.cs" />
<Compile Include="PropertyRef\KeyPropertyRefFixture.cs" />
@@ -1174,10 +1233,34 @@
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="NHSpecificTest\NH1324\Mappings.hbm.xml" />
- <Content Include="NHSpecificTest\NH1098\Mappings.hbm.xml" />
+ <EmbeddedResource Include="NHSpecificTest\NH1077\Mappings.hbm.xml" />
+ <EmbeddedResource Include="Generatedkeys\Identity\MyEntity.hbm.xml" />
+ <EmbeddedResource Include="NHSpecificTest\NH1098\Mappings.hbm.xml" />
+ <EmbeddedResource Include="NHSpecificTest\NH1101\Mappings.hbm.xml" />
<Content Include="NHSpecificTest\NH1250\Mappings.hbm.xml" />
<Content Include="NHSpecificTest\NH1252\Mappings.hbm.xml" />
<Content Include="NHSpecificTest\NH1275\Mappings.hbm.xml" />
+ <EmbeddedResource Include="Ondelete\EFGJoinedSubclass.hbm.xml" />
+ <EmbeddedResource Include="Ondelete\ParentChild.hbm.xml" />
+ <EmbeddedResource Include="Ondelete\Person.hbm.xml" />
+ <EmbeddedResource Include="NHSpecificTest\NH693\EmptyTableName.hbm.xml" />
+ <EmbeddedResource Include="NHSpecificTest\NH693\SpaceTableName.hbm.xml" />
+ <EmbeddedResource Include="NHSpecificTest\NH1300\Mappings.hbm.xml" />
+ <EmbeddedResource Include="NHSpecificTest\NH1301\Mappings.hbm.xml" />
+ <EmbeddedResource Include="NHSpecificTest\NH1304\Mappings.hbm.xml" />
+ <EmbeddedResource Include="NHSpecificTest\NH1313\Mappings.hbm.xml" />
+ <EmbeddedResource Include="NHSpecificTest\NH1332\Mappings.hbm.xml" />
+ <EmbeddedResource Include="NHSpecificTest\NH1355\Category.hbm.xml" />
+ <EmbeddedResource Include="NHSpecificTest\NH1362\Mappings.hbm.xml" />
+ <EmbeddedResource Include="NHSpecificTest\NH1383\Mappings.hbm.xml" />
+ <EmbeddedResource Include="NHSpecificTest\NH1403\Mappings.hbm.xml" />
+ <EmbeddedResource Include="NHSpecificTest\NH1405\Mappings.hbm.xml" />
+ <EmbeddedResource Include="NHSpecificTest\NH1408\Mappings.hbm.xml" />
+ <EmbeddedResource Include="NHSpecificTest\NH1413\Mappings.hbm.xml" />
+ <EmbeddedResource Include="NHSpecificTest\NH1419\Mappings.hbm.xml" />
+ <EmbeddedResource Include="NHSpecificTest\NH1483\Mappings.hbm.xml" />
+ <EmbeddedResource Include="NHSpecificTest\NH1488\Mappings.hbm.xml" />
+ <EmbeddedResource Include="NHSpecificTest\NH1499\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1326\Mappings.hbm.xml" />
</ItemGroup>
<ItemGroup>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
