Menu
▾
▴
nhibernate-commit
|
From: <pa...@us...> - 2011-04-11 17:04:49
|
Revision: 5667
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5667&view=rev
Author: patearl
Date: 2011-04-11 17:04:42 +0000 (Mon, 11 Apr 2011)
Log Message:
-----------
Improved ANTLR batch files and menus.
Modified Paths:
--------------
trunk/nhibernate/ShowBuildMenu.bat
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrHql.bat
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrHqlDebug.bat
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrHqlSqlWalker.bat
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrHqlSqlWalkerDebug.bat
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrSqlGenerator.bat
Added Paths:
-----------
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrSqlGeneratorDebug.bat
Modified: trunk/nhibernate/ShowBuildMenu.bat
===================================================================
--- trunk/nhibernate/ShowBuildMenu.bat 2011-04-11 11:41:09 UTC (rev 5666)
+++ trunk/nhibernate/ShowBuildMenu.bat 2011-04-11 17:04:42 UTC (rev 5667)
@@ -122,32 +122,36 @@
echo C. Regenerate SqlGenerator.cs from SqlGenerator.g.
echo D. Regenerate Hql.g in debug mode.
echo E. Regenerate HqlSqlWalker.g in debug mode.
-echo H. Quick instructions on using debug mode.
+echo F. Regenerate SqlGenerator.g in debug mode.
+echo G. Quick instructions on using debug mode.
echo.
if exist %SYSTEMROOT%\System32\choice.exe ( goto grammar-prompt-choice )
goto grammar-prompt-set
:grammar-prompt-choice
-choice /C:abcde
+choice /C:abcdefg
if errorlevel 255 goto end
-if errorlevel 5 goto antlr-debug
-if errorlevel 4 goto antlr-hqlsqlwalker-debug
-if errorlevel 3 goto antlr-hql-debug
+if errorlevel 7 goto antlr-debug
+if errorlevel 6 goto antlr-sqlgenerator-debug
+if errorlevel 5 goto antlr-hqlsqlwalker-debug
+if errorlevel 4 goto antlr-hql-debug
+if errorlevel 3 goto antlr-sqlgenerator
if errorlevel 2 goto antlr-hqlsqlwalker
if errorlevel 1 goto antlr-hql
if errorlevel 0 goto end
:grammar-prompt-set
-set /p OPT=[A, B, C, D, E, H]?
+set /p OPT=[A, B, C, D, E, F, G]?
if /I "%OPT%"=="A" goto antlr-hql
if /I "%OPT%"=="B" goto antlr-hqlsqlwalker
if /I "%OPT%"=="C" goto antlr-sqlgenerator
if /I "%OPT%"=="D" goto antlr-hql-debug
if /I "%OPT%"=="E" goto antlr-hqlsqlwalker-debug
-if /I "%OPT%"=="H" goto antlr-debug
+if /I "%OPT%"=="F" goto antlr-sqlgenerator
+if /I "%OPT%"=="G" goto antlr-debug
goto grammar-prompt-set
:antlr-hql
@@ -170,12 +174,17 @@
call src\NHibernate\Hql\Ast\ANTLR\AntlrHqlSqlWalkerDebug.bat
goto end
+:antlr-sqlgenerator-debug
+call src\NHibernate\Hql\Ast\ANTLR\AntlrSqlGeneratorDebug.bat
+goto end
+
:antlr-debug
echo To use the debug grammar:
echo 1. Create a unit test that runs the hql parser on the input you're interested in.
+echo The one you want to debug must be the first grammar parsed.
echo 2. Run the unit test. It will appear to stall.
-echo 3. Download and run AntlrWorks.
-echo 4. Choose "Debug Remote" and allow the default ports.
+echo 3. Download and run AntlrWorks (java -jar AntlrWorks.jar).
+echo 4. Choose "Debug Remote" and accept the default port.
echo 5. You should now be connected and able to step through your grammar.
goto end
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrHql.bat
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrHql.bat 2011-04-11 11:41:09 UTC (rev 5666)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrHql.bat 2011-04-11 17:04:42 UTC (rev 5667)
@@ -1,5 +1,5 @@
+@echo off
rem I wanted to put this in the nant build file, but I had very annoying problems with 64-bit java running from the 32-bit nant process.
-@echo off
pushd %~dp0
java.exe -cp ..\..\..\..\..\Tools\Antlr\antlr-3.2.jar org.antlr.Tool -o Generated Hql.g
popd
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrHqlDebug.bat
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrHqlDebug.bat 2011-04-11 11:41:09 UTC (rev 5666)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrHqlDebug.bat 2011-04-11 17:04:42 UTC (rev 5667)
@@ -1,5 +1,5 @@
+@echo off
rem I wanted to put this in the nant build file, but I had very annoying problems with 64-bit java running from the 32-bit nant process.
-@echo off
pushd %~dp0
java.exe -cp ..\..\..\..\..\Tools\Antlr\antlr-3.2.jar org.antlr.Tool -debug -o Generated Hql.g
popd
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrHqlSqlWalker.bat
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrHqlSqlWalker.bat 2011-04-11 11:41:09 UTC (rev 5666)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrHqlSqlWalker.bat 2011-04-11 17:04:42 UTC (rev 5667)
@@ -1,5 +1,5 @@
+@echo off
rem I wanted to put this in the nant build file, but I had very annoying problems with 64-bit java running from the 32-bit nant process.
-@echo off
pushd %~dp0
java.exe -cp ..\..\..\..\..\Tools\Antlr\antlr-3.2.jar org.antlr.Tool -o Generated HqlSqlWalker.g
popd
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrHqlSqlWalkerDebug.bat
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrHqlSqlWalkerDebug.bat 2011-04-11 11:41:09 UTC (rev 5666)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrHqlSqlWalkerDebug.bat 2011-04-11 17:04:42 UTC (rev 5667)
@@ -1,5 +1,5 @@
+@echo off
rem I wanted to put this in the nant build file, but I had very annoying problems with 64-bit java running from the 32-bit nant process.
-@echo off
pushd %~dp0
java.exe -cp ..\..\..\..\..\Tools\Antlr\antlr-3.2.jar org.antlr.Tool -debug -o Generated HqlSqlWalker.g
popd
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrSqlGenerator.bat
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrSqlGenerator.bat 2011-04-11 11:41:09 UTC (rev 5666)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrSqlGenerator.bat 2011-04-11 17:04:42 UTC (rev 5667)
@@ -1,5 +1,5 @@
+@echo off
rem I wanted to put this in the nant build file, but I had very annoying problems with 64-bit java running from the 32-bit nant process.
-@echo off
pushd %~dp0
java.exe -cp ..\..\..\..\..\Tools\Antlr\antlr-3.2.jar org.antlr.Tool -o Generated SqlGenerator.g
popd
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrSqlGeneratorDebug.bat
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrSqlGeneratorDebug.bat (rev 0)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrSqlGeneratorDebug.bat 2011-04-11 17:04:42 UTC (rev 5667)
@@ -0,0 +1,5 @@
+@echo off
+rem I wanted to put this in the nant build file, but I had very annoying problems with 64-bit java running from the 32-bit nant process.
+pushd %~dp0
+java.exe -cp ..\..\..\..\..\Tools\Antlr\antlr-3.2.jar org.antlr.Tool -debug -o Generated SqlGenerator.g
+popd
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jul...@us...> - 2011-04-12 09:36:54
|
Revision: 5673
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5673&view=rev
Author: julian-maughan
Date: 2011-04-12 09:36:48 +0000 (Tue, 12 Apr 2011)
Log Message:
-----------
Removed references to obsolete 'use_outer_join' setting from documentation and example MSSQL configuration template (NH-2643)
Modified Paths:
--------------
trunk/nhibernate/doc/reference/modules/configuration.xml
trunk/nhibernate/src/NHibernate.Config.Templates/MSSQL.cfg.xml
Modified: trunk/nhibernate/doc/reference/modules/configuration.xml
===================================================================
--- trunk/nhibernate/doc/reference/modules/configuration.xml 2011-04-12 05:30:03 UTC (rev 5672)
+++ trunk/nhibernate/doc/reference/modules/configuration.xml 2011-04-12 09:36:48 UTC (rev 5673)
@@ -409,18 +409,6 @@
</row>
<row>
<entry>
- <literal>use_outer_join</literal>
- </entry>
- <entry>
- Enables outer join fetching. Deprecated, use <literal>max_fetch_depth</literal>.
- <para>
- <emphasis role="strong">eg.</emphasis>
- <literal>true</literal> | <literal>false</literal>
- </para>
- </entry>
- </row>
- <row>
- <entry>
<literal>max_fetch_depth</literal>
</entry>
<entry>
@@ -942,7 +930,6 @@
<property name="connection.connection_string">Server=localhost;initial catalog=nhibernate;User Id=;Password=</property>
<property name="show_sql">false</property>
<property name="dialect">NHibernate.Dialect.MsSql2000Dialect</property>
- <property name="use_outer_join">true</property>
<!-- mapping files -->
<mapping resource="NHibernate.Auction.Item.hbm.xml" assembly="NHibernate.Auction" />
Modified: trunk/nhibernate/src/NHibernate.Config.Templates/MSSQL.cfg.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Config.Templates/MSSQL.cfg.xml 2011-04-12 05:30:03 UTC (rev 5672)
+++ trunk/nhibernate/src/NHibernate.Config.Templates/MSSQL.cfg.xml 2011-04-12 09:36:48 UTC (rev 5673)
@@ -14,7 +14,6 @@
<property name="adonet.batch_size">10</property>
<property name="show_sql">false</property>
<property name="dialect">NHibernate.Dialect.MsSql2000Dialect</property>
- <property name="use_outer_join">true</property>
<property name="command_timeout">60</property>
<property name="query.substitutions">true 1, false 0, yes 'Y', no 'N'</property>
</session-factory>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2011-04-18 21:24:31
|
Revision: 5718
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5718&view=rev
Author: fabiomaulo
Date: 2011-04-18 21:24:23 +0000 (Mon, 18 Apr 2011)
Log Message:
-----------
- Sync between proxy-validator and proxy-factory
- removed no more used exception about proxy-factory-factory
Breaking Change:
what was "only" a log-error in PocoEntityTuplizer.LogPropertyAccessorsErrors is now checked by the proxy-validator and an early exception is thrown when the proxy-validator is active.
Modified Paths:
--------------
trunk/nhibernate/releasenotes.txt
trunk/nhibernate/src/NHibernate/Linq/EnumerableHelper.cs
trunk/nhibernate/src/NHibernate/Linq/Functions/DictionaryGenerator.cs
trunk/nhibernate/src/NHibernate/Linq/Functions/QueryableGenerator.cs
trunk/nhibernate/src/NHibernate/NHibernate.csproj
trunk/nhibernate/src/NHibernate/Proxy/DynProxyTypeValidator.cs
trunk/nhibernate/src/NHibernate/Proxy/DynamicProxy/ProxyFactory.cs
trunk/nhibernate/src/NHibernate/Util/ReflectHelper.cs
trunk/nhibernate/src/NHibernate.Test/Insertordering/Membership.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1343/OrderLine.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1584/Cat.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1612/Area.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1612/City.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1612/Country.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1612/Person.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1693/Model.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1864/Model.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1868/Model.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1904/Model.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1908/Model.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1922/Model.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1925/Model.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1927/Model.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1928/Model.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2245/Model.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2420/MyTable.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2632/Domain.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/ProxyValidator/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
trunk/nhibernate/src/NHibernate.Test/UtilityTest/ReflectionHelperIsMethodOfTests.cs
trunk/nhibernate/src/NHibernate.Test/VersionTest/Db/MsSQL/ComplexDomain.cs
trunk/nhibernate/src/NHibernate.Test/VersionTest/Db/MsSQL/SimpleVersioned.cs
Added Paths:
-----------
trunk/nhibernate/src/NHibernate/Proxy/DefaultDynamicProxyMethodCheckerExtensions.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/ProxyValidator/ShouldBeProxiableTests.cs
Removed Paths:
-------------
trunk/nhibernate/src/NHibernate/Bytecode/ProxyFactoryFactoryNotConfiguredException.cs
Modified: trunk/nhibernate/releasenotes.txt
===================================================================
--- trunk/nhibernate/releasenotes.txt 2011-04-18 17:25:00 UTC (rev 5717)
+++ trunk/nhibernate/releasenotes.txt 2011-04-18 21:24:23 UTC (rev 5718)
@@ -4,9 +4,11 @@
##### Possible Breaking Changes #####
* [NH-2550] - Allow public access to FieldInterceptor Session (IFieldInterceptor changed)
- * [NH-2593] - Form Microsoft SQL Server the default batch-size (adonet.batch_size) is set to 20 where not explicit defined in the session-factory configuration
+ * [NH-2593] - For Microsoft SQL Server the default batch-size (adonet.batch_size) is set to 20 where not explicit defined in the session-factory configuration
* - ICollectionPersister added property to fix [NH-2489]
* [NH-2605] Refactorize MultiQuery/MultiCriteria implementation to delegate responsibility to IDrive (IDrive changed).
+ * For users who don't look at Log-ERROR, to prevent wrong behavior when lazy-properties are used the DynamicProxyValidator validates the accessability of properties setters.
+
Build 3.2.0.Aplha2 (rev5715)
=============================
** Bug
Deleted: trunk/nhibernate/src/NHibernate/Bytecode/ProxyFactoryFactoryNotConfiguredException.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Bytecode/ProxyFactoryFactoryNotConfiguredException.cs 2011-04-18 17:25:00 UTC (rev 5717)
+++ trunk/nhibernate/src/NHibernate/Bytecode/ProxyFactoryFactoryNotConfiguredException.cs 2011-04-18 21:24:23 UTC (rev 5718)
@@ -1,29 +0,0 @@
-using System;
-using System.Runtime.Serialization;
-
-namespace NHibernate.Bytecode
-{
-
- [Serializable]
- public class ProxyFactoryFactoryNotConfiguredException : HibernateByteCodeException
- {
- public ProxyFactoryFactoryNotConfiguredException() {}
-
- protected ProxyFactoryFactoryNotConfiguredException(SerializationInfo info,
- StreamingContext context) : base(info, context) {}
-
- public override string Message
- {
- get
- {
- const string msg = @"The ProxyFactoryFactory was not configured.
-Initialize 'proxyfactory.factory_class' property of the session-factory configuration section with one of the available NHibernate.ByteCode providers.
-Example:
-<property name='proxyfactory.factory_class'>NHibernate.ByteCode.LinFu.ProxyFactoryFactory, NHibernate.ByteCode.LinFu</property>
-Example:
-<property name='proxyfactory.factory_class'>NHibernate.ByteCode.Castle.ProxyFactoryFactory, NHibernate.ByteCode.Castle</property>";
- return msg;
- }
- }
- }
-}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Linq/EnumerableHelper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Linq/EnumerableHelper.cs 2011-04-18 17:25:00 UTC (rev 5717)
+++ trunk/nhibernate/src/NHibernate/Linq/EnumerableHelper.cs 2011-04-18 21:24:23 UTC (rev 5718)
@@ -55,58 +55,6 @@
}
return ((MemberExpression)property.Body).Member;
}
-
- /// <summary>
- /// Check if a method is declared in a given <see cref="System.Type"/>.
- /// </summary>
- /// <param name="source">The method to check.</param>
- /// <param name="realDeclaringType">The where the method is really declared.</param>
- /// <returns>True if the method is an implementation of the method declared in <paramref name="realDeclaringType"/>; false otherwise. </returns>
- public static bool IsMethodOf(this MethodInfo source, System.Type realDeclaringType)
- {
- if (source == null)
- {
- throw new ArgumentNullException("source");
- }
- if (realDeclaringType == null)
- {
- throw new ArgumentNullException("realDeclaringType");
- }
- var methodDeclaringType = source.DeclaringType;
- if(realDeclaringType.Equals(methodDeclaringType))
- {
- return true;
- }
- if (methodDeclaringType.IsGenericType && !methodDeclaringType.IsGenericTypeDefinition &&
- realDeclaringType.Equals(methodDeclaringType.GetGenericTypeDefinition()))
- {
- return true;
- }
- if (realDeclaringType.IsInterface)
- {
- var declaringTypeInterfaces = methodDeclaringType.GetInterfaces();
- if(declaringTypeInterfaces.Contains(realDeclaringType))
- {
- var methodsMap = methodDeclaringType.GetInterfaceMap(realDeclaringType);
- if(methodsMap.TargetMethods.Contains(source))
- {
- return true;
- }
- }
- if (realDeclaringType.IsGenericTypeDefinition)
- {
- bool implements = declaringTypeInterfaces
- .Where(t => t.IsGenericType && t.GetGenericTypeDefinition().Equals(realDeclaringType))
- .Select(implementedGenericInterface => methodDeclaringType.GetInterfaceMap(implementedGenericInterface))
- .Any(methodsMap => methodsMap.TargetMethods.Contains(source));
- if (implements)
- {
- return true;
- }
- }
- }
- return false;
- }
}
// TODO rename / remove - reflection helper above is better
Modified: trunk/nhibernate/src/NHibernate/Linq/Functions/DictionaryGenerator.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Linq/Functions/DictionaryGenerator.cs 2011-04-18 17:25:00 UTC (rev 5717)
+++ trunk/nhibernate/src/NHibernate/Linq/Functions/DictionaryGenerator.cs 2011-04-18 21:24:23 UTC (rev 5718)
@@ -6,6 +6,7 @@
using System.Reflection;
using NHibernate.Hql.Ast;
using NHibernate.Linq.Visitors;
+using NHibernate.Util;
namespace NHibernate.Linq.Functions
{
Modified: trunk/nhibernate/src/NHibernate/Linq/Functions/QueryableGenerator.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Linq/Functions/QueryableGenerator.cs 2011-04-18 17:25:00 UTC (rev 5717)
+++ trunk/nhibernate/src/NHibernate/Linq/Functions/QueryableGenerator.cs 2011-04-18 21:24:23 UTC (rev 5718)
@@ -5,6 +5,7 @@
using System.Reflection;
using NHibernate.Hql.Ast;
using NHibernate.Linq.Visitors;
+using NHibernate.Util;
namespace NHibernate.Linq.Functions
{
Modified: trunk/nhibernate/src/NHibernate/NHibernate.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate/NHibernate.csproj 2011-04-18 17:25:00 UTC (rev 5717)
+++ trunk/nhibernate/src/NHibernate/NHibernate.csproj 2011-04-18 21:24:23 UTC (rev 5718)
@@ -496,6 +496,7 @@
<Compile Include="Properties\PascalCaseMUnderscoreStrategy.cs" />
<Compile Include="Properties\PascalCaseUnderscoreStrategy.cs" />
<Compile Include="Properties\PropertyAccessorFactory.cs" />
+ <Compile Include="Proxy\DefaultDynamicProxyMethodCheckerExtensions.cs" />
<Compile Include="Proxy\DefaultLazyInitializer.cs" />
<Compile Include="Proxy\DefaultProxyFactory.cs" />
<Compile Include="Proxy\DynamicProxy\DefaultArgumentHandler.cs" />
@@ -680,7 +681,6 @@
<Compile Include="Bytecode\HibernateByteCodeException.cs" />
<Compile Include="Bytecode\IInjectableCollectionTypeFactoryClass.cs" />
<Compile Include="Bytecode\IObjectsFactory.cs" />
- <Compile Include="Bytecode\ProxyFactoryFactoryNotConfiguredException.cs" />
<Compile Include="Bytecode\UnableToLoadProxyFactoryFactoryException.cs" />
<Compile Include="Cache\FakeCache.cs" />
<Compile Include="Cfg\BindMappingEventArgs.cs" />
Added: trunk/nhibernate/src/NHibernate/Proxy/DefaultDynamicProxyMethodCheckerExtensions.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Proxy/DefaultDynamicProxyMethodCheckerExtensions.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate/Proxy/DefaultDynamicProxyMethodCheckerExtensions.cs 2011-04-18 21:24:23 UTC (rev 5718)
@@ -0,0 +1,50 @@
+using System;
+using System.Linq;
+using System.Reflection;
+using NHibernate.Util;
+
+namespace NHibernate.Proxy
+{
+ public static class DefaultDynamicProxyMethodCheckerExtensions
+ {
+ public static bool IsProxiable(this MethodInfo method)
+ {
+ return !method.IsFinal
+ && (method.DeclaringType != typeof(MarshalByRefObject))
+ && (method.DeclaringType != typeof(object) || !"finalize".Equals(method.Name.ToLowerInvariant()))
+ &&
+ (
+ ((method.IsPublic || method.IsFamily) && (method.IsVirtual || method.IsAbstract)) // public or protected (virtual)
+ ||
+ (method.IsFamilyOrAssembly && (method.IsVirtual || method.IsAbstract)) // internal protected virtual
+ );
+ }
+
+ public static bool ShouldBeProxiable(this MethodInfo method)
+ {
+ // to use only for real methods (no getter/setter)
+ return (method.DeclaringType != typeof (MarshalByRefObject)) &&
+ (method.DeclaringType != typeof (object) || !"finalize".Equals(method.Name.ToLowerInvariant())) &&
+ (!(method.DeclaringType == typeof (object) && "GetType".Equals(method.Name))) &&
+ !IsDisposeMethod(method) &&
+ (method.IsPublic || method.IsAssembly || method.IsFamilyOrAssembly);
+ }
+
+ public static bool ShouldBeProxiable(this PropertyInfo propertyInfo)
+ {
+ if(propertyInfo != null)
+ {
+ var accessors = propertyInfo.GetAccessors(true);
+ return accessors.Where(x => x.IsPublic || x.IsAssembly || x.IsFamilyOrAssembly).Any();
+ }
+ return true;
+ }
+
+ private static bool IsDisposeMethod(MethodInfo method)
+ {
+ // NH-1464
+ return method.Name.Equals("Dispose") && method.MemberType == MemberTypes.Method && method.GetParameters().Length == 0;
+ // return method.Name.Equals("Dispose") && method.IsMethodOf(typeof(IDisposable));
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Proxy/DynProxyTypeValidator.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Proxy/DynProxyTypeValidator.cs 2011-04-18 17:25:00 UTC (rev 5717)
+++ trunk/nhibernate/src/NHibernate/Proxy/DynProxyTypeValidator.cs 2011-04-18 21:24:23 UTC (rev 5718)
@@ -52,36 +52,44 @@
if (member is PropertyInfo)
{
var property = (PropertyInfo) member;
- MethodInfo[] accessors = property.GetAccessors(false);
+ if(property.ShouldBeProxiable())
+ {
+ MethodInfo[] accessors = property.GetAccessors(true);
- if (accessors != null)
- {
- foreach (var accessor in accessors)
+ if (accessors != null)
{
- CheckMethodIsVirtual(type, accessor);
+ foreach (var accessor in accessors)
+ {
+ CheckMethodIsVirtual(type, accessor);
+ }
}
}
}
else if (member is MethodInfo)
{
- if (member.DeclaringType == typeof (object) && member.Name == "GetType")
+ var methodInfo = (MethodInfo) member;
+ // avoid the check of properties getter and setter because already checked when the PropertyInfo was found.
+ if (!IsPropertyMethod(methodInfo) && methodInfo.ShouldBeProxiable())
{
- // object.GetType is ignored
- continue;
+ CheckMethodIsVirtual(type, methodInfo);
}
- CheckMethodIsVirtual(type, (MethodInfo) member);
}
else if (member is FieldInfo)
{
var memberField = (FieldInfo) member;
if (memberField.IsPublic || memberField.IsAssembly || memberField.IsFamilyOrAssembly)
{
- EnlistError(type, "field " + member.Name + " should not be public nor internal");
+ EnlistError(type, "field " + member.Name + " should not be public nor internal (ecapsulate it in a property).");
}
}
}
}
+ private bool IsPropertyMethod(MethodInfo methodInfo)
+ {
+ return methodInfo.IsSpecialName && (methodInfo.Name.StartsWith("get_") || methodInfo.Name.StartsWith("set_"));
+ }
+
protected virtual void CheckMethodIsVirtual(System.Type type, MethodInfo method)
{
if (!IsProxeable(method))
@@ -92,17 +100,11 @@
public virtual bool IsProxeable(MethodInfo method)
{
- // In NET if IsVirtual is false or IsFinal is true, then the method cannot be overridden.
- return !(method.DeclaringType != typeof (object) && !IsDisposeMethod(method)
- && (method.IsPublic || method.IsAssembly || method.IsFamilyOrAssembly)
- && (!method.IsVirtual || method.IsFinal || (method.IsVirtual && method.IsAssembly)));
+ // NH: this method is used even when the proxy-validation at start-up is turned off to check each persistent property (only persistent properties).
+ // it must be in sync with what is really proxiable by the proxy-factory.
+ return method.IsProxiable();
}
- protected static bool IsDisposeMethod(MethodBase method)
- {
- return method.Name.Equals("Dispose") && method.MemberType == MemberTypes.Method && method.GetParameters().Length == 0;
- }
-
protected virtual bool HasVisibleDefaultConstructor(System.Type type)
{
ConstructorInfo constructor =
Modified: trunk/nhibernate/src/NHibernate/Proxy/DynamicProxy/ProxyFactory.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Proxy/DynamicProxy/ProxyFactory.cs 2011-04-18 17:25:00 UTC (rev 5717)
+++ trunk/nhibernate/src/NHibernate/Proxy/DynamicProxy/ProxyFactory.cs 2011-04-18 21:24:23 UTC (rev 5718)
@@ -173,20 +173,10 @@
const BindingFlags candidateMethodsBindingFlags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
return
type.GetMethods(candidateMethodsBindingFlags)
- .Where(method => IsProxiable(method))
+ .Where(method=> method.IsProxiable())
.Concat(interfaces.SelectMany(interfaceType => interfaceType.GetMethods())).Distinct();
}
- private bool IsProxiable(MethodInfo method)
- {
- return (
- ((method.IsPublic || method.IsFamily || method.IsAssembly || method.IsFamilyOrAssembly) && (method.IsVirtual || method.IsAbstract))
- && !method.IsFinal
- && (method.DeclaringType != typeof (MarshalByRefObject)))
- && (method.DeclaringType != typeof (object) || !"finalize".Equals(method.Name.ToLowerInvariant())
- );
- }
-
private static ConstructorBuilder DefineConstructor(TypeBuilder typeBuilder)
{
const MethodAttributes constructorAttributes = MethodAttributes.Public |
Modified: trunk/nhibernate/src/NHibernate/Util/ReflectHelper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Util/ReflectHelper.cs 2011-04-18 17:25:00 UTC (rev 5717)
+++ trunk/nhibernate/src/NHibernate/Util/ReflectHelper.cs 2011-04-18 21:24:23 UTC (rev 5718)
@@ -689,5 +689,57 @@
}
return HasProperty(source.BaseType, propertyName) || source.GetInterfaces().Any(@interface => HasProperty(@interface, propertyName));
}
- }
+
+ /// <summary>
+ /// Check if a method is declared in a given <see cref="System.Type"/>.
+ /// </summary>
+ /// <param name="source">The method to check.</param>
+ /// <param name="realDeclaringType">The where the method is really declared.</param>
+ /// <returns>True if the method is an implementation of the method declared in <paramref name="realDeclaringType"/>; false otherwise. </returns>
+ public static bool IsMethodOf(this MethodInfo source, System.Type realDeclaringType)
+ {
+ if (source == null)
+ {
+ throw new ArgumentNullException("source");
+ }
+ if (realDeclaringType == null)
+ {
+ throw new ArgumentNullException("realDeclaringType");
+ }
+ var methodDeclaringType = source.DeclaringType;
+ if(realDeclaringType.Equals(methodDeclaringType))
+ {
+ return true;
+ }
+ if (methodDeclaringType.IsGenericType && !methodDeclaringType.IsGenericTypeDefinition &&
+ realDeclaringType.Equals(methodDeclaringType.GetGenericTypeDefinition()))
+ {
+ return true;
+ }
+ if (realDeclaringType.IsInterface)
+ {
+ var declaringTypeInterfaces = methodDeclaringType.GetInterfaces();
+ if(declaringTypeInterfaces.Contains(realDeclaringType))
+ {
+ var methodsMap = methodDeclaringType.GetInterfaceMap(realDeclaringType);
+ if(methodsMap.TargetMethods.Contains(source))
+ {
+ return true;
+ }
+ }
+ if (realDeclaringType.IsGenericTypeDefinition)
+ {
+ bool implements = declaringTypeInterfaces
+ .Where(t => t.IsGenericType && t.GetGenericTypeDefinition().Equals(realDeclaringType))
+ .Select(implementedGenericInterface => methodDeclaringType.GetInterfaceMap(implementedGenericInterface))
+ .Any(methodsMap => methodsMap.TargetMethods.Contains(source));
+ if (implements)
+ {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+ }
}
Modified: trunk/nhibernate/src/NHibernate.Test/Insertordering/Membership.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Insertordering/Membership.cs 2011-04-18 17:25:00 UTC (rev 5717)
+++ trunk/nhibernate/src/NHibernate.Test/Insertordering/Membership.cs 2011-04-18 21:24:23 UTC (rev 5718)
@@ -16,8 +16,8 @@
}
public virtual int Id { get; protected set; }
- public virtual User User { get; private set; }
- public virtual Group Group { get; private set; }
- public virtual DateTime ActivationDate { get; private set; }
+ public virtual User User { get; protected set; }
+ public virtual Group Group { get; protected set; }
+ public virtual DateTime ActivationDate { get; protected set; }
}
}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1343/OrderLine.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1343/OrderLine.cs 2011-04-18 17:25:00 UTC (rev 5717)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1343/OrderLine.cs 2011-04-18 21:24:23 UTC (rev 5718)
@@ -10,7 +10,7 @@
Product = product;
}
- public virtual int Id { get; private set; }
+ public virtual int Id { get; protected set; }
public virtual string Description { get; set; }
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1584/Cat.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1584/Cat.cs 2011-04-18 17:25:00 UTC (rev 5717)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1584/Cat.cs 2011-04-18 21:24:23 UTC (rev 5718)
@@ -2,7 +2,7 @@
{
public abstract class Cat
{
- public virtual int Id { get; private set; }
+ public virtual int Id { get; protected set; }
public virtual string Name { get; set; }
}
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1612/Area.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1612/Area.cs 2011-04-18 17:25:00 UTC (rev 5717)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1612/Area.cs 2011-04-18 21:24:23 UTC (rev 5718)
@@ -4,10 +4,10 @@
{
public abstract class Area
{
- public virtual string Code { get; private set; }
- public virtual string Name { get; private set; }
- public virtual int Version { get; private set; }
- public virtual IDictionary<int, AreaStatistics> Statistics { get; private set; }
+ public virtual string Code { get; protected set; }
+ public virtual string Name { get; protected set; }
+ public virtual int Version { get; protected set; }
+ public virtual IDictionary<int, AreaStatistics> Statistics { get; protected set; }
protected Area() {}
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1612/City.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1612/City.cs 2011-04-18 17:25:00 UTC (rev 5717)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1612/City.cs 2011-04-18 21:24:23 UTC (rev 5718)
@@ -2,7 +2,7 @@
{
public class City : Area
{
- public virtual Country Country { get; private set; }
+ public virtual Country Country { get; protected set; }
protected City() {}
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1612/Country.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1612/Country.cs 2011-04-18 17:25:00 UTC (rev 5717)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1612/Country.cs 2011-04-18 21:24:23 UTC (rev 5718)
@@ -4,8 +4,8 @@
{
public class Country : Area
{
- public virtual IList<string> Routes { get; private set; }
- public virtual IList<City> Cities { get; private set; }
+ public virtual IList<string> Routes { get; protected set; }
+ public virtual IList<City> Cities { get; protected set; }
protected Country() {}
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1612/Person.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1612/Person.cs 2011-04-18 17:25:00 UTC (rev 5717)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1612/Person.cs 2011-04-18 21:24:23 UTC (rev 5718)
@@ -4,9 +4,9 @@
{
public class Person
{
- public virtual Guid PersonId { get; private set; }
- public virtual string Name { get; private set; }
- public virtual int Version { get; private set; }
+ public virtual Guid PersonId { get; protected set; }
+ public virtual string Name { get; protected set; }
+ public virtual int Version { get; protected set; }
protected Person() {}
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1693/Model.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1693/Model.cs 2011-04-18 17:25:00 UTC (rev 5717)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1693/Model.cs 2011-04-18 21:24:23 UTC (rev 5718)
@@ -2,7 +2,7 @@
{
public class Invoice
{
- public virtual int ID { get; private set; }
+ public virtual int ID { get; protected set; }
public virtual string Mode { get; set; }
public virtual int Category { get; set; }
public virtual int Num { get; set; }
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1864/Model.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1864/Model.cs 2011-04-18 17:25:00 UTC (rev 5717)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1864/Model.cs 2011-04-18 21:24:23 UTC (rev 5718)
@@ -4,13 +4,13 @@
{
public class Category
{
- public virtual int ID { get; private set; }
+ public virtual int ID { get; protected set; }
public virtual DateTime ValidUntil { get; set; }
}
public class Invoice
{
- public virtual int ID { get; private set; }
+ public virtual int ID { get; protected set; }
public virtual DateTime ValidUntil { get; set; }
public virtual int Foo { get; set; }
}
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1868/Model.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1868/Model.cs 2011-04-18 17:25:00 UTC (rev 5717)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1868/Model.cs 2011-04-18 21:24:23 UTC (rev 5718)
@@ -4,19 +4,19 @@
{
public class Category
{
- public virtual int ID { get; private set; }
+ public virtual int ID { get; protected set; }
public virtual DateTime ValidUntil { get; set; }
}
public class Package
{
- public virtual int ID { get; private set; }
+ public virtual int ID { get; protected set; }
public virtual DateTime ValidUntil { get; set; }
}
public class Invoice
{
- public virtual int ID { get; private set; }
+ public virtual int ID { get; protected set; }
public virtual DateTime ValidUntil { get; set; }
public virtual Category Category { get; set; }
public virtual Package Package { get; set; }
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1904/Model.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1904/Model.cs 2011-04-18 17:25:00 UTC (rev 5717)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1904/Model.cs 2011-04-18 21:24:23 UTC (rev 5718)
@@ -4,7 +4,7 @@
{
public class Invoice
{
- public virtual int ID { get; private set; }
+ public virtual int ID { get; protected set; }
public virtual DateTime Issued { get; set; }
protected virtual DateTime issued { get; set; }
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1908/Model.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1908/Model.cs 2011-04-18 17:25:00 UTC (rev 5717)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1908/Model.cs 2011-04-18 21:24:23 UTC (rev 5718)
@@ -4,14 +4,14 @@
{
public class Category
{
- public virtual int ID { get; private set; }
+ public virtual int ID { get; protected set; }
public virtual Category ParentCategory { get; set; }
public virtual DateTime ValidUntil { get; set; }
}
public class Invoice
{
- public virtual int ID { get; private set; }
+ public virtual int ID { get; protected set; }
public virtual DateTime Issued { get; set; }
public virtual Category Category { get; set; }
}
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1922/Model.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1922/Model.cs 2011-04-18 17:25:00 UTC (rev 5717)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1922/Model.cs 2011-04-18 21:24:23 UTC (rev 5718)
@@ -5,7 +5,7 @@
{
public class Customer
{
- public virtual int ID { get; private set; }
+ public virtual int ID { get; protected set; }
public virtual DateTime ValidUntil { get; set; }
}
}
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1925/Model.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1925/Model.cs 2011-04-18 17:25:00 UTC (rev 5717)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1925/Model.cs 2011-04-18 21:24:23 UTC (rev 5718)
@@ -4,14 +4,14 @@
{
public class Customer
{
- public virtual int ID { get; private set; }
+ public virtual int ID { get; protected set; }
public virtual ISet<Invoice> Invoices { get; set; }
public virtual string Name { get; set; }
}
public class Invoice
{
- public virtual int ID { get; private set; }
+ public virtual int ID { get; protected set; }
public virtual Customer Customer { get; set; }
public virtual int Number { get; set; }
}
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1927/Model.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1927/Model.cs 2011-04-18 17:25:00 UTC (rev 5717)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1927/Model.cs 2011-04-18 21:24:23 UTC (rev 5718)
@@ -5,14 +5,14 @@
{
public class Customer
{
- public virtual int ID { get; private set; }
+ public virtual int ID { get; protected set; }
public virtual ISet<Invoice> Invoices { get; set; }
public vi...
[truncated message content] |
|
From: <ric...@us...> - 2011-04-27 09:50:04
|
Revision: 5770
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5770&view=rev
Author: ricbrown
Date: 2011-04-27 09:49:57 +0000 (Wed, 27 Apr 2011)
Log Message:
-----------
Added test-dialect for Firebird to allow defaulting to embedded client.
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate.Test/GeneratedTest/ComponentOwner.hbm.xml
trunk/nhibernate/src/NHibernate.Test/Generatedkeys/Select/MyEntity.hbm.xml
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
trunk/nhibernate/teamcity.build
Added Paths:
-----------
trunk/nhibernate/src/NHibernate.Test/DialectTest/FirebirdClientDialect.cs
Added: trunk/nhibernate/src/NHibernate.Test/DialectTest/FirebirdClientDialect.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/DialectTest/FirebirdClientDialect.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/DialectTest/FirebirdClientDialect.cs 2011-04-27 09:49:57 UTC (rev 5770)
@@ -0,0 +1,14 @@
+using NHibernate.Cfg;
+using NHibernate.Dialect;
+
+namespace NHibernate.Test.DialectTest
+{
+ public class FirebirdClientDialect : FirebirdDialect
+ {
+ public FirebirdClientDialect() : base()
+ {
+ // overrides default driver to allow tests to run using embedded client
+ DefaultProperties[Environment.ConnectionDriver] = "NHibernate.Driver.FirebirdClientDriver";
+ }
+ }
+}
Modified: trunk/nhibernate/src/NHibernate.Test/GeneratedTest/ComponentOwner.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/GeneratedTest/ComponentOwner.hbm.xml 2011-04-26 22:15:51 UTC (rev 5769)
+++ trunk/nhibernate/src/NHibernate.Test/GeneratedTest/ComponentOwner.hbm.xml 2011-04-27 09:49:57 UTC (rev 5770)
@@ -70,6 +70,7 @@
<![CDATA[DROP TRIGGER t_iu_part_gen_comp]]>
</drop>
<dialect-scope name="NHibernate.Dialect.FirebirdDialect"/>
+ <dialect-scope name="NHibernate.Test.DialectTest.FirebirdClientDialect"/>
</database-object>
</hibernate-mapping>
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Test/Generatedkeys/Select/MyEntity.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Generatedkeys/Select/MyEntity.hbm.xml 2011-04-26 22:15:51 UTC (rev 5769)
+++ trunk/nhibernate/src/NHibernate.Test/Generatedkeys/Select/MyEntity.hbm.xml 2011-04-27 09:49:57 UTC (rev 5770)
@@ -21,6 +21,7 @@
DROP GENERATOR MYGENERATOR;
</drop>
<dialect-scope name="NHibernate.Dialect.FirebirdDialect"/>
+ <dialect-scope name="NHibernate.Test.DialectTest.FirebirdClientDialect"/>
</database-object>
<database-object>
@@ -36,8 +37,9 @@
<drop>
DROP TRIGGER my_entity_BI;
</drop>
- <dialect-scope name="NHibernate.Dialect.FirebirdDialect"/>
- </database-object>
+ <dialect-scope name="NHibernate.Dialect.FirebirdDialect"/>
+ <dialect-scope name="NHibernate.Test.DialectTest.FirebirdClientDialect"/>
+ </database-object>
<database-object>
<create>
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2011-04-26 22:15:51 UTC (rev 5769)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2011-04-27 09:49:57 UTC (rev 5770)
@@ -211,6 +211,7 @@
<Compile Include="Criteria\MaterialResource.cs" />
<Compile Include="Criteria\ProjectionsTest.cs" />
<Compile Include="Criteria\Reptile.cs" />
+ <Compile Include="DialectTest\FirebirdClientDialect.cs" />
<Compile Include="DialectTest\MsSqlCe40DialectFixture.cs" />
<Compile Include="DriverTest\DbProviderFactoryDriveConnectionCommandProviderTest.cs" />
<Compile Include="DriverTest\ReflectionBasedDriverTest.cs" />
Modified: trunk/nhibernate/teamcity.build
===================================================================
--- trunk/nhibernate/teamcity.build 2011-04-26 22:15:51 UTC (rev 5769)
+++ trunk/nhibernate/teamcity.build 2011-04-27 09:49:57 UTC (rev 5770)
@@ -35,7 +35,7 @@
<target name="setup-teamcity-firebird32">
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.FirebirdClientDriver" />
- <property name="nhibernate.dialect" value="NHibernate.Dialect.FirebirdDialect" />
+ <property name="nhibernate.dialect" value="NHibernate.Test.DialectTest.FirebirdClientDialect, NHibernate.Test" />
<property name="nhibernate.connection.connection_string" value="Database=NHibernate.fdb;ServerType=1;UserID=SYSDBA" />
<copy todir="${bin.dir}">
<fileset basedir="${root.dir}/lib/teamcity/firebird/x86">
@@ -51,7 +51,7 @@
<property name="nunit-console" value="${tools.dir}/NUnit/nunit-console.exe" />
<property name="nunit.found" value="true" />
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.FirebirdClientDriver" />
- <property name="nhibernate.dialect" value="NHibernate.Dialect.FirebirdDialect" />
+ <property name="nhibernate.dialect" value="NHibernate.Test.DialectTest.FirebirdClientDialect, NHibernate.Test" />
<property name="nhibernate.connection.connection_string" value="Database=NHibernate.fdb;ServerType=1;UserID=SYSDBA" />
<copy todir="${bin.dir}">
<fileset basedir="${root.dir}/lib/teamcity/firebird/x64">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ric...@us...> - 2011-05-17 20:45:42
|
Revision: 5833
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5833&view=rev
Author: ricbrown
Date: 2011-05-17 20:45:36 +0000 (Tue, 17 May 2011)
Log Message:
-----------
Reverted rev 5770 (no longer needed after Firebird Dialect had corrected default Driver)
Revision Links:
--------------
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5770&view=rev
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate.Test/GeneratedTest/ComponentOwner.hbm.xml
trunk/nhibernate/src/NHibernate.Test/Generatedkeys/Select/MyEntity.hbm.xml
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
trunk/nhibernate/teamcity.build
Removed Paths:
-------------
trunk/nhibernate/src/NHibernate.Test/DialectTest/FirebirdClientDialect.cs
Deleted: trunk/nhibernate/src/NHibernate.Test/DialectTest/FirebirdClientDialect.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/DialectTest/FirebirdClientDialect.cs 2011-05-17 20:07:15 UTC (rev 5832)
+++ trunk/nhibernate/src/NHibernate.Test/DialectTest/FirebirdClientDialect.cs 2011-05-17 20:45:36 UTC (rev 5833)
@@ -1,14 +0,0 @@
-using NHibernate.Cfg;
-using NHibernate.Dialect;
-
-namespace NHibernate.Test.DialectTest
-{
- public class FirebirdClientDialect : FirebirdDialect
- {
- public FirebirdClientDialect() : base()
- {
- // overrides default driver to allow tests to run using embedded client
- DefaultProperties[Environment.ConnectionDriver] = "NHibernate.Driver.FirebirdClientDriver";
- }
- }
-}
Modified: trunk/nhibernate/src/NHibernate.Test/GeneratedTest/ComponentOwner.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/GeneratedTest/ComponentOwner.hbm.xml 2011-05-17 20:07:15 UTC (rev 5832)
+++ trunk/nhibernate/src/NHibernate.Test/GeneratedTest/ComponentOwner.hbm.xml 2011-05-17 20:45:36 UTC (rev 5833)
@@ -70,7 +70,6 @@
<![CDATA[DROP TRIGGER t_iu_part_gen_comp]]>
</drop>
<dialect-scope name="NHibernate.Dialect.FirebirdDialect"/>
- <dialect-scope name="NHibernate.Test.DialectTest.FirebirdClientDialect"/>
</database-object>
</hibernate-mapping>
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Test/Generatedkeys/Select/MyEntity.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Generatedkeys/Select/MyEntity.hbm.xml 2011-05-17 20:07:15 UTC (rev 5832)
+++ trunk/nhibernate/src/NHibernate.Test/Generatedkeys/Select/MyEntity.hbm.xml 2011-05-17 20:45:36 UTC (rev 5833)
@@ -21,7 +21,6 @@
DROP GENERATOR MYGENERATOR;
</drop>
<dialect-scope name="NHibernate.Dialect.FirebirdDialect"/>
- <dialect-scope name="NHibernate.Test.DialectTest.FirebirdClientDialect"/>
</database-object>
<database-object>
@@ -37,9 +36,8 @@
<drop>
DROP TRIGGER my_entity_BI;
</drop>
- <dialect-scope name="NHibernate.Dialect.FirebirdDialect"/>
- <dialect-scope name="NHibernate.Test.DialectTest.FirebirdClientDialect"/>
- </database-object>
+ <dialect-scope name="NHibernate.Dialect.FirebirdDialect"/>
+ </database-object>
<database-object>
<create>
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2011-05-17 20:07:15 UTC (rev 5832)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2011-05-17 20:45:36 UTC (rev 5833)
@@ -212,7 +212,6 @@
<Compile Include="Criteria\MaterialResource.cs" />
<Compile Include="Criteria\ProjectionsTest.cs" />
<Compile Include="Criteria\Reptile.cs" />
- <Compile Include="DialectTest\FirebirdClientDialect.cs" />
<Compile Include="DialectTest\MsSqlCe40DialectFixture.cs" />
<Compile Include="DriverTest\DbProviderFactoryDriveConnectionCommandProviderTest.cs" />
<Compile Include="DriverTest\ReflectionBasedDriverTest.cs" />
Modified: trunk/nhibernate/teamcity.build
===================================================================
--- trunk/nhibernate/teamcity.build 2011-05-17 20:07:15 UTC (rev 5832)
+++ trunk/nhibernate/teamcity.build 2011-05-17 20:45:36 UTC (rev 5833)
@@ -35,7 +35,7 @@
<target name="setup-teamcity-firebird32">
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.FirebirdClientDriver" />
- <property name="nhibernate.dialect" value="NHibernate.Test.DialectTest.FirebirdClientDialect, NHibernate.Test" />
+ <property name="nhibernate.dialect" value="NHibernate.Dialect.FirebirdDialect" />
<property name="nhibernate.connection.connection_string" value="Database=NHibernate.fdb;ServerType=1;UserID=SYSDBA" />
<copy todir="${bin.dir}">
<fileset basedir="${root.dir}/lib/teamcity/firebird/x86">
@@ -51,7 +51,7 @@
<property name="nunit-console" value="${tools.dir}/NUnit/nunit-console.exe" />
<property name="nunit.found" value="true" />
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.FirebirdClientDriver" />
- <property name="nhibernate.dialect" value="NHibernate.Test.DialectTest.FirebirdClientDialect, NHibernate.Test" />
+ <property name="nhibernate.dialect" value="NHibernate.Dialect.FirebirdDialect" />
<property name="nhibernate.connection.connection_string" value="Database=NHibernate.fdb;ServerType=1;UserID=SYSDBA" />
<copy todir="${bin.dir}">
<fileset basedir="${root.dir}/lib/teamcity/firebird/x64">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2011-05-18 18:08:24
|
Revision: 5839
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5839&view=rev
Author: fabiomaulo
Date: 2011-05-18 18:08:18 +0000 (Wed, 18 May 2011)
Log Message:
-----------
Preparing release
Modified Paths:
--------------
trunk/nhibernate/build-common/common.xml
trunk/nhibernate/releasenotes.txt
Modified: trunk/nhibernate/build-common/common.xml
===================================================================
--- trunk/nhibernate/build-common/common.xml 2011-05-18 17:51:09 UTC (rev 5838)
+++ trunk/nhibernate/build-common/common.xml 2011-05-18 18:08:18 UTC (rev 5839)
@@ -84,7 +84,7 @@
effectively SP0).
-->
- <property name="project.version" value="3.2.0.Alpha3" overwrite="false" />
+ <property name="project.version" value="3.2.0.Beta1" overwrite="false" />
<!-- Compute short project version (major.minor) using a regex -->
<regex input="${project.version}" pattern="^(?'shortversion'\d+\.\d+)" />
Modified: trunk/nhibernate/releasenotes.txt
===================================================================
--- trunk/nhibernate/releasenotes.txt 2011-05-18 17:51:09 UTC (rev 5838)
+++ trunk/nhibernate/releasenotes.txt 2011-05-18 18:08:18 UTC (rev 5839)
@@ -10,6 +10,26 @@
* For users who don't look at Log-ERROR, to prevent wrong behavior when lazy-properties are used the DynamicProxyValidator validates the accessability of properties setters.
* For those implementing IDrive without inherit from DriveBase: IDrive.AdjustCommand
+Build 3.2.0.Beta1 (rev5839)
+=============================
+** Bug
+ * [NH-2404] - Future queries crash (MultiQuery) when using projection queries using hql + result transformer or the linq provider (which compiles into hql)
+ * [NH-2421] - NotSupportedException text in ToFuture and ToFutureValue does not make sense (or help)
+ * [NH-2422] - ToFuture throws NotSupportedException on IQueryable if Fetch is used.
+ * [NH-2559] - NH 3.0 Linq Provider : Issue using multiple filters on the same entity
+ * [NH-2615] - Linq Fetch cannot traverse through components
+ * [NH-2690] - Linq Select() broken with .ToFuture()
+ * [NH-2691] - Linq LongCount() behavior different from Count()
+ * [NH-2697] - Named parameter not found in HQL with mapping using "entity-name"
+ * [NH-2698] - Proxying fails for methods with generic type constraints
+
+** Improvement
+ * [NH-2568] - Create Custom Persister for Collection Type inherited from OneToManyPersister
+ * [NH-2695] - update default driver of firebird dialect to FirebirdClientDriver (FirebirdDriver is obsolete)
+
+** New Feature
+ * [NH-2699] - Sql Azure dialect
+
Build 3.2.0.Aplha3 (rev5803)
=============================
** Sub-task
@@ -514,6 +534,19 @@
* [NH-2013] - HQL breaking change
* [NH-2247] - Update FlushMode Documentation
+Build 2.1.2.GA (rev4854)
+=============================
+** Bug
+ * [NH-2011] - Many-to-many inside a component will not be saved when using SaveOrUpdateCopy or Merge
+ * [NH-2283] - CLONE -one-to-many collection with table per subclass, using discriminator: wrong proxies in collection
+
+** Improvement
+ * [NH-2022] - Allow overriding in Query By Example
+
+** Patch
+ * [NH-2007] - SesssionIdLoggingContext patch for big resultsets
+ * [NH-2019] - Clarification about the use of <import> for polymorphic queries
+
Build 2.1.1.GA (rev4814)
=============================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pa...@us...> - 2011-05-29 18:37:03
|
Revision: 5880
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5880&view=rev
Author: patearl
Date: 2011-05-29 18:36:56 +0000 (Sun, 29 May 2011)
Log Message:
-----------
Documentation and consistency improvements in limit support. Includes a fix for a bug recently introduced in the MsSql2005Dialect.
Modified Paths:
--------------
trunk/nhibernate/releasenotes.txt
trunk/nhibernate/src/NHibernate/Criterion/SubqueryExpression.cs
trunk/nhibernate/src/NHibernate/Dialect/Dialect.cs
trunk/nhibernate/src/NHibernate/Dialect/MsSql2005Dialect.cs
trunk/nhibernate/src/NHibernate/Loader/Loader.cs
Modified: trunk/nhibernate/releasenotes.txt
===================================================================
--- trunk/nhibernate/releasenotes.txt 2011-05-29 18:06:21 UTC (rev 5879)
+++ trunk/nhibernate/releasenotes.txt 2011-05-29 18:36:56 UTC (rev 5880)
@@ -4,6 +4,8 @@
##### Possible Breaking Changes #####
* All Dialect.GetLimitString() methods replaced with a single GetLimitString method with a new signature.
+ For dialects the developers don't perform routine tests on, efforts were made to ensure the new limit string
+ method conforms to the database documentation. Please report any limit-related bugs discovered at runtime.
* [NH-2550] - Allow public access to FieldInterceptor Session (IFieldInterceptor changed)
* [NH-2593] - For Microsoft SQL Server the default batch-size (adonet.batch_size) is set to 20 where not explicit defined in the session-factory configuration
* - ICollectionPersister added property to fix [NH-2489]
Modified: trunk/nhibernate/src/NHibernate/Criterion/SubqueryExpression.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Criterion/SubqueryExpression.cs 2011-05-29 18:06:21 UTC (rev 5879)
+++ trunk/nhibernate/src/NHibernate/Criterion/SubqueryExpression.cs 2011-05-29 18:36:56 UTC (rev 5880)
@@ -66,11 +66,13 @@
if (criteriaImpl.FirstResult != 0 || criteriaImpl.MaxResults != RowSelection.NoValue)
{
- int firstResults = factory.Dialect.GetOffsetValue(Loader.Loader.GetFirstRow(parameters.RowSelection));
- int maxResults = Loader.Loader.GetMaxOrLimit(factory.Dialect, parameters.RowSelection);
- int? offsetParameterIndex = criteriaQuery.CreatePagingParameter(firstResults);
- int? limitParameterIndex = criteriaQuery.CreatePagingParameter(maxResults);
- sql = factory.Dialect.GetLimitString(sql, firstResults, maxResults, offsetParameterIndex, limitParameterIndex);
+ int? offset = Loader.Loader.GetOffsetUsingDialect(parameters.RowSelection, factory.Dialect);
+ int? limit = Loader.Loader.GetLimitUsingDialect(parameters.RowSelection, factory.Dialect);
+ int? offsetParameterIndex = offset.HasValue ? criteriaQuery.CreatePagingParameter(offset.Value) : null;
+ int? limitParameterIndex = limit.HasValue ? criteriaQuery.CreatePagingParameter(limit.Value) : null;
+ Parameter offsetParameter = offsetParameterIndex.HasValue ? Parameter.WithIndex(offsetParameterIndex.Value) : null;
+ Parameter limitParameter = limitParameterIndex.HasValue ? Parameter.WithIndex(limitParameterIndex.Value) : null;
+ sql = factory.Dialect.GetLimitString(sql, offset, limit, offsetParameter, limitParameter);
}
if (op != null)
Modified: trunk/nhibernate/src/NHibernate/Dialect/Dialect.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Dialect/Dialect.cs 2011-05-29 18:06:21 UTC (rev 5879)
+++ trunk/nhibernate/src/NHibernate/Dialect/Dialect.cs 2011-05-29 18:36:56 UTC (rev 5880)
@@ -1702,28 +1702,34 @@
}
/// <summary>
+ /// Generates a string to limit the result set to a number of maximum results with a specified offset into the results.
/// Expects any database-specific offset and limit adjustments to have already been performed (ex. UseMaxForLimit, OffsetStartsAtOne).
+ /// Performs error checking based on the various dialect limit support options. If both parameters and fixed valeus are
+ /// specified, this will use the parameter option if possible. Otherwise, it will fall back to a fixed string.
/// </summary>
- internal SqlString GetLimitString(SqlString queryString, int? offset, int? limit, int? offsetParameterIndex, int? limitParameterIndex)
+ /// <param name="queryString"></param>
+ /// <param name="offset"></param>
+ /// <param name="limit"></param>
+ /// <param name="offsetParameter"></param>
+ /// <param name="limitParameter"></param>
+ /// <returns></returns>
+ public SqlString GetLimitString(SqlString queryString, int? offset, int? limit, Parameter offsetParameter, Parameter limitParameter)
{
- SqlString offsetParameter =
- SupportsVariableLimit && offsetParameterIndex.HasValue ? new SqlString(Parameter.WithIndex(offsetParameterIndex.Value)) :
- offset.HasValue ? new SqlString(offset.ToString()) :
- null;
+ if (offset == null && limit == null && offsetParameter == null && limitParameter == null)
+ return queryString;
- SqlString limitParameter =
- SupportsVariableLimit && limitParameterIndex.HasValue ? new SqlString(Parameter.WithIndex(limitParameterIndex.Value)) :
- limit.HasValue ? new SqlString(limit.ToString()) :
- null;
+ if (!SupportsLimit)
+ throw new NotSupportedException("Dialect does not support limits.");
- return GetLimitString(queryString, offsetParameter, limitParameter);
- }
+ if (!SupportsVariableLimit && offsetParameter != null && offset == null)
+ throw new NotSupportedException("Dialect does not support variable limits.");
- /// <summary>
- /// Expects any database-specific offset and limit adjustments to have already been performed (ex. UseMaxForLimit, OffsetStartsAtOne).
- /// </summary>
- internal SqlString GetLimitString(SqlString queryString, int? offset, int? limit, Parameter offsetParameter, Parameter limitParameter)
- {
+ if (!SupportsVariableLimit && limitParameter != null && limit == null)
+ throw new NotSupportedException("Dialect does not support variable limits.");
+
+ if (!SupportsLimitOffset && (offset != null || offsetParameter != null))
+ throw new NotSupportedException("Dialect does not support limits with offsets.");
+
SqlString o =
SupportsVariableLimit && offsetParameter != null ? new SqlString(offsetParameter) :
offset.HasValue ? new SqlString(offset.ToString()) :
@@ -1737,7 +1743,15 @@
return GetLimitString(queryString, o, l);
}
- internal int GetLimitValue(int offset, int limit)
+ /// <summary>
+ /// Some databases require that a limit statement contain the maximum row number
+ /// instead of the number of rows to retrieve. This method adjusts source
+ /// limit and offset values to account for this.
+ /// </summary>
+ /// <param name="offset"></param>
+ /// <param name="limit"></param>
+ /// <returns></returns>
+ public int GetLimitValue(int offset, int limit)
{
if (limit == int.MaxValue)
return int.MaxValue;
@@ -1748,7 +1762,13 @@
return limit;
}
- internal int GetOffsetValue(int offset)
+ /// <summary>
+ /// Some databases use limit row offsets that start at one instead of zero.
+ /// This method adjusts a desired offset using the OffsetStartsAtOne flag.
+ /// </summary>
+ /// <param name="offset"></param>
+ /// <returns></returns>
+ public int GetOffsetValue(int offset)
{
if (OffsetStartsAtOne)
return offset + 1;
Modified: trunk/nhibernate/src/NHibernate/Dialect/MsSql2005Dialect.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Dialect/MsSql2005Dialect.cs 2011-05-29 18:06:21 UTC (rev 5879)
+++ trunk/nhibernate/src/NHibernate/Dialect/MsSql2005Dialect.cs 2011-05-29 18:36:56 UTC (rev 5880)
@@ -76,6 +76,9 @@
if (limit != null)
result.Add("TOP (").Add(limit).Add(") ");
+ else
+ // ORDER BY can only be used in subqueries if TOP is also specified.
+ result.Add("TOP (" + int.MaxValue + ") ");
result
.Add(StringHelper.Join(", ", columnsOrAliases))
Modified: trunk/nhibernate/src/NHibernate/Loader/Loader.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Loader/Loader.cs 2011-05-29 18:06:21 UTC (rev 5879)
+++ trunk/nhibernate/src/NHibernate/Loader/Loader.cs 2011-05-29 18:36:56 UTC (rev 5880)
@@ -1098,6 +1098,29 @@
return dialect.SupportsLimit && (HasMaxRows(selection) || HasOffset(selection));
}
+ /// <summary>
+ /// Performs dialect-specific manipulations on the offset value before returning it.
+ /// This method is applicable for use in limit statements only.
+ /// </summary>
+ internal static int? GetOffsetUsingDialect(RowSelection selection, Dialect.Dialect dialect)
+ {
+ int firstRow = GetFirstRow(selection);
+ if (firstRow == 0)
+ return null;
+ return dialect.GetOffsetValue(firstRow);
+ }
+
+ /// <summary>
+ /// Performs dialect-specific manipulations on the limit value before returning it.
+ /// This method is applicable for use in limit statements only.
+ /// </summary>
+ internal static int? GetLimitUsingDialect(RowSelection selection, Dialect.Dialect dialect)
+ {
+ if (selection == null || selection.MaxRows == RowSelection.NoValue)
+ return null;
+ return dialect.GetLimitValue(GetFirstRow(selection), selection.MaxRows);
+ }
+
/// <summary>
/// Obtain an <c>IDbCommand</c> with all parameters pre-bound. Bind positional parameters,
/// named parameters, and limit parameters.
@@ -1127,14 +1150,17 @@
if (useLimit)
{
- int max = GetMaxOrLimit(dialect, selection);
+ int? offset = GetOffsetUsingDialect(selection, dialect);
+ int? limit = GetLimitUsingDialect(selection, dialect);
+ Parameter offsetParameter = queryParameters.OffsetParameterIndex.HasValue ? Parameter.WithIndex(queryParameters.OffsetParameterIndex.Value) : null;
+ Parameter limitParameter = queryParameters.LimitParameterIndex.HasValue ? Parameter.WithIndex(queryParameters.LimitParameterIndex.Value) : null;
sqlString =
dialect.GetLimitString(
sqlString.Trim(),
- useOffset ? (int?)dialect.GetOffsetValue(GetFirstRow(selection)) : null,
- max != int.MaxValue ? (int?)max : null,
- queryParameters.OffsetParameterIndex,
- queryParameters.LimitParameterIndex);
+ useOffset ? offset : null,
+ limit,
+ useOffset ? offsetParameter : null,
+ limitParameter);
}
sqlString = PreprocessSQL(sqlString, queryParameters, dialect);
@@ -1742,15 +1768,18 @@
if (useLimit)
{
- int max = GetMaxOrLimit(dialect, selection);
- sqlString =
- dialect.GetLimitString(
- sqlString.Trim(),
- useOffset ? (int?)dialect.GetOffsetValue(GetFirstRow(selection)) : null,
- max != int.MaxValue ? (int?)max : null,
- parameters.OffsetParameterIndex,
- parameters.LimitParameterIndex);
- }
+ int? offset = GetOffsetUsingDialect(selection, dialect);
+ int? limit = GetLimitUsingDialect(selection, dialect);
+ Parameter offsetParameter = parameters.OffsetParameterIndex.HasValue ? Parameter.WithIndex(parameters.OffsetParameterIndex.Value) : null;
+ Parameter limitParameter = parameters.LimitParameterIndex.HasValue ? Parameter.WithIndex(parameters.LimitParameterIndex.Value) : null;
+ sqlString =
+ dialect.GetLimitString(
+ sqlString.Trim(),
+ useOffset ? offset : null,
+ limit,
+ useOffset ? offsetParameter : null,
+ limitParameter);
+ }
sqlString = PreprocessSQL(sqlString, parameters, dialect);
return new SqlCommandInfo(sqlString, sqlTypes);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jul...@us...> - 2011-06-02 15:16:22
|
Revision: 5902
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5902&view=rev
Author: julian-maughan
Date: 2011-06-02 15:16:15 +0000 (Thu, 02 Jun 2011)
Log Message:
-----------
Minor dialect- and dialect-related documentation corrections and improvements
Modified Paths:
--------------
trunk/nhibernate/doc/reference/modules/configuration.xml
trunk/nhibernate/src/NHibernate/Driver/ASA10ClientDriver.cs
trunk/nhibernate/src/NHibernate/Driver/ASAClientDriver.cs
Modified: trunk/nhibernate/doc/reference/modules/configuration.xml
===================================================================
--- trunk/nhibernate/doc/reference/modules/configuration.xml 2011-05-31 19:56:28 UTC (rev 5901)
+++ trunk/nhibernate/doc/reference/modules/configuration.xml 2011-06-02 15:16:15 UTC (rev 5902)
@@ -686,7 +686,7 @@
<entry></entry>
</row>
<row>
- <entry>Oracle </entry>
+ <entry>Oracle</entry>
<entry><literal>NHibernate.Dialect.Oracle8iDialect</literal></entry>
<entry></entry>
</row>
@@ -701,16 +701,38 @@
<entry></entry>
</row>
<row>
- <entry>Sybase Adaptive Server Enterprise</entry>
- <entry><literal>NHibernate.Dialect.SybaseDialect</literal></entry>
+ <entry>Sybase Adaptive Server Enterprise 15</entry>
+ <entry><literal>NHibernate.Dialect.SybaseASE15Dialect</literal></entry>
<entry></entry>
</row>
<row>
- <entry>Sybase Adaptive Server Anywhere</entry>
- <entry><literal>NHibernate.Dialect.SybaseAnywhereDialect</literal></entry>
+ <entry>Sybase Adaptive Server Anywhere 9</entry>
+ <entry><literal>NHibernate.Dialect.SybaseASA9Dialect</literal></entry>
<entry></entry>
</row>
<row>
+ <entry>Sybase Adaptive Server Anywhere 10</entry>
+ <entry><literal>NHibernate.Dialect.SybaseASA10Dialect</literal></entry>
+ <entry>
+ Deprecated. Use the Sybase SQL Anywhere 10 Dialect instead.
+ </entry>
+ </row>
+ <row>
+ <entry>Sybase SQL Anywhere 10</entry>
+ <entry><literal>NHibernate.Dialect.SybaseSQLAnywhere10Dialect</literal></entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry>Sybase SQL Anywhere 11</entry>
+ <entry><literal>NHibernate.Dialect.SybaseSQLAnywhere11Dialect</literal></entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry>Microsoft SQL Server 7</entry>
+ <entry><literal>NHibernate.Dialect.MsSql7Dialect</literal></entry>
+ <entry></entry>
+ </row>
+ <row>
<entry>Microsoft SQL Server 2000</entry>
<entry><literal>NHibernate.Dialect.MsSql2000Dialect</literal></entry>
<entry></entry>
@@ -718,17 +740,16 @@
<row>
<entry>Microsoft SQL Server 2005</entry>
<entry><literal>NHibernate.Dialect.MsSql2005Dialect</literal></entry>
- <entry>
- </entry>
+ <entry></entry>
</row>
<row>
- <entry>Microsoft SQL Server 2005 Everywhere Edition</entry>
- <entry><literal>NHibernate.Dialect.MsSqlCeDialect</literal></entry>
+ <entry>Microsoft SQL Server 2008</entry>
+ <entry><literal>NHibernate.Dialect.MsSql2008Dialect</literal></entry>
+ <entry></entry>
</row>
<row>
- <entry>Microsoft SQL Server 7</entry>
- <entry><literal>NHibernate.Dialect.MsSql7Dialect</literal></entry>
- <entry></entry>
+ <entry>Microsoft SQL Server Compact Edition</entry>
+ <entry><literal>NHibernate.Dialect.MsSqlCeDialect</literal></entry>
</row>
<row>
<entry>Firebird</entry>
@@ -748,11 +769,6 @@
for System.Data.SQLite provider for .NET 2.0.
</entry>
</row>
- <row>
- <entry>Ingres 3.0</entry>
- <entry><literal>NHibernate.Dialect.IngresDialect</literal></entry>
- <entry></entry>
- </row>
</tbody>
</tgroup>
</table>
Modified: trunk/nhibernate/src/NHibernate/Driver/ASA10ClientDriver.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Driver/ASA10ClientDriver.cs 2011-05-31 19:56:28 UTC (rev 5901)
+++ trunk/nhibernate/src/NHibernate/Driver/ASA10ClientDriver.cs 2011-06-02 15:16:15 UTC (rev 5902)
@@ -2,7 +2,7 @@
namespace NHibernate.Driver
{
- [Obsolete("Please use SybaseSQLAnywhereDriver instead. This dialect will be removed in a future release.")]
+ [Obsolete("Please use SybaseSQLAnywhereDriver instead. This driver will be removed in a future release.")]
public class ASA10ClientDriver : SybaseSQLAnywhereDriver
{
public ASA10ClientDriver() : base() { }
Modified: trunk/nhibernate/src/NHibernate/Driver/ASAClientDriver.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Driver/ASAClientDriver.cs 2011-05-31 19:56:28 UTC (rev 5901)
+++ trunk/nhibernate/src/NHibernate/Driver/ASAClientDriver.cs 2011-06-02 15:16:15 UTC (rev 5902)
@@ -2,7 +2,7 @@
namespace NHibernate.Driver
{
- [Obsolete("Please use SybaseASADriver instead. This dialect will be removed in a future release.")]
+ [Obsolete("Please use SybaseAsaClientDriver instead. This driver will be removed in a future release.")]
public class ASAClientDriver : SybaseAsaClientDriver
{
public ASAClientDriver() : base() { }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2011-06-17 12:03:48
|
Revision: 5940
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5940&view=rev
Author: fabiomaulo
Date: 2011-06-17 12:03:42 +0000 (Fri, 17 Jun 2011)
Log Message:
-----------
Removed no more needed code
Modified Paths:
--------------
trunk/nhibernate/releasenotes.txt
trunk/nhibernate/src/NHibernate/Dialect/DB2Dialect.cs
trunk/nhibernate/src/NHibernate/Dialect/Dialect.cs
trunk/nhibernate/src/NHibernate/Dialect/InformixDialect.cs
trunk/nhibernate/src/NHibernate/Dialect/MsSql2005Dialect.cs
trunk/nhibernate/src/NHibernate/Dialect/Oracle8iDialect.cs
trunk/nhibernate/src/NHibernate/Dialect/PostgreSQLDialect.cs
trunk/nhibernate/src/NHibernate/Dialect/SybaseSQLAnywhere10Dialect.cs
trunk/nhibernate/src/NHibernate/Loader/Loader.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2467/NH2467Test.cs
trunk/nhibernate/src/NHibernate.Test/Pagination/CustomMsSqlDialect.cs
Modified: trunk/nhibernate/releasenotes.txt
===================================================================
--- trunk/nhibernate/releasenotes.txt 2011-06-16 17:32:25 UTC (rev 5939)
+++ trunk/nhibernate/releasenotes.txt 2011-06-17 12:03:42 UTC (rev 5940)
@@ -12,6 +12,7 @@
* [NH-2605] Refactorize MultiQuery/MultiCriteria implementation to delegate responsibility to IDrive (IDrive changed).
* For users who don't look at Log-ERROR, to prevent wrong behavior when lazy-properties are used the DynamicProxyValidator validates the accessability of properties setters.
* For those implementing IDrive without inherit from DriveBase: IDrive.AdjustCommand
+ * Dialect base: removed some no more needed properties
Build 3.2.0.Beta1 (rev5839)
=============================
Modified: trunk/nhibernate/src/NHibernate/Dialect/DB2Dialect.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Dialect/DB2Dialect.cs 2011-06-16 17:32:25 UTC (rev 5939)
+++ trunk/nhibernate/src/NHibernate/Dialect/DB2Dialect.cs 2011-06-17 12:03:42 UTC (rev 5940)
@@ -194,12 +194,6 @@
}
/// <summary></summary>
- public override bool BindLimitParametersInReverseOrder
- {
- get { return false; }
- }
-
- /// <summary></summary>
public override bool UseMaxForLimit
{
get { return true; }
Modified: trunk/nhibernate/src/NHibernate/Dialect/Dialect.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Dialect/Dialect.cs 2011-06-16 17:32:25 UTC (rev 5939)
+++ trunk/nhibernate/src/NHibernate/Dialect/Dialect.cs 2011-06-17 12:03:42 UTC (rev 5940)
@@ -1639,27 +1639,6 @@
get { return SupportsLimit; }
}
- /// <summary>
- /// Does the <c>LIMIT</c> clause specify arguments in the "reverse" order
- /// limit, offset instead of offset, limit?
- /// </summary>
- /// <value>False, unless overridden.</value>
- /// <remarks>Inheritors should return true if the correct order is limit, offset</remarks>
- public virtual bool BindLimitParametersInReverseOrder
- {
- get { return false; }
- }
-
- /// <summary>
- /// Does the <c>LIMIT</c> clause come at the start of the
- /// <c>SELECT</c> statement rather than at the end?
- /// </summary>
- /// <value>false, unless overridden</value>
- public virtual bool BindLimitParametersFirst
- {
- get { return false; }
- }
-
/// <summary>
/// Does the <tt>LIMIT</tt> clause take a "maximum" row number instead
/// of a total number of returned rows?
Modified: trunk/nhibernate/src/NHibernate/Dialect/InformixDialect.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Dialect/InformixDialect.cs 2011-06-16 17:32:25 UTC (rev 5939)
+++ trunk/nhibernate/src/NHibernate/Dialect/InformixDialect.cs 2011-06-17 12:03:42 UTC (rev 5940)
@@ -366,16 +366,6 @@
get { return false; }
}
- /// <summary>
- /// Does the <c>LIMIT</c> clause come at the start of the
- /// <c>SELECT</c> statement rather than at the end?
- /// </summary>
- /// <value>false, unless overridden</value>
- public override bool BindLimitParametersFirst
- {
- get { return true; }
- }
-
public override SqlString GetLimitString(SqlString queryString, SqlString offset, SqlString limit)
{
/*
Modified: trunk/nhibernate/src/NHibernate/Dialect/MsSql2005Dialect.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Dialect/MsSql2005Dialect.cs 2011-06-16 17:32:25 UTC (rev 5939)
+++ trunk/nhibernate/src/NHibernate/Dialect/MsSql2005Dialect.cs 2011-06-17 12:03:42 UTC (rev 5940)
@@ -205,21 +205,11 @@
get { return true; }
}
- public override bool BindLimitParametersInReverseOrder
- {
- get { return true; }
- }
-
public override bool SupportsVariableLimit
{
get { return true; }
}
- public override bool BindLimitParametersFirst
- {
- get { return true; }
- }
-
protected override string GetSelectExistingObject(string name, Table table)
{
string schema = table.GetQuotedSchemaName(this);
Modified: trunk/nhibernate/src/NHibernate/Dialect/Oracle8iDialect.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Dialect/Oracle8iDialect.cs 2011-06-16 17:32:25 UTC (rev 5939)
+++ trunk/nhibernate/src/NHibernate/Dialect/Oracle8iDialect.cs 2011-06-17 12:03:42 UTC (rev 5940)
@@ -394,11 +394,6 @@
return ForUpdateString + " of " + aliases + " nowait";
}
- public override bool BindLimitParametersInReverseOrder
- {
- get { return true; }
- }
-
public override bool UseMaxForLimit
{
get { return true; }
Modified: trunk/nhibernate/src/NHibernate/Dialect/PostgreSQLDialect.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Dialect/PostgreSQLDialect.cs 2011-06-16 17:32:25 UTC (rev 5939)
+++ trunk/nhibernate/src/NHibernate/Dialect/PostgreSQLDialect.cs 2011-06-17 12:03:42 UTC (rev 5940)
@@ -128,11 +128,6 @@
get { return true; }
}
- public override bool BindLimitParametersInReverseOrder
- {
- get { return true; }
- }
-
public override SqlString GetLimitString(SqlString queryString, SqlString offset, SqlString limit)
{
SqlStringBuilder pagingBuilder = new SqlStringBuilder();
Modified: trunk/nhibernate/src/NHibernate/Dialect/SybaseSQLAnywhere10Dialect.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Dialect/SybaseSQLAnywhere10Dialect.cs 2011-06-16 17:32:25 UTC (rev 5939)
+++ trunk/nhibernate/src/NHibernate/Dialect/SybaseSQLAnywhere10Dialect.cs 2011-06-17 12:03:42 UTC (rev 5940)
@@ -415,23 +415,6 @@
get { return true; }
}
- /// <summary>
- /// SQL Anywhere syntax is SELECT TOP n START AT m
- /// </summary>
- public override bool BindLimitParametersInReverseOrder
- {
- get { return true; }
- }
-
- /// <summary>
- /// SQL Anywhere 11 uses SELECT TOP n START AT m [ select list items ]
- /// for LIMIT/OFFSET support.
- /// </summary>
- public override bool BindLimitParametersFirst
- {
- get { return true; }
- }
-
private static int GetAfterSelectInsertPoint(SqlString sql)
{
// Assume no common table expressions with the statement.
Modified: trunk/nhibernate/src/NHibernate/Loader/Loader.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Loader/Loader.cs 2011-06-16 17:32:25 UTC (rev 5939)
+++ trunk/nhibernate/src/NHibernate/Loader/Loader.cs 2011-06-17 12:03:42 UTC (rev 5940)
@@ -1189,42 +1189,7 @@
return dialect.GetLimitValue(firstRow, rowCount);
}
- private int GetFirstLimitParameterCount(Dialect.Dialect dialect, bool useLimit, bool hasFirstRow, bool useOffset)
- {
- if (!useLimit) return 0;
- if (!dialect.SupportsVariableLimit) return 0;
- if (!dialect.BindLimitParametersFirst) return 0;
- return (hasFirstRow && useOffset) ? 2 : 1;
- }
-
/// <summary>
- /// Bind parameters needed by the dialect-specific LIMIT clause
- /// </summary>
- /// <returns>The number of parameters bound</returns>
- internal int BindLimitParameters(IDbCommand st, int index, RowSelection selection, ISessionImplementor session)
- {
- Dialect.Dialect dialect = session.Factory.Dialect;
- if (!dialect.SupportsVariableLimit)
- {
- return 0;
- }
-
- int firstRow = GetFirstRow(selection);
- int lastRow = GetMaxOrLimit(dialect, selection);
-
- bool hasFirstRow = firstRow > 0 && dialect.SupportsLimitOffset;
- bool reverse = dialect.BindLimitParametersInReverseOrder;
-
- if (hasFirstRow)
- {
- ((IDataParameter) st.Parameters[index + (reverse ? 1 : 0)]).Value = firstRow;
- }
- ((IDataParameter) st.Parameters[index + ((reverse || !hasFirstRow) ? 0 : 1)]).Value = lastRow;
-
- return hasFirstRow ? 2 : 1;
- }
-
- /// <summary>
/// Limits the number of rows returned by the Sql query if necessary.
/// </summary>
/// <param name="st">The IDbCommand to limit.</param>
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2467/NH2467Test.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2467/NH2467Test.cs 2011-06-16 17:32:25 UTC (rev 5939)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2467/NH2467Test.cs 2011-06-17 12:03:42 UTC (rev 5940)
@@ -20,7 +20,7 @@
protected override bool AppliesTo(Dialect.Dialect dialect)
{
- return dialect.SupportsLimit && !dialect.BindLimitParametersFirst;
+ return dialect.SupportsLimit;
}
protected override void OnTearDown()
Modified: trunk/nhibernate/src/NHibernate.Test/Pagination/CustomMsSqlDialect.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Pagination/CustomMsSqlDialect.cs 2011-06-16 17:32:25 UTC (rev 5939)
+++ trunk/nhibernate/src/NHibernate.Test/Pagination/CustomMsSqlDialect.cs 2011-06-17 12:03:42 UTC (rev 5940)
@@ -11,7 +11,6 @@
public bool ForcedBindLimitParameterFirst;
public bool ForcedSupportsVariableLimit;
- public override bool BindLimitParametersFirst { get { return ForcedBindLimitParameterFirst; } }
public override bool SupportsVariableLimit { get { return ForcedSupportsVariableLimit; } }
}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ric...@us...> - 2011-07-23 15:29:59
|
Revision: 5990
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5990&view=rev
Author: ricbrown
Date: 2011-07-23 15:29:50 +0000 (Sat, 23 Jul 2011)
Log Message:
-----------
Added initial version of Oracle installation instructions and build config for Teamcity.
Modified Paths:
--------------
trunk/nhibernate/ShowBuildMenu.bat
trunk/nhibernate/src/NHibernate.TestDatabaseSetup/TestDatabaseSetup.cs
trunk/nhibernate/teamcity.build
Added Paths:
-----------
trunk/nhibernate/lib/teamcity/oracle/
trunk/nhibernate/lib/teamcity/oracle/NHibernate.Test.last-results.xml
trunk/nhibernate/lib/teamcity/oracle/oracle_installation.txt
trunk/nhibernate/lib/teamcity/oracle/x86/
trunk/nhibernate/lib/teamcity/oracle/x86/Oracle.DataAccess.dll
Modified: trunk/nhibernate/ShowBuildMenu.bat
===================================================================
--- trunk/nhibernate/ShowBuildMenu.bat 2011-07-22 05:25:00 UTC (rev 5989)
+++ trunk/nhibernate/ShowBuildMenu.bat 2011-07-23 15:29:50 UTC (rev 5990)
@@ -208,15 +208,17 @@
echo D. NHibernate Trunk - SQLite (32-bit)
echo E. NHibernate Trunk - SQLite (64-bit)
echo F. NHibernate Trunk - PostgreSQL
+echo G. NHibernate Trunk - Oracle (32-bit)
echo.
if exist %SYSTEMROOT%\System32\choice.exe ( goto teamcity-menu-prompt-choice )
goto teamcity-menu-prompt-set
:teamcity-menu-prompt-choice
-choice /C:abcdef
+choice /C:abcdefg
if errorlevel 255 goto end
+if errorlevel 7 goto teamcity-oracle32
if errorlevel 6 goto teamcity-postgresql
if errorlevel 5 goto teamcity-sqlite64
if errorlevel 4 goto teamcity-sqlite32
@@ -226,7 +228,7 @@
if errorlevel 0 goto end
:teamcity-menu-prompt-set
-set /p OPT=[A, B, C, D, E, F]?
+set /p OPT=[A, B, C, D, E, F, G]?
if /I "%OPT%"=="A" goto teamcity-trunk
if /I "%OPT%"=="B" goto teamcity-firebird32
@@ -234,6 +236,7 @@
if /I "%OPT%"=="D" goto teamcity-sqlite32
if /I "%OPT%"=="E" goto teamcity-sqlite64
if /I "%OPT%"=="F" goto teamcity-postgresql
+if /I "%OPT%"=="G" goto teamcity-oracle32
goto teamcity-menu-prompt-set
:teamcity-trunk
@@ -260,6 +263,10 @@
%NANT% /f:teamcity.build -D:skip.manual=true -D:CCNetLabel=-1 -D:config.teamcity=postgresql
goto end
+:teamcity-oracle32
+%NANT% /f:teamcity.build -D:skip.manual=true -D:CCNetLabel=-1 -D:config.teamcity=oracle32
+goto end
+
:end
popd
pause
Property changes on: trunk/nhibernate/lib/teamcity/oracle
___________________________________________________________________
Added: bugtraq:url
+ http://jira.nhibernate.org/browse/%BUGID%
Added: bugtraq:number
+ true
Added: bugtraq:logregex
+ NH-\d+
Added: trunk/nhibernate/lib/teamcity/oracle/NHibernate.Test.last-results.xml
===================================================================
--- trunk/nhibernate/lib/teamcity/oracle/NHibernate.Test.last-results.xml (rev 0)
+++ trunk/nhibernate/lib/teamcity/oracle/NHibernate.Test.last-results.xml 2011-07-23 15:29:50 UTC (rev 5990)
@@ -0,0 +1,18555 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!--This file represents the results of running a test suite-->
+<test-results name="../../build/NHibernate-3.2.0.GA-debug/bin/net-3.5/NHibernate.Test.dll" total="4018" errors="178" failures="519" not-run="319" inconclusive="0" ignored="319" skipped="0" invalid="0" date="2011-07-23" time="16:13:26">
+ <environment nunit-version="2.5.5.10112" clr-version="2.0.50727.5446" os-version="Microsoft Windows NT 6.1.7601 Service Pack 1" platform="Win32NT" cwd="C:\work\oss\NhTrunk\nhibernate\src\NHibernate.Test" machine-name="TELLUSLTA" user="Richard" user-domain="TELLUSLTA" />
+ <culture-info current-culture="en-GB" current-uiculture="en-US" />
+ <test-suite type="Assembly" name="../../build/NHibernate-3.2.0.GA-debug/bin/net-3.5/NHibernate.Test.dll" executed="True" result="Failure" success="False" time="602.907" asserts="0">
+ <results>
+ <test-suite type="Namespace" name="NHibernate" executed="True" result="Failure" success="False" time="602.902" asserts="0">
+ <results>
+ <test-suite type="Namespace" name="Test" executed="True" result="Failure" success="False" time="602.896" asserts="0">
+ <results>
+ <test-suite type="Namespace" name="Ado" executed="True" result="Success" success="True" time="10.061" asserts="0">
+ <results>
+ <test-suite type="TestFixture" name="BatcherFixture" executed="True" result="Success" success="True" time="10.060" asserts="0">
+ <results>
+ <test-case name="NHibernate.Test.Ado.BatcherFixture.AbstractBatcherLog" description="Activating the AbstractBatcher's log the log stream:
-should not contains batch info 
-should contain SQL log info only regarding batcher (SQL log should not be duplicated)
-the batcher should work." executed="True" result="Success" success="True" time="1.226" asserts="3" />
+ <test-case name="NHibernate.Test.Ado.BatcherFixture.AbstractBatcherLogFormattedSql" description="Activating the AbstractBatcher's log the log stream:
-should contain well formatted SQL log info" executed="True" result="Success" success="True" time="0.027" asserts="1" />
+ <test-case name="NHibernate.Test.Ado.BatcherFixture.BatchedoutputShouldBeFormatted" description="SqlClient: The batcher log output should be formatted" executed="False" result="Ignored">
+ <reason>
+ <message><![CDATA[This test is for SqlClientBatchingBatcher only]]></message>
+ </reason>
+ </test-case>
+ <test-case name="NHibernate.Test.Ado.BatcherFixture.OneRoundTripDelete" description="The batcher should run all DELETE queries in only one roundtrip." executed="True" result="Success" success="True" time="0.206" asserts="1" />
+ <test-case name="NHibernate.Test.Ado.BatcherFixture.OneRoundTripInserts" description="The batcher should run all INSERT queries in only one roundtrip." executed="True" result="Success" success="True" time="0.016" asserts="1" />
+ <test-case name="NHibernate.Test.Ado.BatcherFixture.OneRoundTripUpdate" description="The batcher should run all UPDATE queries in only one roundtrip." executed="True" result="Success" success="True" time="0.071" asserts="1" />
+ <test-case name="NHibernate.Test.Ado.BatcherFixture.SqlClientOneRoundTripForUpdateAndInsert" description="SqlClient: The batcher should run all different INSERT queries in only one roundtrip." executed="False" result="Ignored">
+ <reason>
+ <message><![CDATA[Not fixed yet.]]></message>
+ </reason>
+ </test-case>
+ <test-case name="NHibernate.Test.Ado.BatcherFixture.SqlLog" description="Activating the SQL and turning off the batcher's log the log stream:
-should not contains adding to batch
-should contain batch command
-the batcher should work." executed="True" result="Success" success="True" time="0.025" asserts="4" />
+ <test-case name="NHibernate.Test.Ado.BatcherFixture.SqlLogShouldGetBatchCommandNotification" executed="True" result="Success" success="True" time="0.033" asserts="2" />
+ </results>
+ </test-suite>
+ </results>
+ </test-suite>
+ <test-suite type="Namespace" name="Any" executed="True" result="Success" success="True" time="0.919" asserts="0">
+ <results>
+ <test-suite type="TestFixture" name="AnyTypeTest" executed="True" result="Success" success="True" time="0.918" asserts="0">
+ <results>
+ <test-case name="NHibernate.Test.Any.AnyTypeTest.FlushProcessing" executed="True" result="Success" success="True" time="0.444" asserts="0" />
+ </results>
+ </test-suite>
+ </results>
+ </test-suite>
+ <test-suite type="Namespace" name="BulkManipulation" executed="True" result="Success" success="True" time="0.810" asserts="0">
+ <results>
+ <test-suite type="TestFixture" name="HqlBulkOperations" executed="True" result="Success" success="True" time="0.545" asserts="0">
+ <results>
+ <test-case name="NHibernate.Test.BulkManipulation.HqlBulkOperations.SimpleDelete" executed="True" result="Success" success="True" time="0.227" asserts="2" />
+ </results>
+ </test-suite>
+ <test-suite type="TestFixture" name="NativeSQLBulkOperations" executed="True" result="Success" success="True" time="0.263" asserts="0">
+ <results>
+ <test-case name="NHibernate.Test.BulkManipulation.NativeSQLBulkOperations.SimpleNativeSQLInsert" executed="True" result="Success" success="True" time="0.181" asserts="8" />
+ </results>
+ </test-suite>
+ </results>
+ </test-suite>
+ <test-suite type="Namespace" name="Bytecode" executed="True" result="Success" success="True" time="0.168" asserts="0">
+ <results>
+ <test-suite type="TestFixture" name="ActivatorObjectFactoryFixture" executed="True" result="Success" success="True" time="0.017" asserts="0">
+ <results>
+ <test-case name="NHibernate.Test.Bytecode.ActivatorObjectFactoryFixture.CreateInstanceDefCtor" executed="True" result="Success" success="True" time="0.008" asserts="4" />
+ <test-case name="NHibernate.Test.Bytecode.ActivatorObjectFactoryFixture.CreateInstanceOfValueType" executed="True" result="Success" success="True" time="0.001" asserts="2" />
+ <test-case name="NHibernate.Test.Bytecode.ActivatorObjectFactoryFixture.CreateInstanceWithArguments" executed="True" result="Success" success="True" time="0.003" asserts="4" />
+ <test-case name="NHibernate.Test.Bytecode.ActivatorObjectFactoryFixture.CreateInstanceWithNoPublicCtor" executed="True" result="Success" success="True" time="0.002" asserts="3" />
+ </results>
+ </test-suite>
+ <test-suite type="Namespace" name="Lightweight" executed="True" result="Success" success="True" time="0.142" asserts="0">
+ <results>
+ <test-suite type="TestFixture" name="BytecodeProviderFixture" executed="True" result="Success" success="True" time="0.140" asserts="0">
+ <results>
+ <test-case name="NHibernate.Test.Bytecode.Lightweight.BytecodeProviderFixture.CantCreateProxyFactoryFactory" executed="True" result="Success" success="True" time="0.020" asserts="1" />
+ <test-case name="NHibernate.Test.Bytecode.Lightweight.BytecodeProviderFixture.CollectionTypeFactoryCantChangeAfterUsage" executed="True" result="Success" success="True" time="0.002" asserts="1" />
+ <test-case name="NHibernate.Test.Bytecode.Lightweight.BytecodeProviderFixture.DoesNotImplementProxyFactoryFactory" executed="True" result="Success" success="True" time="0.001" asserts="1" />
+ <test-case name="NHibernate.Test.Bytecode.Lightweight.BytecodeProviderFixture.InvalidCollectionTypeFactoryCtor" executed="True" result="Success" success="True" time="0.001" asserts="1" />
+ <test-case name="NHibernate.Test.Bytecode.Lightweight.BytecodeProviderFixture.NotConfiguredCollectionTypeFactory" executed="True" result="Success" success="True" time="0.000" asserts="1" />
+ <test-case name="NHibernate.Test.Bytecode.Lightweight.BytecodeProviderFixture.NotConfiguredProxyFactoryFactory" executed="True" result="Success" success="True" time="0.077" asserts="0" />
+ <test-case name="NHibernate.Test.Bytecode.Lightweight.BytecodeProviderFixture.SetCollectionTypeFactoryClassByName" executed="True" result="Success" success="True" time="0.010" asserts="3" />
+ <test-case name="NHibernate.Test.Bytecode.Lightweight.BytecodeProviderFixture.SetCollectionTypeFactoryClassByType" executed="True" result="Success" success="True" time="0.002" asserts="2" />
+ <test-case name="NHibernate.Test.Bytecode.Lightweight.BytecodeProviderFixture.UnableToLoadProxyFactoryFactory" executed="True" result="Success" success="True" time="0.005" asserts="3" />
+ </results>
+ </test-suite>
+ </results>
+ </test-suite>
+ </results>
+ </test-suite>
+ <test-suite type="Namespace" name="CacheTest" executed="True" result="Success" success="True" time="0.866" asserts="0">
+ <results>
+ <test-suite type="TestFixture" name="CacheFixture" executed="True" result="Success" success="True" time="0.214" asserts="0">
+ <results>
+ <test-case name="NHibernate.Test.CacheTest.CacheFixture.MinValueTimestamp" executed="True" result="Success" success="True" time="0.007" asserts="6" />
+ <test-case name="NHibernate.Test.CacheTest.CacheFixture.TestSimpleCache" executed="True" result="Success" success="True" time="0.206" asserts="24" />
+ </results>
+ </test-suite>
+ <test-suite type="TestFixture" name="FilterKeyFixture" executed="True" result="Success" success="True" time="0.141" asserts="0">
+ <results>
+ <test-case name="NHibernate.Test.CacheTest.FilterKeyFixture.Equality" executed="True" result="Success" success="True" time="0.015" asserts="2" />
+ <test-case name="NHibernate.Test.CacheTest.FilterKeyFixture.HashCode" executed="True" result="Success" success="True" time="0.004" asserts="2" />
+ <test-case name="NHibernate.Test.CacheTest.FilterKeyFixture.NotEqualHashCode" executed="True" result="Success" success="True" time="0.002" asserts="2" />
+ <test-case name="NHibernate.Test.CacheTest.FilterKeyFixture.NotEquality" executed="True" result="Success" success="True" time="0.002" asserts="2" />
+ <test-case name="NHibernate.Test.CacheTest.FilterKeyFixture.ToStringIncludeAll" executed="True" result="Success" success="True" time="0.004" asserts="2" />
+ </results>
+ </test-suite>
+ <test-suite type="TestFixture" name="QueryCacheFixture" executed="True" result="Success" success="True" time="0.370" asserts="0">
+ <results>
+ <test-case name="NHibernate.Test.CacheTest.QueryCacheFixture.QueryCacheWithNullParameters" executed="True" result="Success" success="True" time="0.158" asserts="2" />
+ </results>
+ </test-suite>
+ <test-suite type="TestFixture" name="QueryKeyFixture" executed="True" result="Success" success="True" time="0.133" asserts="0">
+ <results>
+ <test-case name="NHibernate.Test.CacheTest.QueryKeyFixture.EqualityWithFilters" executed="True" result="Success" success="True" time="0.011" asserts="2" />
+ <test-case name="NHibernate.Test.CacheTest.QueryKeyFixture.HashCodeWithFilters" executed="True" result="Success" success="True" time="0.002" asserts="2" />
+ <test-case name="NHibernate.Test.CacheTest.QueryKeyFixture.NotEqualHashCodeWithFilters" executed="True" result="Success" success="True" time="0.002" asserts="2" />
+ <test-case name="NHibernate.Test.CacheTest.QueryKeyFixture.NotEqualityWithFilters" executed="True" result="Success" success="True" time="0.002" asserts="2" />
+ <test-case name="NHibernate.Test.CacheTest.QueryKeyFixture.ToStringWithFilters" executed="True" result="Success" success="True" time="0.009" asserts="2" />
+ <test-case name="NHibernate.Test.CacheTest.QueryKeyFixture.ToStringWithMoreFilters" executed="True" result="Success" success="True" time="0.003" asserts="1" />
+ </results>
+ </test-suite>
+ <test-suite type="TestFixture" name="TimestamperFixture" executed="True" result="Inconclusive" success="False" time="0.000" asserts="0" />
+ </results>
+ </test-suite>
+ <test-suite type="Namespace" name="Cascade" executed="True" result="Success" success="True" time="2.970" asserts="0">
+ <results>
+ <test-suite type="Namespace" name="Circle" executed="True" result="Success" success="True" time="1.768" asserts="0">
+ <results>
+ <test-suite type="TestFixture" name="CascadeMergeToChildBeforeParentTest" executed="True" result="Success" success="True" time="0.979" asserts="0">
+ <results>
+ <test-case name="NHibernate.Test.Cascade.Circle.CascadeMergeToChildBeforeParentTest.Merge" executed="True" result="Success" success="True" time="0.219" asserts="0" />
+ <test-case name="NHibernate.Test.Cascade.Circle.CascadeMergeToChildBeforeParentTest.MergeData3Nodes" executed="True" result="Success" success="True" time="0.117" asserts="0" />
+ <test-case name="NHibernate.Test.Cascade.Circle.CascadeMergeToChildBeforeParentTest.MergeTransientChildBeforeTransientParent" executed="True" result="Success" success="True" time="0.042" asserts="0" />
+ </results>
+ </test-suite>
+ <test-suite type="TestFixture" name="MultiPathCircleCascadeTest" executed="True" result="Success" success="True" time="0.788" asserts="0">
+ <results>
+ <test-case name="NHibernate.Test.Cascade.Circle.MultiPathCircleCascadeTest.MergeDeliveryNode" executed="True" result="Success" success="True" time="0.141" asserts="26" />
+ <test-case name="NHibernate.Test.Cascade.Circle.MultiPathCircleCascadeTest.MergeEntityWithNonNullableEntityNull" executed="True" result="Success" success="True" time="0.030" asserts="1" />
+ <test-case name="NHibernate.Test.Cascade.Circle.MultiPathCircleCascadeTest.MergeEntityWithNonNullableTransientEntity" executed="True" result="Success" success="True" time="0.025" asserts="1" />
+ <test-case name="NHibernate.Test.Cascade.Circle.MultiPathCircleCascadeTest.MergePickupNode" executed="True" result="Success" success="True" time="0.042" asserts="26" />
+ <test-case name="NHibernate.Test.Cascade.Circle.MultiPathCircleCascadeTest.MergeRoute" executed="True" result="Success" success="True" time="0.070" asserts="27" />
+ <test-case name="NHibernate.Test.Cascade.Circle.MultiPathCircleCascadeTest.MergeTour" executed="True" result="Success" success="True" time="0.049" asserts="26" />
+ <test-case name="NHibernate.Test.Cascade.Circle.MultiPathCircleCascadeTest.MergeTransport" executed="True" result="Success" success="True" time="0.044" asserts="26" />
+ </results>
+ </test-suite>
+ </results>
+ </test-suite>
+ <test-suite type="TestFixture" name="MultiPathCascadeTest" executed="True" result="Success" success="True" time="0.832" asserts="0">
+ <results>
+ <test-case name="NHibernate.Test.Cascade.MultiPathCascadeTest.MultiPathGetAndModify" executed="True" result="Success" success="True" time="0.173" asserts="15" />
+ <test-case name="NHibernate.Test.Cascade.MultiPathCascadeTest.MultiPathMergeModifiedDetached" executed="True" result="Success" success="True" time="0.048" asserts="15" />
+ <test-case name="NHibernate.Test.Cascade.MultiPathCascadeTest.MultiPathMergeModifiedDetachedIntoProxy" executed="True" result="Success" success="True" time="0.040" asserts="17" />
+ <test-case name="NHibernate.Test.Cascade.MultiPathCascadeTest.MultiPathMergeNonCascadedTransientEntityInCollection" executed="True" result="Success" success="True" time="0.046" asserts="16" />
+ <test-case name="NHibernate.Test.Cascade.MultiPathCascadeTest.MultiPathMergeNonCascadedTransientEntityInManyToOne" executed="True" result="Success" success="True" time="0.045" asserts="16" />
+ <test-case name="NHibernate.Test.Cascade.MultiPathCascadeTest.MultiPathMergeNonCascadedTransientEntityInOneToOne" executed="True" result="Success" success="True" time="0.042" asserts="15" />
+ <test-case name="NHibernate.Test.Cascade.MultiPathCascadeTest.MultiPathUpdateModifiedDetached" executed="True" result="Success" success="True" time="0.046" asserts="15" />
+ </results>
+ </test-suite>
+ <test-suite type="TestFixture" name="RefreshFixture" executed="True" result="Success" success="True" time="0.362" asserts="0">
+ <results>
+ <test-case name="NHibernate.Test.Cascade.RefreshFixture.RefreshCascade" executed="True" result="Success" success="True" time="0.125" asserts="2" />
+ <test-case name="NHibernate.Test.Cascade.RefreshFixture.RefreshIgnoringTransient" executed="True" result="Success" success="True" time="0.007" asserts="0" />
+ <test-case name="NHibernate.Test.Cascade.RefreshFixture.RefreshIgnoringTransientInCollection" executed="True" result="Success" success="True" time="0.018" asserts="1" />
+ <test-case name="NHibernate.Test.Cascade.RefreshFixture.RefreshNotIgnoringTransientByUnsavedValue" executed="True" result="Success" success="True" time="0.007" asserts="0" />
+ </results>
+ </test-suite>
+ </results>
+ </test-suite>
+ <test-suite type="Namespace" name="CfgTest" executed="True" result="Failure" success="False" time="2.387" asserts="0">
+ <results>
+ <test-suite type="TestFixture" name="AccessorsSerializableTest" executed="True" result="Success" success="True" time="0.073" asserts="0">
+ <results>
+ <test-suite type="ParameterizedTest" name="AllAccessorsAreMarkedAsSerializable" executed="True" result="Success" success="True" time="0.033" asserts="0">
+ <results>
+ <test-case name="NHibernate.Test.CfgTest.AccessorsSerializableTest.AllAccessorsAreMarkedAsSerializable(NHibernate.Properties.BackrefPropertyAccessor)" executed="True" result="Success" success="True" time="0.012" asserts="0" />
+ <test-case name="NHibernate.Test.CfgTest.AccessorsSerializableTest.AllAccessorsAreMarkedAsSerializable(NHibernate.Properties.BasicPropertyAccessor)" executed="True" result="Success" success="True" time="0.000" asserts="0" />
+ <test-case name="NHibernate.Test.CfgTest.AccessorsSerializableTest.AllAccessorsAreMarkedAsSerializable(NHibernate.Properties.ChainedPropertyAccessor)" executed="True" result="Success" success="True" time="0.000" asserts="0" />
+ <test-case name="NHibernate.Test.CfgTest.AccessorsSerializableTest.AllAccessorsAreMarkedAsSerializable(NHibernate.Properties.EmbeddedPropertyAccessor)" executed="True" result="Success" success="True" time="0.001" asserts="0" />
+ <test-case name="NHibernate.Test.CfgTest.AccessorsSerializableTest.AllAccessorsAreMarkedAsSerializable(NHibernate.Properties.FieldAccessor)" executed="True" result="Success" success="True" time="0.000" asserts="0" />
+ <test-case name="NHibernate.Test.CfgTest.AccessorsSerializableTest.AllAccessorsAreMarkedAsSerializable(NHibernate.Properties.IndexPropertyAccessor)" executed="True" result="Success" success="True" time="0.000" asserts="0" />
+ <test-case name="NHibernate.Test.CfgTest.AccessorsSerializableTest.AllAccessorsAreMarkedAsSerializable(NHibernate.Properties.MapAccessor)" executed="True" result="Success" success="True" time="0.000" asserts="0" />
+ <test-case name="NHibernate.Test.CfgTest.AccessorsSerializableTest.AllAccessorsAreMarkedAsSerializable(NHibernate.Properties.NoopAccessor)" executed="True" result="Success" success="True" time="0.000" asserts="0" />
+ <test-case name="NHibernate.Test.CfgTest.AccessorsSerializableTest.AllAccessorsAreMarkedAsSerializable(NHibernate.Properties.NoSetterAccessor)" executed="True" result="Success" success="True" time="0.000" asserts="0" />
+ <test-case name="NHibernate.Test.CfgTest.AccessorsSerializableTest.AllAccessorsAreMarkedAsSerializable(NHibernate.Properties.ReadOnlyAccessor)" executed="True" result="Success" success="True" time="0.000" asserts="0" />
+ <test-case name="NHibernate.Test.CfgTest.AccessorsSerializableTest.AllAccessorsAreMarkedAsSerializable(NHibernate.Properties.XmlAccessor)" executed="True" result="Success" success="True" time="0.000" asserts="0" />
+ </results>
+ </test-suite>
+ <test-suite type="ParameterizedTest" name="AllGettersAreMarkedAsSerializable" executed="True" result="Success" success="True" time="0.013" asserts="0">
+ <results>
+ <test-case name="NHibernate.Test.CfgTest.AccessorsSerializableTest.AllGettersAreMarkedAsSerializable(NHibernate.Properties.BackrefPropertyAccessor+BackrefGetter)" executed="True" result="Success" success="True" time="0.001" asserts="0" />
+ <test-case name="NHibernate.Test.CfgTest.AccessorsSerializableTest.AllGettersAreMarkedAsSerializable(NHibernate.Properties.BasicPropertyAccessor+BasicGetter)" executed="True" result="Success" success="True" time="0.000" asserts="0" />
+ <test-case name="NHibernate.Test.CfgTest.AccessorsSerializableTest.AllGettersAreMarkedAsSerializable(NHibernate.Properties.EmbeddedPropertyAccessor+EmbeddedGetter)" executed="True" result="Success" success="True" time="0.000" asserts="0" />
+ <test-case name="NHibernate.Test.CfgTest.AccessorsSerializableTest.AllGettersAreMarkedAsSerializable(NHibernate.Properties.FieldAccessor+FieldGetter)" executed="True" result="Success" success="True" time="0.000" asserts="0" />
+ <test-case name="NHibernate.Test.CfgTest.AccessorsSerializableTest.AllGettersAreMarkedAsSerializable(NHibernate.Properties.IndexPropertyAccessor+IndexGetter)" executed="True" result="Success" success="True" time="0.000" asserts="0" />
+ <test-case name="NHibernate.Test.CfgTest.AccessorsSerializableTest.AllGettersAreMarkedAsSerializable(NHibernate.Properties.MapAccessor+MapGetter)" executed="True" result="Success" success="True" time="0.000" asserts="0" />
+ <test-case name="NHibernate.Test.CfgTest.AccessorsSerializableTest.AllGettersAreMarkedAsSerializable(NHibernate.Properties.NoopAccessor+NoopGetter)" executed="True" result="Success" success="True" time="0.000" asserts="0" />
+ <test-case name="NHibernate.Test.CfgTest.AccessorsSerializableTest.AllGettersAreMarkedAsSerializable(NHibernate.Properties.XmlAccessor+XmlGetter)" executed="True" result="Success" success="True" time="0.000" asserts="0" />
+ <test-case name="NHibernate.Test.CfgTest.AccessorsSerializableTest.AllGettersAreMarkedAsSerializable(NHibernate.Properties.XmlAccessor+AttributeGetter)" executed="True" result="Success" success="True" time="0.000" asserts="0" />
+ <test-case name="NHibernate.Test.CfgTest.AccessorsSerializableTest.AllGettersAreMarkedAsSerializable(NHibernate.Properties.XmlAccessor+ElementAttributeGetter)" executed="True" result="Success" success="True" time="0.000" asserts="0" />
+ <test-case name="NHibernate.Test.CfgTest.AccessorsSerializableTest.AllGettersAreMarkedAsSerializable(NHibernate.Properties.XmlAccessor+ElementGetter)" executed="True" result="Success" success="True" time="0.000" asserts="0" />
+ <test-case name="NHibernate.Test.CfgTest.AccessorsSerializableTest.AllGettersAreMarkedAsSerializable(NHibernate.Properties.XmlAccessor+TextGetter)" executed="True" result="Success" success="True" time="0.000" asserts="0" />
+ </results>
+ </test-suite>
+ <test-suite type="ParameterizedTest" name="AllSettersAreMarkedAsSerializable" executed="True" result="Success" success="True" time="0.017" asserts="0">
+ <results>
+ <test-case name="NHibernate.Test.CfgTest.AccessorsSerializableTest.AllSettersAreMarkedAsSerializable(NHibernate.Properties.BackrefPropertyAccessor+BackrefSetter)" executed="True" result="Success" success="True" time="0.001" asserts="0" />
+ <test-case name="NHibernate.Test.CfgTest.AccessorsSerializableTest.AllSettersAreMarkedAsSerializable(NHibernate.Properties.BasicPropertyAccessor+BasicSetter)" executed="True" result="Success" success="True" time="0.000" asserts="0" />
+ <test-case name="NHibernate.Test.CfgTest.AccessorsSerializableTest.AllSettersAreMarkedAsSerializable(NHibernate.Properties.EmbeddedPropertyAccessor+EmbeddedSetter)" executed="True" result="Success" success="True" time="0.000" asserts="0" />
+ <test-case name="NHibernate.Test.CfgTest.AccessorsSerializableTest.AllSettersAreM...
[truncated message content] |
|
From: <ric...@us...> - 2011-07-28 15:05:41
|
Revision: 5995
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5995&view=rev
Author: ricbrown
Date: 2011-07-28 15:05:32 +0000 (Thu, 28 Jul 2011)
Log Message:
-----------
Enabled build fail when new tests added fail (to any dialect). Updated Firebird build results to prevent immediate fail.
Modified Paths:
--------------
trunk/nhibernate/lib/teamcity/firebird/NHibernate.Test.last-results.xml
trunk/nhibernate/teamcity.build
Modified: trunk/nhibernate/lib/teamcity/firebird/NHibernate.Test.last-results.xml
===================================================================
--- trunk/nhibernate/lib/teamcity/firebird/NHibernate.Test.last-results.xml 2011-07-25 12:51:16 UTC (rev 5994)
+++ trunk/nhibernate/lib/teamcity/firebird/NHibernate.Test.last-results.xml 2011-07-28 15:05:32 UTC (rev 5995)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<!--This file represents the results of running a test suite-->
-<test-results name="../../build/NHibernate-3.2.0.GA-debug/bin/net-3.5/NHibernate.Test.dll" errors="90" failures="435" not-run="354" inconclusive="0" ignored="354" skipped="0" invalid="0">
- <environment nunit-version="2.5.5.10112" clr-version="2.0.50727.5420" os-version="Microsoft Windows NT 6.1.7601 Service Pack 1" platform="Win32NT" />
- <culture-info current-culture="en-GB" current-uiculture="en-US" />
+<test-results name="../../build/NHibernate-3.2.0.GA-debug/bin/net-3.5/NHibernate.Test.dll" errors="106" failures="330" not-run="377" inconclusive="0" ignored="377" skipped="0" invalid="0">
+ <environment nunit-version="2.5.5.10112" clr-version="2.0.50727.3623" os-version="Microsoft Windows NT 5.2.3790 Service Pack 2" platform="Win32NT" />
+ <culture-info current-culture="en-US" current-uiculture="en-US" />
<test-suite type="Assembly" name="../../build/NHibernate-3.2.0.GA-debug/bin/net-3.5/NHibernate.Test.dll" executed="True" result="Failure" success="False" asserts="0">
<results>
<test-suite type="Namespace" name="NHibernate" executed="True" result="Failure" success="False" asserts="0">
@@ -221,9 +221,9 @@
<test-suite type="TestFixture" name="TimestamperFixture" executed="True" result="Inconclusive" success="False" asserts="0" />
</results>
</test-suite>
- <test-suite type="Namespace" name="Cascade" executed="True" result="Success" success="True" asserts="0">
+ <test-suite type="Namespace" name="Cascade" executed="True" result="Failure" success="False" asserts="0">
<results>
- <test-suite type="Namespace" name="Circle" executed="True" result="Success" success="True" asserts="0">
+ <test-suite type="Namespace" name="Circle" executed="True" result="Failure" success="False" asserts="0">
<results>
<test-suite type="TestFixture" name="CascadeMergeToChildBeforeParentTest" executed="True" result="Success" success="True" asserts="0">
<results>
@@ -232,10 +232,7 @@
<test-case name="NHibernate.Test.Cascade.Circle.CascadeMergeToChildBeforeParentTest.MergeTransientChildBeforeTransientParent" executed="True" result="Success" success="True" asserts="0" />
</results>
</test-suite>
- <test-suite type="TestFixture" name="MultiPathCircleCascadeTest" executed="False" result="Ignored">
- <reason>
- <message><![CDATA[NHibernate.Test.Cascade.Circle.MultiPathCircleCascadeTest does not apply to NHibernate.Dialect.FirebirdDialect]]></message>
- </reason>
+ <test-suite type="TestFixture" name="MultiPathCircleCascadeTest" executed="True" result="Failure" success="False" asserts="0">
<results>
<test-case name="NHibernate.Test.Cascade.Circle.MultiPathCircleCascadeTest.MergeDeliveryNode" executed="False" result="Ignored">
<reason>
@@ -453,6 +450,15 @@
<test-case name="NHibernate.Test.CfgTest.Loquacious.LambdaConfigurationFixture.FullConfiguration" executed="True" result="Success" success="True" asserts="28" />
</results>
</test-suite>
+ <test-suite type="TestFixture" name="NamedQueryTests" executed="True" result="Success" success="True" asserts="0">
+ <results>
+ <test-case name="NHibernate.Test.CfgTest.Loquacious.NamedQueryTests.AddSimpleNamedQuery" executed="True" result="Success" success="True" asserts="0" />
+ <test-case name="NHibernate.Test.CfgTest.Loquacious.NamedQueryTests.WhenSetInvalidFetchSizeThenLeaveDefault" executed="True" result="Success" success="True" asserts="0" />
+ <test-case name="NHibernate.Test.CfgTest.Loquacious.NamedQueryTests.WhenSetInvalidTimeoutThenLeaveDefault" executed="True" result="Success" success="True" asserts="0" />
+ <test-case name="NHibernate.Test.CfgTest.Loquacious.NamedQueryTests.WhenSetValidFetchSizeThenSetValue" executed="True" result="Success" success="True" asserts="0" />
+ <test-case name="NHibernate.Test.CfgTest.Loquacious.NamedQueryTests.WhenSetValidTimeoutThenSetValue" executed="True" result="Success" success="True" asserts="0" />
+ </results>
+ </test-suite>
<test-suite type="TestFixture" name="TypeDefinitionFixture" executed="True" result="Success" success="True" asserts="0">
<results>
<test-case name="NHibernate.Test.CfgTest.Loquacious.TypeDefinitionFixture.AddTypeDef" executed="True" result="Success" success="True" asserts="2" />
@@ -581,10 +587,7 @@
</test-suite>
<test-suite type="Namespace" name="CompositeId" executed="True" result="Failure" success="False" asserts="0">
<results>
- <test-suite type="TestFixture" name="ClassWithCompositeIdFixture" executed="False" result="Ignored">
- <reason>
- <message><![CDATA[NHibernate.Test.CompositeId.ClassWithCompositeIdFixture does not apply to NHibernate.Dialect.FirebirdDialect]]></message>
- </reason>
+ <test-suite type="TestFixture" name="ClassWithCompositeIdFixture" executed="True" result="Failure" success="False" asserts="0">
<results>
<test-case name="NHibernate.Test.CompositeId.ClassWithCompositeIdFixture.Criteria" executed="False" result="Ignored">
<reason>
@@ -1088,16 +1091,50 @@
<test-case name="NHibernate.Test.Criteria.Lambda.ExpressionProcessorFixture.TestEvaluateRestrictionExtension" executed="True" result="Success" success="True" asserts="1" />
<test-case name="NHibernate.Test.Criteria.Lambda.ExpressionProcessorFixture.TestEvaluateStaticPropertyExpression" executed="True" result="Success" success="True" asserts="1" />
<test-case name="NHibernate.Test.Criteria.Lambda.ExpressionProcessorFixture.TestEvaluateSubclass" executed="True" result="Success" success="True" asserts="1" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.ExpressionProcessorFixture.TestFindMemberExpressionClass" executed="True" result="Success" success="True" asserts="1" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.ExpressionProcessorFixture.TestFindMemberExpressionClassAlias" executed="True" result="Success" success="True" asserts="1" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.ExpressionProcessorFixture.TestFindMemberExpressionComponent" executed="True" result="Success" success="True" asserts="1" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.ExpressionProcessorFixture.TestFindMemberExpressionComponentAlias" executed="True" result="Success" success="True" asserts="1" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.ExpressionProcessorFixture.TestFindMemberExpressionConstants" executed="True" result="Success" success="True" asserts="7" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.ExpressionProcessorFixture.TestFindMemberExpressionNullableValue" executed="True" result="Success" success="True" asserts="1" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.ExpressionProcessorFixture.TestFindMemberExpressionNullableValueAlias" executed="True" result="Success" success="True" asserts="1" />
<test-case name="NHibernate.Test.Criteria.Lambda.ExpressionProcessorFixture.TestFindMemberExpressionReference" executed="True" result="Success" success="True" asserts="1" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.ExpressionProcessorFixture.TestFindMemberExpressionReferenceAlias" executed="True" result="Success" success="True" asserts="1" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.ExpressionProcessorFixture.TestFindMemberExpressionReferenceCast" executed="True" result="Success" success="True" asserts="1" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.ExpressionProcessorFixture.TestFindMemberExpressionReferenceCastAlias" executed="True" result="Success" success="True" asserts="1" />
<test-case name="NHibernate.Test.Criteria.Lambda.ExpressionProcessorFixture.TestFindMemberExpressionSubCollectionExtensionMethod" executed="True" result="Success" success="True" asserts="1" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.ExpressionProcessorFixture.TestFindMemberExpressionSubCollectionExtensionMethodAlias" executed="True" result="Success" success="True" asserts="1" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.ExpressionProcessorFixture.TestFindMemberExpressionSubCollectionFirst" executed="True" result="Success" success="True" asserts="1" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.ExpressionProcessorFixture.TestFindMemberExpressionSubCollectionFirstAlias" executed="True" result="Success" success="True" asserts="1" />
<test-case name="NHibernate.Test.Criteria.Lambda.ExpressionProcessorFixture.TestFindMemberExpressionSubCollectionIndex" executed="True" result="Success" success="True" asserts="1" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.ExpressionProcessorFixture.TestFindMemberExpressionSubCollectionIndexAlias" executed="True" result="Success" success="True" asserts="1" />
<test-case name="NHibernate.Test.Criteria.Lambda.ExpressionProcessorFixture.TestFindMemberExpressionValue" executed="True" result="Success" success="True" asserts="1" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.ExpressionProcessorFixture.TestFindMemberExpressionValueAlias" executed="True" result="Success" success="True" asserts="1" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.ExpressionProcessorFixture.TestSignatureGeneric" executed="True" result="Success" success="True" asserts="0" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.ExpressionProcessorFixture.TestSignatureNonGeneric" executed="True" result="Success" success="True" asserts="0" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.ExpressionProcessorFixture.TestSignatureQualifiedGeneric" executed="True" result="Success" success="True" asserts="0" />
</results>
</test-suite>
<test-suite type="TestFixture" name="IntegrationFixture" executed="True" result="Failure" success="False" asserts="0">
<results>
<test-case name="NHibernate.Test.Criteria.Lambda.IntegrationFixture.DetachedQuery_SimpleCriterion" executed="True" result="Success" success="True" asserts="1" />
- <test-case name="NHibernate.Test.Criteria.Lambda.IntegrationFixture.ICriteriaOfT_SimpleCriterion" executed="True" result="Success" success="True" asserts="1" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.IntegrationFixture.Functions" executed="True" result="Error" success="False" asserts="0">
+ <failure>
+ <message><![CDATA[NHibernate.Exceptions.GenericADOException : could not execute query
+[ SELECT (this_.Name||@p0||this_.Name) as y0_ FROM Person this_ WHERE this_.Name = @p1 ]
+ Name:cp0 - Value:, Name:cp1 - Value:p1
+[SQL: SELECT (this_.Name||@p0||this_.Name) as y0_ FROM Person this_ WHERE this_.Name = @p1]
+ ----> FirebirdSql.Data.FirebirdClient.FbException : Dynamic SQL Error
+SQL error code = -804
+Data type unknown
+ ----> FirebirdSql.Data.Common.IscException : Dynamic SQL Error
+SQL error code = -804
+Data type unknown]]></message>
+ </failure>
+ </test-case>
+ <test-case name="NHibernate.Test.Criteria.Lambda.IntegrationFixture.FunctionsOrder" executed="True" result="Success" success="True" asserts="0" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.IntegrationFixture.FunctionsProperty" executed="True" result="Success" success="True" asserts="0" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.IntegrationFixture.ICriteriaOfT_SimpleCriterion" executed="True" result="Success" success="True" asserts="2" />
<test-case name="NHibernate.Test.Criteria.Lambda.IntegrationFixture.IsType" executed="True" result="Success" success="True" asserts="8" />
<test-case name="NHibernate.Test.Criteria.Lambda.IntegrationFixture.MultiCriteria" executed="True" result="Error" success="False" asserts="0">
<failure>
@@ -1119,8 +1156,10 @@
</test-suite>
<test-suite type="TestFixture" name="ProjectionsFixture" executed="True" result="Success" success="True" asserts="0">
<results>
- <test-case name="NHibernate.Test.Criteria.Lambda.ProjectionsFixture.ArbitraryProjections" executed="True" result="Success" success="True" asserts="263" />
- <test-case name="NHibernate.Test.Criteria.Lambda.ProjectionsFixture.InlineProjectionList" executed="True" result="Success" success="True" asserts="260" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.ProjectionsFixture.ArbitraryProjections" executed="True" result="Success" success="True" asserts="294" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.ProjectionsFixture.InlineProjectionList" executed="True" result="Success" success="True" asserts="289" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.ProjectionsFixture.SelectMultipleFunction" executed="True" result="Success" success="True" asserts="82" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.ProjectionsFixture.SelectSingleFunction" executed="True" result="Success" success="True" asserts="67" />
</results>
</test-suite>
<test-suite type="TestFixture" name="QueryOverFixture" executed="True" result="Success" success="True" asserts="0">
@@ -1128,81 +1167,84 @@
<test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.Alias_Join" executed="True" result="Success" success="True" asserts="69" />
<test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.Alias_JoinAlias" executed="True" result="Success" success="True" asserts="69" />
<test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.Alias_JoinCombinations" executed="True" result="Success" success="True" asserts="147" />
- <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.AllowSingleCallSyntax" executed="True" result="Success" success="True" asserts="69" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.AllowSingleCallSyntax" executed="True" result="Success" success="True" asserts="72" />
<test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.Cachable" executed="True" result="Success" success="True" asserts="45" />
- <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.CloneIQueryOver" executed="True" result="Success" success="True" asserts="61" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.CloneIQueryOver" executed="True" result="Success" success="True" asserts="64" />
<test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.CloneIQueryOverWithSubType" executed="True" result="Success" success="True" asserts="54" />
- <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.CloneQueryOver" executed="True" result="Success" success="True" asserts="61" />
- <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.CustomMethodExpression" executed="True" result="Success" success="True" asserts="68" />
- <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.DetachedQueryOver" executed="True" result="Success" success="True" asserts="57" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.CloneQueryOver" executed="True" result="Success" success="True" asserts="64" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.CustomMethodExpression" executed="True" result="Success" success="True" asserts="74" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.DetachedQueryOver" executed="True" result="Success" success="True" asserts="60" />
<test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.Fetch" executed="True" result="Success" success="True" asserts="47" />
<test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.LockAlias" executed="True" result="Success" success="True" asserts="50" />
<test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.LockAll" executed="True" result="Success" success="True" asserts="50" />
- <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.MultipleCriterionExpression" executed="True" result="Success" success="True" asserts="77" />
- <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.Negation" executed="True" result="Success" success="True" asserts="69" />
- <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.OnClause_Alias" executed="True" result="Success" success="True" asserts="303" />
- <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.OnClause_SubCriteria" executed="True" result="Success" success="True" asserts="303" />
- <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.OnClauseDetached_Alias" executed="True" result="Success" success="True" asserts="305" />
- <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.OnClauseDetached_SubCriteria" executed="True" result="Success" success="True" asserts="305" />
- <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.OrderBy" executed="True" result="Success" success="True" asserts="103" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.MultipleCriterionExpression" executed="True" result="Success" success="True" asserts="83" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.Negation" executed="True" result="Success" success="True" asserts="75" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.OnClause_Alias" executed="True" result="Success" success="True" asserts="327" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.OnClause_SubCriteria" executed="True" result="Success" success="True" asserts="327" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.OnClauseDetached_Alias" executed="True" result="Success" success="True" asserts="329" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.OnClauseDetached_SubCriteria" executed="True" result="Success" success="True" asserts="329" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.OrderBy" executed="True" result="Success" success="True" asserts="115" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.OrderByFunction" executed="True" result="Success" success="True" asserts="76" />
<test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.Paging" executed="True" result="Success" success="True" asserts="43" />
<test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.PrivateProperties" executed="True" result="Success" success="True" asserts="85" />
<test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.Project" executed="True" result="Success" success="True" asserts="65" />
- <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.PropertyCriterion_NoAlias" executed="True" result="Success" success="True" asserts="98" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.PropertyCriterion_NoAlias" executed="True" result="Success" success="True" asserts="134" />
<test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.Readonly" executed="True" result="Success" success="True" asserts="44" />
<test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.ResultTransformer" executed="True" result="Success" success="True" asserts="54" />
- <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.SimpleCriterion_AliasReferenceSyntax" executed="True" result="Success" success="True" asserts="140" />
- <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.SimpleCriterion_Char" executed="True" result="Success" success="True" asserts="68" />
- <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.SimpleCriterion_NoAlias" executed="True" result="Success" success="True" asserts="140" />
- <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.SubCriteria_JoinQueryOver_ToMany" executed="True" result="Success" success="True" asserts="66" />
- <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.SubCriteria_JoinQueryOver_ToManyAlias" executed="True" result="Success" success="True" asserts="66" />
- <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.SubCriteria_JoinQueryOver_ToOne" executed="True" result="Success" success="True" asserts="66" />
- <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.SubCriteria_JoinQueryOver_ToOneAlias" executed="True" result="Success" success="True" asserts="66" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.SimpleCriterion_AliasReferenceSyntax" executed="True" result="Success" success="True" asserts="161" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.SimpleCriterion_Char" executed="True" result="Success" success="True" asserts="74" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.SimpleCriterion_NoAlias" executed="True" result="Success" success="True" asserts="161" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.SubCriteria_JoinQueryOver_ToMany" executed="True" result="Success" success="True" asserts="69" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.SubCriteria_JoinQueryOver_ToManyAlias" executed="True" result="Success" success="True" asserts="69" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.SubCriteria_JoinQueryOver_ToOne" executed="True" result="Success" success="True" asserts="69" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.SubCriteria_JoinQueryOver_ToOneAlias" executed="True" result="Success" success="True" asserts="69" />
<test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.SubCriteria_JoinQueryOverCombinations" executed="True" result="Success" success="True" asserts="137" />
- <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.TransformQueryOverToRowCount" executed="True" result="Success" success="True" asserts="78" />
- <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.TransformQueryOverToRowCount64" executed="True" result="Success" success="True" asserts="78" />
- <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.VisualBasicStringComparison" executed="True" result="Success" success="True" asserts="171" />
- <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.Where_BehavesTheSameAs_And" executed="True" result="Success" success="True" asserts="93" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.TransformQueryOverToRowCount" executed="True" result="Success" success="True" asserts="84" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.TransformQueryOverToRowCount64" executed="True" result="Success" success="True" asserts="84" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.VisualBasicStringComparison" executed="True" result="Success" success="True" asserts="225" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.QueryOverFixture.Where_BehavesTheSameAs_And" executed="True" result="Success" success="True" asserts="105" />
</results>
</test-suite>
<test-suite type="TestFixture" name="RestrictionsFixture" executed="True" result="Success" success="True" asserts="0">
<results>
- <test-case name="NHibernate.Test.Criteria.Lambda.RestrictionsFixture.ArbitraryCriterion" executed="True" result="Success" success="True" asserts="93" />
- <test-case name="NHibernate.Test.Criteria.Lambda.RestrictionsFixture.DetachedRestrictions" executed="True" result="Success" success="True" asserts="93" />
- <test-case name="NHibernate.Test.Criteria.Lambda.RestrictionsFixture.Junction" executed="True" result="Success" success="True" asserts="93" />
- <test-case name="NHibernate.Test.Criteria.Lambda.RestrictionsFixture.NullRestriction" executed="True" result="Success" success="True" asserts="153" />
- <test-case name="NHibernate.Test.Criteria.Lambda.RestrictionsFixture.RestrictionsExtensions" executed="True" result="Success" success="True" asserts="131" />
- <test-case name="NHibernate.Test.Criteria.Lambda.RestrictionsFixture.SqlOperators" executed="True" result="Success" success="True" asserts="241" />
- <test-case name="NHibernate.Test.Criteria.Lambda.RestrictionsFixture.SqlOperatorsInline" executed="True" result="Success" success="True" asserts="209" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.RestrictionsFixture.ArbitraryCriterion" executed="True" result="Success" success="True" asserts="105" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.RestrictionsFixture.DetachedRestrictions" executed="True" result="Success" success="True" asserts="105" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.RestrictionsFixture.FunctionExtensions" executed="True" result="Success" success="True" asserts="611" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.RestrictionsFixture.FunctionExtensionsProperty" executed="True" result="Success" success="True" asserts="85" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.RestrictionsFixture.Junction" executed="True" result="Success" success="True" asserts="105" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.RestrictionsFixture.NullRestriction" executed="True" result="Success" success="True" asserts="204" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.RestrictionsFixture.RestrictionsExtensions" executed="True" result="Success" success="True" asserts="172" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.RestrictionsFixture.SqlOperators" executed="True" result="Success" success="True" asserts="300" />
+ <test-case name="NHibernate.Test.Criteria.Lambda.RestrictionsFi...
[truncated message content] |
|
From: <ric...@us...> - 2011-08-09 13:25:38
|
Revision: 6004
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=6004&view=rev
Author: ricbrown
Date: 2011-08-09 13:25:29 +0000 (Tue, 09 Aug 2011)
Log Message:
-----------
Turned of Oracle creation until password updated.
Modified Paths:
--------------
trunk/nhibernate/lib/teamcity/oracle/oracle_installation.txt
trunk/nhibernate/src/NHibernate.TestDatabaseSetup/TestDatabaseSetup.cs
Modified: trunk/nhibernate/lib/teamcity/oracle/oracle_installation.txt
===================================================================
--- trunk/nhibernate/lib/teamcity/oracle/oracle_installation.txt 2011-08-07 19:31:59 UTC (rev 6003)
+++ trunk/nhibernate/lib/teamcity/oracle/oracle_installation.txt 2011-08-09 13:25:29 UTC (rev 6004)
@@ -2,7 +2,9 @@
Installation steps for Oracle (Express Edition) for NH TeamCity:
1. Download Oracle Database 10g Express Edition (OracleXE.exe): http://www.oracle.com/technetwork/database/express-edition/downloads/102xewinsoft-090667.html;
-2. Run the installer ... choose any HTTP port for the listener (e.g., 8081);
+ (Note: you'll need to sign-up for a (free) Oracle account to download)
+
+2. Run the installer ... choose any HTTP port for the listener if asked (it may automatically choose the default 8080 if available);
3. Enter 'password' as the password for the SYS and SYSTEM accounts;
4. The setup should install Oracle (XE) on the machine;
5. Once the installation is complete, leave the option ticked to open the homepage for configuration.
Modified: trunk/nhibernate/src/NHibernate.TestDatabaseSetup/TestDatabaseSetup.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.TestDatabaseSetup/TestDatabaseSetup.cs 2011-08-07 19:31:59 UTC (rev 6003)
+++ trunk/nhibernate/src/NHibernate.TestDatabaseSetup/TestDatabaseSetup.cs 2011-08-09 13:25:29 UTC (rev 6004)
@@ -130,33 +130,35 @@
private static void SetupOracle(Cfg.Configuration cfg)
{
- var connStr =
- cfg.Properties[Cfg.Environment.ConnectionString]
- .Replace("User ID=nhibernate", "User ID=SYSTEM")
- .Replace("Password=nhibernate", "Password=password");
+ // disabled until system password is set on TeamCity
- cfg.DataBaseIntegration(db =>
- {
- db.ConnectionString = connStr;
- db.Dialect<NHibernate.Dialect.Oracle10gDialect>();
- db.KeywordsAutoImport = Hbm2DDLKeyWords.None;
- });
+ //var connStr =
+ // cfg.Properties[Cfg.Environment.ConnectionString]
+ // .Replace("User ID=nhibernate", "User ID=SYSTEM")
+ // .Replace("Password=nhibernate", "Password=password");
- using (var sf = cfg.BuildSessionFactory())
- {
- try
- {
- using(var s = sf.OpenSession())
- s.CreateSQLQuery("drop user nhibernate cascade").ExecuteUpdate();
- }
- catch {}
+ //cfg.DataBaseIntegration(db =>
+ // {
+ // db.ConnectionString = connStr;
+ // db.Dialect<NHibernate.Dialect.Oracle10gDialect>();
+ // db.KeywordsAutoImport = Hbm2DDLKeyWords.None;
+ // });
- using (var s = sf.OpenSession())
- {
- s.CreateSQLQuery("create user nhibernate identified by nhibernate").ExecuteUpdate();
- s.CreateSQLQuery("grant dba to nhibernate with admin option").ExecuteUpdate();
- }
- }
+ //using (var sf = cfg.BuildSessionFactory())
+ //{
+ // try
+ // {
+ // using(var s = sf.OpenSession())
+ // s.CreateSQLQuery("drop user nhibernate cascade").ExecuteUpdate();
+ // }
+ // catch {}
+
+ // using (var s = sf.OpenSession())
+ // {
+ // s.CreateSQLQuery("create user nhibernate identified by nhibernate").ExecuteUpdate();
+ // s.CreateSQLQuery("grant dba to nhibernate with admin option").ExecuteUpdate();
+ // }
+ //}
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sb...@us...> - 2011-08-22 10:55:50
|
Revision: 6006
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=6006&view=rev
Author: sbohlen
Date: 2011-08-22 10:55:43 +0000 (Mon, 22 Aug 2011)
Log Message:
-----------
-delete non-source-code-related content from the repository to prevent subsequent use now that the authoritative repo has been switched to GITHUB
-introduce OBSOLETE.txt message file into all folders
-prepend OBSOLETE message to all .cs files to further ensure viewers are advised that the content in this repo is obsolete
Removed Paths:
-------------
trunk/nhibernate/Tools/
trunk/nhibernate/build-common/
trunk/nhibernate/doc/
trunk/nhibernate/external-bin/
trunk/nhibernate/lib/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X