Menu
▾
▴
[Nhibernate-commit] SF.net SVN: nhibernate:[3880] trunk/nhibernate/src
|
From: <cha...@us...> - 2008-10-28 21:56:13
|
Revision: 3880
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3880&view=rev
Author: chadly69
Date: 2008-10-28 21:56:07 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
Temporarily reverting r3871 (fix for NH-1090) - was causing issues for NHibernate.Linq in NH Contrib.
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Impl/MultiCriteriaImpl.cs
trunk/nhibernate/src/NHibernate/Loader/Criteria/CriteriaLoader.cs
trunk/nhibernate/src/NHibernate/Loader/Criteria/CriteriaQueryTranslator.cs
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
trunk/nhibernate/src/NHibernate.Test/QueryTest/MultiCriteriaFixture.cs
Removed Paths:
-------------
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1090/
Property Changed:
----------------
trunk/nhibernate/src/Iesi.Collections/Iesi.Collections.csproj
trunk/nhibernate/src/Iesi.Collections.Test/Iesi.Collections.Test.csproj
trunk/nhibernate/src/NHibernate/NHibernate.csproj
trunk/nhibernate/src/NHibernate/Properties/BackFieldStrategy.cs
trunk/nhibernate/src/NHibernate/Properties/XmlAccessor.cs
trunk/nhibernate/src/NHibernate/Proxy/DynProxyTypeValidator.cs
trunk/nhibernate/src/NHibernate.DomainModel/NHibernate.DomainModel.csproj
trunk/nhibernate/src/NHibernate.Examples/NHibernate.Examples.csproj
trunk/nhibernate/src/NHibernate.Linq/Expressions/NHExpression.cs
trunk/nhibernate/src/NHibernate.Linq/Expressions/NHExpressionType.cs
trunk/nhibernate/src/NHibernate.Linq/Expressions/OneToManyPropertyExpression.cs
trunk/nhibernate/src/NHibernate.Linq/Expressions/OneToOnePropertyExpression.cs
trunk/nhibernate/src/NHibernate.Linq/Expressions/QueryParameterExpression.cs
trunk/nhibernate/src/NHibernate.Linq/Expressions/QuerySourceExpression.cs
trunk/nhibernate/src/NHibernate.Linq/Query/
trunk/nhibernate/src/NHibernate.Linq/Visitors/AssociationRewriteVisitor.cs
trunk/nhibernate/src/NHibernate.Linq/Visitors/NHExpressionToSqlExpressionTransformer.cs
trunk/nhibernate/src/NHibernate.Linq/Visitors/OrderByTransformer.cs
trunk/nhibernate/src/NHibernate.Linq/Visitors/Replacer.cs
trunk/nhibernate/src/NHibernate.Linq/Visitors/SqlExpressionTranslator.cs
trunk/nhibernate/src/NHibernate.Linq/Visitors/WhereExpressionCombiner.cs
trunk/nhibernate/src/NHibernate.Linq.Test/ExpressionEqualityChecker.cs
trunk/nhibernate/src/NHibernate.Linq.Test/VisitorTests/WhereExpressionCombinerTests.cs
trunk/nhibernate/src/NHibernate.ProxyGenerators.CastleDynamicProxy/LazyInitializer.cs
trunk/nhibernate/src/NHibernate.ProxyGenerators.CastleDynamicProxy/ProxyFactory.cs
trunk/nhibernate/src/NHibernate.ProxyGenerators.CastleDynamicProxy/ProxyFactoryFactory.cs
trunk/nhibernate/src/NHibernate.ProxyGenerators.CastleDynamicProxy/ProxyGenerators.build
trunk/nhibernate/src/NHibernate.ProxyGenerators.CastleDynamicProxy.Tests/App.config
trunk/nhibernate/src/NHibernate.ProxyGenerators.CastleDynamicProxy.Tests/DebugConnectionProvider.cs
trunk/nhibernate/src/NHibernate.ProxyGenerators.CastleDynamicProxy.Tests/ProxyGenerators.Test.build
trunk/nhibernate/src/NHibernate.ProxyGenerators.CastleDynamicProxy.Tests/ProxyInterface/CastleProxy.cs
trunk/nhibernate/src/NHibernate.ProxyGenerators.CastleDynamicProxy.Tests/ProxyInterface/CastleProxyFixture.cs
trunk/nhibernate/src/NHibernate.ProxyGenerators.CastleDynamicProxy.Tests/ProxyInterface/CastleProxyImpl.cs
trunk/nhibernate/src/NHibernate.ProxyGenerators.CastleDynamicProxy.Tests/ProxyInterface/CastleProxyImpl.hbm.xml
trunk/nhibernate/src/NHibernate.ProxyGenerators.CastleDynamicProxy.Tests/ProxyInterface/Classes.cs
trunk/nhibernate/src/NHibernate.ProxyGenerators.CastleDynamicProxy.Tests/ProxyInterface/CustomProxyFixture.cs
trunk/nhibernate/src/NHibernate.ProxyGenerators.CastleDynamicProxy.Tests/ProxyInterface/Mappings.hbm.xml
trunk/nhibernate/src/NHibernate.ProxyGenerators.CastleDynamicProxy.Tests/TestCase.cs
trunk/nhibernate/src/NHibernate.ProxyGenerators.CastleDynamicProxy.Tests/TestConfigurationHelper.cs
trunk/nhibernate/src/NHibernate.Test/Any/IPropertyValue.cs
trunk/nhibernate/src/NHibernate.Test/EntityModeTest/Map/Basic/DynamicClassFixture.cs
trunk/nhibernate/src/NHibernate.Test/EntityModeTest/Map/Basic/ProductLine.hbm.xml
trunk/nhibernate/src/NHibernate.Test/Events/Collections/IEntity.cs
trunk/nhibernate/src/NHibernate.Test/Extendshbm/entitynamesWithColl.hbm.xml
trunk/nhibernate/src/NHibernate.Test/Extendshbm/packageentitynamesf1.hbm.xml
trunk/nhibernate/src/NHibernate.Test/GenericTest/OrderedSetGeneric/B.cs
trunk/nhibernate/src/NHibernate.Test/HQL/
trunk/nhibernate/src/NHibernate.Test/HQL/HqlFixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1033/Animal.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1033/Reptile.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1293/Domain.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1293/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1293/Mappings.hbm.xml
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1355/CategoryTD.hbm.xml
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1355/CustomVersionType.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1355/UserTypeTimestamp.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1362/
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1399/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1403/Female.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1403/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1403/Hobby.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1403/Male.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1403/Mappings.hbm.xml
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1403/Person.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1405/Column.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1405/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1405/Mappings.hbm.xml
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1413/Foo.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1413/Mappings.hbm.xml
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1413/PagingTest.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1419/Blog.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1419/Entry.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1419/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1419/Mappings.hbm.xml
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1490/Domain.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1490/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1490/Mappings.hbm.xml
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1492/ChildEntity.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1492/Entity.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1492/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1492/Mappings.hbm.xml
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH662/Domain.cs
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
trunk/nhibernate/src/NHibernate.Test.Performance/NHibernate.Test.Performance.csproj
Property changes on: trunk/nhibernate/src/Iesi.Collections/Iesi.Collections.csproj
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/Iesi.Collections.Test/Iesi.Collections.Test.csproj
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: trunk/nhibernate/src/NHibernate/Impl/MultiCriteriaImpl.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Impl/MultiCriteriaImpl.cs 2008-10-25 20:06:57 UTC (rev 3879)
+++ trunk/nhibernate/src/NHibernate/Impl/MultiCriteriaImpl.cs 2008-10-28 21:56:07 UTC (rev 3880)
@@ -151,16 +151,7 @@
CriteriaImpl critImp = criteriaQueries[i] as CriteriaImpl;
if(critImp==null || critImp.ResultTransformer==null)
continue;
- ArrayList resultForOneCriteria = ((ArrayList) results[i]);
- for (int j = 0; j < resultForOneCriteria.Count; j++)
- {
- if (!(critImp.ResultTransformer is RootEntityResultTransformer))
- {
- object[] itemsForOneRow = (object[]) resultForOneCriteria[j];
- resultForOneCriteria[j] = critImp.ResultTransformer.TransformTuple(itemsForOneRow, new string[] {});
- }
- }
- critImp.ResultTransformer.TransformList(resultForOneCriteria);
+ results[i] = critImp.ResultTransformer.TransformList((IList)results[i]);
}
}
return results;
Modified: trunk/nhibernate/src/NHibernate/Loader/Criteria/CriteriaLoader.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Loader/Criteria/CriteriaLoader.cs 2008-10-25 20:06:57 UTC (rev 3879)
+++ trunk/nhibernate/src/NHibernate/Loader/Criteria/CriteriaLoader.cs 2008-10-28 21:56:07 UTC (rev 3880)
@@ -1,4 +1,3 @@
-using System;
using System.Collections;
using System.Collections.Generic;
using System.Data;
@@ -29,7 +28,7 @@
private readonly string[] userAliases;
public CriteriaLoader(IOuterJoinLoadable persister, ISessionFactoryImplementor factory, CriteriaImpl rootCriteria,
- string rootEntityName, IDictionary<string, IFilter> enabledFilters)
+ string rootEntityName, IDictionary<string, IFilter> enabledFilters)
: base(factory, enabledFilters)
{
translator = new CriteriaQueryTranslator(factory, rootCriteria, rootEntityName, CriteriaQueryTranslator.RootSqlAlias);
@@ -75,9 +74,10 @@
}
protected override object GetResultColumnOrRow(object[] row, IResultTransformer resultTransformer, IDataReader rs,
- ISessionImplementor session)
+ ISessionImplementor session)
{
object[] result;
+ string[] aliases;
if (translator.HasProjection)
{
@@ -96,15 +96,11 @@
result = row;
aliases = userAliases;
}
- if (translator.RootCriteria.ResultTransformer is RootEntityResultTransformer)
- return row[row.Length-1];
- else
- return result;
+ return translator.RootCriteria.ResultTransformer.TransformTuple(result, aliases);
}
- private string[] aliases;
protected override SqlString ApplyLocks(SqlString sqlSelectString, IDictionary<string, LockMode> lockModes,
- Dialect.Dialect dialect)
+ Dialect.Dialect dialect)
{
if (lockModes == null || lockModes.Count == 0)
{
@@ -119,7 +115,7 @@
LockMode lockMode;
if (lockModes.TryGetValue(drivingSqlAliases[i], out lockMode))
{
- ILockable drivingPersister = (ILockable)EntityPersisters[i];
+ ILockable drivingPersister = (ILockable) EntityPersisters[i];
string rootSqlAlias = drivingPersister.GetRootTableAlias(drivingSqlAliases[i]);
aliasedLockModes[rootSqlAlias] = lockMode;
if (keyColumnNames != null)
@@ -155,15 +151,7 @@
protected override IList GetResultList(IList results, IResultTransformer resultTransformer)
{
- if (!(resultTransformer is RootEntityResultTransformer))
- {
- for (int i = 0; i < results.Count; i++)
- {
- object[] row = (object[]) results[i];
- results[i] = resultTransformer.TransformTuple(row, aliases);
- }
- }
- return resultTransformer.TransformList(results);
+ return translator.RootCriteria.ResultTransformer.TransformList(results);
}
}
}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Loader/Criteria/CriteriaQueryTranslator.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Loader/Criteria/CriteriaQueryTranslator.cs 2008-10-25 20:06:57 UTC (rev 3879)
+++ trunk/nhibernate/src/NHibernate/Loader/Criteria/CriteriaQueryTranslator.cs 2008-10-28 21:56:07 UTC (rev 3880)
@@ -62,7 +62,7 @@
}
[CLSCompliant(false)] // TODO: Why does this cause a problem in 1.1
- public string RootSQLAlias
+ public string RootSQLAlias
{
get { return rootSQLAlias; }
}
Property changes on: trunk/nhibernate/src/NHibernate/NHibernate.csproj
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate/Properties/BackFieldStrategy.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate/Properties/XmlAccessor.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate/Proxy/DynProxyTypeValidator.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.DomainModel/NHibernate.DomainModel.csproj
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Examples/NHibernate.Examples.csproj
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Linq/Expressions/NHExpression.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Linq/Expressions/NHExpressionType.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Linq/Expressions/OneToManyPropertyExpression.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Linq/Expressions/OneToOnePropertyExpression.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Linq/Expressions/QueryParameterExpression.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Linq/Expressions/QuerySourceExpression.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Linq/Query
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Linq/Visitors/AssociationRewriteVisitor.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Linq/Visitors/NHExpressionToSqlExpressionTransformer.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Linq/Visitors/OrderByTransformer.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Linq/Visitors/Replacer.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Linq/Visitors/SqlExpressionTranslator.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Linq/Visitors/WhereExpressionCombiner.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Linq.Test/ExpressionEqualityChecker.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Linq.Test/VisitorTests/WhereExpressionCombinerTests.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.ProxyGenerators.CastleDynamicProxy/LazyInitializer.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.ProxyGenerators.CastleDynamicProxy/ProxyFactory.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.ProxyGenerators.CastleDynamicProxy/ProxyFactoryFactory.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.ProxyGenerators.CastleDynamicProxy/ProxyGenerators.build
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.ProxyGenerators.CastleDynamicProxy.Tests/App.config
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.ProxyGenerators.CastleDynamicProxy.Tests/DebugConnectionProvider.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.ProxyGenerators.CastleDynamicProxy.Tests/ProxyGenerators.Test.build
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.ProxyGenerators.CastleDynamicProxy.Tests/ProxyInterface/CastleProxy.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.ProxyGenerators.CastleDynamicProxy.Tests/ProxyInterface/CastleProxyFixture.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.ProxyGenerators.CastleDynamicProxy.Tests/ProxyInterface/CastleProxyImpl.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.ProxyGenerators.CastleDynamicProxy.Tests/ProxyInterface/CastleProxyImpl.hbm.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.ProxyGenerators.CastleDynamicProxy.Tests/ProxyInterface/Classes.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.ProxyGenerators.CastleDynamicProxy.Tests/ProxyInterface/CustomProxyFixture.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.ProxyGenerators.CastleDynamicProxy.Tests/ProxyInterface/Mappings.hbm.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.ProxyGenerators.CastleDynamicProxy.Tests/TestCase.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.ProxyGenerators.CastleDynamicProxy.Tests/TestConfigurationHelper.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/Any/IPropertyValue.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/EntityModeTest/Map/Basic/DynamicClassFixture.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/EntityModeTest/Map/Basic/ProductLine.hbm.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/Events/Collections/IEntity.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/Extendshbm/entitynamesWithColl.hbm.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/Extendshbm/packageentitynamesf1.hbm.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/GenericTest/OrderedSetGeneric/B.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/HQL
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/HQL/HqlFixture.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1033/Animal.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1033/Reptile.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1293/Domain.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1293/Fixture.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1293/Mappings.hbm.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1355/CategoryTD.hbm.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1355/CustomVersionType.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1355/UserTypeTimestamp.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1362
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1399/Fixture.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1403/Female.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1403/Fixture.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1403/Hobby.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1403/Male.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1403/Mappings.hbm.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1403/Person.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1405/Column.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1405/Fixture.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1405/Mappings.hbm.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1413/Foo.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1413/Mappings.hbm.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1413/PagingTest.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1419/Blog.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1419/Entry.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1419/Fixture.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1419/Mappings.hbm.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1490/Domain.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1490/Fixture.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1490/Mappings.hbm.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1492/ChildEntity.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1492/Entity.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1492/Fixture.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1492/Mappings.hbm.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH662/Domain.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2008-10-25 20:06:57 UTC (rev 3879)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2008-10-28 21:56:07 UTC (rev 3880)
@@ -380,10 +380,6 @@
<Compile Include="NHSpecificTest\NH1033\Reptile.cs" />
<Compile Include="NHSpecificTest\NH1077\A.cs" />
<Compile Include="NHSpecificTest\NH1077\Fixture.cs" />
- <Compile Include="NHSpecificTest\NH1090\Fixture.cs" />
- <Compile Include="NHSpecificTest\NH1090\MainClass.cs" />
- <Compile Include="NHSpecificTest\NH1090\MainClassDescriptionOnly.cs" />
- <Compile Include="NHSpecificTest\NH1090\TuppleToPropertyResultTransformer.cs" />
<Compile Include="NHSpecificTest\NH1098\FilterParameterOrderFixture.cs" />
<Compile Include="NHSpecificTest\NH1098\Model.cs" />
<Compile Include="NHSpecificTest\NH1101\Domain.cs" />
@@ -1517,7 +1513,6 @@
<EmbeddedResource Include="Extendshbm\entitynamesWithColl.hbm.xml" />
<EmbeddedResource Include="Extendshbm\packageentitynamesf1.hbm.xml" />
<EmbeddedResource Include="Extendshbm\packageentitynamesf2.hbm.xml" />
- <EmbeddedResource Include="NHSpecificTest\NH1090\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH662\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1495\Mappings.hbm.xml" />
<EmbeddedResource Include="ProjectionFixtures\Mapping.hbm.xml" />
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: trunk/nhibernate/src/NHibernate.Test/QueryTest/MultiCriteriaFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/QueryTest/MultiCriteriaFixture.cs 2008-10-25 20:06:57 UTC (rev 3879)
+++ trunk/nhibernate/src/NHibernate.Test/QueryTest/MultiCriteriaFixture.cs 2008-10-28 21:56:07 UTC (rev 3880)
@@ -146,7 +146,7 @@
firstQueryResults.Add(4);
IList secondQueryResults = (IList)cachedQuery[1];
- secondQueryResults[0] = new object[]{2};
+ secondQueryResults[0] = 2;
using (ISession s = sessions.OpenSession())
{
Property changes on: trunk/nhibernate/src/NHibernate.Test.Performance/NHibernate.Test.Performance.csproj
___________________________________________________________________
Deleted: svn:mergeinfo
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
