Menu
▾
▴
nhibernate-commit — CVS Commits
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
(248) |
May
(82) |
Jun
(90) |
Jul
(177) |
Aug
(253) |
Sep
(157) |
Oct
(151) |
Nov
(143) |
Dec
(278) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(152) |
Feb
(107) |
Mar
(177) |
Apr
(133) |
May
(259) |
Jun
(81) |
Jul
(119) |
Aug
(306) |
Sep
(416) |
Oct
(240) |
Nov
(329) |
Dec
(206) |
| 2006 |
Jan
(466) |
Feb
(382) |
Mar
(153) |
Apr
(162) |
May
(133) |
Jun
(21) |
Jul
(18) |
Aug
(37) |
Sep
(97) |
Oct
(114) |
Nov
(110) |
Dec
(28) |
| 2007 |
Jan
(74) |
Feb
(65) |
Mar
(49) |
Apr
(76) |
May
(43) |
Jun
(15) |
Jul
(68) |
Aug
(55) |
Sep
(63) |
Oct
(59) |
Nov
(70) |
Dec
(66) |
| 2008 |
Jan
(71) |
Feb
(60) |
Mar
(120) |
Apr
(31) |
May
(48) |
Jun
(81) |
Jul
(107) |
Aug
(51) |
Sep
(80) |
Oct
(83) |
Nov
(83) |
Dec
(79) |
| 2009 |
Jan
(83) |
Feb
(110) |
Mar
(97) |
Apr
(91) |
May
(291) |
Jun
(250) |
Jul
(197) |
Aug
(58) |
Sep
(54) |
Oct
(122) |
Nov
(68) |
Dec
(34) |
| 2010 |
Jan
(50) |
Feb
(17) |
Mar
(63) |
Apr
(61) |
May
(84) |
Jun
(81) |
Jul
(138) |
Aug
(144) |
Sep
(78) |
Oct
(26) |
Nov
(30) |
Dec
(61) |
| 2011 |
Jan
(33) |
Feb
(35) |
Mar
(166) |
Apr
(221) |
May
(109) |
Jun
(76) |
Jul
(27) |
Aug
(37) |
Sep
(1) |
Oct
(4) |
Nov
(2) |
Dec
(1) |
| 2012 |
Jan
|
Feb
|
Mar
(2) |
Apr
(2) |
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
(1) |
Oct
|
Nov
(1) |
Dec
|
| 2013 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(1) |
Sep
(3) |
Oct
(2) |
Nov
|
Dec
(1) |
| 2014 |
Jan
(1) |
Feb
(1) |
Mar
(3) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <Ric...@us...> - 2009-06-22 22:01:06
|
Revision: 4510
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4510&view=rev
Author: RicBrown
Date: 2009-06-22 22:00:03 +0000 (Mon, 22 Jun 2009)
Log Message:
-----------
First test and overload for ICriteria Lambda overloads.
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/ICriteria.cs
trunk/nhibernate/src/NHibernate/Impl/CriteriaImpl.cs
trunk/nhibernate/src/NHibernate/NHibernate.csproj
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.build
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
trunk/nhibernate/lib/net/3.5/Rhino.Mocks.acknowledgements.txt
trunk/nhibernate/lib/net/3.5/Rhino.Mocks.dll
trunk/nhibernate/lib/net/3.5/Rhino.Mocks.license.txt
trunk/nhibernate/lib/net/3.5/Rhino.Mocks.xml
trunk/nhibernate/src/NHibernate/Impl/ExpressionProcessor.cs
trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/
trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/CriteriaFixture.cs
trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/LambdaFixtureBase.cs
trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/Model.cs
Added: trunk/nhibernate/lib/net/3.5/Rhino.Mocks.acknowledgements.txt
===================================================================
--- trunk/nhibernate/lib/net/3.5/Rhino.Mocks.acknowledgements.txt (rev 0)
+++ trunk/nhibernate/lib/net/3.5/Rhino.Mocks.acknowledgements.txt 2009-06-22 22:00:03 UTC (rev 4510)
@@ -0,0 +1,2 @@
+Rhino Mocks is using Castle Dynamic Proxy (http://www.castleproject.org/dynamicproxy/index.html) to handle proxying the types it needs to mock.
+The Dynamic Proxy project has been invaluable resource and made creating Rhino Mocks possible.
\ No newline at end of file
Added: trunk/nhibernate/lib/net/3.5/Rhino.Mocks.dll
===================================================================
(Binary files differ)
Property changes on: trunk/nhibernate/lib/net/3.5/Rhino.Mocks.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/nhibernate/lib/net/3.5/Rhino.Mocks.license.txt
===================================================================
--- trunk/nhibernate/lib/net/3.5/Rhino.Mocks.license.txt (rev 0)
+++ trunk/nhibernate/lib/net/3.5/Rhino.Mocks.license.txt 2009-06-22 22:00:03 UTC (rev 4510)
@@ -0,0 +1,25 @@
+Copyright (c) 2005 - 2008 Ayende Rahien (ay...@ay...)
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * Neither the name of Ayende Rahien nor the names of its
+ contributors may be used to endorse or promote products derived from this
+ software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
Added: trunk/nhibernate/lib/net/3.5/Rhino.Mocks.xml
===================================================================
--- trunk/nhibernate/lib/net/3.5/Rhino.Mocks.xml (rev 0)
+++ trunk/nhibernate/lib/net/3.5/Rhino.Mocks.xml 2009-06-22 22:00:03 UTC (rev 4510)
@@ -0,0 +1,5206 @@
+<?xml version="1.0"?>
+<doc>
+ <assembly>
+ <name>Rhino.Mocks.Partial</name>
+ </assembly>
+ <members>
+ <member name="T:Rhino.Mocks.Constraints.AbstractConstraint">
+ <summary>
+ Interface for constraints
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.AbstractConstraint.Eval(System.Object)">
+ <summary>
+ determains if the object pass the constraints
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.AbstractConstraint.op_BitwiseAnd(Rhino.Mocks.Constraints.AbstractConstraint,Rhino.Mocks.Constraints.AbstractConstraint)">
+ <summary>
+ And operator for constraints
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.AbstractConstraint.op_LogicalNot(Rhino.Mocks.Constraints.AbstractConstraint)">
+ <summary>
+ Not operator for constraints
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.AbstractConstraint.op_BitwiseOr(Rhino.Mocks.Constraints.AbstractConstraint,Rhino.Mocks.Constraints.AbstractConstraint)">
+ <summary>
+ Or operator for constraints
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.AbstractConstraint.op_False(Rhino.Mocks.Constraints.AbstractConstraint)">
+ <summary>
+ Allow overriding of || or &&
+ </summary>
+ <param name="c"></param>
+ <returns></returns>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.AbstractConstraint.op_True(Rhino.Mocks.Constraints.AbstractConstraint)">
+ <summary>
+ Allow overriding of || or &&
+ </summary>
+ <param name="c"></param>
+ <returns></returns>
+ </member>
+ <member name="P:Rhino.Mocks.Constraints.AbstractConstraint.Message">
+ <summary>
+ Gets the message for this constraint
+ </summary>
+ <value></value>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.AllPropertiesMatchConstraint.#ctor(System.Object)">
+ <summary>
+ Initializes a new constraint object.
+ </summary>
+ <param name="expected">The expected object, The actual object is passed in as a parameter to the <see cref="M:Rhino.Mocks.Constraints.AllPropertiesMatchConstraint.Eval(System.Object)"/> method</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.AllPropertiesMatchConstraint.Eval(System.Object)">
+ <summary>
+ Evaluate this constraint.
+ </summary>
+ <param name="obj">The actual object that was passed in the method call to the mock.</param>
+ <returns>True when the constraint is met, else false.</returns>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.AllPropertiesMatchConstraint.CheckReferenceType(System.Object,System.Object)">
+ <summary>
+ Checks if the properties of the <paramref name="actual"/> object
+ are the same as the properies of the <paramref name="expected"/> object.
+ </summary>
+ <param name="expected">The expected object</param>
+ <param name="actual">The actual object</param>
+ <returns>True when both objects have the same values, else False.</returns>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.AllPropertiesMatchConstraint.CheckValue(System.Object,System.Object)">
+ <summary>
+
+ </summary>
+ <param name="expected"></param>
+ <param name="actual"></param>
+ <returns></returns>
+ <remarks>This is the real heart of the beast.</remarks>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.AllPropertiesMatchConstraint.CheckProperties(System.Object,System.Object)">
+ <summary>
+ Used by CheckReferenceType to check all properties of the reference type.
+ </summary>
+ <param name="expected">The expected object</param>
+ <param name="actual">The actual object</param>
+ <returns>True when both objects have the same values, else False.</returns>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.AllPropertiesMatchConstraint.CheckFields(System.Object,System.Object)">
+ <summary>
+ Used by CheckReferenceType to check all fields of the reference type.
+ </summary>
+ <param name="expected">The expected object</param>
+ <param name="actual">The actual object</param>
+ <returns>True when both objects have the same values, else False.</returns>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.AllPropertiesMatchConstraint.CheckCollection(System.Collections.IEnumerable,System.Collections.IEnumerable)">
+ <summary>
+ Checks the items of both collections
+ </summary>
+ <param name="expectedCollection">The expected collection</param>
+ <param name="actualCollection"></param>
+ <returns>True if both collections contain the same items in the same order.</returns>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.AllPropertiesMatchConstraint.BuildPropertyName">
+ <summary>
+ Builds a propertyname from the Stack _properties like 'Order.Product.Price'
+ to be used in the error message.
+ </summary>
+ <returns>A nested property name.</returns>
+ </member>
+ <member name="P:Rhino.Mocks.Constraints.AllPropertiesMatchConstraint.Message">
+ <summary>
+ Rhino.Mocks uses this property to generate an error message.
+ </summary>
+ <value>
+ A message telling the tester why the constraint failed.
+ </value>
+ </member>
+ <member name="T:Rhino.Mocks.Constraints.PublicFieldIs">
+ <summary>
+ Constrain that the public field has a specified value
+ </summary>
+ </member>
+ <member name="T:Rhino.Mocks.Constraints.PublicFieldConstraint">
+ <summary>
+ Constrain that the public field matches another constraint.
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.PublicFieldConstraint.#ctor(System.String,Rhino.Mocks.Constraints.AbstractConstraint)">
+ <summary>
+ Creates a new <see cref="T:Rhino.Mocks.Constraints.PublicFieldConstraint"/> instance.
+ </summary>
+ <param name="publicFieldName">Name of the public field.</param>
+ <param name="constraint">Constraint to place on the public field value.</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.PublicFieldConstraint.#ctor(System.Type,System.String,Rhino.Mocks.Constraints.AbstractConstraint)">
+ <summary>
+ Creates a new <see cref="T:Rhino.Mocks.Constraints.PublicFieldConstraint"/> instance, specifying a disambiguating
+ <paramref name="declaringType"/> for the public field.
+ </summary>
+ <param name="declaringType">The type that declares the public field, used to disambiguate between public fields.</param>
+ <param name="publicFieldName">Name of the public field.</param>
+ <param name="constraint">Constraint to place on the public field value.</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.PublicFieldConstraint.Eval(System.Object)">
+ <summary>
+ Determines if the object passes the constraint.
+ </summary>
+ </member>
+ <member name="P:Rhino.Mocks.Constraints.PublicFieldConstraint.Message">
+ <summary>
+ Gets the message for this constraint
+ </summary>
+ <value></value>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.PublicFieldIs.#ctor(System.String,System.Object)">
+ <summary>
+ Creates a new <see cref="T:Rhino.Mocks.Constraints.PublicFieldIs"/> instance.
+ </summary>
+ <param name="publicFieldName">Name of the public field.</param>
+ <param name="expectedValue">Expected value.</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.PublicFieldIs.#ctor(System.Type,System.String,System.Object)">
+ <summary>
+ Creates a new <see cref="T:Rhino.Mocks.Constraints.PublicFieldIs"/> instance, specifying a disambiguating
+ <paramref name="declaringType"/> for the public field.
+ </summary>
+ <param name="declaringType">The type that declares the public field, used to disambiguate between public fields.</param>
+ <param name="publicFieldName">Name of the public field.</param>
+ <param name="expectedValue">Expected value.</param>
+ </member>
+ <member name="T:Rhino.Mocks.Constraints.PropertyIs">
+ <summary>
+ Constrain that the property has a specified value
+ </summary>
+ </member>
+ <member name="T:Rhino.Mocks.Constraints.PropertyConstraint">
+ <summary>
+ Constrain that the property matches another constraint.
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.PropertyConstraint.#ctor(System.String,Rhino.Mocks.Constraints.AbstractConstraint)">
+ <summary>
+ Creates a new <see cref="T:Rhino.Mocks.Constraints.PropertyConstraint"/> instance.
+ </summary>
+ <param name="propertyName">Name of the property.</param>
+ <param name="constraint">Constraint to place on the property value.</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.PropertyConstraint.#ctor(System.Type,System.String,Rhino.Mocks.Constraints.AbstractConstraint)">
+ <summary>
+ Creates a new <see cref="T:Rhino.Mocks.Constraints.PropertyConstraint"/> instance, specifying a disambiguating
+ <paramref name="declaringType"/> for the property.
+ </summary>
+ <param name="declaringType">The type that declares the property, used to disambiguate between properties.</param>
+ <param name="propertyName">Name of the property.</param>
+ <param name="constraint">Constraint to place on the property value.</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.PropertyConstraint.Eval(System.Object)">
+ <summary>
+ Determines if the object passes the constraint.
+ </summary>
+ </member>
+ <member name="P:Rhino.Mocks.Constraints.PropertyConstraint.Message">
+ <summary>
+ Gets the message for this constraint
+ </summary>
+ <value></value>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.PropertyIs.#ctor(System.String,System.Object)">
+ <summary>
+ Creates a new <see cref="T:Rhino.Mocks.Constraints.PropertyIs"/> instance.
+ </summary>
+ <param name="propertyName">Name of the property.</param>
+ <param name="expectedValue">Expected value.</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.PropertyIs.#ctor(System.Type,System.String,System.Object)">
+ <summary>
+ Creates a new <see cref="T:Rhino.Mocks.Constraints.PropertyIs"/> instance, specifying a disambiguating
+ <paramref name="declaringType"/> for the property.
+ </summary>
+ <param name="declaringType">The type that declares the property, used to disambiguate between properties.</param>
+ <param name="propertyName">Name of the property.</param>
+ <param name="expectedValue">Expected value.</param>
+ </member>
+ <member name="T:Rhino.Mocks.Constraints.TypeOf">
+ <summary>
+ Constrain that the parameter must be of the specified type
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.TypeOf.#ctor(System.Type)">
+ <summary>
+ Creates a new <see cref="T:Rhino.Mocks.Constraints.TypeOf"/> instance.
+ </summary>
+ <param name="type">Type.</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.TypeOf.Eval(System.Object)">
+ <summary>
+ determains if the object pass the constraints
+ </summary>
+ </member>
+ <member name="P:Rhino.Mocks.Constraints.TypeOf.Message">
+ <summary>
+ Gets the message for this constraint
+ </summary>
+ <value></value>
+ </member>
+ <member name="T:Rhino.Mocks.Constraints.Same">
+ <summary>
+ Constraint that determines whether an object is the same object as another.
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Same.#ctor(System.Object)">
+ <summary>
+ Creates a new <see cref="T:Rhino.Mocks.Constraints.Equal"/> instance.
+ </summary>
+ <param name="obj">Obj.</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Same.Eval(System.Object)">
+ <summary>
+ Determines if the object passes the constraints.
+ </summary>
+ </member>
+ <member name="P:Rhino.Mocks.Constraints.Same.Message">
+ <summary>
+ Gets the message for this constraint.
+ </summary>
+ </member>
+ <member name="T:Rhino.Mocks.Constraints.PredicateConstraint`1">
+ <summary>
+ Evaluate a parameter using constraints
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.PredicateConstraint`1.#ctor(System.Predicate{`0})">
+ <summary>
+ Create new instance
+ </summary>
+ <param name="predicate"></param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.PredicateConstraint`1.Eval(System.Object)">
+ <summary>
+ determains if the object pass the constraints
+ </summary>
+ </member>
+ <member name="P:Rhino.Mocks.Constraints.PredicateConstraint`1.Message">
+ <summary>
+ Gets the message for this constraint
+ </summary>
+ <value></value>
+ </member>
+ <member name="T:Rhino.Mocks.Constraints.CollectionEqual">
+ <summary>
+ Constrain that the list contains the same items as the parameter list
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.CollectionEqual.#ctor(System.Collections.IEnumerable)">
+ <summary>
+ Creates a new <see cref="T:Rhino.Mocks.Constraints.CollectionEqual"/> instance.
+ </summary>
+ <param name="collection">In list.</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.CollectionEqual.Eval(System.Object)">
+ <summary>
+ determains if the object pass the constraints
+ </summary>
+ </member>
+ <member name="P:Rhino.Mocks.Constraints.CollectionEqual.Message">
+ <summary>
+ Gets the message for this constraint
+ </summary>
+ <value></value>
+ </member>
+ <member name="T:Rhino.Mocks.Constraints.OneOf">
+ <summary>
+ Constrain that the parameter is one of the items in the list
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.OneOf.#ctor(System.Collections.IEnumerable)">
+ <summary>
+ Creates a new <see cref="T:Rhino.Mocks.Constraints.OneOf"/> instance.
+ </summary>
+ <param name="collection">In list.</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.OneOf.Eval(System.Object)">
+ <summary>
+ determains if the object pass the constraints
+ </summary>
+ </member>
+ <member name="P:Rhino.Mocks.Constraints.OneOf.Message">
+ <summary>
+ Gets the message for this constraint
+ </summary>
+ <value></value>
+ </member>
+ <member name="T:Rhino.Mocks.Constraints.IsIn">
+ <summary>
+ Constrain that the object is inside the parameter list
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.IsIn.#ctor(System.Object)">
+ <summary>
+ Creates a new <see cref="T:Rhino.Mocks.Constraints.IsIn"/> instance.
+ </summary>
+ <param name="inList">In list.</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.IsIn.Eval(System.Object)">
+ <summary>
+ determains if the object pass the constraints
+ </summary>
+ </member>
+ <member name="P:Rhino.Mocks.Constraints.IsIn.Message">
+ <summary>
+ Gets the message for this constraint
+ </summary>
+ <value></value>
+ </member>
+ <member name="T:Rhino.Mocks.Constraints.CollectionCount">
+ <summary>
+ Applies another AbstractConstraint to the collection count.
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.CollectionCount.#ctor(Rhino.Mocks.Constraints.AbstractConstraint)">
+ <summary>
+ Creates a new <see cref="T:Rhino.Mocks.Constraints.CollectionCount"/> instance.
+ </summary>
+ <param name="constraint">The constraint that should be applied to the collection count.</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.CollectionCount.Eval(System.Object)">
+ <summary>
+ Determines if the parameter conforms to this constraint.
+ </summary>
+ </member>
+ <member name="P:Rhino.Mocks.Constraints.CollectionCount.Message">
+ <summary>
+ Gets the message for this constraint.
+ </summary>
+ </member>
+ <member name="T:Rhino.Mocks.Constraints.ListElement">
+ <summary>
+ Applies another AbstractConstraint to a specific list element.
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.ListElement.#ctor(System.Int32,Rhino.Mocks.Constraints.AbstractConstraint)">
+ <summary>
+ Creates a new <see cref="T:Rhino.Mocks.Constraints.ListElement"/> instance.
+ </summary>
+ <param name="index">The zero-based index of the list element.</param>
+ <param name="constraint">The constraint that should be applied to the list element.</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.ListElement.Eval(System.Object)">
+ <summary>
+ Determines if the parameter conforms to this constraint.
+ </summary>
+ </member>
+ <member name="P:Rhino.Mocks.Constraints.ListElement.Message">
+ <summary>
+ Gets the message for this constraint
+ </summary>
+ <value></value>
+ </member>
+ <member name="T:Rhino.Mocks.Constraints.KeyedListElement`1">
+ <summary>
+ Applies another AbstractConstraint to a specific generic keyed list element.
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.KeyedListElement`1.#ctor(`0,Rhino.Mocks.Constraints.AbstractConstraint)">
+ <summary>
+ Creates a new <see cref="T:KeyedListElement"/> instance.
+ </summary>
+ <param name="key">The key of the list element.</param>
+ <param name="constraint">The constraint that should be applied to the list element.</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.KeyedListElement`1.Eval(System.Object)">
+ <summary>
+ Determines if the parameter conforms to this constraint.
+ </summary>
+ </member>
+ <member name="P:Rhino.Mocks.Constraints.KeyedListElement`1.Message">
+ <summary>
+ Gets the message for this constraint
+ </summary>
+ <value></value>
+ </member>
+ <member name="T:Rhino.Mocks.Constraints.ContainsAll">
+ <summary>
+ Constrains that all elements are in the parameter list
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.ContainsAll.#ctor(System.Collections.IEnumerable)">
+ <summary>
+ Initializes a new instance of the <see cref="T:Rhino.Mocks.Constraints.ContainsAll"/> class.
+ </summary>
+ <param name="these">The these.</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.ContainsAll.Eval(System.Object)">
+ <summary>
+ determains if the object pass the constraints
+ </summary>
+ <param name="obj"></param>
+ <returns></returns>
+ </member>
+ <member name="P:Rhino.Mocks.Constraints.ContainsAll.Message">
+ <summary>
+ Gets the message for this constraint
+ </summary>
+ <value></value>
+ </member>
+ <member name="T:Rhino.Mocks.Constraints.Or">
+ <summary>
+ Combines two constraints, constraint pass if either is fine.
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Or.#ctor(Rhino.Mocks.Constraints.AbstractConstraint,Rhino.Mocks.Constraints.AbstractConstraint)">
+ <summary>
+ Creates a new <see cref="T:Rhino.Mocks.Constraints.And"/> instance.
+ </summary>
+ <param name="c1">C1.</param>
+ <param name="c2">C2.</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Or.Eval(System.Object)">
+ <summary>
+ determains if the object pass the constraints
+ </summary>
+ </member>
+ <member name="P:Rhino.Mocks.Constraints.Or.Message">
+ <summary>
+ Gets the message for this constraint
+ </summary>
+ <value></value>
+ </member>
+ <member name="T:Rhino.Mocks.Constraints.Not">
+ <summary>
+ Negate a constraint
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Not.#ctor(Rhino.Mocks.Constraints.AbstractConstraint)">
+ <summary>
+ Creates a new <see cref="T:Rhino.Mocks.Constraints.And"/> instance.
+ </summary>
+ <param name="c1">C1.</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Not.Eval(System.Object)">
+ <summary>
+ determains if the object pass the constraints
+ </summary>
+ </member>
+ <member name="P:Rhino.Mocks.Constraints.Not.Message">
+ <summary>
+ Gets the message for this constraint
+ </summary>
+ <value></value>
+ </member>
+ <member name="T:Rhino.Mocks.Constraints.And">
+ <summary>
+ Combines two constraints
+ </summary>
+ <remarks></remarks>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.And.#ctor(Rhino.Mocks.Constraints.AbstractConstraint,Rhino.Mocks.Constraints.AbstractConstraint)">
+ <summary>
+ Creates a new <see cref="T:Rhino.Mocks.Constraints.And"/> instance.
+ </summary>
+ <param name="c1">C1.</param>
+ <param name="c2">C2.</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.And.Eval(System.Object)">
+ <summary>
+ determains if the object pass the constraints
+ </summary>
+ </member>
+ <member name="P:Rhino.Mocks.Constraints.And.Message">
+ <summary>
+ Gets the message for this constraint
+ </summary>
+ <value></value>
+ </member>
+ <member name="T:Rhino.Mocks.Constraints.Like">
+ <summary>
+ Constrain the argument to validate according to regex pattern
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Like.#ctor(System.String)">
+ <summary>
+ Creates a new <see cref="T:Rhino.Mocks.Constraints.Like"/> instance.
+ </summary>
+ <param name="pattern">Pattern.</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Like.Eval(System.Object)">
+ <summary>
+ determains if the object pass the constraints
+ </summary>
+ </member>
+ <member name="P:Rhino.Mocks.Constraints.Like.Message">
+ <summary>
+ Gets the message for this constraint
+ </summary>
+ <value></value>
+ </member>
+ <member name="T:Rhino.Mocks.Constraints.Contains">
+ <summary>
+ Constraint that evaluate whatever an argument contains the specified string.
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Contains.#ctor(System.String)">
+ <summary>
+ Creates a new <see cref="T:Rhino.Mocks.Constraints.Contains"/> instance.
+ </summary>
+ <param name="innerString">Inner string.</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Contains.Eval(System.Object)">
+ <summary>
+ determains if the object pass the constraints
+ </summary>
+ </member>
+ <member name="P:Rhino.Mocks.Constraints.Contains.Message">
+ <summary>
+ Gets the message for this constraint
+ </summary>
+ <value></value>
+ </member>
+ <member name="T:Rhino.Mocks.Constraints.EndsWith">
+ <summary>
+ Constraint that evaluate whatever an argument ends with the specified string
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.EndsWith.#ctor(System.String)">
+ <summary>
+ Creates a new <see cref="T:Rhino.Mocks.Constraints.EndsWith"/> instance.
+ </summary>
+ <param name="end">End.</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.EndsWith.Eval(System.Object)">
+ <summary>
+ determains if the object pass the constraints
+ </summary>
+ </member>
+ <member name="P:Rhino.Mocks.Constraints.EndsWith.Message">
+ <summary>
+ Gets the message for this constraint
+ </summary>
+ <value></value>
+ </member>
+ <member name="T:Rhino.Mocks.Constraints.StartsWith">
+ <summary>
+ Constraint that evaluate whatever an argument start with the specified string
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.StartsWith.#ctor(System.String)">
+ <summary>
+ Creates a new <see cref="T:Rhino.Mocks.Constraints.StartsWith"/> instance.
+ </summary>
+ <param name="start">Start.</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.StartsWith.Eval(System.Object)">
+ <summary>
+ determains if the object pass the constraints
+ </summary>
+ </member>
+ <member name="P:Rhino.Mocks.Constraints.StartsWith.Message">
+ <summary>
+ Gets the message for this constraint
+ </summary>
+ <value></value>
+ </member>
+ <member name="T:Rhino.Mocks.Constraints.Equal">
+ <summary>
+ Constraint that evaluate whatever an object equals another
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Equal.#ctor(System.Object)">
+ <summary>
+ Creates a new <see cref="T:Rhino.Mocks.Constraints.Equal"/> instance.
+ </summary>
+ <param name="obj">Obj.</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Equal.Eval(System.Object)">
+ <summary>
+ determains if the object pass the constraints
+ </summary>
+ </member>
+ <member name="P:Rhino.Mocks.Constraints.Equal.Message">
+ <summary>
+ Gets the message for this constraint
+ </summary>
+ <value></value>
+ </member>
+ <member name="T:Rhino.Mocks.Constraints.Anything">
+ <summary>
+ Constraint that always returns true
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Anything.Eval(System.Object)">
+ <summary>
+ determains if the object pass the constraints
+ </summary>
+ </member>
+ <member name="P:Rhino.Mocks.Constraints.Anything.Message">
+ <summary>
+ Gets the message for this constraint
+ </summary>
+ <value></value>
+ </member>
+ <member name="T:Rhino.Mocks.Constraints.ComparingConstraint">
+ <summary>
+ Constraint that evaluate whatever a comparable is greater than another
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.ComparingConstraint.#ctor(System.IComparable,System.Boolean,System.Boolean)">
+ <summary>
+ Creates a new <see cref="T:Rhino.Mocks.Constraints.ComparingConstraint"/> instance.
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.ComparingConstraint.Eval(System.Object)">
+ <summary>
+ determains if the object pass the constraints
+ </summary>
+ </member>
+ <member name="P:Rhino.Mocks.Constraints.ComparingConstraint.Message">
+ <summary>
+ Gets the message for this constraint
+ </summary>
+ <value></value>
+ </member>
+ <member name="T:Rhino.Mocks.Constraints.Is">
+ <summary>
+ Central location for constraints
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Is.GreaterThan(System.IComparable)">
+ <summary>
+ Evaluate a greater than constraint for <see cref="T:System.IComparable"/>.
+ </summary>
+ <param name="objToCompare">The object the parameter should be greater than</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Is.LessThan(System.IComparable)">
+ <summary>
+ Evaluate a less than constraint for <see cref="T:System.IComparable"/>.
+ </summary>
+ <param name="objToCompare">The object the parameter should be less than</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Is.LessThanOrEqual(System.IComparable)">
+ <summary>
+ Evaluate a less than or equal constraint for <see cref="T:System.IComparable"/>.
+ </summary>
+ <param name="objToCompare">The object the parameter should be less than or equal to</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Is.GreaterThanOrEqual(System.IComparable)">
+ <summary>
+ Evaluate a greater than or equal constraint for <see cref="T:System.IComparable"/>.
+ </summary>
+ <param name="objToCompare">The object the parameter should be greater than or equal to</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Is.Equal(System.Object)">
+ <summary>
+ Evaluate an equal constraint for <see cref="T:System.IComparable"/>.
+ </summary>
+ <param name="obj">The object the parameter should equal to</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Is.NotEqual(System.Object)">
+ <summary>
+ Evaluate a not equal constraint for <see cref="T:System.IComparable"/>.
+ </summary>
+ <param name="obj">The object the parameter should not equal to</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Is.Same(System.Object)">
+ <summary>
+ Evaluate a same as constraint.
+ </summary>
+ <param name="obj">The object the parameter should the same as.</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Is.NotSame(System.Object)">
+ <summary>
+ Evaluate a not same as constraint.
+ </summary>
+ <param name="obj">The object the parameter should not be the same as.</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Is.Anything">
+ <summary>
+ A constraints that accept anything
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Is.Null">
+ <summary>
+ A constraint that accept only nulls
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Is.NotNull">
+ <summary>
+ A constraint that accept only non null values
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Is.TypeOf(System.Type)">
+ <summary>
+ A constraint that accept only value of the specified type
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Is.TypeOf``1">
+ <summary>
+ A constraint that accept only value of the specified type
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Is.Matching``1(System.Predicate{``0})">
+ <summary>
+ Evaluate a parameter using a predicate
+ </summary>
+ <param name="predicate">The predicate to use</param>
+ </member>
+ <member name="T:Rhino.Mocks.Constraints.IsArg`1">
+ <summary>
+ Provides access to the constraintes defined in the class <see cref="T:Rhino.Mocks.Constraints.Is"/> to be used in context
+ with the <see cref="T:Rhino.Mocks.Arg`1"/> syntax.
+ </summary>
+ <typeparam name="T">The type of the argument</typeparam>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.IsArg`1.GreaterThan(System.IComparable)">
+ <summary>
+ Evaluate a greater than constraint for <see cref="T:System.IComparable"/>.
+ </summary>
+ <param name="objToCompare">The object the parameter should be greater than</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.IsArg`1.LessThan(System.IComparable)">
+ <summary>
+ Evaluate a less than constraint for <see cref="T:System.IComparable"/>.
+ </summary>
+ <param name="objToCompare">The object the parameter should be less than</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.IsArg`1.LessThanOrEqual(System.IComparable)">
+ <summary>
+ Evaluate a less than or equal constraint for <see cref="T:System.IComparable"/>.
+ </summary>
+ <param name="objToCompare">The object the parameter should be less than or equal to</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.IsArg`1.GreaterThanOrEqual(System.IComparable)">
+ <summary>
+ Evaluate a greater than or equal constraint for <see cref="T:System.IComparable"/>.
+ </summary>
+ <param name="objToCompare">The object the parameter should be greater than or equal to</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.IsArg`1.Equal(System.Object)">
+ <summary>
+ Evaluate an equal constraint for <see cref="T:System.IComparable"/>.
+ </summary>
+ <param name="obj">The object the parameter should equal to</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.IsArg`1.NotEqual(System.Object)">
+ <summary>
+ Evaluate a not equal constraint for <see cref="T:System.IComparable"/>.
+ </summary>
+ <param name="obj">The object the parameter should not equal to</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.IsArg`1.Same(System.Object)">
+ <summary>
+ Evaluate a same as constraint.
+ </summary>
+ <param name="obj">The object the parameter should the same as.</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.IsArg`1.NotSame(System.Object)">
+ <summary>
+ Evaluate a not same as constraint.
+ </summary>
+ <param name="obj">The object the parameter should not be the same as.</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.IsArg`1.Equals(System.Object)">
+ <summary>
+ Throws NotSupportedException. Don't use Equals to define constraints. Use Equal instead.
+ </summary>
+ <param name="obj"></param>
+ <returns></returns>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.IsArg`1.GetHashCode">
+ <summary>
+ Serves as a hash function for a particular type.
+ </summary>
+ <returns>
+ A hash code for the current <see cref="T:System.Object"/>.
+ </returns>
+ </member>
+ <member name="P:Rhino.Mocks.Constraints.IsArg`1.Anything">
+ <summary>
+ A constraints that accept anything
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="P:Rhino.Mocks.Constraints.IsArg`1.Null">
+ <summary>
+ A constraint that accept only nulls
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="P:Rhino.Mocks.Constraints.IsArg`1.NotNull">
+ <summary>
+ A constraint that accept only non null values
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="P:Rhino.Mocks.Constraints.IsArg`1.TypeOf">
+ <summary>
+ A constraint that accept only value of the specified type.
+ The check is performed on the type that has been defined
+ as the argument type.
+ </summary>
+ </member>
+ <member name="T:Rhino.Mocks.Constraints.List">
+ <summary>
+ Central location for constraints about lists and collections
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.List.IsIn(System.Object)">
+ <summary>
+ Determines whether the specified obj is in the paramter.
+ The parameter must be IEnumerable.
+ </summary>
+ <param name="obj">Obj.</param>
+ <returns></returns>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.List.OneOf(System.Collections.IEnumerable)">
+ <summary>
+ Determains whatever the parameter is in the collection.
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.List.Equal(System.Collections.IEnumerable)">
+ <summary>
+ Determains that the parameter collection is identical to the specified collection
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.List.Count(Rhino.Mocks.Constraints.AbstractConstraint)">
+ <summary>
+ Determines that the parameter collection has the specified number of elements.
+ </summary>
+ <param name="constraint">The constraint that should be applied to the collection count.</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.List.Element(System.Int32,Rhino.Mocks.Constraints.AbstractConstraint)">
+ <summary>
+ Determines that an element of the parameter collections conforms to another AbstractConstraint.
+ </summary>
+ <param name="index">The zero-based index of the list element.</param>
+ <param name="constraint">The constraint which should be applied to the list element.</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.List.Element``1(``0,Rhino.Mocks.Constraints.AbstractConstraint)">
+ <summary>
+ Determines that an element of the parameter collections conforms to another AbstractConstraint.
+ </summary>
+ <param name="key">The key of the element.</param>
+ <param name="constraint">The constraint which should be applied to the element.</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.List.ContainsAll(System.Collections.IEnumerable)">
+ <summary>
+ Determines that all elements of the specified collection are in the the parameter collection
+ </summary>
+ <param name="collection">The collection to compare against</param>
+ <returns>The constraint which should be applied to the list parameter.</returns>
+ </member>
+ <member name="T:Rhino.Mocks.Constraints.ListArg`1">
+ <summary>
+ Provides access to the constraintes defined in the class <see cref="T:Rhino.Mocks.Constraints.Text"/> to be used in context
+ with the <see cref="T:Rhino.Mocks.Arg`1"/> syntax.
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.ListArg`1.IsIn(System.Object)">
+ <summary>
+ Determines whether the specified object is in the paramter.
+ The parameter must be IEnumerable.
+ </summary>
+ <param name="obj">Obj.</param>
+ <returns></returns>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.ListArg`1.OneOf(System.Collections.IEnumerable)">
+ <summary>
+ Determains whatever the parameter is in the collection.
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.ListArg`1.Equal(System.Collections.IEnumerable)">
+ <summary>
+ Determains that the parameter collection is identical to the specified collection
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.ListArg`1.Count(Rhino.Mocks.Constraints.AbstractConstraint)">
+ <summary>
+ Determines that the parameter collection has the specified number of elements.
+ </summary>
+ <param name="constraint">The constraint that should be applied to the collection count.</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.ListArg`1.Element(System.Int32,Rhino.Mocks.Constraints.AbstractConstraint)">
+ <summary>
+ Determines that an element of the parameter collections conforms to another AbstractConstraint.
+ </summary>
+ <param name="index">The zero-based index of the list element.</param>
+ <param name="constraint">The constraint which should be applied to the list element.</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.ListArg`1.ContainsAll(System.Collections.IEnumerable)">
+ <summary>
+ Determines that all elements of the specified collection are in the the parameter collection
+ </summary>
+ <param name="collection">The collection to compare against</param>
+ <returns>The constraint which should be applied to the list parameter.</returns>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.ListArg`1.Equals(System.Object)">
+ <summary>
+ Throws NotSupportedException. Don't use Equals to define constraints. Use Equal instead.
+ </summary>
+ <param name="obj"></param>
+ <returns></returns>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.ListArg`1.GetHashCode">
+ <summary>
+ Serves as a hash function for a particular type.
+ </summary>
+ <returns>
+ A hash code for the current <see cref="T:System.Object"/>.
+ </returns>
+ </member>
+ <member name="T:Rhino.Mocks.Constraints.OutRefArgDummy`1">
+ <summary>
+ Provides a dummy field to pass as out or ref argument.
+ </summary>
+ <typeparam name="T"></typeparam>
+ </member>
+ <member name="F:Rhino.Mocks.Constraints.OutRefArgDummy`1.Dummy">
+ <summary>
+ Dummy field to satisfy the compiler. Used for out and ref arguments.
+ </summary>
+ </member>
+ <member name="T:Rhino.Mocks.Constraints.Property">
+ <summary>
+ Central location for constraints for object's properties
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Property.Value(System.String,System.Object)">
+ <summary>
+ Constrains the parameter to have property with the specified value
+ </summary>
+ <param name="propertyName">Name of the property.</param>
+ <param name="expectedValue">Expected value.</param>
+ <returns></returns>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Property.Value(System.Type,System.String,System.Object)">
+ <summary>
+ Constrains the parameter to have property with the specified value.
+ </summary>
+ <param name="declaringType">The type that declares the property, used to disambiguate between properties.</param>
+ <param name="propertyName">Name of the property.</param>
+ <param name="expectedValue">Expected value.</param>
+ <returns></returns>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Property.ValueConstraint(System.String,Rhino.Mocks.Constraints.AbstractConstraint)">
+ <summary>
+ Constrains the parameter to have a property satisfying a specified constraint.
+ </summary>
+ <param name="propertyName">Name of the property.</param>
+ <param name="propertyConstraint">Constraint for the property.</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Property.ValueConstraint(System.Type,System.String,Rhino.Mocks.Constraints.AbstractConstraint)">
+ <summary>
+ Constrains the parameter to have a property satisfying a specified constraint.
+ </summary>
+ <param name="declaringType">The type that declares the property, used to disambiguate between properties.</param>
+ <param name="propertyName">Name of the property.</param>
+ <param name="propertyConstraint">Constraint for the property.</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Property.IsNull(System.String)">
+ <summary>
+ Determines whether the parameter has the specified property and that it is null.
+ </summary>
+ <param name="propertyName">Name of the property.</param>
+ <returns></returns>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Property.IsNull(System.Type,System.String)">
+ <summary>
+ Determines whether the parameter has the specified property and that it is null.
+ </summary>
+ <param name="declaringType">The type that declares the property, used to disambiguate between properties.</param>
+ <param name="propertyName">Name of the property.</param>
+ <returns></returns>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Property.IsNotNull(System.String)">
+ <summary>
+ Determines whether the parameter has the specified property and that it is not null.
+ </summary>
+ <param name="propertyName">Name of the property.</param>
+ <returns></returns>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Property.IsNotNull(System.Type,System.String)">
+ <summary>
+ Determines whether the parameter has the specified property and that it is not null.
+ </summary>
+ <param name="declaringType">The type that declares the property, used to disambiguate between properties.</param>
+ <param name="propertyName">Name of the property.</param>
+ <returns></returns>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Property.AllPropertiesMatch(System.Object)">
+ <summary>
+ constraints the parameter to have the exact same property values as the expected object.
+ </summary>
+ <param name="expected">An object, of the same type as the parameter, whose properties are set with the expected values.</param>
+ <returns>An instance of the constraint that will do the actual check.</returns>
+ <remarks>
+ The parameter's public property values and public field values will be matched against the expected object's
+ public property values and public field values. The first mismatch will be reported and no further matching is done.
+ The matching is recursive for any property or field that has properties or fields of it's own.
+ Collections are supported through IEnumerable, which means the constraint will check if the actual and expected
+ collection contain the same values in the same order, where the values contained by the collection can have properties
+ and fields of their own that will be checked as well because of the recursive nature of this constraint.
+ </remarks>
+ </member>
+ <member name="T:Rhino.Mocks.Constraints.PublicField">
+ <summary>
+ Central location for constraints for object's public fields
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.PublicField.Value(System.String,System.Object)">
+ <summary>
+ Constrains the parameter to have a public field with the specified value
+ </summary>
+ <param name="publicFieldName">Name of the public field.</param>
+ <param name="expectedValue">Expected value.</param>
+ <returns></returns>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.PublicField.Value(System.Type,System.String,System.Object)">
+ <summary>
+ Constrains the parameter to have a public field with the specified value.
+ </summary>
+ <param name="declaringType">The type that declares the public field, used to disambiguate between public fields.</param>
+ <param name="publicFieldName">Name of the public field.</param>
+ <param name="expectedValue">Expected value.</param>
+ <returns></returns>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.PublicField.ValueConstraint(System.String,Rhino.Mocks.Constraints.AbstractConstraint)">
+ <summary>
+ Constrains the parameter to have a public field satisfying a specified constraint.
+ </summary>
+ <param name="publicFieldName">Name of the public field.</param>
+ <param name="publicFieldConstraint">Constraint for the public field.</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.PublicField.ValueConstraint(System.Type,System.String,Rhino.Mocks.Constraints.AbstractConstraint)">
+ <summary>
+ Constrains the parameter to have a public field satisfying a specified constraint.
+ </summary>
+ <param name="declaringType">The type that declares the public field, used to disambiguate between public fields.</param>
+ <param name="publicFieldName">Name of the public field.</param>
+ <param name="publicFieldConstraint">Constraint for the public field.</param>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.PublicField.IsNull(System.String)">
+ <summary>
+ Determines whether the parameter has the specified public field and that it is null.
+ </summary>
+ <param name="publicFieldName">Name of the public field.</param>
+ <returns></returns>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.PublicField.IsNull(System.Type,System.String)">
+ <summary>
+ Determines whether the parameter has the specified public field and that it is null.
+ </summary>
+ <param name="declaringType">The type that declares the public field, used to disambiguate between public fields.</param>
+ <param name="publicFieldName">Name of the public field.</param>
+ <returns></returns>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.PublicField.IsNotNull(System.String)">
+ <summary>
+ Determines whether the parameter has the specified public field and that it is not null.
+ </summary>
+ <param name="publicFieldName">Name of the public field.</param>
+ <returns></returns>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.PublicField.IsNotNull(System.Type,System.String)">
+ <summary>
+ Determines whether the parameter has the specified public field and that it is not null.
+ </summary>
+ <param name="declaringType">The type that declares the public field, used to disambiguate between public fields.</param>
+ <param name="publicFieldName">Name of the public field.</param>
+ <returns></returns>
+ </member>
+ <member name="T:Rhino.Mocks.Constraints.Text">
+ <summary>
+ Central location for all text related constraints
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Text.StartsWith(System.String)">
+ <summary>
+ Constrain the argument to starts with the specified string
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Text.EndsWith(System.String)">
+ <summary>
+ Constrain the argument to end with the specified string
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Text.Contains(System.String)">
+ <summary>
+ Constrain the argument to contain the specified string
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.Text.Like(System.String)">
+ <summary>
+ Constrain the argument to validate according to regex pattern
+ </summary>
+ </member>
+ <member name="T:Rhino.Mocks.Constraints.TextArg">
+ <summary>
+ Provides access to the constraintes defined in the class <see cref="T:Rhino.Mocks.Constraints.Text"/> to be used in context
+ with the <see cref="T:Rhino.Mocks.Arg"/> syntax.
+ </summary>
+ </member>
+ <member name="M:Rhino.Mocks.Constraints.TextArg.StartsWith(System.String)">
+ <summary>
+ Constrain the argument to starts with the specified string
+ </summary>
+ ...
[truncated message content] |
|
From: Bazzell<chi...@fo...> - 2009-06-22 12:07:15
|
How to Make a Women Want to Get in Bed With You - Ultra Rarre Tricks Eevry Man Must Know (www shop51 net) Custjomer leqaves life-changing tip for waitress |
|
From: <aye...@us...> - 2009-06-22 10:48:34
|
Revision: 4509
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4509&view=rev
Author: ayenderahien
Date: 2009-06-22 10:48:32 +0000 (Mon, 22 Jun 2009)
Log Message:
-----------
Merging from 2.1.x branch
Fixing NH-1844 - SessionIdLoggingContext causing perf problems
Modified Paths:
--------------
trunk/nhibernate/default.build
trunk/nhibernate/src/NHibernate/Impl/SessionIdLoggingContext.cs
trunk/nhibernate/src/NHibernate.Test/LogSpy.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/Logs/LogsFixture.cs
Property Changed:
----------------
trunk/
trunk/nhibernate/src/Iesi.Collections.Test/
trunk/nhibernate/src/NHibernate.ByteCode.Castle.Tests/
trunk/nhibernate/src/NHibernate.ByteCode.LinFu.Tests/
trunk/nhibernate/src/NHibernate.ByteCode.Spring.Tests/
trunk/nhibernate/src/NHibernate.Test/
trunk/nhibernate/src/NHibernate.Test/Tools/hbm2ddl/SchemaExportTests/
trunk/nhibernate/src/NHibernate.Test/Tools/hbm2ddl/SchemaExportTests/WithColumnTag.hbm.xml
Property changes on: trunk
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/2.1.x:4505-4508
Modified: trunk/nhibernate/default.build
===================================================================
--- trunk/nhibernate/default.build 2009-06-22 05:26:50 UTC (rev 4508)
+++ trunk/nhibernate/default.build 2009-06-22 10:48:32 UTC (rev 4509)
@@ -52,6 +52,7 @@
<target name="copy-referenced-assemblies">
<!-- Copy framework-neutral libraries -->
+
<copy todir="${bin.dir}" >
<fileset basedir="${lib.dir}">
<include name="*.dll" />
Property changes on: trunk/nhibernate/src/Iesi.Collections.Test
___________________________________________________________________
Modified: svn:ignore
- bin
obj
AssemblyInfo.cs
[Bb]in
[Dd]ebug
[Rr]elease
*.user
*.aps
*.eto
*resharper*
+ bin
obj
AssemblyInfo.cs
[Bb]in
[Dd]ebug
[Rr]elease
*.user
*.aps
*.eto
*.xml
Modified: trunk/nhibernate/src/NHibernate/Impl/SessionIdLoggingContext.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Impl/SessionIdLoggingContext.cs 2009-06-22 05:26:50 UTC (rev 4508)
+++ trunk/nhibernate/src/NHibernate/Impl/SessionIdLoggingContext.cs 2009-06-22 10:48:32 UTC (rev 4509)
@@ -3,10 +3,16 @@
namespace NHibernate.Impl
{
+ using System.Web;
+
public class SessionIdLoggingContext : IDisposable
{
- private readonly object oldSessonId;
+ [ThreadStatic] private static Guid? CurrentSessionId;
+ private const string CurrentSessionIdKey = "NHibernate.Impl.SessionIdLoggingContext.CurrentSessionId";
+
+ private readonly Guid? oldSessonId;
+
public SessionIdLoggingContext(Guid id)
{
oldSessonId = SessionId;
@@ -18,28 +24,20 @@
/// this is usally the case if we are called from the finalizer, since this is something
/// that we do only for logging, we ignore the error.
/// </summary>
- private static object SessionId
+ public static Guid? SessionId
{
get
{
- try
- {
- return ThreadContext.Properties["sessionId"];
- }
- catch (Exception)
- {
- return null;
- }
+ if (HttpContext.Current != null)
+ return (Guid?)HttpContext.Current.Items[CurrentSessionIdKey];
+ return CurrentSessionId;
}
set
{
- try
- {
- ThreadContext.Properties["sessionId"] = value;
- }
- catch (Exception)
- {
- }
+ if (HttpContext.Current != null)
+ HttpContext.Current.Items[CurrentSessionIdKey] = value;
+ else
+ CurrentSessionId = value;
}
}
Property changes on: trunk/nhibernate/src/NHibernate.ByteCode.Castle.Tests
___________________________________________________________________
Modified: svn:ignore
- obj
.#*
*.user
*.xsx
AssemblyInfo.cs
hibernate.cfg.xml
*.aps
*.eto
[Bb]in
[Dd]ebug
[Rr]elease
*resharper*
+ obj
.#*
*.user
*.xsx
AssemblyInfo.cs
hibernate.cfg.xml
*.aps
*.eto
[Bb]in
[Dd]ebug
[Rr]elease
*resharper*
*.xml
Property changes on: trunk/nhibernate/src/NHibernate.ByteCode.LinFu.Tests
___________________________________________________________________
Modified: svn:ignore
- obj
.#*
*.user
*.xsx
AssemblyInfo.cs
hibernate.cfg.xml
*.aps
*.eto
[Bb]in
[Dd]ebug
[Rr]elease
*resharper*
+ obj
.#*
*.user
*.xsx
AssemblyInfo.cs
hibernate.cfg.xml
*.aps
*.eto
[Bb]in
[Dd]ebug
[Rr]elease
*resharper*
*.xml
Property changes on: trunk/nhibernate/src/NHibernate.ByteCode.Spring.Tests
___________________________________________________________________
Modified: svn:ignore
- obj
.#*
*.user
*.xsx
*.aps
*.eto
[Bb]in
[Dd]ebug
[Rr]elease
*resharper*
AssemblyInfo.cs
hibernate.cfg.xml
+ obj
.#*
*.user
*.xsx
*.aps
*.eto
[Bb]in
[Dd]ebug
[Rr]elease
*resharper*
AssemblyInfo.cs
hibernate.cfg.xml
*.xml
Property changes on: trunk/nhibernate/src/NHibernate.Test
___________________________________________________________________
Modified: svn:ignore
- bin
obj
.#*
*.user
*.xsx
AssemblyInfo.cs
hibernate.cfg.xml
Debug
Release
*.aps
*.eto
[Bb]in
[Dd]ebug
[Rr]elease
*resharper*
+ bin
obj
.#*
*.user
*.xsx
AssemblyInfo.cs
hibernate.cfg.xml
Debug
Release
*.aps
*.eto
[Bb]in
[Dd]ebug
[Rr]elease
*resharper*
*.xml
Modified: trunk/nhibernate/src/NHibernate.Test/LogSpy.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/LogSpy.cs 2009-06-22 05:26:50 UTC (rev 4508)
+++ trunk/nhibernate/src/NHibernate.Test/LogSpy.cs 2009-06-22 10:48:32 UTC (rev 4509)
@@ -19,7 +19,7 @@
logger = log.Logger as Logger;
if (logger == null)
{
- throw new Exception("Unable to get the SQL logger");
+ throw new Exception("Unable to get the logger");
}
// Change the log level to DEBUG and temporarily save the previous log level
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/Logs/LogsFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/Logs/LogsFixture.cs 2009-06-22 05:26:50 UTC (rev 4508)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/Logs/LogsFixture.cs 2009-06-22 10:48:32 UTC (rev 4509)
@@ -6,6 +6,15 @@
namespace NHibernate.Test.NHSpecificTest.Logs
{
+ using System;
+ using System.IO;
+ using System.Text;
+ using log4net;
+ using log4net.Appender;
+ using log4net.Core;
+ using log4net.Layout;
+ using log4net.Repository.Hierarchy;
+
[TestFixture]
public class LogsFixture : TestCase
{
@@ -22,16 +31,62 @@
[Test]
public void WillGetSessionIdFromSessionLogs()
{
- using (var spy = new SqlLogSpy())
+ ThreadContext.Properties["sessionId"] = new SessionIdCapturer();
+
+ using (var spy = new TextLogSpy("NHibernate.SQL", "%message | SessionId: %property{sessionId}"))
using (var s = sessions.OpenSession())
{
var sessionId = ((SessionImpl)s).SessionId;
s.Get<Person>(1);//will execute some sql
- var loggingEvent = spy.Appender.GetEvents()[0];
- Assert.AreEqual(sessionId, loggingEvent.Properties["sessionId"]);
+ var loggingEvent = spy.Events[0];
+ Assert.True(loggingEvent.Contains(sessionId.ToString()));
}
}
+
+ public class SessionIdCapturer
+ {
+ public override string ToString()
+ {
+ return SessionIdLoggingContext.SessionId.ToString();
+ }
+ }
+
+ public class TextLogSpy : IDisposable
+ {
+ private readonly TextWriterAppender appender;
+ private readonly Logger loggerImpl;
+ private readonly StringBuilder stringBuilder;
+
+ public TextLogSpy(string loggerName, string pattern)
+ {
+ stringBuilder = new StringBuilder();
+ appender = new TextWriterAppender
+ {
+ Layout = new PatternLayout(pattern),
+ Threshold = Level.All,
+ Writer = new StringWriter(stringBuilder)
+ };
+ loggerImpl = (Logger)LogManager.GetLogger(loggerName).Logger;
+ loggerImpl.AddAppender(appender);
+ loggerImpl.Level = Level.All;
+ }
+
+ public string[] Events
+ {
+ get
+ {
+ return stringBuilder.ToString().Split(new[] {Environment.NewLine}, StringSplitOptions.RemoveEmptyEntries);
+ }
+ }
+
+ public void Dispose()
+ {
+ loggerImpl.RemoveAppender(appender);
+ }
+ }
}
+
+
}
\ No newline at end of file
Property changes on: trunk/nhibernate/src/NHibernate.Test/Tools/hbm2ddl/SchemaExportTests
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /branches/2.1.x/nhibernate/src/NHibernate.Test/Tools/hbm2ddl/SchemaExportTests:4507-4508
Property changes on: trunk/nhibernate/src/NHibernate.Test/Tools/hbm2ddl/SchemaExportTests/WithColumnTag.hbm.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aye...@us...> - 2009-06-22 05:26:56
|
Revision: 4508
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4508&view=rev
Author: ayenderahien
Date: 2009-06-22 05:26:50 +0000 (Mon, 22 Jun 2009)
Log Message:
-----------
Fixing NH-1844 - SessionIdLoggingContext causing perf problems
Modified Paths:
--------------
branches/2.1.x/nhibernate/src/NHibernate/Impl/SessionIdLoggingContext.cs
branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/Logs/LogsFixture.cs
Property Changed:
----------------
branches/2.1.x/nhibernate/src/Iesi.Collections.Test/
branches/2.1.x/nhibernate/src/NHibernate.ByteCode.Castle.Tests/
branches/2.1.x/nhibernate/src/NHibernate.ByteCode.LinFu.Tests/
branches/2.1.x/nhibernate/src/NHibernate.ByteCode.Spring.Tests/
branches/2.1.x/nhibernate/src/NHibernate.Test/
Property changes on: branches/2.1.x/nhibernate/src/Iesi.Collections.Test
___________________________________________________________________
Modified: svn:ignore
- bin
obj
AssemblyInfo.cs
[Bb]in
[Dd]ebug
[Rr]elease
*.user
*.aps
*.eto
+ bin
obj
AssemblyInfo.cs
[Bb]in
[Dd]ebug
[Rr]elease
*.user
*.aps
*.eto
*.xml
Modified: branches/2.1.x/nhibernate/src/NHibernate/Impl/SessionIdLoggingContext.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate/Impl/SessionIdLoggingContext.cs 2009-06-22 05:00:35 UTC (rev 4507)
+++ branches/2.1.x/nhibernate/src/NHibernate/Impl/SessionIdLoggingContext.cs 2009-06-22 05:26:50 UTC (rev 4508)
@@ -3,10 +3,16 @@
namespace NHibernate.Impl
{
+ using System.Web;
+
public class SessionIdLoggingContext : IDisposable
{
- private readonly object oldSessonId;
+ [ThreadStatic] private static Guid? CurrentSessionId;
+ private const string CurrentSessionIdKey = "NHibernate.Impl.SessionIdLoggingContext.CurrentSessionId";
+
+ private readonly Guid? oldSessonId;
+
public SessionIdLoggingContext(Guid id)
{
oldSessonId = SessionId;
@@ -18,28 +24,20 @@
/// this is usally the case if we are called from the finalizer, since this is something
/// that we do only for logging, we ignore the error.
/// </summary>
- private static object SessionId
+ public static Guid? SessionId
{
get
{
- try
- {
- return ThreadContext.Properties["sessionId"];
- }
- catch (Exception)
- {
- return null;
- }
+ if (HttpContext.Current != null)
+ return (Guid?)HttpContext.Current.Items[CurrentSessionIdKey];
+ return CurrentSessionId;
}
set
{
- try
- {
- ThreadContext.Properties["sessionId"] = value;
- }
- catch (Exception)
- {
- }
+ if (HttpContext.Current != null)
+ HttpContext.Current.Items[CurrentSessionIdKey] = value;
+ else
+ CurrentSessionId = value;
}
}
Property changes on: branches/2.1.x/nhibernate/src/NHibernate.ByteCode.Castle.Tests
___________________________________________________________________
Modified: svn:ignore
- obj
.#*
*.user
*.xsx
AssemblyInfo.cs
hibernate.cfg.xml
*.aps
*.eto
[Bb]in
[Dd]ebug
[Rr]elease
*resharper*
+ obj
.#*
*.user
*.xsx
AssemblyInfo.cs
hibernate.cfg.xml
*.aps
*.eto
[Bb]in
[Dd]ebug
[Rr]elease
*resharper*
*.xml
Property changes on: branches/2.1.x/nhibernate/src/NHibernate.ByteCode.LinFu.Tests
___________________________________________________________________
Modified: svn:ignore
- obj
.#*
*.user
*.xsx
AssemblyInfo.cs
hibernate.cfg.xml
*.aps
*.eto
[Bb]in
[Dd]ebug
[Rr]elease
*resharper*
+ obj
.#*
*.user
*.xsx
AssemblyInfo.cs
hibernate.cfg.xml
*.aps
*.eto
[Bb]in
[Dd]ebug
[Rr]elease
*resharper*
*.xml
Property changes on: branches/2.1.x/nhibernate/src/NHibernate.ByteCode.Spring.Tests
___________________________________________________________________
Modified: svn:ignore
- obj
.#*
*.user
*.xsx
*.aps
*.eto
[Bb]in
[Dd]ebug
[Rr]elease
*resharper*
AssemblyInfo.cs
hibernate.cfg.xml
+ obj
.#*
*.user
*.xsx
*.aps
*.eto
[Bb]in
[Dd]ebug
[Rr]elease
*resharper*
AssemblyInfo.cs
hibernate.cfg.xml
*.xml
Property changes on: branches/2.1.x/nhibernate/src/NHibernate.Test
___________________________________________________________________
Modified: svn:ignore
- bin
obj
.#*
*.user
*.xsx
AssemblyInfo.cs
hibernate.cfg.xml
Debug
Release
*.aps
*.eto
[Bb]in
[Dd]ebug
[Rr]elease
*resharper*
+ bin
obj
.#*
*.user
*.xsx
AssemblyInfo.cs
hibernate.cfg.xml
Debug
Release
*.aps
*.eto
[Bb]in
[Dd]ebug
[Rr]elease
*resharper*
*.xml
Modified: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/Logs/LogsFixture.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/Logs/LogsFixture.cs 2009-06-22 05:00:35 UTC (rev 4507)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/Logs/LogsFixture.cs 2009-06-22 05:26:50 UTC (rev 4508)
@@ -6,6 +6,15 @@
namespace NHibernate.Test.NHSpecificTest.Logs
{
+ using System;
+ using System.IO;
+ using System.Text;
+ using log4net;
+ using log4net.Appender;
+ using log4net.Core;
+ using log4net.Layout;
+ using log4net.Repository.Hierarchy;
+
[TestFixture]
public class LogsFixture : TestCase
{
@@ -22,16 +31,62 @@
[Test]
public void WillGetSessionIdFromSessionLogs()
{
- using (var spy = new SqlLogSpy())
+ ThreadContext.Properties["sessionId"] = new SessionIdCapturer();
+
+ using (var spy = new TextLogSpy("NHibernate.SQL", "%message | SessionId: %property{sessionId}"))
using (var s = sessions.OpenSession())
{
var sessionId = ((SessionImpl)s).SessionId;
s.Get<Person>(1);//will execute some sql
- var loggingEvent = spy.Appender.GetEvents()[0];
- Assert.AreEqual(sessionId, loggingEvent.Properties["sessionId"]);
+ var loggingEvent = spy.Events[0];
+ Assert.True(loggingEvent.Contains(sessionId.ToString()));
}
}
+
+ public class SessionIdCapturer
+ {
+ public override string ToString()
+ {
+ return SessionIdLoggingContext.SessionId.ToString();
+ }
+ }
+
+ public class TextLogSpy : IDisposable
+ {
+ private readonly TextWriterAppender appender;
+ private readonly Logger loggerImpl;
+ private readonly StringBuilder stringBuilder;
+
+ public TextLogSpy(string loggerName, string pattern)
+ {
+ stringBuilder = new StringBuilder();
+ appender = new TextWriterAppender
+ {
+ Layout = new PatternLayout(pattern),
+ Threshold = Level.All,
+ Writer = new StringWriter(stringBuilder)
+ };
+ loggerImpl = (Logger)LogManager.GetLogger(loggerName).Logger;
+ loggerImpl.AddAppender(appender);
+ loggerImpl.Level = Level.All;
+ }
+
+ public string[] Events
+ {
+ get
+ {
+ return stringBuilder.ToString().Split(new[] {Environment.NewLine}, StringSplitOptions.RemoveEmptyEntries);
+ }
+ }
+
+ public void Dispose()
+ {
+ loggerImpl.RemoveAppender(appender);
+ }
+ }
}
+
+
}
\ 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: <aye...@us...> - 2009-06-22 05:00:48
|
Revision: 4507
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4507&view=rev
Author: ayenderahien
Date: 2009-06-22 05:00:35 +0000 (Mon, 22 Jun 2009)
Log Message:
-----------
minor - more accurate error message
Modified Paths:
--------------
branches/2.1.x/nhibernate/src/NHibernate.Test/LogSpy.cs
Modified: branches/2.1.x/nhibernate/src/NHibernate.Test/LogSpy.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/LogSpy.cs 2009-06-21 15:03:38 UTC (rev 4506)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/LogSpy.cs 2009-06-22 05:00:35 UTC (rev 4507)
@@ -19,7 +19,7 @@
logger = log.Logger as Logger;
if (logger == null)
{
- throw new Exception("Unable to get the SQL logger");
+ throw new Exception("Unable to get the logger");
}
// Change the log level to DEBUG and temporarily save the previous log level
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2009-06-21 15:03:40
|
Revision: 4506
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4506&view=rev
Author: fabiomaulo
Date: 2009-06-21 15:03:38 +0000 (Sun, 21 Jun 2009)
Log Message:
-----------
trunk target to .NET3.5
Modified Paths:
--------------
trunk/nhibernate/default.build
trunk/nhibernate/lib/net/3.5/Iesi.Collections.dll
trunk/nhibernate/src/Iesi.Collections.Test/Iesi.Collections.Test.csproj
trunk/nhibernate/src/NHibernate/NHibernate.csproj
trunk/nhibernate/src/NHibernate.ByteCode.Castle/NHibernate.ByteCode.Castle.csproj
trunk/nhibernate/src/NHibernate.ByteCode.Castle.Tests/NHibernate.ByteCode.Castle.Tests.csproj
trunk/nhibernate/src/NHibernate.ByteCode.LinFu/NHibernate.ByteCode.LinFu.csproj
trunk/nhibernate/src/NHibernate.ByteCode.LinFu.Tests/NHibernate.ByteCode.LinFu.Tests.csproj
trunk/nhibernate/src/NHibernate.ByteCode.Spring/NHibernate.ByteCode.Spring.csproj
trunk/nhibernate/src/NHibernate.ByteCode.Spring.Tests/NHibernate.ByteCode.Spring.Tests.csproj
trunk/nhibernate/src/NHibernate.DomainModel/NHibernate.DomainModel.csproj
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
trunk/nhibernate/src/NHibernate.Example.Web/Bin/Antlr3.Runtime.dll.refresh
trunk/nhibernate/src/NHibernate.Example.Web/Bin/Iesi.Collections.dll.refresh
trunk/nhibernate/src/NHibernate.Example.Web/Bin/LinFu.DynamicProxy.dll.refresh
trunk/nhibernate/src/NHibernate.Example.Web/Bin/log4net.dll.refresh
Removed Paths:
-------------
trunk/nhibernate/lib/net/2.0/
trunk/nhibernate/src/NHibernate.Example.Web/Bin/log4net.dll.refresh
Property Changed:
----------------
trunk/nhibernate/src/Iesi.Collections.Test/
Modified: trunk/nhibernate/default.build
===================================================================
--- trunk/nhibernate/default.build 2009-06-21 13:25:11 UTC (rev 4505)
+++ trunk/nhibernate/default.build 2009-06-21 15:03:38 UTC (rev 4506)
@@ -16,7 +16,7 @@
Supported versions of .NET Framework, separated by spaces.
Used by *-all-frameworks targets.
-->
- <property name="supported.frameworks" value="net-2.0" />
+ <property name="supported.frameworks" value="net-3.5" />
<fileset id="buildfiles.all" basedir="src">
<!-- Files have to be in dependency order -->
@@ -110,7 +110,7 @@
<target name="check-framework-version">
<echo>Running with ${framework::get-target-framework()}</echo>
- <fail message="ERROR: NHibernate requires .Net 3.5 to compile (but can run on .Net 2.0), please use the -t:net-3.5 parameter when starting nant" if="${framework::get-target-framework()!='net-3.5'}"/>
+ <fail message="ERROR: NHibernate requires .Net 3.5." if="${framework::get-target-framework()!='net-3.5'}"/>
</target>
<target name="test-report" if="${nunit2report.installed}">
Modified: trunk/nhibernate/lib/net/3.5/Iesi.Collections.dll
===================================================================
(Binary files differ)
Property changes on: trunk/nhibernate/src/Iesi.Collections.Test
___________________________________________________________________
Modified: svn:ignore
- bin
obj
AssemblyInfo.cs
[Bb]in
[Dd]ebug
[Rr]elease
*.user
*.aps
*.eto
+ bin
obj
AssemblyInfo.cs
[Bb]in
[Dd]ebug
[Rr]elease
*.user
*.aps
*.eto
*resharper*
Modified: trunk/nhibernate/src/Iesi.Collections.Test/Iesi.Collections.Test.csproj
===================================================================
--- trunk/nhibernate/src/Iesi.Collections.Test/Iesi.Collections.Test.csproj 2009-06-21 13:25:11 UTC (rev 4505)
+++ trunk/nhibernate/src/Iesi.Collections.Test/Iesi.Collections.Test.csproj 2009-06-21 15:03:38 UTC (rev 4506)
@@ -14,6 +14,7 @@
<OldToolsVersion>2.0</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -37,11 +38,14 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="nunit.framework, Version=2.2.0.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
+ <Reference Include="nunit.framework, Version=2.5.0.9122, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\net\2.0\nunit.framework.dll</HintPath>
+ <HintPath>..\..\lib\net\3.5\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
+ <Reference Include="System.Core">
+ <RequiredTargetFramework>3.5</RequiredTargetFramework>
+ </Reference>
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
Modified: trunk/nhibernate/src/NHibernate/NHibernate.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate/NHibernate.csproj 2009-06-21 13:25:11 UTC (rev 4505)
+++ trunk/nhibernate/src/NHibernate/NHibernate.csproj 2009-06-21 15:03:38 UTC (rev 4506)
@@ -14,7 +14,7 @@
<OldToolsVersion>2.0</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkSubset>
</TargetFrameworkSubset>
</PropertyGroup>
@@ -45,18 +45,21 @@
<ItemGroup>
<Reference Include="Antlr3.Runtime, Version=3.1.0.39271, Culture=neutral, PublicKeyToken=3a9cab8f8d22bfb7, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\net\2.0\Antlr3.Runtime.dll</HintPath>
+ <HintPath>..\..\lib\net\3.5\Antlr3.Runtime.dll</HintPath>
</Reference>
- <Reference Include="Iesi.Collections, Version=1.0.0.1, Culture=neutral, PublicKeyToken=154fdcb44c4484fc">
+ <Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\net\2.0\Iesi.Collections.dll</HintPath>
+ <HintPath>..\..\lib\net\3.5\Iesi.Collections.dll</HintPath>
</Reference>
- <Reference Include="log4net, Version=1.2.9.0, Culture=neutral, PublicKeyToken=b32731d11ce58905">
+ <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\net\2.0\log4net.dll</HintPath>
+ <HintPath>..\..\lib\net\3.5\log4net.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
+ <Reference Include="System.Core">
+ <RequiredTargetFramework>3.5</RequiredTargetFramework>
+ </Reference>
<Reference Include="System.Data" />
<Reference Include="System.Data.OracleClient" />
<Reference Include="System.Transactions" />
Modified: trunk/nhibernate/src/NHibernate.ByteCode.Castle/NHibernate.ByteCode.Castle.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.ByteCode.Castle/NHibernate.ByteCode.Castle.csproj 2009-06-21 13:25:11 UTC (rev 4505)
+++ trunk/nhibernate/src/NHibernate.ByteCode.Castle/NHibernate.ByteCode.Castle.csproj 2009-06-21 15:03:38 UTC (rev 4506)
@@ -33,21 +33,21 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Castle.Core, Version=1.0.3.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+ <Reference Include="Castle.Core, Version=1.1.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\net\2.0\Castle.Core.dll</HintPath>
+ <HintPath>..\..\lib\net\3.5\Castle.Core.dll</HintPath>
</Reference>
<Reference Include="Castle.DynamicProxy2, Version=2.1.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\net\2.0\Castle.DynamicProxy2.dll</HintPath>
+ <HintPath>..\..\lib\net\3.5\Castle.DynamicProxy2.dll</HintPath>
</Reference>
- <Reference Include="Iesi.Collections, Version=1.0.0.3, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+ <Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\net\2.0\Iesi.Collections.dll</HintPath>
+ <HintPath>..\..\lib\net\3.5\Iesi.Collections.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\net\2.0\log4net.dll</HintPath>
+ <HintPath>..\..\lib\net\3.5\log4net.dll</HintPath>
</Reference>
<Reference Include="System" />
</ItemGroup>
Modified: trunk/nhibernate/src/NHibernate.ByteCode.Castle.Tests/NHibernate.ByteCode.Castle.Tests.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.ByteCode.Castle.Tests/NHibernate.ByteCode.Castle.Tests.csproj 2009-06-21 13:25:11 UTC (rev 4505)
+++ trunk/nhibernate/src/NHibernate.ByteCode.Castle.Tests/NHibernate.ByteCode.Castle.Tests.csproj 2009-06-21 15:03:38 UTC (rev 4506)
@@ -33,25 +33,25 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Castle.Core, Version=1.0.3.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+ <Reference Include="Castle.Core, Version=1.1.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\net\2.0\Castle.Core.dll</HintPath>
+ <HintPath>..\..\lib\net\3.5\Castle.Core.dll</HintPath>
</Reference>
<Reference Include="Castle.DynamicProxy2, Version=2.1.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\net\2.0\Castle.DynamicProxy2.dll</HintPath>
+ <HintPath>..\..\lib\net\3.5\Castle.DynamicProxy2.dll</HintPath>
</Reference>
- <Reference Include="Iesi.Collections, Version=1.0.0.3, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+ <Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\net\2.0\Iesi.Collections.dll</HintPath>
+ <HintPath>..\..\lib\net\3.5\Iesi.Collections.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\net\2.0\log4net.dll</HintPath>
+ <HintPath>..\..\lib\net\3.5\log4net.dll</HintPath>
</Reference>
- <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+ <Reference Include="nunit.framework, Version=2.5.0.9122, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\net\2.0\nunit.framework.dll</HintPath>
+ <HintPath>..\..\lib\net\3.5\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: trunk/nhibernate/src/NHibernate.ByteCode.LinFu/NHibernate.ByteCode.LinFu.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.ByteCode.LinFu/NHibernate.ByteCode.LinFu.csproj 2009-06-21 13:25:11 UTC (rev 4505)
+++ trunk/nhibernate/src/NHibernate.ByteCode.LinFu/NHibernate.ByteCode.LinFu.csproj 2009-06-21 15:03:38 UTC (rev 4506)
@@ -37,9 +37,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\net\3.5\Iesi.Collections.dll</HintPath>
</Reference>
- <Reference Include="LinFu.DynamicProxy, Version=1.0.3232.29886, Culture=neutral, PublicKeyToken=62a6874124340d6e, processorArchitecture=MSIL">
+ <Reference Include="LinFu.DynamicProxy, Version=1.0.3.14911, Culture=neutral, PublicKeyToken=62a6874124340d6e, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\net\2.0\LinFu.DynamicProxy.dll</HintPath>
+ <HintPath>..\..\lib\net\3.5\LinFu.DynamicProxy.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Modified: trunk/nhibernate/src/NHibernate.ByteCode.LinFu.Tests/NHibernate.ByteCode.LinFu.Tests.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.ByteCode.LinFu.Tests/NHibernate.ByteCode.LinFu.Tests.csproj 2009-06-21 13:25:11 UTC (rev 4505)
+++ trunk/nhibernate/src/NHibernate.ByteCode.LinFu.Tests/NHibernate.ByteCode.LinFu.Tests.csproj 2009-06-21 15:03:38 UTC (rev 4506)
@@ -37,15 +37,15 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\net\3.5\Iesi.Collections.dll</HintPath>
</Reference>
- <Reference Include="LinFu.DynamicProxy, Version=1.0.3232.29886, Culture=neutral, PublicKeyToken=62a6874124340d6e, processorArchitecture=MSIL">
+ <Reference Include="LinFu.DynamicProxy, Version=1.0.3.14911, Culture=neutral, PublicKeyToken=62a6874124340d6e, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\net\2.0\LinFu.DynamicProxy.dll</HintPath>
+ <HintPath>..\..\lib\net\3.5\LinFu.DynamicProxy.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\net\3.5\log4net.dll</HintPath>
</Reference>
- <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+ <Reference Include="nunit.framework, Version=2.5.0.9122, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\net\3.5\nunit.framework.dll</HintPath>
</Reference>
Modified: trunk/nhibernate/src/NHibernate.ByteCode.Spring/NHibernate.ByteCode.Spring.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.ByteCode.Spring/NHibernate.ByteCode.Spring.csproj 2009-06-21 13:25:11 UTC (rev 4505)
+++ trunk/nhibernate/src/NHibernate.ByteCode.Spring/NHibernate.ByteCode.Spring.csproj 2009-06-21 15:03:38 UTC (rev 4506)
@@ -49,11 +49,11 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\net\3.5\log4net.dll</HintPath>
</Reference>
- <Reference Include="Spring.Aop, Version=1.2.0.20001, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="Spring.Aop, Version=0.0.0.20110, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\net\3.5\Spring.Aop.dll</HintPath>
</Reference>
- <Reference Include="Spring.Core, Version=1.2.0.20001, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="Spring.Core, Version=0.0.0.20110, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\net\3.5\Spring.Core.dll</HintPath>
</Reference>
Modified: trunk/nhibernate/src/NHibernate.ByteCode.Spring.Tests/NHibernate.ByteCode.Spring.Tests.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.ByteCode.Spring.Tests/NHibernate.ByteCode.Spring.Tests.csproj 2009-06-21 13:25:11 UTC (rev 4505)
+++ trunk/nhibernate/src/NHibernate.ByteCode.Spring.Tests/NHibernate.ByteCode.Spring.Tests.csproj 2009-06-21 15:03:38 UTC (rev 4506)
@@ -49,15 +49,15 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\net\3.5\log4net.dll</HintPath>
</Reference>
- <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+ <Reference Include="nunit.framework, Version=2.5.0.9122, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\net\3.5\nunit.framework.dll</HintPath>
</Reference>
- <Reference Include="Spring.Aop, Version=1.2.0.20001, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="Spring.Aop, Version=0.0.0.20110, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\net\3.5\Spring.Aop.dll</HintPath>
</Reference>
- <Reference Include="Spring.Core, Version=1.2.0.20001, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="Spring.Core, Version=0.0.0.20110, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\net\3.5\Spring.Core.dll</HintPath>
</Reference>
Modified: trunk/nhibernate/src/NHibernate.DomainModel/NHibernate.DomainModel.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.DomainModel/NHibernate.DomainModel.csproj 2009-06-21 13:25:11 UTC (rev 4505)
+++ trunk/nhibernate/src/NHibernate.DomainModel/NHibernate.DomainModel.csproj 2009-06-21 15:03:38 UTC (rev 4506)
@@ -37,9 +37,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Iesi.Collections, Version=1.0.0.1, Culture=neutral, PublicKeyToken=154fdcb44c4484fc">
+ <Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\net\2.0\Iesi.Collections.dll</HintPath>
+ <HintPath>..\..\lib\net\3.5\Iesi.Collections.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
Added: trunk/nhibernate/src/NHibernate.Example.Web/Bin/Antlr3.Runtime.dll.refresh
===================================================================
(Binary files differ)
Property changes on: trunk/nhibernate/src/NHibernate.Example.Web/Bin/Antlr3.Runtime.dll.refresh
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/nhibernate/src/NHibernate.Example.Web/Bin/Iesi.Collections.dll.refresh
===================================================================
(Binary files differ)
Property changes on: trunk/nhibernate/src/NHibernate.Example.Web/Bin/Iesi.Collections.dll.refresh
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/nhibernate/src/NHibernate.Example.Web/Bin/LinFu.DynamicProxy.dll.refresh
===================================================================
(Binary files differ)
Property changes on: trunk/nhibernate/src/NHibernate.Example.Web/Bin/LinFu.DynamicProxy.dll.refresh
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/nhibernate/src/NHibernate.Example.Web/Bin/log4net.dll.refresh
===================================================================
(Binary files differ)
Added: trunk/nhibernate/src/NHibernate.Example.Web/Bin/log4net.dll.refresh
===================================================================
(Binary files differ)
Property changes on: trunk/nhibernate/src/NHibernate.Example.Web/Bin/log4net.dll.refresh
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-06-21 13:25:11 UTC (rev 4505)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-06-21 15:03:38 UTC (rev 4506)
@@ -14,7 +14,7 @@
<OldToolsVersion>2.0</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkSubset>
</TargetFrameworkSubset>
</PropertyGroup>
@@ -44,30 +44,29 @@
<ItemGroup>
<Reference Include="Antlr3.Runtime, Version=3.1.0.39271, Culture=neutral, PublicKeyToken=3a9cab8f8d22bfb7, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\net\2.0\Antlr3.Runtime.dll</HintPath>
+ <HintPath>..\..\lib\net\3.5\Antlr3.Runtime.dll</HintPath>
</Reference>
- <Reference Include="Iesi.Collections, Version=1.0.0.1, Culture=neutral, PublicKeyToken=154fdcb44c4484fc">
+ <Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\net\2.0\Iesi.Collections.dll</HintPath>
+ <HintPath>..\..\lib\net\3.5\Iesi.Collections.dll</HintPath>
</Reference>
- <Reference Include="LinFu.DynamicProxy, Version=1.0.3233.760, Culture=neutral, PublicKeyToken=62a6874124340d6e, processorArchitecture=MSIL">
+ <Reference Include="LinFu.DynamicProxy, Version=1.0.3.14911, Culture=neutral, PublicKeyToken=62a6874124340d6e, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\net\2.0\LinFu.DynamicProxy.dll</HintPath>
+ <HintPath>..\..\lib\net\3.5\LinFu.DynamicProxy.dll</HintPath>
</Reference>
- <Reference Include="log4net, Version=1.2.9.0, Culture=neutral, PublicKeyToken=b32731d11ce58905">
+ <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\net\2.0\log4net.dll</HintPath>
+ <HintPath>..\..\lib\net\3.5\log4net.dll</HintPath>
</Reference>
- <Reference Include="nunit.core, Version=2.2.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+ <Reference Include="nunit.framework, Version=2.5.0.9122, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\net\2.0\nunit.core.dll</HintPath>
+ <HintPath>..\..\lib\net\3.5\nunit.framework.dll</HintPath>
</Reference>
- <Reference Include="nunit.framework, Version=2.2.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\net\2.0\nunit.framework.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
+ <Reference Include="System.Core">
+ <RequiredTargetFramework>3.5</RequiredTargetFramework>
+ </Reference>
<Reference Include="System.Data" />
<Reference Include="System.Data.OracleClient" />
<Reference Include="System.Transactions" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2009-06-21 13:25:14
|
Revision: 4505
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4505&view=rev
Author: fabiomaulo
Date: 2009-06-21 13:25:11 +0000 (Sun, 21 Jun 2009)
Log Message:
-----------
Changed version to NH3.0.0Alpha1
Modified Paths:
--------------
trunk/nhibernate/build-common/common.xml
Modified: trunk/nhibernate/build-common/common.xml
===================================================================
--- trunk/nhibernate/build-common/common.xml 2009-06-21 13:22:47 UTC (rev 4504)
+++ trunk/nhibernate/build-common/common.xml 2009-06-21 13:25:11 UTC (rev 4505)
@@ -76,7 +76,7 @@
effectively SP0).
-->
- <property name="project.version" value="2.1.0.Beta2" overwrite="false" />
+ <property name="project.version" value="3.0.0.Alpha1" overwrite="false" />
<!-- Compute short project version (major.minor) using a regex -->
<regex input="${project.version}" pattern="^(?'shortversion'\d+\.\d+)" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2009-06-21 13:22:51
|
Revision: 4504
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4504&view=rev
Author: fabiomaulo
Date: 2009-06-21 13:22:47 +0000 (Sun, 21 Jun 2009)
Log Message:
-----------
Changed version to 2.1.0CR1
Modified Paths:
--------------
branches/2.1.x/nhibernate/build-common/common.xml
Modified: branches/2.1.x/nhibernate/build-common/common.xml
===================================================================
--- branches/2.1.x/nhibernate/build-common/common.xml 2009-06-21 12:39:53 UTC (rev 4503)
+++ branches/2.1.x/nhibernate/build-common/common.xml 2009-06-21 13:22:47 UTC (rev 4504)
@@ -76,7 +76,7 @@
effectively SP0).
-->
- <property name="project.version" value="2.1.0.Beta2" overwrite="false" />
+ <property name="project.version" value="2.1.0.CR1" overwrite="false" />
<!-- Compute short project version (major.minor) using a regex -->
<regex input="${project.version}" pattern="^(?'shortversion'\d+\.\d+)" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2009-06-21 13:22:32
|
Revision: 4502
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4502&view=rev
Author: fabiomaulo
Date: 2009-06-21 12:18:45 +0000 (Sun, 21 Jun 2009)
Log Message:
-----------
Minor
Modified Paths:
--------------
trunk/nhibernate/releasenotes.txt
Modified: trunk/nhibernate/releasenotes.txt
===================================================================
--- trunk/nhibernate/releasenotes.txt 2009-06-21 12:18:09 UTC (rev 4501)
+++ trunk/nhibernate/releasenotes.txt 2009-06-21 12:18:45 UTC (rev 4502)
@@ -33,7 +33,7 @@
* ADOException now use string instead SqlString
* IParameterizedType is using IDictionary<string, string>
-Build 2.1.0.Beta2 (rev4499)
+Build 2.1.0.Beta2 (rev4501)
=============================
** Sub-task
* [NH-1827] - SchemaUpdate exception
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2009-06-21 13:22:14
|
Revision: 4503
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4503&view=rev
Author: fabiomaulo
Date: 2009-06-21 12:39:53 +0000 (Sun, 21 Jun 2009)
Log Message:
-----------
Version 2.1.0 and above targeting .NET2.0
Added Paths:
-----------
branches/2.1.x/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2009-06-21 13:22:12
|
Revision: 4501
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4501&view=rev
Author: fabiomaulo
Date: 2009-06-21 12:18:09 +0000 (Sun, 21 Jun 2009)
Log Message:
-----------
Minor (removed some warning)
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Bytecode/ICollectionTypeFactory.cs
trunk/nhibernate/src/NHibernate/Engine/Transaction/IIsolatedWork.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/CaseInsensitiveStringStream.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/ErrorCounter.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/SessionFactoryHelperExtensions.cs
trunk/nhibernate/src/NHibernate/Impl/SessionImpl.cs
Modified: trunk/nhibernate/src/NHibernate/Bytecode/ICollectionTypeFactory.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Bytecode/ICollectionTypeFactory.cs 2009-06-21 11:40:14 UTC (rev 4500)
+++ trunk/nhibernate/src/NHibernate/Bytecode/ICollectionTypeFactory.cs 2009-06-21 12:18:09 UTC (rev 4501)
@@ -235,8 +235,8 @@
/// <param name="role">The role the collection is in.</param>
/// <param name="propertyRef">The name of the property in the
/// owner object containing the collection ID, or <see langword="null" /> if it is
- /// the primary key.<
- /// /param>
+ /// the primary key.
+ /// </param>
/// <param name="embedded">Is embedded in XML (not supported yet)</param>
/// <returns>
/// A <see cref="MapType"/> for the specified role.
Modified: trunk/nhibernate/src/NHibernate/Engine/Transaction/IIsolatedWork.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Engine/Transaction/IIsolatedWork.cs 2009-06-21 11:40:14 UTC (rev 4500)
+++ trunk/nhibernate/src/NHibernate/Engine/Transaction/IIsolatedWork.cs 2009-06-21 12:18:09 UTC (rev 4501)
@@ -13,6 +13,7 @@
/// Perform the actual work to be done.
/// </summary>
/// <param name="connection">The ADP connection to use.</param>
+ /// <param name="transaction">The active transaction of the connection.</param>
void DoWork(IDbConnection connection, IDbTransaction transaction);
}
}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/CaseInsensitiveStringStream.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/CaseInsensitiveStringStream.cs 2009-06-21 11:40:14 UTC (rev 4500)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/CaseInsensitiveStringStream.cs 2009-06-21 12:18:09 UTC (rev 4501)
@@ -7,7 +7,6 @@
/// Look ahead for tokenizing is all lowercase, whereas the original case of an input stream is preserved.
/// Copied from http://www.antlr.org/wiki/pages/viewpage.action?pageId=1782
///</summary>
- [CLSCompliant(false)]
internal class CaseInsensitiveStringStream : ANTLRStringStream
{
public CaseInsensitiveStringStream(string input) : base(input) { }
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/ErrorCounter.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/ErrorCounter.cs 2009-06-21 11:40:14 UTC (rev 4500)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/ErrorCounter.cs 2009-06-21 12:18:09 UTC (rev 4501)
@@ -9,7 +9,6 @@
/// <summary>
/// An error handler that counts parsing errors and warnings.
/// </summary>
- [CLSCompliant(false)]
internal class ErrorCounter : IParseErrorHandler
{
private static readonly ILog log = LogManager.GetLogger(typeof(ErrorCounter));
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs 2009-06-21 11:40:14 UTC (rev 4500)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs 2009-06-21 12:18:09 UTC (rev 4501)
@@ -449,7 +449,6 @@
}
}
- [CLSCompliant(false)]
internal class HqlParseEngine
{
private static readonly ILog log = LogManager.GetLogger(typeof(HqlParseEngine));
@@ -560,7 +559,6 @@
}
}
- [CLSCompliant(false)]
internal class HqlSqlTranslator
{
private readonly IASTNode _inputAst;
@@ -613,7 +611,6 @@
}
}
- [CLSCompliant(false)]
internal class HqlSqlGenerator
{
private static readonly ILog log = LogManager.GetLogger(typeof(HqlSqlGenerator));
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/SessionFactoryHelperExtensions.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/SessionFactoryHelperExtensions.cs 2009-06-21 11:40:14 UTC (rev 4500)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/SessionFactoryHelperExtensions.cs 2009-06-21 12:18:09 UTC (rev 4501)
@@ -1,5 +1,4 @@
using System;
-using System.Collections.Generic;
using NHibernate.Dialect.Function;
using NHibernate.Engine;
using NHibernate.Hql.Ast.ANTLR.Tree;
@@ -14,7 +13,7 @@
namespace NHibernate.Hql.Ast.ANTLR
{
[CLSCompliant(false)]
- internal class SessionFactoryHelperExtensions
+ public class SessionFactoryHelperExtensions
{
private readonly ISessionFactoryImplementor _sfi;
private readonly NullableDictionary<string, IPropertyMapping> _collectionPropertyMappingByRole;
Modified: trunk/nhibernate/src/NHibernate/Impl/SessionImpl.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Impl/SessionImpl.cs 2009-06-21 11:40:14 UTC (rev 4500)
+++ trunk/nhibernate/src/NHibernate/Impl/SessionImpl.cs 2009-06-21 12:18:09 UTC (rev 4501)
@@ -1684,7 +1684,7 @@
/// If this Session is being Finalized (<c>isDisposing==false</c>) then make sure not
/// to call any methods that could potentially bring this Session back to life.
/// </remarks>
- protected void Dispose(bool isDisposing)
+ private void Dispose(bool isDisposing)
{
using (new SessionIdLoggingContext(SessionId))
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2009-06-21 11:41:22
|
Revision: 4500
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4500&view=rev
Author: fabiomaulo
Date: 2009-06-21 11:40:14 +0000 (Sun, 21 Jun 2009)
Log Message:
-----------
Actualization releasenotes to release NH2.1.0Beta2
Modified Paths:
--------------
trunk/nhibernate/releasenotes.txt
Modified: trunk/nhibernate/releasenotes.txt
===================================================================
--- trunk/nhibernate/releasenotes.txt 2009-06-21 11:20:28 UTC (rev 4499)
+++ trunk/nhibernate/releasenotes.txt 2009-06-21 11:40:14 UTC (rev 4500)
@@ -33,6 +33,46 @@
* ADOException now use string instead SqlString
* IParameterizedType is using IDictionary<string, string>
+Build 2.1.0.Beta2 (rev4499)
+=============================
+** Sub-task
+ * [NH-1827] - SchemaUpdate exception
+ * [NH-1843] - Precision and scale for MySQL is not working, too
+
+** Bug
+ * [NH-1734] - NHibernate aggregate function sum() to return Int64 instead of floating point value
+ * [NH-1810] - Use of custom sorted set leads to "collection not processed by flush" exception
+ * [NH-1812] - Aggregates + IsNull bug (AST parser)
+ * [NH-1821] - Wrong SQL executed when the SQL contains new lines
+ * [NH-1822] - CLONE -NHibernate.Util.TypeNameParser doesn't parse correctly generic types
+ * [NH-1830] - Missing MatchMode Parameter
+ * [NH-1831] - AST Parser & Bitwise queries
+ * [NH-1834] - Formula node in Many-To-One is ignored
+ * [NH-1835] - prepare_sql = true (creating prepared queries) makes NHibernate set up wrong size for byte arrays larger than 8000
+ * [NH-1837] - UniqueResult<T>() executes sql query twice.
+
+** Improvement
+ * [NH-473] - order-by in <bag> is ignored if FetchMode is Join
+ * [NH-1069] - Add context information to LazyInitializationException.
+ * [NH-1097] - Should not parse column names, and consider them as failing HQL queries
+ * [NH-1192] - Support bitwise operations
+ * [NH-1266] - ISQLExceptionConverter for various Dialects
+ * [NH-1672] - Unnecessary calls to planCache.Put
+ * [NH-1820] - PostgreSQL: support for Temporary Tables
+ * [NH-1824] - MySQL: support for Temporary Tables
+ * [NH-1826] - PostgreSQL: support iff() function
+ * [NH-1833] - OverflowException instead of expected FormatException when trying to parse a "long" literal
+ * [NH-1846] - DbTimestampType (from H3.3.1)
+
+** New Feature
+ * [NH-1623] - Configuration of UserCollection for any collection type
+ * [NH-1817] - Allow <typedef> for Id generator class
+
+** Patch
+ * [NH-1829] - AbstractEntityPersister.Delete is not virtual
+ * [NH-1842] - Type.CharBooleanType.ctor(SqlType) is internal for no reason. Making it protected supports better extensibility.
+
+
Build 2.1.0.Beta1 (rev4424)
=============================
** Bug
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2009-06-21 11:21:28
|
Revision: 4499
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4499&view=rev
Author: fabiomaulo
Date: 2009-06-21 11:20:28 +0000 (Sun, 21 Jun 2009)
Log Message:
-----------
Minor
Modified Paths:
--------------
trunk/nhibernate/releasenotes.txt
Modified: trunk/nhibernate/releasenotes.txt
===================================================================
--- trunk/nhibernate/releasenotes.txt 2009-06-21 08:17:14 UTC (rev 4498)
+++ trunk/nhibernate/releasenotes.txt 2009-06-21 11:20:28 UTC (rev 4499)
@@ -56,6 +56,7 @@
* [NH-1813] - Not understandable exception message
** Improvement
+ * [NH-1019] - Improve error message for HQL in when entity not recognised
* [NH-1814] - Autoregister ReservedWords from MetaData
** New Feature
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <te...@us...> - 2009-06-21 08:17:16
|
Revision: 4498
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4498&view=rev
Author: tehlike
Date: 2009-06-21 08:17:14 +0000 (Sun, 21 Jun 2009)
Log Message:
-----------
Adding tests for NH-1192 showing it is no longer an issue. Should have been fixed with the new AST parser.
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1192/
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1192/Domain.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1192/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1192/Mappings.hbm.xml
Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1192/Domain.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1192/Domain.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1192/Domain.cs 2009-06-21 08:17:14 UTC (rev 4498)
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace NHibernate.Test.NHSpecificTest.NH1192
+{
+ public enum Status
+ {
+ None,
+ Bold=1,
+ Italic=2,
+ Underlined=4
+
+ }
+ public class ObjectA
+ {
+ public virtual int Id { get; set; }
+ public virtual Status FontType { get; set; }
+ public virtual string Name { get; set; }
+ }
+}
Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1192/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1192/Fixture.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1192/Fixture.cs 2009-06-21 08:17:14 UTC (rev 4498)
@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH1192
+{
+ [TestFixture]
+ public class Fixture:BugTestCase
+ {
+ protected override void OnSetUp()
+ {
+ using(var session=this.OpenSession())
+ using(var tran=session.BeginTransaction())
+ {
+ session.Save(new ObjectA {FontType = Status.Bold|Status.Italic, Name = "Object1"});
+ session.Save(new ObjectA { FontType = Status.Italic, Name = "Object2" });
+ session.Save(new ObjectA { FontType = Status.Underlined, Name = "Object2" });
+ tran.Commit();
+ }
+ }
+ protected override void OnTearDown()
+ {
+ using (var session = this.OpenSession())
+ using (var tran = session.BeginTransaction())
+ {
+ session.Delete("from ObjectA");
+ tran.Commit();
+ }
+ }
+
+ [Test]
+ public void BitwiseAndWorksCorrectly()
+ {
+ using (var session = this.OpenSession())
+ using (var tran = session.BeginTransaction())
+ {
+ var query = session.CreateQuery("from ObjectA o where (o.FontType & 1) > 0");
+ var result = query.List();
+ Assert.That(result,Has.Count.EqualTo(1));
+ query = session.CreateQuery("from ObjectA o where (o.FontType & 2) > 0");
+ result = query.List();
+ Assert.That(result, Has.Count.EqualTo(2));
+
+ query = session.CreateQuery("from ObjectA o where (o.FontType & 4) > 0");
+ result = query.List();
+ Assert.That(result, Has.Count.EqualTo(1));
+ }
+ }
+
+ [Test]
+ public void BitwiseOrWorksCorrectly()
+ {
+ using (var session = this.OpenSession())
+ using (var tran = session.BeginTransaction())
+ {
+ var query = session.CreateQuery("from ObjectA o where (o.FontType | 2) = (1|2) ");
+ var result = query.List();
+ Assert.That(result, Has.Count.EqualTo(1));
+ }
+ }
+ }
+}
Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1192/Mappings.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1192/Mappings.hbm.xml (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1192/Mappings.hbm.xml 2009-06-21 08:17:14 UTC (rev 4498)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+ namespace="NHibernate.Test.NHSpecificTest.NH1192"
+ assembly="NHibernate.Test">
+
+ <class name="ObjectA">
+ <id name="Id">
+ <generator class="native"/>
+ </id>
+ <property name="Name"/>
+ <property name="FontType"/>
+
+ </class>
+</hibernate-mapping>
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-06-20 19:24:32 UTC (rev 4497)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-06-21 08:17:14 UTC (rev 4498)
@@ -372,6 +372,8 @@
<Compile Include="NHSpecificTest\NH1171\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1182\Domain.cs" />
<Compile Include="NHSpecificTest\NH1182\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1192\Domain.cs" />
+ <Compile Include="NHSpecificTest\NH1192\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1264\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1264\Name.cs" />
<Compile Include="NHSpecificTest\NH1264\Passenger.cs" />
@@ -1929,6 +1931,7 @@
<EmbeddedResource Include="Bytecode\Lightweight\ProductLine.hbm.xml" />
<EmbeddedResource Include="DriverTest\MultiTypeEntity.hbm.xml" />
<Content Include="DynamicEntity\package.html" />
+ <EmbeddedResource Include="NHSpecificTest\NH1192\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1734\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1097\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH473\Mappings.hbm.xml" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <te...@us...> - 2009-06-20 19:24:39
|
Revision: 4497
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4497&view=rev
Author: tehlike
Date: 2009-06-20 19:24:32 +0000 (Sat, 20 Jun 2009)
Log Message:
-----------
Adding tests to show NH-1734 is no longer an issue. Possibly fixed with new AST parser.
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1734/
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1734/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1734/Mappings.hbm.xml
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1734/Product.cs
Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1734/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1734/Fixture.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1734/Fixture.cs 2009-06-20 19:24:32 UTC (rev 4497)
@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH1734
+{
+ [TestFixture]
+ public class Fixture:BugTestCase
+ {
+ protected override void OnSetUp()
+ {
+ using(var session=this.OpenSession())
+ using(var tran=session.BeginTransaction())
+ {
+ var product = new Product {Amount = 3, Price = 43.2};
+ var product2 = new Product { Amount = 3, Price = 43.2 };
+ session.Save(product);
+ session.Save(product2);
+ tran.Commit();
+ }
+ }
+ protected override void OnTearDown()
+ {
+ using(var session=this.OpenSession())
+ using (var tran = session.BeginTransaction())
+ {
+ session.Delete("from Product");
+ tran.Commit();
+ }
+ }
+
+ [Test]
+ public void ReturnsApropriateTypeWhenSumUsedWithSomeFormula()
+ {
+ using (var session = this.OpenSession())
+ using (var tran = session.BeginTransaction())
+ {
+ var query=session.CreateQuery("select sum(Amount*Price) from Product");
+ var result=query.UniqueResult();
+ Assert.That(result, Is.InstanceOf(typeof (double)));
+ Assert.That(result, Is.EqualTo(43.2*3*2));
+ query = session.CreateQuery("select sum(Price*Amount) from Product");
+ result = query.UniqueResult();
+ Assert.That(result, Is.InstanceOf(typeof(double)));
+ Assert.That(result, Is.EqualTo(43.2 * 3 * 2));
+
+ query = session.CreateQuery("select sum(Price) from Product");
+ result = query.UniqueResult();
+ Assert.That(result, Is.InstanceOf(typeof(double)));
+ Assert.That(result, Is.EqualTo(43.2 * 2));
+
+ query = session.CreateQuery("select sum(Amount) from Product");
+ result = query.UniqueResult();
+ Assert.That(result, Is.InstanceOf(typeof(Int64)));
+ Assert.That(result, Is.EqualTo(6.0));
+ }
+ }
+ }
+}
Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1734/Mappings.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1734/Mappings.hbm.xml (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1734/Mappings.hbm.xml 2009-06-20 19:24:32 UTC (rev 4497)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+ namespace="NHibernate.Test.NHSpecificTest.NH1734"
+ assembly="NHibernate.Test">
+ <class name="Product">
+ <id name="Id">
+ <generator class="native"/>
+ </id>
+ <property name="Price"/>
+ <property name="Amount" />
+ </class>
+</hibernate-mapping>
Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1734/Product.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1734/Product.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1734/Product.cs 2009-06-20 19:24:32 UTC (rev 4497)
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace NHibernate.Test.NHSpecificTest.NH1734
+{
+ public class Product
+ {
+ public virtual int Id { get; set; }
+ public virtual double Price { get; set; }
+ public virtual int Amount { get; set; }
+ }
+}
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-06-20 18:40:44 UTC (rev 4496)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-06-20 19:24:32 UTC (rev 4497)
@@ -457,6 +457,8 @@
<Compile Include="NHSpecificTest\NH1716\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1727\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1727\Model.cs" />
+ <Compile Include="NHSpecificTest\NH1734\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1734\Product.cs" />
<Compile Include="NHSpecificTest\NH1741\Domain.cs" />
<Compile Include="NHSpecificTest\NH1741\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1742\DomainClass.cs" />
@@ -1927,6 +1929,7 @@
<EmbeddedResource Include="Bytecode\Lightweight\ProductLine.hbm.xml" />
<EmbeddedResource Include="DriverTest\MultiTypeEntity.hbm.xml" />
<Content Include="DynamicEntity\package.html" />
+ <EmbeddedResource Include="NHSpecificTest\NH1734\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1097\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH473\Mappings.hbm.xml" />
<EmbeddedResource Include="VersionTest\Db\User.hbm.xml" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <te...@us...> - 2009-06-20 18:40:46
|
Revision: 4496
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4496&view=rev
Author: tehlike
Date: 2009-06-20 18:40:44 +0000 (Sat, 20 Jun 2009)
Log Message:
-----------
Adding tests to show that NH-1097 is no longer an issue
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1097/
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1097/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1097/Mappings.hbm.xml
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1097/Person.cs
Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1097/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1097/Fixture.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1097/Fixture.cs 2009-06-20 18:40:44 UTC (rev 4496)
@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH1097
+{
+ [TestFixture]
+ public class Fixture:BugTestCase
+ {
+ protected override void OnSetUp()
+ {
+ using(var session=this.OpenSession())
+ using(var tran=session.BeginTransaction())
+ {
+ session.Save(new Person {Name = "Fabio"});
+ session.Save(new Person { Name = "Dario" });
+ tran.Commit();
+ }
+ }
+ protected override void OnTearDown()
+ {
+ using (var session = this.OpenSession())
+ using (var tran = session.BeginTransaction())
+ {
+ session.Save(new Person { Name = "Fabio" });
+ session.Save(new Person { Name = "Dario" });
+ session.Delete("from Person");
+ tran.Commit();
+ }
+ }
+
+ [Test]
+ public void ThrowsExceptionWhenColumnNameIsUsedInQuery()
+ {
+ using (var session = this.OpenSession())
+ using (var tran = session.BeginTransaction())
+ {
+
+ Assert.Throws<QueryException>(delegate
+ {
+ var query = session.CreateQuery("from Person p where p.namecolumn=:nameOfPerson");
+ query.SetString("nameOfPerson", "Dario");
+ query.List();
+ });
+ }
+ }
+ }
+}
Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1097/Mappings.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1097/Mappings.hbm.xml (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1097/Mappings.hbm.xml 2009-06-20 18:40:44 UTC (rev 4496)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+ assembly="NHibernate.Test"
+ namespace="NHibernate.Test.NHSpecificTest.NH1097">
+ <class name="Person">
+ <id name="Id">
+ <generator class="native" />
+ </id>
+ <property name="Name" column="namecolumn"/>
+ </class>
+</hibernate-mapping>
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1097/Person.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1097/Person.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1097/Person.cs 2009-06-20 18:40:44 UTC (rev 4496)
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace NHibernate.Test.NHSpecificTest.NH1097
+{
+ public class Person
+ {
+ public virtual int Id { get; set; }
+ public virtual string Name { get; set; }
+
+ }
+}
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-06-20 16:09:53 UTC (rev 4495)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-06-20 18:40:44 UTC (rev 4496)
@@ -362,6 +362,8 @@
<Compile Include="NHSpecificTest\NH1092\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1093\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1093\SimpleCached.cs" />
+ <Compile Include="NHSpecificTest\NH1097\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1097\Person.cs" />
<Compile Include="NHSpecificTest\NH1159\Contact.cs" />
<Compile Include="NHSpecificTest\NH1159\ContactTitle.cs" />
<Compile Include="NHSpecificTest\NH1159\Fixture.cs" />
@@ -1925,6 +1927,7 @@
<EmbeddedResource Include="Bytecode\Lightweight\ProductLine.hbm.xml" />
<EmbeddedResource Include="DriverTest\MultiTypeEntity.hbm.xml" />
<Content Include="DynamicEntity\package.html" />
+ <EmbeddedResource Include="NHSpecificTest\NH1097\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH473\Mappings.hbm.xml" />
<EmbeddedResource Include="VersionTest\Db\User.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1831\Mappings.hbm.xml" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Dakota D. <nhi...@li...> - 2009-06-20 16:54:31
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html dir="ltr"><head><title>Weekly Newsletter</title><style type="text/css">
a, a:link, a:active, a:visited {
color: #0075A7;
text-decoration: none;
}
a:hover {
text-decoration: underline;
}
img {border:0;}
body{padding:0;margin:0;background-color:#ffffff;}
</style></head><body><table cellspacing="0" cellpadding="0" width="600" align="center" border="0"><tr><td align="center" colspan="3" height="40"><font face="Arial,
Helvetica, sans-serif" style="font-weight: normal; font-size: 11px; color: #202020">View this email <a target="_blank" href="http://gxpyr23.tohmemig.cn/?obutozigj=rihewql&oahyekqgaw=81daa685dda78&vasim=jvuhozj" name="Online">online</a> | Change your <a target="_blank" href="http://obwqq39.tohmemig.cn/?bilq=sopqtqpogo&uleujtadj=81daa685dda78&jbiqnorq=uponi" name="Profile">preferences</a></font></td></tr></table><table cellspacing="0" cellpadding="0" width="728" align="center" border="0"><tr>
<td>
<table cellspacing="0" cellpadding="0" border="0" style="width: 725px"><tr>
<td colspan="3" style="text-align: center"><br />
<a name="" target="" href="http://obwqq39.tohmemig.cn/?oxjvapqyxu=sqbey&yliiloh=81daa685dda78&newoycjk=gjhjdou">
<img alt="Click here" border="0" src="http://obwqq39.tohmemig.cn/spacer.gif"></a><br /><hr size="1" color="#cccccc" /></td></tr></table></td></tr></table>
<table cellspacing="3" cellpadding="0" width="600" align="center" border="0"><tr><td align="center">
<font face="Arial, Helvetica, sans-serif" style="font-weight: normal; font-size: 11px; color: #000000"><p id="links_container"style="display: inline;" >
</p>
</font><br /><font face="Arial, Helvetica, sans-serif" style="font-weight: normal; font-size: 11px; color: #000000"><a target="_blank" href="http://jvw62.tohmemig.cn/?pepec=ifypu&qzaq=81daa685dda78&aiyvatig=jijxuwym" name="Profile">
Update Your Profile</a> | <a target="_blank" href="http://obwqq39.tohmemig.cn/?ijgauv=qhjriaz&bjso=81daa685dda78&gisq=qywj" name="Unsubscribe">
Unsubscribe</a> | <a target="_blank" href="http://obwqq39.tohmemig.cn/?orifayguw=tyypjjniwq&cyupae=81daa685dda78&apji=vaqsof" name="Privacy Policy">
Privacy Policy</a> | <a target="_blank" href="http://obwqq39.tohmemig.cn/?acqhireisj=tykiega&osjawo=81daa685dda78&yrjkqr=cjciw" name="Forward">
Forward this email</a> </font></td></tr><tr><td align="center"><font face="Arial, Helvetica,
sans-serif" style="font-weight: normal; font-size: 11px; color: #000000">Copyright © <b>Niyduutj Corporation</b></font></td></tr></table></body></html>
|
|
From: <te...@us...> - 2009-06-20 16:09:57
|
Revision: 4495
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4495&view=rev
Author: tehlike
Date: 2009-06-20 16:09:53 +0000 (Sat, 20 Jun 2009)
Log Message:
-----------
Adding test to show NH-473 is not an issue (should have been fixed somewhere in the past)
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH473/
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH473/Child.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH473/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH473/Mappings.hbm.xml
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH473/Parent.cs
Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH473/Child.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH473/Child.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH473/Child.cs 2009-06-20 16:09:53 UTC (rev 4495)
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace NHibernate.Test.NHSpecificTest.NH473
+{
+ public class Child
+ {
+ public virtual int Id { get; set; }
+ public virtual string Name { get; set; }
+ }
+}
Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH473/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH473/Fixture.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH473/Fixture.cs 2009-06-20 16:09:53 UTC (rev 4495)
@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH473
+{
+ [TestFixture]
+ public class Fixture:BugTestCase
+ {
+ protected override void OnSetUp()
+ {
+ using(var session=this.OpenSession())
+ using(var tran=session.BeginTransaction())
+ {
+ var parent = new Parent();
+ var child1 = new Child {Name = "Fabio"};
+ var child2 = new Child {Name = "Ayende"};
+ var child3 = new Child {Name = "Dario"};
+ parent.Children.Add(child1);
+ parent.Children.Add(child2);
+ parent.Children.Add(child3);
+ session.Save(parent);
+ tran.Commit();
+ }
+ }
+ protected override void OnTearDown()
+ {
+ using (var session = this.OpenSession())
+ using (var tran = session.BeginTransaction())
+ {
+ session.Delete("from Parent");
+ tran.Commit();
+ }
+ }
+ [Test]
+ public void ChildItemsGetInOrderWhenUsingFetchJoin()
+ {
+ using(var session=this.OpenSession())
+ using(var tran=session.BeginTransaction())
+ {
+ var result = session.CreateCriteria(typeof (Parent))
+ .SetFetchMode("Children", FetchMode.Join)
+ .List<Parent>();
+ Assert.That(result[0].Children[0].Name,Is.EqualTo("Ayende"));
+ Assert.That(result[0].Children[1].Name, Is.EqualTo("Dario"));
+ Assert.That(result[0].Children[2].Name, Is.EqualTo("Fabio"));
+ }
+ }
+
+ [Test]
+ public void ChildItemsGetInOrderWhenUsingFetchJoinUniqueResult()
+ {
+ using (var session = this.OpenSession())
+ using (var tran = session.BeginTransaction())
+ {
+ var result = session.CreateCriteria(typeof(Parent))
+ .SetFetchMode("Children", FetchMode.Join)
+ .UniqueResult<Parent>();
+ Assert.That(result.Children[0].Name, Is.EqualTo("Ayende"));
+ Assert.That(result.Children[1].Name, Is.EqualTo("Dario"));
+ Assert.That(result.Children[2].Name, Is.EqualTo("Fabio"));
+ }
+ }
+ }
+}
Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH473/Mappings.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH473/Mappings.hbm.xml (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH473/Mappings.hbm.xml 2009-06-20 16:09:53 UTC (rev 4495)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+ assembly="NHibernate.Test"
+ namespace="NHibernate.Test.NHSpecificTest.NH473">
+
+ <class name="Parent">
+ <id name="Id">
+ <generator class="native"/>
+ </id>
+
+ <bag name="Children" lazy="true" order-by="Name" cascade="all-delete-orphan">
+ <key column="ParentId" />
+ <one-to-many class="Child" />
+ </bag>
+ </class>
+
+ <class name="Child">
+ <id name="Id">
+ <generator class="native" />
+ </id>
+ <property name="Name"/>
+ </class>
+</hibernate-mapping>
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH473/Parent.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH473/Parent.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH473/Parent.cs 2009-06-20 16:09:53 UTC (rev 4495)
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Iesi.Collections;
+using Iesi.Collections.Generic;
+
+namespace NHibernate.Test.NHSpecificTest.NH473
+{
+ public class Parent
+ {
+ public Parent()
+ {
+ this.Children = new List<Child>();
+ }
+ public virtual int Id { get; set; }
+ public virtual IList<Child> Children { get; set; }
+ }
+}
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-06-20 15:21:09 UTC (rev 4494)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-06-20 16:09:53 UTC (rev 4495)
@@ -515,6 +515,9 @@
<Compile Include="NHSpecificTest\NH1837\Customer.cs" />
<Compile Include="NHSpecificTest\NH1837\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1837\Order.cs" />
+ <Compile Include="NHSpecificTest\NH473\Child.cs" />
+ <Compile Include="NHSpecificTest\NH473\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH473\Parent.cs" />
<Compile Include="NHSpecificTest\NH645\HQLFunctionFixture.cs" />
<Compile Include="HQL\HQLFunctions.cs" />
<Compile Include="HQL\Human.cs" />
@@ -1922,6 +1925,7 @@
<EmbeddedResource Include="Bytecode\Lightweight\ProductLine.hbm.xml" />
<EmbeddedResource Include="DriverTest\MultiTypeEntity.hbm.xml" />
<Content Include="DynamicEntity\package.html" />
+ <EmbeddedResource Include="NHSpecificTest\NH473\Mappings.hbm.xml" />
<EmbeddedResource Include="VersionTest\Db\User.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1831\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1069\Mappings.hbm.xml" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2009-06-20 15:21:53
|
Revision: 4494
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4494&view=rev
Author: fabiomaulo
Date: 2009-06-20 15:21:09 +0000 (Sat, 20 Jun 2009)
Log Message:
-----------
Fix NH-1846
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/RootClassBinder.cs
trunk/nhibernate/src/NHibernate/NHibernate.csproj
trunk/nhibernate/src/NHibernate/NHibernateUtil.cs
trunk/nhibernate/src/NHibernate/Type/TypeFactory.cs
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
trunk/nhibernate/src/NHibernate/Type/DbTimestampType.cs
trunk/nhibernate/src/NHibernate.Test/VersionTest/Db/DbVersionFixture.cs
trunk/nhibernate/src/NHibernate.Test/VersionTest/Db/Group.cs
trunk/nhibernate/src/NHibernate.Test/VersionTest/Db/Permission.cs
trunk/nhibernate/src/NHibernate.Test/VersionTest/Db/User.cs
trunk/nhibernate/src/NHibernate.Test/VersionTest/Db/User.hbm.xml
Modified: trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/RootClassBinder.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/RootClassBinder.cs 2009-06-20 03:21:45 UTC (rev 4493)
+++ trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/RootClassBinder.cs 2009-06-20 15:21:09 UTC (rev 4494)
@@ -76,7 +76,20 @@
BindColumns(timestampSchema, simpleValue, propertyName);
if (!simpleValue.IsTypeSpecified)
- simpleValue.TypeName = NHibernateUtil.Timestamp.Name;
+ {
+ switch (timestampSchema.source)
+ {
+ case HbmTimestampSource.Vm:
+ simpleValue.TypeName = NHibernateUtil.Timestamp.Name;
+ break;
+ case HbmTimestampSource.Db:
+ simpleValue.TypeName = NHibernateUtil.DbTimestamp.Name;
+ break;
+ default:
+ simpleValue.TypeName = NHibernateUtil.Timestamp.Name;
+ break;
+ }
+ }
var property = new Property(simpleValue);
BindProperty(timestampSchema, property, inheritedMetas);
Modified: trunk/nhibernate/src/NHibernate/NHibernate.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate/NHibernate.csproj 2009-06-20 03:21:45 UTC (rev 4493)
+++ trunk/nhibernate/src/NHibernate/NHibernate.csproj 2009-06-20 15:21:09 UTC (rev 4494)
@@ -604,6 +604,7 @@
<Compile Include="Tool\hbm2ddl\SchemaMetadataUpdater.cs" />
<Compile Include="Transaction\AdoNetWithDistrubtedTransactionFactory.cs" />
<Compile Include="Transform\ToListResultTransformer.cs" />
+ <Compile Include="Type\DbTimestampType.cs" />
<Compile Include="Type\DefaultCollectionTypeFactory.cs" />
<Compile Include="Bytecode\ICollectionTypeFactory.cs" />
<Compile Include="Util\NullableDictionary.cs" />
Modified: trunk/nhibernate/src/NHibernate/NHibernateUtil.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/NHibernateUtil.cs 2009-06-20 03:21:45 UTC (rev 4493)
+++ trunk/nhibernate/src/NHibernate/NHibernateUtil.cs 2009-06-20 15:21:09 UTC (rev 4494)
@@ -224,6 +224,8 @@
/// NHibernate Timestamp type
/// </summary>
public static readonly NullableType Timestamp = new TimestampType();
+
+ public static readonly NullableType DbTimestamp = new DbTimestampType();
/// <summary>
/// NHibernate TrueFalse type
Added: trunk/nhibernate/src/NHibernate/Type/DbTimestampType.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Type/DbTimestampType.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate/Type/DbTimestampType.cs 2009-06-20 15:21:09 UTC (rev 4494)
@@ -0,0 +1,94 @@
+using System;
+using System.Data;
+using System.Data.Common;
+using log4net;
+using NHibernate.Engine;
+using NHibernate.Exceptions;
+using NHibernate.SqlCommand;
+using NHibernate.SqlTypes;
+
+namespace NHibernate.Type
+{
+ /// <summary> An extension of <see cref="TimestampType"/> which
+ /// maps to the database's current timestamp, rather than the vm's
+ /// current timestamp.
+ /// </summary>
+ /// <remarks>
+ /// Note: May/may-not cause issues on dialects which do not properly support
+ /// a true notion of timestamp
+ /// </remarks>
+ [Serializable]
+ public class DbTimestampType : TimestampType, IVersionType
+ {
+ private static readonly ILog log = LogManager.GetLogger(typeof (DbTimestampType));
+ private static readonly SqlType[] EmptyParams = new SqlType[0];
+
+ public override string Name
+ {
+ get { return "DbTimestamp"; }
+ }
+
+ public override object Seed(ISessionImplementor session)
+ {
+ if (session == null)
+ {
+ log.Debug("incoming session was null; using current vm time");
+ return base.Seed(session);
+ }
+ else if (!session.Factory.Dialect.SupportsCurrentTimestampSelection)
+ {
+ log.Debug("falling back to vm-based timestamp, as dialect does not support current timestamp selection");
+ return base.Seed(session);
+ }
+ else
+ {
+ return GetCurrentTimestamp(session);
+ }
+ }
+
+ private object GetCurrentTimestamp(ISessionImplementor session)
+ {
+ Dialect.Dialect dialect = session.Factory.Dialect;
+ string timestampSelectString = dialect.CurrentTimestampSelectString;
+ return UsePreparedStatement(timestampSelectString, session);
+ }
+
+ protected virtual object UsePreparedStatement(string timestampSelectString, ISessionImplementor session)
+ {
+ var tsSelect = new SqlString(timestampSelectString);
+ IDbCommand ps = null;
+ IDataReader rs = null;
+ try
+ {
+ ps = session.Batcher.PrepareCommand(CommandType.Text, tsSelect, EmptyParams);
+ rs = session.Batcher.ExecuteReader(ps);
+ rs.Read();
+ DateTime ts = rs.GetDateTime(0);
+ if (log.IsDebugEnabled)
+ {
+ log.Debug("current timestamp retreived from db : " + ts + " (tiks=" + ts.Ticks + ")");
+ }
+ return ts;
+ }
+ catch (DbException sqle)
+ {
+ throw ADOExceptionHelper.Convert(session.Factory.SQLExceptionConverter, sqle,
+ "could not select current db timestamp", tsSelect);
+ }
+ finally
+ {
+ if (ps != null)
+ {
+ try
+ {
+ session.Batcher.CloseCommand(ps, rs);
+ }
+ catch (DbException sqle)
+ {
+ log.Warn("unable to clean up prepared statement", sqle);
+ }
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Type/TypeFactory.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Type/TypeFactory.cs 2009-06-20 03:21:45 UTC (rev 4493)
+++ trunk/nhibernate/src/NHibernate/Type/TypeFactory.cs 2009-06-20 15:21:09 UTC (rev 4494)
@@ -232,6 +232,7 @@
RegisterType(NHibernateUtil.Date, new[] { "date" });
RegisterType(NHibernateUtil.Timestamp, new[] { "timestamp" });
+ RegisterType(NHibernateUtil.DbTimestamp, new[] { "dbtimestamp" });
RegisterType(NHibernateUtil.Time, new[] { "time" });
RegisterType(NHibernateUtil.TrueFalse, new[] { "true_false" });
RegisterType(NHibernateUtil.YesNo, new[] { "yes_no" });
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-06-20 03:21:45 UTC (rev 4493)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-06-20 15:21:09 UTC (rev 4494)
@@ -1349,11 +1349,15 @@
<Compile Include="UtilityTest\ThreadSafeDictionaryFixture.cs" />
<Compile Include="UtilityTest\TypeNameParserFixture.cs" />
<Compile Include="UtilityTest\WeakHashtableFixture.cs" />
+ <Compile Include="VersionTest\Db\DbVersionFixture.cs" />
+ <Compile Include="VersionTest\Db\Group.cs" />
<Compile Include="VersionTest\Db\MsSQL\BinaryTimestamp.cs" />
<Compile Include="VersionTest\Db\MsSQL\ComplexDomain.cs" />
<Compile Include="VersionTest\Db\MsSQL\ComplexDomainFixture.cs" />
<Compile Include="VersionTest\Db\MsSQL\GeneratedBinaryVersionFixture.cs" />
<Compile Include="VersionTest\Db\MsSQL\SimpleVersioned.cs" />
+ <Compile Include="VersionTest\Db\Permission.cs" />
+ <Compile Include="VersionTest\Db\User.cs" />
<Compile Include="VersionTest\Person.cs" />
<Compile Include="VersionTest\Task.cs" />
<Compile Include="VersionTest\Thing.cs" />
@@ -1918,6 +1922,7 @@
<EmbeddedResource Include="Bytecode\Lightweight\ProductLine.hbm.xml" />
<EmbeddedResource Include="DriverTest\MultiTypeEntity.hbm.xml" />
<Content Include="DynamicEntity\package.html" />
+ <EmbeddedResource Include="VersionTest\Db\User.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1831\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1069\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1837\Mappings.hbm.xml" />
Added: trunk/nhibernate/src/NHibernate.Test/VersionTest/Db/DbVersionFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/VersionTest/Db/DbVersionFixture.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/VersionTest/Db/DbVersionFixture.cs 2009-06-20 15:21:09 UTC (rev 4494)
@@ -0,0 +1,111 @@
+using System;
+using System.Collections;
+using System.Threading;
+using NUnit.Framework;
+
+namespace NHibernate.Test.VersionTest.Db
+{
+ [TestFixture]
+ public class DbVersionFixture : TestCase
+ {
+ protected override IList Mappings
+ {
+ get { return new[] {"VersionTest.Db.User.hbm.xml"}; }
+ }
+
+ protected override string MappingsAssembly
+ {
+ get { return "NHibernate.Test"; }
+ }
+
+ [Test]
+ public void CollectionVersion()
+ {
+ ISession s = OpenSession();
+ ITransaction t = s.BeginTransaction();
+ var guy = new User { Username = "guy" };
+ s.Persist(guy);
+ var admin = new Group {Name = "admin"};
+ s.Persist(admin);
+ t.Commit();
+ s.Close();
+
+ DateTime guyTimestamp = guy.Timestamp;
+
+ // For dialects (Oracle8 for example) which do not return "true
+ // timestamps" sleep for a bit to allow the db date-time increment...
+ Thread.Sleep(1500);
+
+ s = OpenSession();
+ t = s.BeginTransaction();
+ guy = s.Get<User>(guy.Id);
+ admin = s.Get<Group>(admin.Id);
+ guy.Groups.Add(admin);
+ admin.Users.Add(guy);
+ t.Commit();
+ s.Close();
+
+ Assert.That(!NHibernateUtil.Timestamp.IsEqual(guyTimestamp, guy.Timestamp), "owner version not incremented");
+
+ guyTimestamp = guy.Timestamp;
+ Thread.Sleep(1500);
+
+ s = OpenSession();
+ t = s.BeginTransaction();
+ guy = s.Get<User>(guy.Id);
+ guy.Groups.Clear();
+ t.Commit();
+ s.Close();
+
+ Assert.That(!NHibernateUtil.Timestamp.IsEqual(guyTimestamp, guy.Timestamp), "owner version not incremented");
+
+ s = OpenSession();
+ t = s.BeginTransaction();
+ s.Delete(s.Load<User>(guy.Id));
+ s.Delete(s.Load<Group>(admin.Id));
+ t.Commit();
+ s.Close();
+ }
+
+ [Test]
+ public void CollectionNoVersion()
+ {
+ ISession s = OpenSession();
+ ITransaction t = s.BeginTransaction();
+ var guy = new User {Username = "guy"};
+ s.Persist(guy);
+ var perm = new Permission {Name = "silly", Access = "user", Context = "rw"};
+ s.Persist(perm);
+ t.Commit();
+ s.Close();
+
+ DateTime guyTimestamp = guy.Timestamp;
+
+ s = OpenSession();
+ t = s.BeginTransaction();
+ guy = s.Get<User>(guy.Id);
+ perm = s.Get<Permission>(perm.Id);
+ guy.Permissions.Add(perm);
+ t.Commit();
+ s.Close();
+
+ Assert.That(NHibernateUtil.Timestamp.IsEqual(guyTimestamp, guy.Timestamp), "owner version was incremented");
+
+ s = OpenSession();
+ t = s.BeginTransaction();
+ guy = s.Get<User>(guy.Id);
+ guy.Permissions.Clear();
+ t.Commit();
+ s.Close();
+
+ Assert.That(NHibernateUtil.Timestamp.IsEqual(guyTimestamp, guy.Timestamp), "owner version was incremented");
+
+ s = OpenSession();
+ t = s.BeginTransaction();
+ s.Delete(s.Load<User>(guy.Id));
+ s.Delete(s.Load<Permission>(perm.Id));
+ t.Commit();
+ s.Close();
+ }
+ }
+}
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate.Test/VersionTest/Db/Group.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/VersionTest/Db/Group.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/VersionTest/Db/Group.cs 2009-06-20 15:21:09 UTC (rev 4494)
@@ -0,0 +1,16 @@
+using System;
+using Iesi.Collections.Generic;
+
+namespace NHibernate.Test.VersionTest.Db
+{
+ public class Group
+ {
+ public virtual long Id { get; set; }
+
+ public virtual DateTime Timestamp { get; set; }
+
+ public virtual string Name { get; set; }
+
+ public virtual ISet<User> Users { get; set; }
+ }
+}
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate.Test/VersionTest/Db/Permission.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/VersionTest/Db/Permission.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/VersionTest/Db/Permission.cs 2009-06-20 15:21:09 UTC (rev 4494)
@@ -0,0 +1,17 @@
+using System;
+
+namespace NHibernate.Test.VersionTest.Db
+{
+ public class Permission
+ {
+ public virtual long Id { get; set; }
+
+ public virtual DateTime Timestamp { get; set; }
+
+ public virtual string Name { get; set; }
+
+ public virtual string Context { get; set; }
+
+ public virtual string Access { get; set; }
+ }
+}
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate.Test/VersionTest/Db/User.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/VersionTest/Db/User.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/VersionTest/Db/User.cs 2009-06-20 15:21:09 UTC (rev 4494)
@@ -0,0 +1,18 @@
+using System;
+using Iesi.Collections.Generic;
+
+namespace NHibernate.Test.VersionTest.Db
+{
+ public class User
+ {
+ public virtual long Id { get; set; }
+
+ public virtual DateTime Timestamp { get; set; }
+
+ public virtual string Username { get; set; }
+
+ public virtual ISet<Group> Groups { get; set; }
+
+ public virtual ISet<Permission> Permissions { get; set; }
+ }
+}
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate.Test/VersionTest/Db/User.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/VersionTest/Db/User.hbm.xml (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/VersionTest/Db/User.hbm.xml 2009-06-20 15:21:09 UTC (rev 4494)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ Demonstrates how to control the optimistic locking behavior
+ of a collection (do changes to the collection result in
+ a version increment on the owning instance)
+ -->
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+ namespace="NHibernate.Test.VersionTest.Db"
+ assembly="NHibernate.Test">
+
+ <class name="User" table="db_vers_user">
+ <id name="Id" column="user_id" type="long">
+ <generator class="native"/>
+ </id>
+ <timestamp name="Timestamp" column="ts" source="db"/>
+ <property name="Username" column="user_name" type="string" unique="true"/>
+ <set name="Groups" table="db_vers_user_group" batch-size="9" inverse="true" optimistic-lock="true" lazy="true" cascade="none" >
+ <key column="user_id"/>
+ <many-to-many column="group_id" class="Group" lazy="false" fetch="join" />
+ </set>
+ <set name="Permissions" table="db_vers_user_perm" batch-size="9" inverse="false" optimistic-lock="false" lazy="true" cascade="none">
+ <key column="user_id"/>
+ <many-to-many column="perm_id" class="Permission" lazy="false" fetch="join"/>
+ </set>
+ </class>
+
+ <class name="Group" table="db_vers_group">
+ <id name="Id" column="group_id" type="long">
+ <generator class="native"/>
+ </id>
+ <timestamp name="Timestamp" column="ts" source="db"/>
+ <property name="Name" column="name" type="string" unique="true"/>
+ <set name="Users" table="db_vers_user_group" batch-size="9" inverse="false" lazy="true" cascade="none" >
+ <key column="group_id"/>
+ <many-to-many column="user_id" class="User" lazy="false" fetch="join" />
+ </set>
+ </class>
+
+ <class name="Permission" table="db_vers_permission">
+ <id name="Id" column="perm_id" type="long">
+ <generator class="native"/>
+ </id>
+ <timestamp name="Timestamp" column="ts" source="db"/>
+ <property name="Name" column="name" type="string" unique="true"/>
+ <property name="Context" column="ctx" type="string"/>
+ <property name="Access" column="priv" type="string"/>
+ </class>
+</hibernate-mapping>
\ 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: <fab...@us...> - 2009-06-20 03:21:51
|
Revision: 4493
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4493&view=rev
Author: fabiomaulo
Date: 2009-06-20 03:21:45 +0000 (Sat, 20 Jun 2009)
Log Message:
-----------
Minor
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate.Test/HQL/Ast/SqlTranslationFixture.cs
Modified: trunk/nhibernate/src/NHibernate.Test/HQL/Ast/SqlTranslationFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/HQL/Ast/SqlTranslationFixture.cs 2009-06-20 00:34:26 UTC (rev 4492)
+++ trunk/nhibernate/src/NHibernate.Test/HQL/Ast/SqlTranslationFixture.cs 2009-06-20 03:21:45 UTC (rev 4493)
@@ -19,7 +19,6 @@
const string query = "from SimpleClass s where (case when s.IntValue > 0 then (cast(s.IntValue as long) * :pAValue) else 1 end) > 0";
Assert.DoesNotThrow(() => GetSql(query));
- // This query fail because parenthesis on the math operation and does not fail in the old parser
const string queryWithoutParen = "from SimpleClass s where (case when s.IntValue > 0 then cast(s.IntValue as long) * :pAValue else 1 end) > 0";
Assert.DoesNotThrow(() => GetSqlWithClassicParser(queryWithoutParen));
Assert.DoesNotThrow(() => GetSql(queryWithoutParen));
@@ -28,11 +27,11 @@
[Test]
public void Union()
{
- string query = "from SimpleClass s where s.id in ((select s1.id from SimpleClass s1) union (select s2.id from SimpleClass s2))";
+ const string query = "from SimpleClass s where s.id in ((select s1.id from SimpleClass s1) union (select s2.id from SimpleClass s2))";
Assert.DoesNotThrow(() => GetSqlWithClassicParser(query));
- query = "from SimpleClass s where s.id in (select s1.id from SimpleClass s1 union select s2.id from SimpleClass s2)";
- Assert.DoesNotThrow(() => GetSql(query));
+ const string queryForAntlr = "from SimpleClass s where s.id in (select s1.id from SimpleClass s1 union select s2.id from SimpleClass s2)";
+ Assert.DoesNotThrow(() => GetSql(queryForAntlr));
}
}
}
\ 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: <ste...@us...> - 2009-06-20 02:50:22
|
Revision: 4491
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4491&view=rev
Author: steverstrong
Date: 2009-06-20 00:23:15 +0000 (Sat, 20 Jun 2009)
Log Message:
-----------
Fixes for a couple of ANTLR parser bugs, specifically NH-1831 and SqlTranslationFixture tests
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlLexer.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlParser.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlSqlWalker.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/SqlGenerator.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/SqlGenerator.g
trunk/nhibernate/src/NHibernate.Test/HQL/Ast/SqlTranslationFixture.cs
Added Paths:
-----------
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1831/
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1831/Entities.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1831/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1831/Mappings.hbm.xml
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlLexer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlLexer.cs 2009-06-19 15:50:13 UTC (rev 4490)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlLexer.cs 2009-06-20 00:23:15 UTC (rev 4491)
@@ -1,4719 +1,4719 @@
-// $ANTLR 3.1.2 C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g 2009-06-18 19:12:17
-
-// The variable 'variable' is assigned but its value is never used.
-#pragma warning disable 168, 219
-// Unreachable code detected.
-#pragma warning disable 162
-namespace NHibernate.Hql.Ast.ANTLR
-{
-
-using System;
-using Antlr.Runtime;
-using IList = System.Collections.IList;
-using ArrayList = System.Collections.ArrayList;
-using Stack = Antlr.Runtime.Collections.StackList;
-
-using IDictionary = System.Collections.IDictionary;
-using Hashtable = System.Collections.Hashtable;
-
-public partial class HqlLexer : Lexer {
- public const int LT = 108;
- public const int EXPONENT = 127;
- public const int STAR = 115;
- public const int FLOAT_SUFFIX = 128;
- public const int LITERAL_by = 54;
- public const int CASE = 55;
- public const int NEW = 37;
- public const int FILTER_ENTITY = 74;
- public const int PARAM = 120;
- public const int COUNT = 12;
- public const int NOT = 38;
- public const int EOF = -1;
- public const int UNARY_PLUS = 89;
- public const int QUOTED_String = 121;
- public const int ESCqs = 125;
- public const int WEIRD_IDENT = 91;
- public const int OPEN_BRACKET = 117;
- public const int FULL = 23;
- public const int ORDER_ELEMENT = 83;
- public const int IS_NULL = 78;
- public const int ESCAPE = 18;
- public const int INSERT = 29;
- public const int BOTH = 62;
- public const int VERSIONED = 52;
- public const int EQ = 99;
- public const int SELECT = 45;
- public const int INTO = 30;
- public const int NE = 106;
- public const int GE = 111;
- public const int CONCAT = 112;
- public const int ID_LETTER = 124;
- public const int NULL = 39;
- public const int ELSE = 57;
- public const int SELECT_FROM = 87;
- public const int TRAILING = 68;
- public const int ON = 60;
- public const int NUM_LONG = 96;
- public const int NUM_DOUBLE = 94;
- public const int UNARY_MINUS = 88;
- public const int DELETE = 13;
- public const int INDICES = 27;
- public const int OF = 67;
- public const int METHOD_CALL = 79;
- public const int LEADING = 64;
- public const int EMPTY = 63;
- public const int GROUP = 24;
- public const int WS = 126;
- public const int FETCH = 21;
- public const int VECTOR_EXPR = 90;
- public const int NOT_IN = 81;
- public const int NUM_INT = 93;
- public const int OR = 40;
- public const int ALIAS = 70;
- public const int JAVA_CONSTANT = 97;
- public const int CONSTANT = 92;
- public const int GT = 109;
- public const int QUERY = 84;
- public const int BNOT = 102;
- public const int INDEX_OP = 76;
- public const int NUM_FLOAT = 95;
- public const int FROM = 22;
- public const int END = 56;
- public const int FALSE = 20;
- public const int T__130 = 130;
- public const int DISTINCT = 16;
- public const int T__131 = 131;
- public const int CONSTRUCTOR = 71;
- public const int CLOSE_BRACKET = 118;
- public const int WHERE = 53;
- public const int CLASS = 11;
- public const int MEMBER = 65;
- public const int INNER = 28;
- public const int PROPERTIES = 43;
- public const int ORDER = 41;
- public const int MAX = 35;
- public const int UPDATE = 51;
- public const int SQL_NE = 107;
- public const int AND = 6;
- public const int SUM = 48;
- public const int ASCENDING = 8;
- public const int EXPR_LIST = 73;
- public const int AS = 7;
- public const int IN = 26;
- public const int THEN = 58;
- public const int OBJECT = 66;
- public const int COMMA = 98;
- public const int IS = 31;
- public const int LEFT = 33;
- public const int AVG = 9;
- public const int SOME = 47;
- public const int ALL = 4;
- public const int BOR = 103;
- public const int IDENT = 122;
- public const int CASE2 = 72;
- public const int BXOR = 104;
- public const int PLUS = 113;
- public const int EXISTS = 19;
- public const int DOT = 15;
- public const int WITH = 61;
- public const int LIKE = 34;
- public const int OUTER = 42;
- public const int ID_START_LETTER = 123;
- public const int ROW_STAR = 86;
- public const int NOT_LIKE = 82;
- public const int RANGE = 85;
- public const int NOT_BETWEEN = 80;
- public const int HEX_DIGIT = 129;
- public const int SET = 46;
- public const int RIGHT = 44;
- public const int HAVING = 25;
- public const int MIN = 36;
- public const int IS_NOT_NULL = 77;
- public const int MINUS = 114;
- public const int ELEMENTS = 17;
- public const int BAND = 105;
- public const int TRUE = 49;
- public const int JOIN = 32;
- public const int IN_LIST = 75;
- public const int UNION = 50;
- public const int OPEN = 100;
- public const int COLON = 119;
- public const int ANY = 5;
- public const int CLOSE = 101;
- public const int WHEN = 59;
- public const int DIV = 116;
- public const int DESCENDING = 14;
- public const int AGGREGATE = 69;
- public const int BETWEEN = 10;
- public const int LE = 110;
-
- // delegates
- // delegators
-
- public HqlLexer()
- {
- InitializeCyclicDFAs();
- }
- public HqlLexer(ICharStream input)
- : this(input, null) {
- }
- public HqlLexer(ICharStream input, RecognizerSharedState state)
- : base(input, state) {
- InitializeCyclicDFAs();
-
- }
-
- override public string GrammarFileName
- {
- get { return "C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g";}
- }
-
- // $ANTLR start "ALL"
- public void mALL() // throws RecognitionException [2]
- {
- try
- {
- int _type = ALL;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:9:5: ( 'all' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:9:7: 'all'
- {
- Match("all"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "ALL"
-
- // $ANTLR start "ANY"
- public void mANY() // throws RecognitionException [2]
- {
- try
- {
- int _type = ANY;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:10:5: ( 'any' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:10:7: 'any'
- {
- Match("any"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "ANY"
-
- // $ANTLR start "AND"
- public void mAND() // throws RecognitionException [2]
- {
- try
- {
- int _type = AND;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:11:5: ( 'and' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:11:7: 'and'
- {
- Match("and"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "AND"
-
- // $ANTLR start "AS"
- public void mAS() // throws RecognitionException [2]
- {
- try
- {
- int _type = AS;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:12:4: ( 'as' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:12:6: 'as'
- {
- Match("as"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "AS"
-
- // $ANTLR start "ASCENDING"
- public void mASCENDING() // throws RecognitionException [2]
- {
- try
- {
- int _type = ASCENDING;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:13:11: ( 'asc' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:13:13: 'asc'
- {
- Match("asc"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "ASCENDING"
-
- // $ANTLR start "AVG"
- public void mAVG() // throws RecognitionException [2]
- {
- try
- {
- int _type = AVG;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:14:5: ( 'avg' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:14:7: 'avg'
- {
- Match("avg"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "AVG"
-
- // $ANTLR start "BETWEEN"
- public void mBETWEEN() // throws RecognitionException [2]
- {
- try
- {
- int _type = BETWEEN;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:15:9: ( 'between' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:15:11: 'between'
- {
- Match("between"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "BETWEEN"
-
- // $ANTLR start "CLASS"
- public void mCLASS() // throws RecognitionException [2]
- {
- try
- {
- int _type = CLASS;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:16:7: ( 'class' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:16:9: 'class'
- {
- Match("class"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "CLASS"
-
- // $ANTLR start "COUNT"
- public void mCOUNT() // throws RecognitionException [2]
- {
- try
- {
- int _type = COUNT;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:17:7: ( 'count' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:17:9: 'count'
- {
- Match("count"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "COUNT"
-
- // $ANTLR start "DELETE"
- public void mDELETE() // throws RecognitionException [2]
- {
- try
- {
- int _type = DELETE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:18:8: ( 'delete' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:18:10: 'delete'
- {
- Match("delete"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "DELETE"
-
- // $ANTLR start "DESCENDING"
- public void mDESCENDING() // throws RecognitionException [2]
- {
- try
- {
- int _type = DESCENDING;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:19:12: ( 'desc' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:19:14: 'desc'
- {
- Match("desc"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "DESCENDING"
-
- // $ANTLR start "DISTINCT"
- public void mDISTINCT() // throws RecognitionException [2]
- {
- try
- {
- int _type = DISTINCT;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:20:10: ( 'distinct' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:20:12: 'distinct'
- {
- Match("distinct"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "DISTINCT"
-
- // $ANTLR start "ELEMENTS"
- public void mELEMENTS() // throws RecognitionException [2]
- {
- try
- {
- int _type = ELEMENTS;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:21:10: ( 'elements' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:21:12: 'elements'
- {
- Match("elements"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "ELEMENTS"
-
- // $ANTLR start "ESCAPE"
- public void mESCAPE() // throws RecognitionException [2]
- {
- try
- {
- int _type = ESCAPE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:22:8: ( 'escape' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:22:10: 'escape'
- {
- Match("escape"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "ESCAPE"
-
- // $ANTLR start "EXISTS"
- public void mEXISTS() // throws RecognitionException [2]
- {
- try
- {
- int _type = EXISTS;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:23:8: ( 'exists' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:23:10: 'exists'
- {
- Match("exists"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "EXISTS"
-
- // $ANTLR start "FALSE"
- public void mFALSE() // throws RecognitionException [2]
- {
- try
- {
- int _type = FALSE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:24:7: ( 'false' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:24:9: 'false'
- {
- Match("false"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "FALSE"
-
- // $ANTLR start "FETCH"
- public void mFETCH() // throws RecognitionException [2]
- {
- try
- {
- int _type = FETCH;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:25:7: ( 'fetch' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:25:9: 'fetch'
- {
- Match("fetch"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "FETCH"
-
- // $ANTLR start "FROM"
- public void mFROM() // throws RecognitionException [2]
- {
- try
- {
- int _type = FROM;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:26:6: ( 'from' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:26:8: 'from'
- {
- Match("from"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "FROM"
-
- // $ANTLR start "FULL"
- public void mFULL() // throws RecognitionException [2]
- {
- try
- {
- int _type = FULL;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:27:6: ( 'full' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:27:8: 'full'
- {
- Match("full"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "FULL"
-
- // $ANTLR start "GROUP"
- public void mGROUP() // throws RecognitionException [2]
- {
- try
- {
- int _type = GROUP;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:28:7: ( 'group' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:28:9: 'group'
- {
- Match("group"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "GROUP"
-
- // $ANTLR start "HAVING"
- public void mHAVING() // throws RecognitionException [2]
- {
- try
- {
- int _type = HAVING;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:29:8: ( 'having' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:29:10: 'having'
- {
- Match("having"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "HAVING"
-
- // $ANTLR start "IN"
- public void mIN() // throws RecognitionException [2]
- {
- try
- {
- int _type = IN;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:30:4: ( 'in' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:30:6: 'in'
- {
- Match("in"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "IN"
-
- // $ANTLR start "INDICES"
- public void mINDICES() // throws RecognitionException [2]
- {
- try
- {
- int _type = INDICES;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:31:9: ( 'indices' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:31:11: 'indices'
- {
- Match("indices"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "INDICES"
-
- // $ANTLR start "INNER"
- public void mINNER() // throws RecognitionException [2]
- {
- try
- {
- int _type = INNER;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:32:7: ( 'inner' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:32:9: 'inner'
- {
- Match("inner"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "INNER"
-
- // $ANTLR start "INSERT"
- public void mINSERT() // throws RecognitionException [2]
- {
- try
- {
- int _type = INSERT;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:33:8: ( 'insert' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:33:10: 'insert'
- {
- Match("insert"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "INSERT"
-
- // $ANTLR start "INTO"
- public void mINTO() // throws RecognitionException [2]
- {
- try
- {
- int _type = INTO;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:34:6: ( 'into' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:34:8: 'into'
- {
- Match("into"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "INTO"
-
- // $ANTLR start "IS"
- public void mIS() // throws RecognitionException [2]
- {
- try
- {
- int _type = IS;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:35:4: ( 'is' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:35:6: 'is'
- {
- Match("is"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "IS"
-
- // $ANTLR start "JOIN"
- public void mJOIN() // throws RecognitionException [2]
- {
- try
- {
- int _type = JOIN;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:36:6: ( 'join' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:36:8: 'join'
- {
- Match("join"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "JOIN"
-
- // $ANTLR start "LEFT"
- public void mLEFT() // throws RecognitionException [2]
- {
- try
- {
- int _type = LEFT;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:37:6: ( 'left' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:37:8: 'left'
- {
- Match("left"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "LEFT"
-
- // $ANTLR start "LIKE"
- public void mLIKE() // throws RecognitionException [2]
- {
- try
- {
- int _type = LIKE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:38:6: ( 'like' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:38:8: 'like'
- {
- Match("like"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "LIKE"
-
- // $ANTLR start "MAX"
- public void mMAX() // throws RecognitionException [2]
- {
- try
- {
- int _type = MAX;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:39:5: ( 'max' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:39:7: 'max'
- {
- Match("max"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "MAX"
-
- // $ANTLR start "MIN"
- public void mMIN() // throws RecognitionException [2]
- {
- try
- {
- int _type = MIN;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:40:5: ( 'min' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:40:7: 'min'
- {
- Match("min"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "MIN"
-
- // $ANTLR start "NEW"
- public void mNEW() // throws RecognitionException [2]
- {
- try
- {
- int _type = NEW;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:41:5: ( 'new' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:41:7: 'new'
- {
- Match("new"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "NEW"
-
- // $ANTLR start "NOT"
- public void mNOT() // throws RecognitionException [2]
- {
- try
- {
- int _type = NOT;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:42:5: ( 'not' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:42:7: 'not'
- {
- Match("not"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "NOT"
-
- // $ANTLR start "NULL"
- public void mNULL() // throws RecognitionException [2]
- {
- try
- {
- int _type = NULL;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:43:6: ( 'null' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:43:8: 'null'
- {
- Match("null"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "NULL"
-
- // $ANTLR start "OR"
- public void mOR() // throws RecognitionException [2]
- {
- try
- {
- int _type = OR;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:44:4: ( 'or' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:44:6: 'or'
- {
- Match("or"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "OR"
-
- // $ANTLR start "ORDER"
- public void mORDER() // throws RecognitionException [2]
- {
- try
- {
- int _type = ORDER;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:45:7: ( 'order' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:45:9: 'order'
- {
- Match("order"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "ORDER"
-
- // $ANTLR start "OUTER"
- public void mOUTER() // throws RecognitionException [2]
- {
- try
- {
- int _type = OUTER;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:46:7: ( 'outer' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:46:9: 'outer'
- {
- Match("outer"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "OUTER"
-
- // $ANTLR start "PROPERTIES"
- public void mPROPERTIES() // throws RecognitionException [2]
- {
- try
- {
- int _type = PROPERTIES;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:47:12: ( 'properties' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:47:14: 'properties'
- {
- Match("properties"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "PROPERTIES"
-
- // $ANTLR start "RIGHT"
- public void mRIGHT() // throws RecognitionException [2]
- {
- try
- {
- int _type = RIGHT;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:48:7: ( 'right' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:48:9: 'right'
- {
- Match("right"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "RIGHT"
-
- // $ANTLR start "SELECT"
- public void mSELECT() // throws RecognitionException [2]
- {
- try
- {
- int _type = SELECT;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:49:8: ( 'select' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:49:10: 'select'
- {
- Match("select"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "SELECT"
-
- // $ANTLR start "SET"
- public void mSET() // throws RecognitionException [2]
- {
- try
- {
- int _type = SET;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:50:5: ( 'set' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:50:7: 'set'
- {
- Match("set"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "SET"
-
- // $ANTLR start "SOME"
- public void mSOME() // throws RecognitionException [2]
- {
- try
- {
- int _type = SOME;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:51:6: ( 'some' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:51:8: 'some'
- {
- Match("some"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "SOME"
-
- // $ANTLR start "SUM"
- public void mSUM() // throws RecognitionException [2]
- {
- try
- {
- int _type = SUM;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:52:5: ( 'sum' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:52:7: 'sum'
- {
- Match("sum"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "SUM"
-
- // $ANTLR start "TRUE"
- public void mTRUE() // throws RecognitionException [2]
- {
- try
- {
- int _type = TRUE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:53:6: ( 'true' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:53:8: 'true'
- {
- Match("true"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "TRUE"
-
- // $ANTLR start "UNION"
- public void mUNION() // throws RecognitionException [2]
- {
- try
- {
- int _type = UNION;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:54:7: ( 'union' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:54:9: 'union'
- {
- Match("union"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "UNION"
-
- // $ANTLR start "UPDATE"
- public void mUPDATE() // throws RecognitionException [2]
- {
- try
- {
- int _type = UPDATE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:55:8: ( 'update' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:55:10: 'update'
- {
- Match("update"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "UPDATE"
-
- // $ANTLR start "VERSIONED"
- public void mVERSIONED() // throws RecognitionException [2]
- {
- try
- {
- int _type = VERSIONED;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:56:11: ( 'versioned' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:56:13: 'versioned'
- {
- Match("versioned"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "VERSIONED"
-
- // $ANTLR start "WHERE"
- public void mWHERE() // throws RecognitionException [2]
- {
- try
- {
- int _type = WHERE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:57:7: ( 'where' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:57:9: 'where'
- {
- Match("where"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "WHERE"
-
- // $ANTLR start "LITERAL_by"
- public void mLITERAL_by() // throws RecognitionException [2]
- {
- try
- {
- int _type = LITERAL_by;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:58:12: ( 'by' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:58:14: 'by'
- {
- Match("by"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "LITERAL_by"
-
- // $ANTLR start "CASE"
- public void mCASE() // throws RecognitionException [2]
- {
- try
- {
- int _type = CASE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:59:6: ( 'case' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:59:8: 'case'
- {
- Match("case"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "CASE"
-
- // $ANTLR start "END"
- public void mEND() // throws RecognitionException [2]
- {
- try
- {
- int _type = END;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:60:5: ( 'end' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:60:7: 'end'
- {
- Match("end"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "END"
-
- // $ANTLR start "ELSE"
- public void mELSE() // throws RecognitionException [2]
- {
- try
- {
- int _type = ELSE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:61:6: ( 'else' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:61:8: 'else'
- {
- Match("else"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "ELSE"
-
- // $ANTLR start "THEN"
- public void mTHEN() // throws RecognitionException [2]
- {
- try
- {
- int _type = THEN;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:62:6: ( 'then' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:62:8: 'then'
- {
- Match("then"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "THEN"
-
- // $ANTLR start "WHEN"
- public void mWHEN() // throws RecognitionException [2]
- {
- try
- {
- int _type = WHEN;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:63:6: ( 'when' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:63:8: 'when'
- {
- Match("when"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "WHEN"
-
- // $ANTLR start "ON"
- public void mON() // throws RecognitionException [2]
- {
- try
- {
- int _type = ON;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:64:4: ( 'on' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:64:6: 'on'
- {
- Match("on"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "ON"
-
- // $ANTLR start "WITH"
- public void mWITH() // throws RecognitionException [2]
- {
- try
- {
- int _type = WITH;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:65:6: ( 'with' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:65:8: 'with'
- {
- Match("with"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "WITH"
-
- // $ANTLR start "BOTH"
- public void mBOTH() // throws RecognitionException [2]
- {
- try
- {
- int _type = BOTH;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:66:6: ( 'both' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:66:8: 'both'
- {
- Match("both"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "BOTH"
-
- // $ANTLR start "EMPTY"
- public void mEMPTY() // throws RecognitionException [2]
- {
- try
- {
- int _type = EMPTY;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:67:7: ( 'empty' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:67:9: 'empty'
- {
- Match("empty"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "EMPTY"
-
- // $ANTLR start "LEADING"
- public void mLEADING() // throws RecognitionException [2]
- {
- try
- {
- int _type = LEADING;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:68:9: ( 'leading' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:68:11: 'leading'
- {
- Match("leading"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "LEADING"
-
- // $ANTLR start "MEMBER"
- public void mMEMBER() // throws RecognitionException [2]
- {
- try
- {
- int _type = MEMBER;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:69:8: ( 'member' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:69:10: 'member'
- {
- Match("member"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "MEMBER"
-
- // $ANTLR start "OBJECT"
- public void mOBJECT() // throws RecognitionException [2]
- {
- try
- {
- int _type = OBJECT;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:70:8: ( 'object' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:70:10: 'object'
- {
- Match("object"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "OBJECT"
-
- // $ANTLR start "OF"
- public void mOF() // throws RecognitionException [2]
- {
- try
- {
- int _type = OF;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:71:4: ( 'of' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:71:6: 'of'
- {
- Match("of"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "OF"
-
- // $ANTLR start "TRAILING"
- public void mTRAILING() // throws RecognitionException [2]
- {
- try
- {
- int _type = TRAILING;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:72:10: ( 'trailing' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:72:12: 'trailing'
- {
- Match("trailing"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "TRAILING"
-
- // $ANTLR start "T__130"
- public void mT__130() // throws RecognitionException [2]
- {
- try
- {
- int _type = T__130;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:73:8: ( 'ascending' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:73:10: 'ascending'
- {
- Match("ascending"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "T__130"
-
- // $ANTLR start "T__131"
- public void mT__131() // throws RecognitionException [2]
- {
- try
- {
- int _type = T__131;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:74:8: ( 'descending' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:74:10: 'descending'
- {
- Match("descending"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "T__131"
-
- // $ANTLR start "EQ"
- public void mEQ() // throws RecognitionException [2]
- {
- try
- {
- int _type = EQ;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:758:3: ( '=' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:758:5: '='
- {
- Match('='); if (state.failed) return ;
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "EQ"
-
- // $ANTLR start "LT"
- public void mLT() // throws RecognitionException [2]
- {
- try
- {
- int _type = LT;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:759:3: ( '<' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:759:5: '<'
- {
- Match('<'); if (state.failed) return ;
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "LT"
-
- // $ANTLR start "GT"
- public void mGT() // throws RecognitionException [2]
- {
- try
- {
- int _type = GT;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:760:3: ( '>' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:760:5: '>'
- {
- Match('>'); if (state.failed) return ;
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "GT"
-
- // $ANTLR start "SQL_NE"
- public void mSQL_NE() // throws RecognitionException [2]
- {
- try
- {
- int _type = SQL_NE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:761:7: ( '<>' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:761:9: '<>'
- {
- Match("<>"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "SQL_NE"
-
- // $ANTLR start "NE"
- public void mNE() // throws RecognitionException [2]
- {
- try
- {
- int _type = NE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:762:3: ( '!=' | '^=' )
- int alt1 = 2;
- int LA1_0 = input.LA(1);
-
- if ( (LA1_0 == '!') )
- {
- alt1 = 1;
- }
- else if ( (LA1_0 == '^') )
- {
- alt1 = 2;
- }
- else
- {
- if ( state.backtracking > 0 ) {state.failed = true; return ;}
- NoViableAltException nvae_d1s0 =
- new NoViableAltException("", 1, 0, input);
-
- throw nvae_d1s0;
- }
- switch (alt1)
- {
- case 1 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:762:5: '!='
- {
- Match("!="); if (state.failed) return ;
-
-
- }
- break;
- case 2 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:762:12: '^='
- {
- Match("^="); if (state.failed) return ;
-
-
- }
- break;
-
- }
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "NE"
-
- // $ANTLR start "LE"
- public void mLE() // throws RecognitionException [2]
- {
- try
- {
- int _type = LE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:763:3: ( '<=' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:763:5: '<='
- {
- Match("<="); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "LE"
-
- // $ANTLR start "GE"
- public void mGE() // throws RecognitionException [2]
- {
- try
- {
- int _type = GE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:764:3: ( '>=' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:764:5: '>='
- {
- Match(">="); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "GE"
-
- // $ANTLR start "BOR"
- public void mBOR() // throws RecognitionException [2]
- {
- try
- {
- int _type = BOR;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:766:5: ( '|' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:766:8: '|'
- {
- Match('|'); if (state.failed) return ;
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "BOR"
-
- // $ANTLR start "BXOR"
- public void mBXOR() // throws RecognitionException [2]
- {
- try
- {
- int _type = BXOR;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:767:6: ( '^' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:767:8: '^'
- {
- Match('^'); if (state.failed) return ;
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "BXOR"
-
- // $ANTLR start "BAND"
- public void mBAND() // throws RecognitionException [2]
- {
- try
- {
- int _type = BAND;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:768:6: ( '&' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:768:8: '&'
- {
- Match('&'); if (state.failed) return ;
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "BAND"
-
- // $ANTLR start "BNOT"
- public void mBNOT() // throws RecognitionException [2]
- {
- try
- {
- int _type = BNOT;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:769:6: ( '!' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:769:8: '!'
- {
- Match('!'); if (state.failed) return ;
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "BNOT"
-
- // $ANTLR start "COMMA"
- public void mCOMMA() // throws RecognitionException [2]
- {
- try
- {
- int _type = COMMA;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:771:6: ( ',' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:771:8: ','
- {
- Match(','); if (state.failed) return ;
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "COMMA"
-
- // $ANTLR start "OPEN"
- public void mOPEN() // throws RecognitionException [2]
- {
- try
- {
- int _type = OPEN;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:773:5: ( '(' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:773:7: '('
- {
- Match('('); if (state.failed) return ;
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "OPEN"
-
- // $ANTLR start "CLOSE"
- public void mCLOSE() // throws RecognitionException [2]
- {
- try
- {
- int _type = CLOSE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:774:6: ( ')' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:774:8: ')'
- {
- Match(')'); if (state.failed) return ;
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "CLOSE"
-
- // $ANTLR start "OPEN_BRACKET"
- public void mOPEN_BRACKET() // throws RecognitionException [2]
- {
- try
- {
- int _type = OPEN_BRACKET;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:775:13: ( '[' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:775:15: '['
- {
- Match('['); if (state.failed) return ;
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "OPEN_BRACKET"
-
- // $ANTLR start "CLOSE_BRACKET"
- public void mCLOSE_BRACKET() // throws RecognitionException [2]
- {
- try
- {
- int _type = CLOSE_BRACKET;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:776:14: ( ']' )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:776:16: ']'
- {
- Match(']'); if (state.failed) return ;
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "CLOSE_BRACKET"
-
- // $ANTLR start "CONCAT"
- public void mCONCAT() // throws RecognitionException [2]
- {
- try
- {
- int _t...
[truncated message content] |
|
From: <ste...@us...> - 2009-06-20 02:50:19
|
Revision: 4492
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4492&view=rev
Author: steverstrong
Date: 2009-06-20 00:34:26 +0000 (Sat, 20 Jun 2009)
Log Message:
-----------
Added test for NH-1831
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-06-20 00:23:15 UTC (rev 4491)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-06-20 00:34:26 UTC (rev 4492)
@@ -506,6 +506,8 @@
<Compile Include="NHSpecificTest\NH1813\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1821\Entity.cs" />
<Compile Include="NHSpecificTest\NH1821\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1831\Entities.cs" />
+ <Compile Include="NHSpecificTest\NH1831\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1834\A.cs" />
<Compile Include="NHSpecificTest\NH1834\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1835\Document.cs" />
@@ -1916,6 +1918,7 @@
<EmbeddedResource Include="Bytecode\Lightweight\ProductLine.hbm.xml" />
<EmbeddedResource Include="DriverTest\MultiTypeEntity.hbm.xml" />
<Content Include="DynamicEntity\package.html" />
+ <EmbeddedResource Include="NHSpecificTest\NH1831\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1069\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1837\Mappings.hbm.xml" />
<EmbeddedResource Include="TypesTest\MultiTypeEntity_WithSqlType.hbm.xml" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2009-06-19 15:50:15
|
Revision: 4490
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4490&view=rev
Author: fabiomaulo
Date: 2009-06-19 15:50:13 +0000 (Fri, 19 Jun 2009)
Log Message:
-----------
Improve of MsSql2000Dialect overriding available Dialect configuration.
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Dialect/MsSql2000Dialect.cs
trunk/nhibernate/src/NHibernate.Test/DialectTest/DialectFixture.cs
Modified: trunk/nhibernate/src/NHibernate/Dialect/MsSql2000Dialect.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Dialect/MsSql2000Dialect.cs 2009-06-18 22:32:11 UTC (rev 4489)
+++ trunk/nhibernate/src/NHibernate/Dialect/MsSql2000Dialect.cs 2009-06-19 15:50:13 UTC (rev 4490)
@@ -146,6 +146,26 @@
get { return " null"; }
}
+ public override string CurrentTimestampSQLFunctionName
+ {
+ get { return "CURRENT_TIMESTAMP"; }
+ }
+
+ public override string CurrentTimestampSelectString
+ {
+ get { return "SELECT CURRENT_TIMESTAMP"; }
+ }
+
+ public override bool IsCurrentTimestampSelectStringCallable
+ {
+ get { return false; }
+ }
+
+ public override bool SupportsCurrentTimestampSelection
+ {
+ get { return true; }
+ }
+
/// <summary></summary>
public override bool QualifyIndexName
{
Modified: trunk/nhibernate/src/NHibernate.Test/DialectTest/DialectFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/DialectTest/DialectFixture.cs 2009-06-18 22:32:11 UTC (rev 4489)
+++ trunk/nhibernate/src/NHibernate.Test/DialectTest/DialectFixture.cs 2009-06-19 15:50:13 UTC (rev 4490)
@@ -1,7 +1,13 @@
+using System;
using System.Collections.Generic;
-using NHibernate.Cfg;
+using System.Data;
using NHibernate.Dialect;
+using NHibernate.Driver;
+using NHibernate.Engine;
+using NHibernate.SqlCommand;
+using NHibernate.SqlTypes;
using NUnit.Framework;
+using Environment=NHibernate.Cfg.Environment;
namespace NHibernate.Test.DialectTest
{
@@ -132,5 +138,31 @@
Dialect.Dialect dialect = Dialect.Dialect.GetDialect(props);
Assert.IsTrue(dialect is MsSql2000Dialect);
}
+
+ [Test]
+ public void CurrentTimestampSelection()
+ {
+ var conf = TestConfigurationHelper.GetDefaultConfiguration();
+ Dialect.Dialect dialect = Dialect.Dialect.GetDialect(conf.Properties);
+ if (!dialect.SupportsCurrentTimestampSelection)
+ {
+ Assert.Ignore("This test does not apply to " + dialect.GetType().FullName);
+ }
+ var sessions = (ISessionFactoryImplementor) conf.BuildSessionFactory();
+ sessions.ConnectionProvider.Configure(conf.Properties);
+ IDriver driver = sessions.ConnectionProvider.Driver;
+
+ using (IDbConnection connection = sessions.ConnectionProvider.GetConnection())
+ {
+ IDbCommand statement = driver.GenerateCommand(CommandType.Text, new SqlString(dialect.CurrentTimestampSelectString),
+ new SqlType[0]);
+ statement.Connection = connection;
+ using(IDataReader reader = statement.ExecuteReader())
+ {
+ Assert.That(reader.Read(), "should return one record");
+ Assert.That(reader[0], Is.InstanceOf<DateTime>());
+ }
+ }
+ }
}
}
\ 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: <fab...@us...> - 2009-06-18 22:32:17
|
Revision: 4489
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4489&view=rev
Author: fabiomaulo
Date: 2009-06-18 22:32:11 +0000 (Thu, 18 Jun 2009)
Log Message:
-----------
First step to support UNION
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlLexer.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlParser.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlLexer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlLexer.cs 2009-06-18 18:51:03 UTC (rev 4488)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlLexer.cs 2009-06-18 22:32:11 UTC (rev 4489)
@@ -1,4719 +1,4719 @@
-// $ANTLR 3.1.2 /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g 2009-05-15 10:57:48
-
-// The variable 'variable' is assigned but its value is never used.
-#pragma warning disable 168, 219
-// Unreachable code detected.
-#pragma warning disable 162
-namespace NHibernate.Hql.Ast.ANTLR
-{
-
-using System;
-using Antlr.Runtime;
-using IList = System.Collections.IList;
-using ArrayList = System.Collections.ArrayList;
-using Stack = Antlr.Runtime.Collections.StackList;
-
-using IDictionary = System.Collections.IDictionary;
-using Hashtable = System.Collections.Hashtable;
-
-public partial class HqlLexer : Lexer {
- public const int EXPR_LIST = 73;
- public const int EXISTS = 19;
- public const int COMMA = 98;
- public const int FETCH = 21;
- public const int MINUS = 114;
- public const int AS = 7;
- public const int END = 56;
- public const int INTO = 30;
- public const int FALSE = 20;
- public const int ELEMENTS = 17;
- public const int THEN = 58;
- public const int ALIAS = 70;
- public const int BOR = 103;
- public const int ON = 60;
- public const int DOT = 15;
- public const int ORDER = 41;
- public const int AND = 6;
- public const int CONSTANT = 92;
- public const int UNARY_MINUS = 88;
- public const int METHOD_CALL = 79;
- public const int RIGHT = 44;
- public const int CONCAT = 112;
- public const int PROPERTIES = 43;
- public const int SELECT = 45;
- public const int LE = 110;
- public const int BETWEEN = 10;
- public const int NUM_INT = 93;
- public const int BOTH = 62;
- public const int PLUS = 113;
- public const int VERSIONED = 52;
- public const int MEMBER = 65;
- public const int UNION = 50;
- public const int DISTINCT = 16;
- public const int RANGE = 85;
- public const int FILTER_ENTITY = 74;
- public const int IDENT = 122;
- public const int WHEN = 59;
- public const int DESCENDING = 14;
- public const int WS = 126;
- public const int EQ = 99;
- public const int NEW = 37;
- public const int LT = 108;
- public const int ESCqs = 125;
- public const int OF = 67;
- public const int T__130 = 130;
- public const int UPDATE = 51;
- public const int SELECT_FROM = 87;
- public const int LITERAL_by = 54;
- public const int FLOAT_SUFFIX = 128;
- public const int ANY = 5;
- public const int UNARY_PLUS = 89;
- public const int NUM_FLOAT = 95;
- public const int GE = 111;
- public const int CASE = 55;
- public const int OPEN_BRACKET = 117;
- public const int ELSE = 57;
- public const int OPEN = 100;
- public const int COUNT = 12;
- public const int NULL = 39;
- public const int COLON = 119;
- public const int DIV = 116;
- public const int HAVING = 25;
- public const int ALL = 4;
- public const int SET = 46;
- public const int T__131 = 131;
- public const int INSERT = 29;
- public const int TRUE = 49;
- public const int CASE2 = 72;
- public const int IS_NOT_NULL = 77;
- public const int WHERE = 53;
- public const int AGGREGATE = 69;
- public const int VECTOR_EXPR = 90;
- public const int BNOT = 102;
- public const int LEADING = 64;
- public const int CLOSE_BRACKET = 118;
- public const int NUM_DOUBLE = 94;
- public const int INNER = 28;
- public const int QUERY = 84;
- public const int ORDER_ELEMENT = 83;
- public const int OR = 40;
- public const int FULL = 23;
- public const int INDICES = 27;
- public const int IS_NULL = 78;
- public const int GROUP = 24;
- public const int ESCAPE = 18;
- public const int PARAM = 120;
- public const int ID_LETTER = 124;
- public const int INDEX_OP = 76;
- public const int HEX_DIGIT = 129;
- public const int LEFT = 33;
- public const int TRAILING = 68;
- public const int JOIN = 32;
- public const int NOT_BETWEEN = 80;
- public const int SUM = 48;
- public const int BAND = 105;
- public const int ROW_STAR = 86;
- public const int OUTER = 42;
- public const int NOT_IN = 81;
- public const int FROM = 22;
- public const int DELETE = 13;
- public const int OBJECT = 66;
- public const int MAX = 35;
- public const int NOT_LIKE = 82;
- public const int EMPTY = 63;
- public const int QUOTED_String = 121;
- public const int ASCENDING = 8;
- public const int NUM_LONG = 96;
- public const int IS = 31;
- public const int SQL_NE = 107;
- public const int IN_LIST = 75;
- public const int WEIRD_IDENT = 91;
- public const int NE = 106;
- public const int GT = 109;
- public const int MIN = 36;
- public const int LIKE = 34;
- public const int WITH = 61;
- public const int IN = 26;
- public const int CONSTRUCTOR = 71;
- public const int SOME = 47;
- public const int CLASS = 11;
- public const int EXPONENT = 127;
- public const int ID_START_LETTER = 123;
- public const int EOF = -1;
- public const int CLOSE = 101;
- public const int AVG = 9;
- public const int BXOR = 104;
- public const int STAR = 115;
- public const int NOT = 38;
- public const int JAVA_CONSTANT = 97;
-
- // delegates
- // delegators
-
- public HqlLexer()
- {
- InitializeCyclicDFAs();
- }
- public HqlLexer(ICharStream input)
- : this(input, null) {
- }
- public HqlLexer(ICharStream input, RecognizerSharedState state)
- : base(input, state) {
- InitializeCyclicDFAs();
-
- }
-
- override public string GrammarFileName
- {
- get { return "/Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g";}
- }
-
- // $ANTLR start "ALL"
- public void mALL() // throws RecognitionException [2]
- {
- try
- {
- int _type = ALL;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:9:5: ( 'all' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:9:7: 'all'
- {
- Match("all"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "ALL"
-
- // $ANTLR start "ANY"
- public void mANY() // throws RecognitionException [2]
- {
- try
- {
- int _type = ANY;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:10:5: ( 'any' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:10:7: 'any'
- {
- Match("any"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "ANY"
-
- // $ANTLR start "AND"
- public void mAND() // throws RecognitionException [2]
- {
- try
- {
- int _type = AND;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:11:5: ( 'and' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:11:7: 'and'
- {
- Match("and"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "AND"
-
- // $ANTLR start "AS"
- public void mAS() // throws RecognitionException [2]
- {
- try
- {
- int _type = AS;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:12:4: ( 'as' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:12:6: 'as'
- {
- Match("as"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "AS"
-
- // $ANTLR start "ASCENDING"
- public void mASCENDING() // throws RecognitionException [2]
- {
- try
- {
- int _type = ASCENDING;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:13:11: ( 'asc' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:13:13: 'asc'
- {
- Match("asc"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "ASCENDING"
-
- // $ANTLR start "AVG"
- public void mAVG() // throws RecognitionException [2]
- {
- try
- {
- int _type = AVG;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:14:5: ( 'avg' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:14:7: 'avg'
- {
- Match("avg"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "AVG"
-
- // $ANTLR start "BETWEEN"
- public void mBETWEEN() // throws RecognitionException [2]
- {
- try
- {
- int _type = BETWEEN;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:15:9: ( 'between' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:15:11: 'between'
- {
- Match("between"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "BETWEEN"
-
- // $ANTLR start "CLASS"
- public void mCLASS() // throws RecognitionException [2]
- {
- try
- {
- int _type = CLASS;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:16:7: ( 'class' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:16:9: 'class'
- {
- Match("class"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "CLASS"
-
- // $ANTLR start "COUNT"
- public void mCOUNT() // throws RecognitionException [2]
- {
- try
- {
- int _type = COUNT;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:17:7: ( 'count' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:17:9: 'count'
- {
- Match("count"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "COUNT"
-
- // $ANTLR start "DELETE"
- public void mDELETE() // throws RecognitionException [2]
- {
- try
- {
- int _type = DELETE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:18:8: ( 'delete' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:18:10: 'delete'
- {
- Match("delete"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "DELETE"
-
- // $ANTLR start "DESCENDING"
- public void mDESCENDING() // throws RecognitionException [2]
- {
- try
- {
- int _type = DESCENDING;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:19:12: ( 'desc' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:19:14: 'desc'
- {
- Match("desc"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "DESCENDING"
-
- // $ANTLR start "DISTINCT"
- public void mDISTINCT() // throws RecognitionException [2]
- {
- try
- {
- int _type = DISTINCT;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:20:10: ( 'distinct' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:20:12: 'distinct'
- {
- Match("distinct"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "DISTINCT"
-
- // $ANTLR start "ELEMENTS"
- public void mELEMENTS() // throws RecognitionException [2]
- {
- try
- {
- int _type = ELEMENTS;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:21:10: ( 'elements' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:21:12: 'elements'
- {
- Match("elements"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "ELEMENTS"
-
- // $ANTLR start "ESCAPE"
- public void mESCAPE() // throws RecognitionException [2]
- {
- try
- {
- int _type = ESCAPE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:22:8: ( 'escape' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:22:10: 'escape'
- {
- Match("escape"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "ESCAPE"
-
- // $ANTLR start "EXISTS"
- public void mEXISTS() // throws RecognitionException [2]
- {
- try
- {
- int _type = EXISTS;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:23:8: ( 'exists' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:23:10: 'exists'
- {
- Match("exists"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "EXISTS"
-
- // $ANTLR start "FALSE"
- public void mFALSE() // throws RecognitionException [2]
- {
- try
- {
- int _type = FALSE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:24:7: ( 'false' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:24:9: 'false'
- {
- Match("false"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "FALSE"
-
- // $ANTLR start "FETCH"
- public void mFETCH() // throws RecognitionException [2]
- {
- try
- {
- int _type = FETCH;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:25:7: ( 'fetch' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:25:9: 'fetch'
- {
- Match("fetch"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "FETCH"
-
- // $ANTLR start "FROM"
- public void mFROM() // throws RecognitionException [2]
- {
- try
- {
- int _type = FROM;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:26:6: ( 'from' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:26:8: 'from'
- {
- Match("from"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "FROM"
-
- // $ANTLR start "FULL"
- public void mFULL() // throws RecognitionException [2]
- {
- try
- {
- int _type = FULL;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:27:6: ( 'full' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:27:8: 'full'
- {
- Match("full"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "FULL"
-
- // $ANTLR start "GROUP"
- public void mGROUP() // throws RecognitionException [2]
- {
- try
- {
- int _type = GROUP;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:28:7: ( 'group' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:28:9: 'group'
- {
- Match("group"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "GROUP"
-
- // $ANTLR start "HAVING"
- public void mHAVING() // throws RecognitionException [2]
- {
- try
- {
- int _type = HAVING;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:29:8: ( 'having' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:29:10: 'having'
- {
- Match("having"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "HAVING"
-
- // $ANTLR start "IN"
- public void mIN() // throws RecognitionException [2]
- {
- try
- {
- int _type = IN;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:30:4: ( 'in' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:30:6: 'in'
- {
- Match("in"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "IN"
-
- // $ANTLR start "INDICES"
- public void mINDICES() // throws RecognitionException [2]
- {
- try
- {
- int _type = INDICES;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:31:9: ( 'indices' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:31:11: 'indices'
- {
- Match("indices"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "INDICES"
-
- // $ANTLR start "INNER"
- public void mINNER() // throws RecognitionException [2]
- {
- try
- {
- int _type = INNER;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:32:7: ( 'inner' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:32:9: 'inner'
- {
- Match("inner"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "INNER"
-
- // $ANTLR start "INSERT"
- public void mINSERT() // throws RecognitionException [2]
- {
- try
- {
- int _type = INSERT;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:33:8: ( 'insert' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:33:10: 'insert'
- {
- Match("insert"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "INSERT"
-
- // $ANTLR start "INTO"
- public void mINTO() // throws RecognitionException [2]
- {
- try
- {
- int _type = INTO;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:34:6: ( 'into' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:34:8: 'into'
- {
- Match("into"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "INTO"
-
- // $ANTLR start "IS"
- public void mIS() // throws RecognitionException [2]
- {
- try
- {
- int _type = IS;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:35:4: ( 'is' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:35:6: 'is'
- {
- Match("is"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "IS"
-
- // $ANTLR start "JOIN"
- public void mJOIN() // throws RecognitionException [2]
- {
- try
- {
- int _type = JOIN;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:36:6: ( 'join' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:36:8: 'join'
- {
- Match("join"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "JOIN"
-
- // $ANTLR start "LEFT"
- public void mLEFT() // throws RecognitionException [2]
- {
- try
- {
- int _type = LEFT;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:37:6: ( 'left' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:37:8: 'left'
- {
- Match("left"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "LEFT"
-
- // $ANTLR start "LIKE"
- public void mLIKE() // throws RecognitionException [2]
- {
- try
- {
- int _type = LIKE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:38:6: ( 'like' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:38:8: 'like'
- {
- Match("like"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "LIKE"
-
- // $ANTLR start "MAX"
- public void mMAX() // throws RecognitionException [2]
- {
- try
- {
- int _type = MAX;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:39:5: ( 'max' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:39:7: 'max'
- {
- Match("max"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "MAX"
-
- // $ANTLR start "MIN"
- public void mMIN() // throws RecognitionException [2]
- {
- try
- {
- int _type = MIN;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:40:5: ( 'min' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:40:7: 'min'
- {
- Match("min"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "MIN"
-
- // $ANTLR start "NEW"
- public void mNEW() // throws RecognitionException [2]
- {
- try
- {
- int _type = NEW;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:41:5: ( 'new' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:41:7: 'new'
- {
- Match("new"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "NEW"
-
- // $ANTLR start "NOT"
- public void mNOT() // throws RecognitionException [2]
- {
- try
- {
- int _type = NOT;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:42:5: ( 'not' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:42:7: 'not'
- {
- Match("not"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "NOT"
-
- // $ANTLR start "NULL"
- public void mNULL() // throws RecognitionException [2]
- {
- try
- {
- int _type = NULL;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:43:6: ( 'null' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:43:8: 'null'
- {
- Match("null"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "NULL"
-
- // $ANTLR start "OR"
- public void mOR() // throws RecognitionException [2]
- {
- try
- {
- int _type = OR;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:44:4: ( 'or' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:44:6: 'or'
- {
- Match("or"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "OR"
-
- // $ANTLR start "ORDER"
- public void mORDER() // throws RecognitionException [2]
- {
- try
- {
- int _type = ORDER;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:45:7: ( 'order' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:45:9: 'order'
- {
- Match("order"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "ORDER"
-
- // $ANTLR start "OUTER"
- public void mOUTER() // throws RecognitionException [2]
- {
- try
- {
- int _type = OUTER;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:46:7: ( 'outer' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:46:9: 'outer'
- {
- Match("outer"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "OUTER"
-
- // $ANTLR start "PROPERTIES"
- public void mPROPERTIES() // throws RecognitionException [2]
- {
- try
- {
- int _type = PROPERTIES;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:47:12: ( 'properties' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:47:14: 'properties'
- {
- Match("properties"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "PROPERTIES"
-
- // $ANTLR start "RIGHT"
- public void mRIGHT() // throws RecognitionException [2]
- {
- try
- {
- int _type = RIGHT;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:48:7: ( 'right' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:48:9: 'right'
- {
- Match("right"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "RIGHT"
-
- // $ANTLR start "SELECT"
- public void mSELECT() // throws RecognitionException [2]
- {
- try
- {
- int _type = SELECT;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:49:8: ( 'select' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:49:10: 'select'
- {
- Match("select"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "SELECT"
-
- // $ANTLR start "SET"
- public void mSET() // throws RecognitionException [2]
- {
- try
- {
- int _type = SET;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:50:5: ( 'set' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:50:7: 'set'
- {
- Match("set"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "SET"
-
- // $ANTLR start "SOME"
- public void mSOME() // throws RecognitionException [2]
- {
- try
- {
- int _type = SOME;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:51:6: ( 'some' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:51:8: 'some'
- {
- Match("some"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "SOME"
-
- // $ANTLR start "SUM"
- public void mSUM() // throws RecognitionException [2]
- {
- try
- {
- int _type = SUM;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:52:5: ( 'sum' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:52:7: 'sum'
- {
- Match("sum"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "SUM"
-
- // $ANTLR start "TRUE"
- public void mTRUE() // throws RecognitionException [2]
- {
- try
- {
- int _type = TRUE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:53:6: ( 'true' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:53:8: 'true'
- {
- Match("true"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "TRUE"
-
- // $ANTLR start "UNION"
- public void mUNION() // throws RecognitionException [2]
- {
- try
- {
- int _type = UNION;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:54:7: ( 'union' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:54:9: 'union'
- {
- Match("union"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "UNION"
-
- // $ANTLR start "UPDATE"
- public void mUPDATE() // throws RecognitionException [2]
- {
- try
- {
- int _type = UPDATE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:55:8: ( 'update' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:55:10: 'update'
- {
- Match("update"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "UPDATE"
-
- // $ANTLR start "VERSIONED"
- public void mVERSIONED() // throws RecognitionException [2]
- {
- try
- {
- int _type = VERSIONED;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:56:11: ( 'versioned' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:56:13: 'versioned'
- {
- Match("versioned"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "VERSIONED"
-
- // $ANTLR start "WHERE"
- public void mWHERE() // throws RecognitionException [2]
- {
- try
- {
- int _type = WHERE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:57:7: ( 'where' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:57:9: 'where'
- {
- Match("where"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "WHERE"
-
- // $ANTLR start "LITERAL_by"
- public void mLITERAL_by() // throws RecognitionException [2]
- {
- try
- {
- int _type = LITERAL_by;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:58:12: ( 'by' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:58:14: 'by'
- {
- Match("by"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "LITERAL_by"
-
- // $ANTLR start "CASE"
- public void mCASE() // throws RecognitionException [2]
- {
- try
- {
- int _type = CASE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:59:6: ( 'case' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:59:8: 'case'
- {
- Match("case"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "CASE"
-
- // $ANTLR start "END"
- public void mEND() // throws RecognitionException [2]
- {
- try
- {
- int _type = END;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:60:5: ( 'end' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:60:7: 'end'
- {
- Match("end"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "END"
-
- // $ANTLR start "ELSE"
- public void mELSE() // throws RecognitionException [2]
- {
- try
- {
- int _type = ELSE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:61:6: ( 'else' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:61:8: 'else'
- {
- Match("else"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "ELSE"
-
- // $ANTLR start "THEN"
- public void mTHEN() // throws RecognitionException [2]
- {
- try
- {
- int _type = THEN;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:62:6: ( 'then' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:62:8: 'then'
- {
- Match("then"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "THEN"
-
- // $ANTLR start "WHEN"
- public void mWHEN() // throws RecognitionException [2]
- {
- try
- {
- int _type = WHEN;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:63:6: ( 'when' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:63:8: 'when'
- {
- Match("when"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "WHEN"
-
- // $ANTLR start "ON"
- public void mON() // throws RecognitionException [2]
- {
- try
- {
- int _type = ON;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:64:4: ( 'on' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:64:6: 'on'
- {
- Match("on"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "ON"
-
- // $ANTLR start "WITH"
- public void mWITH() // throws RecognitionException [2]
- {
- try
- {
- int _type = WITH;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:65:6: ( 'with' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:65:8: 'with'
- {
- Match("with"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "WITH"
-
- // $ANTLR start "BOTH"
- public void mBOTH() // throws RecognitionException [2]
- {
- try
- {
- int _type = BOTH;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:66:6: ( 'both' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:66:8: 'both'
- {
- Match("both"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "BOTH"
-
- // $ANTLR start "EMPTY"
- public void mEMPTY() // throws RecognitionException [2]
- {
- try
- {
- int _type = EMPTY;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:67:7: ( 'empty' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:67:9: 'empty'
- {
- Match("empty"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "EMPTY"
-
- // $ANTLR start "LEADING"
- public void mLEADING() // throws RecognitionException [2]
- {
- try
- {
- int _type = LEADING;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:68:9: ( 'leading' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:68:11: 'leading'
- {
- Match("leading"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "LEADING"
-
- // $ANTLR start "MEMBER"
- public void mMEMBER() // throws RecognitionException [2]
- {
- try
- {
- int _type = MEMBER;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:69:8: ( 'member' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:69:10: 'member'
- {
- Match("member"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "MEMBER"
-
- // $ANTLR start "OBJECT"
- public void mOBJECT() // throws RecognitionException [2]
- {
- try
- {
- int _type = OBJECT;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:70:8: ( 'object' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:70:10: 'object'
- {
- Match("object"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "OBJECT"
-
- // $ANTLR start "OF"
- public void mOF() // throws RecognitionException [2]
- {
- try
- {
- int _type = OF;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:71:4: ( 'of' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:71:6: 'of'
- {
- Match("of"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "OF"
-
- // $ANTLR start "TRAILING"
- public void mTRAILING() // throws RecognitionException [2]
- {
- try
- {
- int _type = TRAILING;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:72:10: ( 'trailing' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:72:12: 'trailing'
- {
- Match("trailing"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "TRAILING"
-
- // $ANTLR start "T__130"
- public void mT__130() // throws RecognitionException [2]
- {
- try
- {
- int _type = T__130;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:73:8: ( 'ascending' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:73:10: 'ascending'
- {
- Match("ascending"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "T__130"
-
- // $ANTLR start "T__131"
- public void mT__131() // throws RecognitionException [2]
- {
- try
- {
- int _type = T__131;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:74:8: ( 'descending' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:74:10: 'descending'
- {
- Match("descending"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "T__131"
-
- // $ANTLR start "EQ"
- public void mEQ() // throws RecognitionException [2]
- {
- try
- {
- int _type = EQ;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:757:3: ( '=' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:757:5: '='
- {
- Match('='); if (state.failed) return ;
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "EQ"
-
- // $ANTLR start "LT"
- public void mLT() // throws RecognitionException [2]
- {
- try
- {
- int _type = LT;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:758:3: ( '<' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:758:5: '<'
- {
- Match('<'); if (state.failed) return ;
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "LT"
-
- // $ANTLR start "GT"
- public void mGT() // throws RecognitionException [2]
- {
- try
- {
- int _type = GT;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:759:3: ( '>' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:759:5: '>'
- {
- Match('>'); if (state.failed) return ;
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "GT"
-
- // $ANTLR start "SQL_NE"
- public void mSQL_NE() // throws RecognitionException [2]
- {
- try
- {
- int _type = SQL_NE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:760:7: ( '<>' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:760:9: '<>'
- {
- Match("<>"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "SQL_NE"
-
- // $ANTLR start "NE"
- public void mNE() // throws RecognitionException [2]
- {
- try
- {
- int _type = NE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:761:3: ( '!=' | '^=' )
- int alt1 = 2;
- int LA1_0 = input.LA(1);
-
- if ( (LA1_0 == '!') )
- {
- alt1 = 1;
- }
- else if ( (LA1_0 == '^') )
- {
- alt1 = 2;
- }
- else
- {
- if ( state.backtracking > 0 ) {state.failed = true; return ;}
- NoViableAltException nvae_d1s0 =
- new NoViableAltException("", 1, 0, input);
-
- throw nvae_d1s0;
- }
- switch (alt1)
- {
- case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:761:5: '!='
- {
- Match("!="); if (state.failed) return ;
-
-
- }
- break;
- case 2 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:761:12: '^='
- {
- Match("^="); if (state.failed) return ;
-
-
- }
- break;
-
- }
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "NE"
-
- // $ANTLR start "LE"
- public void mLE() // throws RecognitionException [2]
- {
- try
- {
- int _type = LE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:762:3: ( '<=' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:762:5: '<='
- {
- Match("<="); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "LE"
-
- // $ANTLR start "GE"
- public void mGE() // throws RecognitionException [2]
- {
- try
- {
- int _type = GE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:763:3: ( '>=' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:763:5: '>='
- {
- Match(">="); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "GE"
-
- // $ANTLR start "BOR"
- public void mBOR() // throws RecognitionException [2]
- {
- try
- {
- int _type = BOR;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:765:5: ( '|' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:765:8: '|'
- {
- Match('|'); if (state.failed) return ;
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "BOR"
-
- // $ANTLR start "BXOR"
- public void mBXOR() // throws RecognitionException [2]
- {
- try
- {
- int _type = BXOR;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:766:6: ( '^' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:766:8: '^'
- {
- Match('^'); if (state.failed) return ;
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "BXOR"
-
- // $ANTLR start "BAND"
- public void mBAND() // throws RecognitionException [2]
- {
- try
- {
- int _type = BAND;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:767:6: ( '&' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:767:8: '&'
- {
- Match('&'); if (state.failed) return ;
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "BAND"
-
- // $ANTLR start "BNOT"
- public void mBNOT() // throws RecognitionException [2]
- {
- try
- {
- int _type = BNOT;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:768:6: ( '!' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:768:8: '!'
- {
- Match('!'); if (state.failed) return ;
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "BNOT"
-
- // $ANTLR start "COMMA"
- public void mCOMMA() // throws RecognitionException [2]
- {
- try
- {
- int _type = COMMA;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:770:6: ( ',' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:770:8: ','
- {
- Match(','); if (state.failed) return ;
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "COMMA"
-
- // $ANTLR start "OPEN"
- public void mOPEN() // throws RecognitionException [2]
- {
- try
- {
- int _type = OPEN;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:772:5: ( '(' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:772:7: '('
- {
- Match('('); if (state.failed) return ;
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "OPEN"
-
- // $ANTLR start "CLOSE"
- public void mCLOSE() // throws RecognitionException [2]
- {
-...
[truncated message content] |
|
From: <fab...@us...> - 2009-06-18 18:51:05
|
Revision: 4488
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4488&view=rev
Author: fabiomaulo
Date: 2009-06-18 18:51:03 +0000 (Thu, 18 Jun 2009)
Log Message:
-----------
Additional tests to fix for ANTR parser
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate.Test/HQL/Ast/BaseFixture.cs
trunk/nhibernate/src/NHibernate.Test/HQL/Ast/SqlTranslationFixture.cs
Modified: trunk/nhibernate/src/NHibernate.Test/HQL/Ast/BaseFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/HQL/Ast/BaseFixture.cs 2009-06-16 14:29:49 UTC (rev 4487)
+++ trunk/nhibernate/src/NHibernate.Test/HQL/Ast/BaseFixture.cs 2009-06-18 18:51:03 UTC (rev 4488)
@@ -43,5 +43,12 @@
qt.Compile(null, false);
return qt.SQLString;
}
+
+ public string GetSqlWithClassicParser(string query)
+ {
+ var qt = new NHibernate.Hql.Classic.QueryTranslator(null, query, emptyfilters, sessions);
+ qt.Compile(new Dictionary<string, string>(), false);
+ return qt.SQLString;
+ }
}
}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Test/HQL/Ast/SqlTranslationFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/HQL/Ast/SqlTranslationFixture.cs 2009-06-16 14:29:49 UTC (rev 4487)
+++ trunk/nhibernate/src/NHibernate.Test/HQL/Ast/SqlTranslationFixture.cs 2009-06-18 18:51:03 UTC (rev 4488)
@@ -12,5 +12,25 @@
Assert.That(GetSql(query), Text.StartsWith("select 123.5"));
}
+
+ [Test, Ignore("Not fixed yet.")]
+ public void CaseClauseWithMath()
+ {
+ const string query = "from SimpleClass s where (case when s.IntValue > 0 then (cast(s.IntValue as long) * :pAValue) else 1 end) > 0";
+ Assert.DoesNotThrow(() => GetSql(query));
+
+ // This query fail because parenthesis on the math operation and does not fail in the old parser
+ const string queryWithoutParen = "from SimpleClass s where (case when s.IntValue > 0 then cast(s.IntValue as long) * :pAValue else 1 end) > 0";
+ Assert.DoesNotThrow(() => GetSqlWithClassicParser(queryWithoutParen));
+ Assert.DoesNotThrow(() => GetSql(queryWithoutParen));
+ }
+
+ [Test, Ignore("Not fixed yet.")]
+ public void Union()
+ {
+ const string query = "from SimpleClass s where s.id in ((select s1.id from SimpleClass s1) union (select s2.id from SimpleClass s2))";
+ Assert.DoesNotThrow(() => GetSqlWithClassicParser(query));
+ Assert.DoesNotThrow(() => GetSql(query));
+ }
}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1279 messages has been excluded from this view by a project administrator.
![http://obwqq39.tohmemig.cn/spacer.gif"></a><br](http://obwqq39.tohmemig.cn/spacer.gif"></a><br){kind=link}