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: <fab...@us...> - 2009-07-05 04:15:42
|
Revision: 4578
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4578&view=rev
Author: fabiomaulo
Date: 2009-07-05 04:15:41 +0000 (Sun, 05 Jul 2009)
Log Message:
-----------
Removed ignore because fixed in r4576
Modified Paths:
--------------
branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH645/HQLFunctionFixture.cs
Modified: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH645/HQLFunctionFixture.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH645/HQLFunctionFixture.cs 2009-07-05 00:27:01 UTC (rev 4577)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH645/HQLFunctionFixture.cs 2009-07-05 04:15:41 UTC (rev 4578)
@@ -21,7 +21,7 @@
}
}
- [TestFixture, Ignore("Not fixed yet in the AST-HQL parser")]
+ [TestFixture]
public class HqlFunctionWithAstHqlParser : HQLFunctionFixtureBase
{
protected override void Configure(Configuration configuration)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ste...@us...> - 2009-07-05 01:22:26
|
Revision: 4577
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4577&view=rev
Author: steverstrong
Date: 2009-07-05 00:27:01 +0000 (Sun, 05 Jul 2009)
Log Message:
-----------
Added test case for NH1849 to project
Modified Paths:
--------------
branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Modified: branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-05 00:15:04 UTC (rev 4576)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-05 00:27:01 UTC (rev 4577)
@@ -521,6 +521,8 @@
<Compile Include="NHSpecificTest\NH1837\Customer.cs" />
<Compile Include="NHSpecificTest\NH1837\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1837\Order.cs" />
+ <Compile Include="NHSpecificTest\NH1849\Customer.cs" />
+ <Compile Include="NHSpecificTest\NH1849\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1850\Customer.cs" />
<Compile Include="NHSpecificTest\NH1850\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1857\Department.cs" />
@@ -1940,6 +1942,7 @@
<EmbeddedResource Include="Bytecode\Lightweight\ProductLine.hbm.xml" />
<EmbeddedResource Include="DriverTest\MultiTypeEntity.hbm.xml" />
<Content Include="DynamicEntity\package.html" />
+ <EmbeddedResource Include="NHSpecificTest\NH1849\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1857\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1859\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1864\Mappings.hbm.xml" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ste...@us...> - 2009-07-05 01:22:15
|
Revision: 4576
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4576&view=rev
Author: steverstrong
Date: 2009-07-05 00:15:04 +0000 (Sun, 05 Jul 2009)
Log Message:
-----------
Fix for NH1849 plus some improvement to AST error reporting
Modified Paths:
--------------
branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlLexer.cs
branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlParser.cs
branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlSqlWalker.cs
branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/SqlGenerator.cs
branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g
branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlToken.cs
branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs
branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/SqlGenerator.g
Added Paths:
-----------
branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/
branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/Customer.cs
branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/Fixture.cs
branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/Mappings.hbm.xml
Modified: branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlLexer.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlLexer.cs 2009-07-04 23:39:49 UTC (rev 4575)
+++ branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlLexer.cs 2009-07-05 00:15:04 UTC (rev 4576)
@@ -1,4 +1,4 @@
-// $ANTLR 3.1.2 /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g 2009-06-20 02:19:06
+// $ANTLR 3.1.2 /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g 2009-07-05 01:43:43
// The variable 'variable' is assigned but its value is never used.
#pragma warning disable 168, 219
@@ -165,7 +165,7 @@
override public string GrammarFileName
{
- get { return "/Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g";}
+ get { return "/Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g";}
}
// $ANTLR start "ALL"
@@ -175,8 +175,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:9:5: ( 'all' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:9:7: 'all'
{
Match("all"); if (state.failed) return ;
@@ -199,8 +199,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:10:5: ( 'any' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:10:7: 'any'
{
Match("any"); if (state.failed) return ;
@@ -223,8 +223,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:11:5: ( 'and' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:11:7: 'and'
{
Match("and"); if (state.failed) return ;
@@ -247,8 +247,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:12:4: ( 'as' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:12:6: 'as'
{
Match("as"); if (state.failed) return ;
@@ -271,8 +271,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:13:11: ( 'asc' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:13:13: 'asc'
{
Match("asc"); if (state.failed) return ;
@@ -295,8 +295,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:14:5: ( 'avg' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:14:7: 'avg'
{
Match("avg"); if (state.failed) return ;
@@ -319,8 +319,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:15:9: ( 'between' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:15:11: 'between'
{
Match("between"); if (state.failed) return ;
@@ -343,8 +343,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:16:7: ( 'class' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:16:9: 'class'
{
Match("class"); if (state.failed) return ;
@@ -367,8 +367,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:17:7: ( 'count' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:17:9: 'count'
{
Match("count"); if (state.failed) return ;
@@ -391,8 +391,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:18:8: ( 'delete' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:18:10: 'delete'
{
Match("delete"); if (state.failed) return ;
@@ -415,8 +415,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:19:12: ( 'desc' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:19:14: 'desc'
{
Match("desc"); if (state.failed) return ;
@@ -439,8 +439,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:20:10: ( 'distinct' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:20:12: 'distinct'
{
Match("distinct"); if (state.failed) return ;
@@ -463,8 +463,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:21:10: ( 'elements' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:21:12: 'elements'
{
Match("elements"); if (state.failed) return ;
@@ -487,8 +487,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:22:8: ( 'escape' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:22:10: 'escape'
{
Match("escape"); if (state.failed) return ;
@@ -511,8 +511,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:23:8: ( 'exists' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:23:10: 'exists'
{
Match("exists"); if (state.failed) return ;
@@ -535,8 +535,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:24:7: ( 'false' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:24:9: 'false'
{
Match("false"); if (state.failed) return ;
@@ -559,8 +559,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:25:7: ( 'fetch' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:25:9: 'fetch'
{
Match("fetch"); if (state.failed) return ;
@@ -583,8 +583,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:26:6: ( 'from' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:26:8: 'from'
{
Match("from"); if (state.failed) return ;
@@ -607,8 +607,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:27:6: ( 'full' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:27:8: 'full'
{
Match("full"); if (state.failed) return ;
@@ -631,8 +631,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:28:7: ( 'group' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:28:9: 'group'
{
Match("group"); if (state.failed) return ;
@@ -655,8 +655,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:29:8: ( 'having' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:29:10: 'having'
{
Match("having"); if (state.failed) return ;
@@ -679,8 +679,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:30:4: ( 'in' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:30:6: 'in'
{
Match("in"); if (state.failed) return ;
@@ -703,8 +703,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:31:9: ( 'indices' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:31:11: 'indices'
{
Match("indices"); if (state.failed) return ;
@@ -727,8 +727,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:32:7: ( 'inner' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:32:9: 'inner'
{
Match("inner"); if (state.failed) return ;
@@ -751,8 +751,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:33:8: ( 'insert' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:33:10: 'insert'
{
Match("insert"); if (state.failed) return ;
@@ -775,8 +775,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:34:6: ( 'into' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:34:8: 'into'
{
Match("into"); if (state.failed) return ;
@@ -799,8 +799,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:35:4: ( 'is' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:35:6: 'is'
{
Match("is"); if (state.failed) return ;
@@ -823,8 +823,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:36:6: ( 'join' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:36:8: 'join'
{
Match("join"); if (state.failed) return ;
@@ -847,8 +847,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:37:6: ( 'left' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:37:8: 'left'
{
Match("left"); if (state.failed) return ;
@@ -871,8 +871,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:38:6: ( 'like' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:38:8: 'like'
{
Match("like"); if (state.failed) return ;
@@ -895,8 +895,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:39:5: ( 'max' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:39:7: 'max'
{
Match("max"); if (state.failed) return ;
@@ -919,8 +919,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:40:5: ( 'min' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:40:7: 'min'
{
Match("min"); if (state.failed) return ;
@@ -943,8 +943,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:41:5: ( 'new' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:41:7: 'new'
{
Match("new"); if (state.failed) return ;
@@ -967,8 +967,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:42:5: ( 'not' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:42:7: 'not'
{
Match("not"); if (state.failed) return ;
@@ -991,8 +991,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:43:6: ( 'null' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:43:8: 'null'
{
Match("null"); if (state.failed) return ;
@@ -1015,8 +1015,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:44:4: ( 'or' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:44:6: 'or'
{
Match("or"); if (state.failed) return ;
@@ -1039,8 +1039,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:45:7: ( 'order' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:45:9: 'order'
{
Match("order"); if (state.failed) return ;
@@ -1063,8 +1063,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:46:7: ( 'outer' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:46:9: 'outer'
{
Match("outer"); if (state.failed) return ;
@@ -1087,8 +1087,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:47:12: ( 'properties' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:47:14: 'properties'
{
Match("properties"); if (state.failed) return ;
@@ -1111,8 +1111,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:48:7: ( 'right' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:48:9: 'right'
{
Match("right"); if (state.failed) return ;
@@ -1135,8 +1135,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:49:8: ( 'select' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:49:10: 'select'
{
Match("select"); if (state.failed) return ;
@@ -1159,8 +1159,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:50:5: ( 'set' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:50:7: 'set'
{
Match("set"); if (state.failed) return ;
@@ -1183,8 +1183,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:51:6: ( 'some' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:51:8: 'some'
{
Match("some"); if (state.failed) return ;
@@ -1207,8 +1207,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:52:5: ( 'sum' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:52:7: 'sum'
{
Match("sum"); if (state.failed) return ;
@@ -1231,8 +1231,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:53:6: ( 'true' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:53:8: 'true'
{
Match("true"); if (state.failed) return ;
@@ -1255,8 +1255,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:54:7: ( 'union' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:54:9: 'union'
{
Match("union"); if (state.failed) return ;
@@ -1279,8 +1279,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:55:8: ( 'update' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:55:10: 'update'
{
Match("update"); if (state.failed) return ;
@@ -1303,8 +1303,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:56:11: ( 'versioned' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:56:13: 'versioned'
{
Match("versioned"); if (state.failed) return ;
@@ -1327,8 +1327,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:57:7: ( 'where' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:57:9: 'where'
{
Match("where"); if (state.failed) return ;
@@ -1351,8 +1351,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:58:12: ( 'by' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:58:14: 'by'
{
Match("by"); if (state.failed) return ;
@@ -1375,8 +1375,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:59:6: ( 'case' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:59:8: 'case'
{
Match("case"); if (state.failed) return ;
@@ -1399,8 +1399,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:60:5: ( 'end' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:60:7: 'end'
{
Match("end"); if (state.failed) return ;
@@ -1423,8 +1423,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:61:6: ( 'else' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:61:8: 'else'
{
Match("else"); if (state.failed) return ;
@@ -1447,8 +1447,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:62:6: ( 'then' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:62:8: 'then'
{
Match("then"); if (state.failed) return ;
@@ -1471,8 +1471,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:63:6: ( 'when' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:63:8: 'when'
{
Match("when"); if (state.failed) return ;
@@ -1495,8 +1495,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:64:4: ( 'on' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:64:6: 'on'
{
Match("on"); if (state.failed) return ;
@@ -1519,8 +1519,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:65:6: ( 'with' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:65:8: 'with'
{
Match("with"); if (state.failed) return ;
@@ -1543,8 +1543,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:66:6: ( 'both' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:66:8: 'both'
{
Match("both"); if (state.failed) return ;
@@ -1567,8 +1567,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:67:7: ( 'empty' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:67:9: 'empty'
{
Match("empty"); if (state.failed) return ;
@@ -1591,8 +1591,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:68:9: ( 'leading' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:68:11: 'leading'
{
Match("leading"); if (state.failed) return ;
@@ -1615,8 +1615,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:69:8: ( 'member' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:69:10: 'member'
{
Match("member"); if (state.failed) return ;
@@ -1639,8 +1639,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:70:8: ( 'object' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:70:10: 'object'
{
Match("object"); if (state.failed) return ;
@@ -1663,8 +1663,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:71:4: ( 'of' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:71:6: 'of'
{
Match("of"); if (state.failed) return ;
@@ -1687,8 +1687,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:72:10: ( 'trailing' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:72:12: 'trailing'
{
Match("trailing"); if (state.failed) return ;
@@ -1711,8 +1711,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:73:8: ( 'ascending' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:73:10: 'ascending'
{
Match("ascending"); if (state.failed) return ;
@@ -1735,8 +1735,8 @@
{
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'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:74:8: ( 'descending' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:74:10: 'descending'
{
Match("descending"); if (state.failed) return ;
@@ -1759,8 +1759,8 @@
{
int _type = EQ;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:670:3: ( '=' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:670:5: '='
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:670:3: ( '=' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:670:5: '='
{
Match('='); if (state.failed) return ;
@@ -1782,8 +1782,8 @@
{
int _type = LT;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:671:3: ( '<' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:671:5: '<'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:671:3: ( '<' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:671:5: '<'
{
Match('<'); if (state.failed) return ;
@@ -1805,8 +1805,8 @@
{
int _type = GT;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:672:3: ( '>' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:672:5: '>'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:672:3: ( '>' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:672:5: '>'
{
Match('>'); if (state.failed) return ;
@@ -1828,8 +1828,8 @@
{
int _type = SQL_NE;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:673:7: ( '<>' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:673:9: '<>'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:673:7: ( '<>' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:673:9: '<>'
{
Match("<>"); if (state.failed) return ;
@@ -1852,7 +1852,7 @@
{
int _type = NE;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:674:3: ( '!=' | '^=' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:674:3: ( '!=' | '^=' )
int alt1 = 2;
int LA1_0 = input.LA(1);
@@ -1875,7 +1875,7 @@
switch (alt1)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:674:5: '!='
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:674:5: '!='
{
Match("!="); if (state.failed) return ;
@@ -1883,7 +1883,7 @@
}
break;
case 2 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:674:12: '^='
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:674:12: '^='
{
Match("^="); if (state.failed) return ;
@@ -1908,8 +1908,8 @@
{
int _type = LE;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:675:3: ( '<=' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:675:5: '<='
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:675:3: ( '<=' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:675:5: '<='
{
Match("<="); if (state.failed) return ;
@@ -1932,8 +1932,8 @@
{
int _type = GE;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:676:3: ( '>=' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:676:5: '>='
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:676:3: ( '>=' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:676:5: '>='
{
Match(">="); if (state.failed) return ;
@@ -1956,8 +1956,8 @@
{
int _type = BOR;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:678:5: ( '|' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:678:8: '|'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:678:5: ( '|' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:678:8: '|'
{
Match('|'); if (state.failed) return ;
@@ -1979,8 +1979,8 @@
{
int _type = BXOR;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:679:6: ( '^' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:679:8: '^'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:679:6: ( '^' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:679:8: '^'
{
Match('^'); if (state.failed) return ;
@@ -2002,8 +2002,8 @@
{
int _type = BAND;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:680:6: ( '&' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:680:8: '&'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:680:6: ( '&' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:680:8: '&'
{
Match('&'); if (state.failed) return ;
@@ -2025,8 +2025,8 @@
{
int _type = BNOT;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:681:6: ( '!' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:681:8: '!'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:681:6: ( '!' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:681:8: '!'
{
Match('!'); if (state.failed) return ;
@@ -2048,8 +2048,8 @@
{
int _type = COMMA;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:683:6: ( ',' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:683:8: ','
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:683:6: ( ',' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:683:8: ','
{
Match(','); if (state.failed) return ;
@@ -2071,8 +2071,8 @@
{
int _type = OPEN;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:685:5: ( '(' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:685:7: '('
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:685:5: ( '(' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:685:7: '('
{
Match('('); if (state.failed) return ;
@@ -2094,8 +2094,8 @@
{
int _type = CLOSE;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:686:6: ( ')' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:686:8: ')'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:686:6: ( ')' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:686:8: ')'
{
Match(')'); if (state.failed) return ;
@@ -2117,8 +2117,8 @@
{
int _type = OPEN_BRACKET;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:687:13: ( '[' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:687:15: '['
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:687:13: ( '[' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:687:15: '['
{
Match('['); if (state.failed) return ;
@@ -2140,8 +2140,8 @@
{
int _type = CLOSE_BRACKET;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:688:14: ( ']' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:688:16: ']'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:688:14: ( ']' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:688:16: ']'
{
Match(']'); if (state.failed) return ;
@@ -2163,8 +2163,8 @@
{
int _type = CONCAT;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:690:7: ( '||' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:690:9: '||'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:690:7: ( '||' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:690:9: '||'
{
Match("||"); if (state.failed) return ;
@@ -2187,8 +2187,8 @@
{
int _type = PLUS;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:691:5: ( '+' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:691:7: '+'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:691:5: ( '+' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:691:7: '+'
{
Match('+'); if (state.failed) return ;
@@ -2210,8 +2210,8 @@
{
int _type = MINUS;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:692:6: ( '-' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:692:8: '-'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:692:6: ( '-' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:692:8: '-'
{
Match('-'); if (state.failed) return ;
@@ -2233,8 +2233,8 @@
{
int _type = STAR;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:693:5: ( '*' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:693:7: '*'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:693:5: ( '*' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:693:7: '*'
{
Match('*'); if (state.failed) return ;
@@ -2256,8 +2256,8 @@
{
int _type = DIV;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:694:4: ( '/' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:694:6: '/'
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:694:4: ( '/' )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:694:6: '/'
{
Match('/'); if (state.failed) return ;
@@ -2279,8 +2279,8 @@
{
int _type = COLON;
int _channel = DEFAULT_TOKEN...
[truncated message content] |
|
From: <ste...@us...> - 2009-07-04 23:39:52
|
Revision: 4575
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4575&view=rev
Author: steverstrong
Date: 2009-07-04 23:39:49 +0000 (Sat, 04 Jul 2009)
Log Message:
-----------
Fix for NH1849, plus some improvement to AST error reporting
Modified Paths:
--------------
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/HqlSqlWalker.g
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlToken.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/SqlGenerator.g
Added Paths:
-----------
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/Fixture.cs
Removed Paths:
-------------
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/Fixture.cs
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlSqlWalker.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlSqlWalker.cs 2009-07-04 23:30:11 UTC (rev 4574)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlSqlWalker.cs 2009-07-04 23:39:49 UTC (rev 4575)
@@ -1,4 +1,4 @@
-// $ANTLR 3.1.2 /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g 2009-06-20 02:19:12
+// $ANTLR 3.1.2 /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g 2009-07-05 00:59:40
// The variable 'variable' is assigned but its value is never used.
#pragma warning disable 168, 219
@@ -350,7 +350,7 @@
}
override public string GrammarFileName {
- get { return "/Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g"; }
+ get { return "/Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g"; }
}
@@ -365,7 +365,7 @@
};
// $ANTLR start "statement"
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:40:1: statement : ( selectStatement | updateStatement | deleteStatement | insertStatement );
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:40:1: statement : ( selectStatement | updateStatement | deleteStatement | insertStatement );
public HqlSqlWalker.statement_return statement() // throws RecognitionException [1]
{
HqlSqlWalker.statement_return retval = new HqlSqlWalker.statement_return();
@@ -388,7 +388,7 @@
try
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:41:2: ( selectStatement | updateStatement | deleteStatement | insertStatement )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:41:2: ( selectStatement | updateStatement | deleteStatement | insertStatement )
int alt1 = 4;
switch ( input.LA(1) )
{
@@ -423,7 +423,7 @@
switch (alt1)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:41:4: selectStatement
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:41:4: selectStatement
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -437,7 +437,7 @@
}
break;
case 2 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:41:22: updateStatement
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:41:22: updateStatement
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -451,7 +451,7 @@
}
break;
case 3 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:41:40: deleteStatement
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:41:40: deleteStatement
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -465,7 +465,7 @@
}
break;
case 4 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:41:58: insertStatement
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:41:58: insertStatement
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -506,7 +506,7 @@
};
// $ANTLR start "selectStatement"
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:44:1: selectStatement : query ;
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:44:1: selectStatement : query ;
public HqlSqlWalker.selectStatement_return selectStatement() // throws RecognitionException [1]
{
HqlSqlWalker.selectStatement_return retval = new HqlSqlWalker.selectStatement_return();
@@ -523,8 +523,8 @@
try
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:45:2: ( query )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:45:4: query
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:45:2: ( query )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:45:4: query
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -563,7 +563,7 @@
};
// $ANTLR start "updateStatement"
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:51:1: updateStatement : ^(u= UPDATE (v= VERSIONED )? f= fromClause s= setClause (w= whereClause )? ) -> ^( $u $f $s ( $w)? ) ;
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:51:1: updateStatement : ^(u= UPDATE (v= VERSIONED )? f= fromClause s= setClause (w= whereClause )? ) -> ^( $u $f $s ( $w)? ) ;
public HqlSqlWalker.updateStatement_return updateStatement() // throws RecognitionException [1]
{
HqlSqlWalker.updateStatement_return retval = new HqlSqlWalker.updateStatement_return();
@@ -592,8 +592,8 @@
RewriteRuleSubtreeStream stream_setClause = new RewriteRuleSubtreeStream(adaptor,"rule setClause");
try
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:58:2: ( ^(u= UPDATE (v= VERSIONED )? f= fromClause s= setClause (w= whereClause )? ) -> ^( $u $f $s ( $w)? ) )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:58:4: ^(u= UPDATE (v= VERSIONED )? f= fromClause s= setClause (w= whereClause )? )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:58:2: ( ^(u= UPDATE (v= VERSIONED )? f= fromClause s= setClause (w= whereClause )? ) -> ^( $u $f $s ( $w)? ) )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:58:4: ^(u= UPDATE (v= VERSIONED )? f= fromClause s= setClause (w= whereClause )? )
{
_last = (IASTNode)input.LT(1);
{
@@ -607,7 +607,7 @@
BeforeStatement( "update", UPDATE );
Match(input, Token.DOWN, null);
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:58:57: (v= VERSIONED )?
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:58:57: (v= VERSIONED )?
int alt2 = 2;
int LA2_0 = input.LA(1);
@@ -618,7 +618,7 @@
switch (alt2)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:58:58: v= VERSIONED
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:58:58: v= VERSIONED
{
_last = (IASTNode)input.LT(1);
v=(IASTNode)Match(input,VERSIONED,FOLLOW_VERSIONED_in_updateStatement222);
@@ -642,7 +642,7 @@
state.followingStackPointer--;
stream_setClause.Add(s.Tree);
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:58:97: (w= whereClause )?
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:58:97: (w= whereClause )?
int alt3 = 2;
int LA3_0 = input.LA(1);
@@ -653,7 +653,7 @@
switch (alt3)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:58:98: w= whereClause
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:58:98: w= whereClause
{
_last = (IASTNode)input.LT(1);
PushFollow(FOLLOW_whereClause_in_updateStatement237);
@@ -674,7 +674,7 @@
// AST REWRITE
- // elements: w, f, s, u
+ // elements: w, s, u, f
// token labels: u
// rule labels: w, f, retval, s
// token list labels:
@@ -690,14 +690,14 @@
root_0 = (IASTNode)adaptor.GetNilNode();
// 59:3: -> ^( $u $f $s ( $w)? )
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:59:6: ^( $u $f $s ( $w)? )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:59:6: ^( $u $f $s ( $w)? )
{
IASTNode root_1 = (IASTNode)adaptor.GetNilNode();
root_1 = (IASTNode)adaptor.BecomeRoot(stream_u.NextNode(), root_1);
adaptor.AddChild(root_1, stream_f.NextTree());
adaptor.AddChild(root_1, stream_s.NextTree());
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:59:17: ( $w)?
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:59:17: ( $w)?
if ( stream_w.HasNext() )
{
adaptor.AddChild(root_1, stream_w.NextTree());
@@ -745,7 +745,7 @@
};
// $ANTLR start "deleteStatement"
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:62:1: deleteStatement : ^( DELETE fromClause ( whereClause )? ) ;
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:62:1: deleteStatement : ^( DELETE fromClause ( whereClause )? ) ;
public HqlSqlWalker.deleteStatement_return deleteStatement() // throws RecognitionException [1]
{
HqlSqlWalker.deleteStatement_return retval = new HqlSqlWalker.deleteStatement_return();
@@ -766,8 +766,8 @@
try
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:68:2: ( ^( DELETE fromClause ( whereClause )? ) )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:68:4: ^( DELETE fromClause ( whereClause )? )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:68:2: ( ^( DELETE fromClause ( whereClause )? ) )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:68:4: ^( DELETE fromClause ( whereClause )? )
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -791,7 +791,7 @@
state.followingStackPointer--;
adaptor.AddChild(root_1, fromClause7.Tree);
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:68:66: ( whereClause )?
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:68:66: ( whereClause )?
int alt4 = 2;
int LA4_0 = input.LA(1);
@@ -802,7 +802,7 @@
switch (alt4)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:68:67: whereClause
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:68:67: whereClause
{
_last = (IASTNode)input.LT(1);
PushFollow(FOLLOW_whereClause_in_deleteStatement287);
@@ -854,7 +854,7 @@
};
// $ANTLR start "insertStatement"
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:71:1: insertStatement : ^( INSERT intoClause query ) ;
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:71:1: insertStatement : ^( INSERT intoClause query ) ;
public HqlSqlWalker.insertStatement_return insertStatement() // throws RecognitionException [1]
{
HqlSqlWalker.insertStatement_return retval = new HqlSqlWalker.insertStatement_return();
@@ -875,8 +875,8 @@
try
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:80:2: ( ^( INSERT intoClause query ) )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:80:4: ^( INSERT intoClause query )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:80:2: ( ^( INSERT intoClause query ) )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:80:4: ^( INSERT intoClause query )
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -944,7 +944,7 @@
};
// $ANTLR start "intoClause"
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:83:1: intoClause : ^( INTO (p= path ) ps= insertablePropertySpec ) ;
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:83:1: intoClause : ^( INTO (p= path ) ps= insertablePropertySpec ) ;
public HqlSqlWalker.intoClause_return intoClause() // throws RecognitionException [1]
{
HqlSqlWalker.intoClause_return retval = new HqlSqlWalker.intoClause_return();
@@ -965,8 +965,8 @@
try
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:87:2: ( ^( INTO (p= path ) ps= insertablePropertySpec ) )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:87:4: ^( INTO (p= path ) ps= insertablePropertySpec )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:87:2: ( ^( INTO (p= path ) ps= insertablePropertySpec ) )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:87:4: ^( INTO (p= path ) ps= insertablePropertySpec )
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -984,8 +984,8 @@
HandleClauseStart( INTO );
Match(input, Token.DOWN, null);
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:87:43: (p= path )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:87:44: p= path
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:87:43: (p= path )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:87:44: p= path
{
_last = (IASTNode)input.LT(1);
PushFollow(FOLLOW_path_in_intoClause354);
@@ -1038,7 +1038,7 @@
};
// $ANTLR start "insertablePropertySpec"
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:90:1: insertablePropertySpec : ^( RANGE ( IDENT )+ ) ;
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:90:1: insertablePropertySpec : ^( RANGE ( IDENT )+ ) ;
public HqlSqlWalker.insertablePropertySpec_return insertablePropertySpec() // throws RecognitionException [1]
{
HqlSqlWalker.insertablePropertySpec_return retval = new HqlSqlWalker.insertablePropertySpec_return();
@@ -1057,8 +1057,8 @@
try
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:91:2: ( ^( RANGE ( IDENT )+ ) )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:91:4: ^( RANGE ( IDENT )+ )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:91:2: ( ^( RANGE ( IDENT )+ ) )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:91:4: ^( RANGE ( IDENT )+ )
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -1075,7 +1075,7 @@
Match(input, Token.DOWN, null);
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:91:13: ( IDENT )+
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:91:13: ( IDENT )+
int cnt5 = 0;
do
{
@@ -1091,7 +1091,7 @@
switch (alt5)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:91:14: IDENT
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:91:14: IDENT
{
_last = (IASTNode)input.LT(1);
IDENT14=(IASTNode)Match(input,IDENT,FOLLOW_IDENT_in_insertablePropertySpec378);
@@ -1148,7 +1148,7 @@
};
// $ANTLR start "setClause"
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:94:1: setClause : ^( SET ( assignment )* ) ;
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:94:1: setClause : ^( SET ( assignment )* ) ;
public HqlSqlWalker.setClause_return setClause() // throws RecognitionException [1]
{
HqlSqlWalker.setClause_return retval = new HqlSqlWalker.setClause_return();
@@ -1167,8 +1167,8 @@
try
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:95:2: ( ^( SET ( assignment )* ) )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:95:4: ^( SET ( assignment )* )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:95:2: ( ^( SET ( assignment )* ) )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:95:4: ^( SET ( assignment )* )
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -1188,7 +1188,7 @@
if ( input.LA(1) == Token.DOWN )
{
Match(input, Token.DOWN, null);
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:95:41: ( assignment )*
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:95:41: ( assignment )*
do
{
int alt6 = 2;
@@ -1203,7 +1203,7 @@
switch (alt6)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:95:42: assignment
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:95:42: assignment
{
_last = (IASTNode)input.LT(1);
PushFollow(FOLLOW_assignment_in_setClause400);
@@ -1257,7 +1257,7 @@
};
// $ANTLR start "assignment"
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:98:1: assignment : ^( EQ (p= propertyRef ) ( newValue ) ) ;
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:98:1: assignment : ^( EQ (p= propertyRef ) ( newValue ) ) ;
public HqlSqlWalker.assignment_return assignment() // throws RecognitionException [1]
{
HqlSqlWalker.assignment_return retval = new HqlSqlWalker.assignment_return();
@@ -1278,8 +1278,8 @@
try
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:104:2: ( ^( EQ (p= propertyRef ) ( newValue ) ) )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:104:4: ^( EQ (p= propertyRef ) ( newValue ) )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:104:2: ( ^( EQ (p= propertyRef ) ( newValue ) ) )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:104:4: ^( EQ (p= propertyRef ) ( newValue ) )
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -1296,8 +1296,8 @@
Match(input, Token.DOWN, null);
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:104:10: (p= propertyRef )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:104:11: p= propertyRef
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:104:10: (p= propertyRef )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:104:11: p= propertyRef
{
_last = (IASTNode)input.LT(1);
PushFollow(FOLLOW_propertyRef_in_assignment432);
@@ -1309,8 +1309,8 @@
}
Resolve(((p != null) ? ((IASTNode)p.Tree) : null));
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:104:48: ( newValue )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:104:49: newValue
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:104:48: ( newValue )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:104:49: newValue
{
_last = (IASTNode)input.LT(1);
PushFollow(FOLLOW_newValue_in_assignment438);
@@ -1357,7 +1357,7 @@
};
// $ANTLR start "newValue"
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:108:1: newValue : ( expr | query );
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:108:1: newValue : ( expr | query );
public HqlSqlWalker.newValue_return newValue() // throws RecognitionException [1]
{
HqlSqlWalker.newValue_return retval = new HqlSqlWalker.newValue_return();
@@ -1376,7 +1376,7 @@
try
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:109:2: ( expr | query )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:109:2: ( expr | query )
int alt7 = 2;
int LA7_0 = input.LA(1);
@@ -1398,7 +1398,7 @@
switch (alt7)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:109:4: expr
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:109:4: expr
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -1412,7 +1412,7 @@
}
break;
case 2 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:109:11: query
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:109:11: query
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -1453,7 +1453,7 @@
};
// $ANTLR start "query"
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:112:1: query : ( unionedQuery | ^( UNION unionedQuery query ) );
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:112:1: query : ( unionedQuery | ^( UNION unionedQuery query ) );
public HqlSqlWalker.query_return query() // throws RecognitionException [1]
{
HqlSqlWalker.query_return retval = new HqlSqlWalker.query_return();
@@ -1476,7 +1476,7 @@
try
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:113:2: ( unionedQuery | ^( UNION unionedQuery query ) )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:113:2: ( unionedQuery | ^( UNION unionedQuery query ) )
int alt8 = 2;
int LA8_0 = input.LA(1);
@@ -1498,7 +1498,7 @@
switch (alt8)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:113:4: unionedQuery
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:113:4: unionedQuery
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -1512,7 +1512,7 @@
}
break;
case 2 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:114:4: ^( UNION unionedQuery query )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:114:4: ^( UNION unionedQuery query )
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -1576,7 +1576,7 @@
};
// $ANTLR start "unionedQuery"
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:119:1: unionedQuery : ^( QUERY ^( SELECT_FROM f= fromClause (s= selectClause )? ) (w= whereClause )? (g= groupClause )? (o= orderClause )? ) -> ^( SELECT ( $s)? $f ( $w)? ( $g)? ( $o)? ) ;
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:119:1: unionedQuery : ^( QUERY ^( SELECT_FROM f= fromClause (s= selectClause )? ) (w= whereClause )? (g= groupClause )? (o= orderClause )? ) -> ^( SELECT ( $s)? $f ( $w)? ( $g)? ( $o)? ) ;
public HqlSqlWalker.unionedQuery_return unionedQuery() // throws RecognitionException [1]
{
HqlSqlWalker.unionedQuery_return retval = new HqlSqlWalker.unionedQuery_return();
@@ -1611,8 +1611,8 @@
RewriteRuleSubtreeStream stream_groupClause = new RewriteRuleSubtreeStream(adaptor,"rule groupClause");
try
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:126:2: ( ^( QUERY ^( SELECT_FROM f= fromClause (s= selectClause )? ) (w= whereClause )? (g= groupClause )? (o= orderClause )? ) -> ^( SELECT ( $s)? $f ( $w)? ( $g)? ( $o)? ) )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:126:4: ^( QUERY ^( SELECT_FROM f= fromClause (s= selectClause )? ) (w= whereClause )? (g= groupClause )? (o= orderClause )? )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:126:2: ( ^( QUERY ^( SELECT_FROM f= fromClause (s= selectClause )? ) (w= whereClause )? (g= groupClause )? (o= orderClause )? ) -> ^( SELECT ( $s)? $f ( $w)? ( $g)? ( $o)? ) )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:126:4: ^( QUERY ^( SELECT_FROM f= fromClause (s= selectClause )? ) (w= whereClause )? (g= groupClause )? (o= orderClause )? )
{
_last = (IASTNode)input.LT(1);
{
@@ -1643,7 +1643,7 @@
state.followingStackPointer--;
stream_fromClause.Add(f.Tree);
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:130:5: (s= selectClause )?
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:130:5: (s= selectClause )?
int alt9 = 2;
int LA9_0 = input.LA(1);
@@ -1654,7 +1654,7 @@
switch (alt9)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:130:6: s= selectClause
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:130:6: s= selectClause
{
_last = (IASTNode)input.LT(1);
PushFollow(FOLLOW_selectClause_in_unionedQuery532);
@@ -1672,7 +1672,7 @@
Match(input, Token.UP, null); adaptor.AddChild(root_1, root_2);_last = _save_last_2;
}
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:132:4: (w= whereClause )?
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:132:4: (w= whereClause )?
int alt10 = 2;
int LA10_0 = input.LA(1);
@@ -1683,7 +1683,7 @@
switch (alt10)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:132:5: w= whereClause
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:132:5: w= whereClause
{
_last = (IASTNode)input.LT(1);
PushFollow(FOLLOW_whereClause_in_unionedQuery547);
@@ -1697,7 +1697,7 @@
}
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:133:4: (g= groupClause )?
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:133:4: (g= groupClause )?
int alt11 = 2;
int LA11_0 = input.LA(1);
@@ -1708,7 +1708,7 @@
switch (alt11)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:133:5: g= groupClause
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:133:5: g= groupClause
{
_last = (IASTNode)input.LT(1);
PushFollow(FOLLOW_groupClause_in_unionedQuery557);
@@ -1722,7 +1722,7 @@
}
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:134:4: (o= orderClause )?
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:134:4: (o= orderClause )?
int alt12 = 2;
int LA12_0 = input.LA(1);
@@ -1733,7 +1733,7 @@
switch (alt12)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:134:5: o= orderClause
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:134:5: o= orderClause
{
_last = (IASTNode)input.LT(1);
PushFollow(FOLLOW_orderClause_in_unionedQuery567);
@@ -1754,7 +1754,7 @@
// AST REWRITE
- // elements: w, s, g, f, o
+ // elements: f, w, s, o, g
// token labels:
// rule labels: o, w, f, retval, g, s
// token list labels:
@@ -1771,12 +1771,12 @@
root_0 = (IASTNode)adaptor.GetNilNode();
// 136:2: -> ^( SELECT ( $s)? $f ( $w)? ( $g)? ( $o)? )
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:136:5: ^( SELECT ( $s)? $f ( $w)? ( $g)? ( $o)? )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:136:5: ^( SELECT ( $s)? $f ( $w)? ( $g)? ( $o)? )
{
IASTNode root_1 = (IASTNode)adaptor.GetNilNode();
root_1 = (IASTNode)adaptor.BecomeRoot((IASTNode)adaptor.Create(SELECT, "SELECT"), root_1);
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:136:14: ( $s)?
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:136:14: ( $s)?
if ( stream_s.HasNext() )
{
adaptor.AddChild(root_1, stream_s.NextTree());
@@ -1784,21 +1784,21 @@
}
stream_s.Reset();
adaptor.AddChild(root_1, stream_f.NextTree());
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:136:21: ( $w)?
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:136:21: ( $w)?
if ( stream_w.HasNext() )
{
adaptor.AddChild(root_1, stream_w.NextTree());
}
stream_w.Reset();
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:136:25: ( $g)?
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:136:25: ( $g)?
if ( stream_g.HasNext() )
{
adaptor.AddChild(root_1, stream_g.NextTree());
}
stream_g.Reset();
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:136:29: ( $o)?
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:136:29: ( $o)?
if ( stream_o.HasNext() )
{
adaptor.AddChild(root_1, stream_o.NextTree());
@@ -1846,7 +1846,7 @@
};
// $ANTLR start "orderClause"
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:139:1: orderClause : ^( ORDER orderExprs ) ;
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:139:1: orderClause : ^( ORDER orderExprs ) ;
public HqlSqlWalker.orderClause_return orderClause() // throws RecognitionException [1]
{
HqlSqlWalker.orderClause_return retval = new HqlSqlWalker.orderClause_return();
@@ -1865,8 +1865,8 @@
try
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:140:2: ( ^( ORDER orderExprs ) )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:140:4: ^( ORDER orderExprs )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:140:2: ( ^( ORDER orderExprs ) )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:140:4: ^( ORDER orderExprs )
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -1923,7 +1923,7 @@
};
// $ANTLR start "orderExprs"
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:143:1: orderExprs : expr ( ASCENDING | DESCENDING )? ( orderExprs )? ;
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:143:1: orderExprs : expr ( ASCENDING | DESCENDING )? ( orderExprs )? ;
public HqlSqlWalker.orderExprs_return orderExprs() // throws RecognitionException [1]
{
HqlSqlWalker.orderExprs_return retval = new HqlSqlWalker.orderExprs_return();
@@ -1944,8 +1944,8 @@
try
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:144:2: ( expr ( ASCENDING | DESCENDING )? ( orderExprs )? )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:144:4: expr ( ASCENDING | DESCENDING )? ( orderExprs )?
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:144:2: ( expr ( ASCENDING | DESCENDING )? ( orderExprs )? )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:144:4: expr ( ASCENDING | DESCENDING )? ( orderExprs )?
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -1955,7 +1955,7 @@
state.followingStackPointer--;
adaptor.AddChild(root_0, expr29.Tree);
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:144:9: ( ASCENDING | DESCENDING )?
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:144:9: ( ASCENDING | DESCENDING )?
int alt13 = 2;
int LA13_0 = input.LA(1);
@@ -1966,7 +1966,7 @@
switch (alt13)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:
{
_last = (IASTNode)input.LT(1);
set30 = (IASTNode)input.LT(1);
@@ -1992,7 +1992,7 @@
}
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:144:37: ( orderExprs )?
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:144:37: ( orderExprs )?
int alt14 = 2;
int LA14_0 = input.LA(1);
@@ -2003,7 +2003,7 @@
switch (alt14)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:144:38: orderExprs
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:144:38: orderExprs
{
_last = (IASTNode)input.LT(1);
PushFollow(FOLLOW_orderExprs_in_orderExprs642);
@@ -2046,7 +2046,7 @@
};
// $ANTLR start "groupClause"
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:147:1: groupClause : ^( GROUP ( expr )+ ( ^( HAVING logicalExpr ) )? ) ;
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:147:1: groupClause : ^( GROUP ( expr )+ ( ^( HAVING logicalExpr ) )? ) ;
public HqlSqlWalker.groupClause_return groupClause() // throws RecognitionException [1]
{
HqlSqlWalker.groupClause_return retval = new HqlSqlWalker.groupClause_return();
@@ -2069,8 +2069,8 @@
try
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:148:2: ( ^( GROUP ( expr )+ ( ^( HAVING logicalExpr ) )? ) )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:148:4: ^( GROUP ( expr )+ ( ^( HAVING logicalExpr ) )? )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:148:2: ( ^( GROUP ( expr )+ ( ^( HAVING logicalExpr ) )? ) )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:148:4: ^( GROUP ( expr )+ ( ^( HAVING logicalExpr ) )? )
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -2088,7 +2088,7 @@
HandleClauseStart( GROUP );
Match(input, Token.DOWN, null);
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:148:44: ( expr )+
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:148:44: ( expr )+
int cnt15 = 0;
do
{
@@ -2104,7 +2104,7 @@
switch (alt15)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:148:45: expr
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:148:45: expr
{
_last = (IASTNode)input.LT(1);
PushFollow(FOLLOW_expr_in_groupClause661);
@@ -2128,7 +2128,7 @@
loop15:
; // Stops C# compiler whinging that label 'loop15' has no statements
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:148:52: ( ^( HAVING logicalExpr ) )?
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:148:52: ( ^( HAVING logicalExpr ) )?
int alt16 = 2;
int LA16_0 = input.LA(1);
@@ -2139,7 +2139,7 @@
switch (alt16)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:148:54: ^( HAVING logicalExpr )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:148:54: ^( HAVING logicalExpr )
{
_last = (IASTNode)input.LT(1);
{
@@ -2203,7 +2203,7 @@
};
// $ANTLR start "selectClause"
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:151:1: selectClause : ^( SELECT (d= DISTINCT )? x= selectExprList ) -> ^( SELECT_CLAUSE[\"{select clause}\"] ( $d)? $x) ;
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:151:1: selectClause : ^( SELECT (d= DISTINCT )? x= selectExprList ) -> ^( SELECT_CLAUSE[\"{select clause}\"] ( $d)? $x) ;
public HqlSqlWalker.selectClause_return selectClause() // throws RecognitionException [1]
{
HqlSqlWalker.selectClause_return retval = new HqlSqlWalker.selectClause_return();
@@ -2226,8 +2226,8 @@
RewriteRuleSubtreeStream stream_selectExprList = new RewriteRuleSubtreeStream(adaptor,"rule selectExprList");
try
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:152:2: ( ^( SELECT (d= DISTINCT )? x= selectExprList ) -> ^( SELECT_CLAUSE[\"{select clause}\"] ( $d)? $x) )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:152:4: ^( SELECT (d= DISTINCT )? x= selectExprList )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:152:2: ( ^( SELECT (d= DISTINCT )? x= selectExprList ) -> ^( SELECT_CLAUSE[\"{select clause}\"] ( $d)? $x) )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:152:4: ^( SELECT (d= DISTINCT )? x= selectExprList )
{
_last = (IASTNode)input.LT(1);
{
@@ -2241,7 +2241,7 @@
HandleClauseStart( SELECT ); BeforeSelectClause();
Match(input, Token.DOWN, null);
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:152:68: (d= DISTINCT )?
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:152:68: (d= DISTINCT )?
int alt17 = 2;
int LA17_0 = input.LA(1);
@@ -2252,7 +2252,7 @@
switch (alt17)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:152:69: d= DISTINCT
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:152:69: d= DISTINCT
{
_last = (IASTNode)input.LT(1);
d=(IASTNode)Match(input,DISTINCT,FOLLOW_DISTINCT_in_selectClause696);
@@ -2291,12 +2291,12 @@
root_0 = (IASTNode)adaptor.GetNilNode();
// 153:2: -> ^( SELECT_CLAUSE[\"{select clause}\"] ( $d)? $x)
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:153:5: ^( SELECT_CLAUSE[\"{select clause}\"] ( $d)? $x)
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:153:5: ^( SELECT_CLAUSE[\"{select clause}\"] ( $d)? $x)
{
IASTNode root_1 = (IASTNode)adaptor.GetNilNode();
root_1 = (IASTNode)adaptor.BecomeRoot((IASTNode)adaptor.Create(SELECT_CLAUSE, "{select clause}"), root_1);
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:153:40: ( $d)?
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:153:40: ( $d)?
if ( stream_d.HasNext() )
{
adaptor.AddChild(root_1, stream_d.NextNode());
@@ -2339,7 +2339,7 @@
};
// $ANTLR start "selectExprList"
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:156:1: selectExprList : ( selectExpr | aliasedSelectExpr )+ ;
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:156:1: selectExprList : ( selectExpr | aliasedSelectExpr )+ ;
public HqlSqlWalker.selectExprList_return selectExprList() // throws RecognitionException [1]
{
HqlSqlWalker.selectExprList_return retval = new HqlSqlWalker.selectExprList_return();
@@ -2362,12 +2362,12 @@
try
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:160:2: ( ( selectExpr | aliasedSelectExpr )+ )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:160:4: ( selectExpr | aliasedSelectExpr )+
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:160:2: ( ( selectExpr | aliasedSelectExpr )+ )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:160:4: ( selectExpr | aliasedSelectExpr )+
{
root_0 = (IASTNode)adaptor.GetNilNode();
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:160:4: ( selectExpr | aliasedSelectExpr )+
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:160:4: ( selectExpr | aliasedSelectExpr )+
int cnt18 = 0;
do
{
@@ -2387,7 +2387,7 @@
switch (alt18)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:160:6: selectExpr
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:160:6: selectExpr
{
_last = (IASTNode)input.LT(1);
PushFollow(FOLLOW_selectExpr_in_selectExprList737);
@@ -2399,7 +2399,7 @@
}
break;
case 2 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:160:19: aliasedSelectExpr
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:160:19: aliasedSelectExpr
{
_last = (IASTNode)input.LT(1);
PushFollow(FOLLOW_aliasedSelectExpr_in_selectExprList741);
@@ -2455,7 +2455,7 @@
};
// $ANTLR start "aliasedSelectExpr"
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:165:1: aliasedSelectExpr : ^( AS se= selectExpr i= identifier ) ;
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:165:1: aliasedSelectExpr : ^( AS se= selectExpr i= identifier ) ;
public HqlSqlWalker.aliasedSelectExpr_return aliasedSelectExpr() // throws RecognitionException [1]
{
HqlSqlWalker.aliasedSelectExpr_return retval = new HqlSqlWalker.aliasedSelectExpr_return();
@@ -2476,8 +2476,8 @@
try
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:170:2: ( ^( AS se= selectExpr i= identifier ) )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:170:4: ^( AS se= selectExpr i= identifier )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:170:2: ( ^( AS se= selectExpr i= identifier ) )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:170:4: ^( AS se= selectExpr i= identifier )
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -2543,7 +2543,7 @@
};
// $ANTLR start "selectExpr"
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:173:1: selectExpr : (p= propertyRef | ^( ALL ar2= aliasRef ) | ^( OBJECT ar3= aliasRef ) | con= constructor | functionCall | count | collectionFunction | literal | arithmeticExpr | query );
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:173:1: selectExpr : (p= propertyRef | ^( ALL ar2= aliasRef ) | ^( OBJECT ar3= aliasRef ) | con= constructor | functionCall | count | collectionFunction | literal | arithmeticExpr | query );
public HqlSqlWalker.selectExpr_return selectExpr() // throws RecognitionException [1]
{
HqlSqlWalker.selectExpr_return retval = new HqlSqlWalker.selectExpr_return();
@@ -2582,7 +2582,7 @@
try
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:174:2: (p= propertyRef | ^( ALL ar2= aliasRef ) | ^( OBJECT ar3= aliasRef ) | con= constructor | functionCall | count | collectionFunction | literal | arithmeticExpr | query )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:174:2: (p= propertyRef | ^( ALL ar2= aliasRef ) | ^( OBJECT ar3= aliasRef ) | con= constructor | functionCall | count | collectionFunction | literal | arithmeticExpr | query )
int alt19 = 10;
switch ( input.LA(1) )
{
@@ -2665,7 +2665,7 @@
switch (alt19)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:174:4: p= propertyRef
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:174:4: p= propertyRef
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -2680,7 +2680,7 @@
}
break;
case 2 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:175:4: ^( ALL ar2= aliasRef )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:175:4: ^( ALL ar2= aliasRef )
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -2712,7 +2712,7 @@
}
break;
case 3 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:176:4: ^( OBJECT ar3= aliasRef )
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:176:4: ^( OBJECT ar3= aliasRef )
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -2744,7 +2744,7 @@
}
break;
case 4 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:177:4: con= constructor
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:177:4: con= constructor
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -2759,7 +2759,7 @@
}
break;
case 5 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:178:4: functionCall
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:178:4: functionCall
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -2773,7 +2773,7 @@
}
break;
case 6 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:179:4: count
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:179:4: count
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -2787,7 +2787,7 @@
}
break;
case 7 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:180:4: collectionFunction
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:180:4: collectionFunction
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -2801,7 +2801,7 @@
}
break;
case 8 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:181:4: literal
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:181:4: literal
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -2815,7 +2815,7 @@
}
break;
case 9 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:182:4: arithmeticExpr
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:182:4: arithmeticExpr
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -2829,7 +2829,7 @@
}
break;
case 10 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:183:4: query
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:183:4: query
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -2870,7 +2870,7 @@
};
// $ANTLR start "count"
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:186:1: count : ^( COUNT ( DISTINCT | ALL )? ( aggregateExpr | ROW_STAR ) ) ;
+ // /Users/Steve/Projects/NHibernate/Branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:186:1: count : ^( COUNT ( DISTINCT | ALL )? ( aggregateExpr | ROW_STAR ) ) ;
public HqlSqlWalker.count_return count() // throws RecognitionException [1]
{
HqlSqlWalker.count_return retval = new HqlSqlWalker.count_return();
@@ -2893,8 +2893,8 @@
try
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql...
[truncated message content] |
|
From: <ric...@us...> - 2009-07-04 23:30:14
|
Revision: 4574
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4574&view=rev
Author: ricbrown
Date: 2009-07-04 23:30:11 +0000 (Sat, 04 Jul 2009)
Log Message:
-----------
Added ordering to IQueryOver.
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs
trunk/nhibernate/src/NHibernate/IQueryOver.cs
trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs
Modified: trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs 2009-07-04 18:58:06 UTC (rev 4573)
+++ trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs 2009-07-04 23:30:11 UTC (rev 4574)
@@ -62,6 +62,26 @@
return Add(expression);
}
+ public QueryOver<T> OrderBy(Expression<Func<T, object>> path, Func<string, Order> orderDelegate)
+ {
+ return AddOrder(path, orderDelegate);
+ }
+
+ public QueryOver<T> OrderBy(Expression<Func<object>> path, Func<string, Order> orderDelegate)
+ {
+ return AddOrder(path, orderDelegate);
+ }
+
+ public QueryOver<T> ThenBy(Expression<Func<T, object>> path, Func<string, Order> orderDelegate)
+ {
+ return AddOrder(path, orderDelegate);
+ }
+
+ public QueryOver<T> ThenBy(Expression<Func<object>> path, Func<string, Order> orderDelegate)
+ {
+ return AddOrder(path, orderDelegate);
+ }
+
public QueryOver<U> JoinQueryOver<U>(Expression<Func<T, U>> path)
{
return new QueryOver<U>(_impl,
@@ -116,7 +136,19 @@
return this;
}
+ private QueryOver<T> AddOrder(Expression<Func<T, object>> path, Func<string, Order> orderDelegate)
+ {
+ _criteria.AddOrder(ExpressionProcessor.ProcessOrder<T>(path, orderDelegate));
+ return this;
+ }
+ private QueryOver<T> AddOrder(Expression<Func<object>> path, Func<string, Order> orderDelegate)
+ {
+ _criteria.AddOrder(ExpressionProcessor.ProcessOrder(path, orderDelegate));
+ return this;
+ }
+
+
IQueryOver<T> IQueryOver<T>.And(Expression<Func<T, bool>> expression)
{ return And(expression); }
@@ -129,6 +161,18 @@
IQueryOver<T> IQueryOver<T>.Where(Expression<Func<bool>> expression)
{ return Where(expression); }
+ IQueryOver<T> IQueryOver<T>.OrderBy(Expression<Func<T, object>> path, Func<string, Order> orderDelegate)
+ { return OrderBy(path, orderDelegate); }
+
+ IQueryOver<T> IQueryOver<T>.OrderBy(Expression<Func<object>> path, Func<string, Order> orderDelegate)
+ { return OrderBy(path, orderDelegate); }
+
+ IQueryOver<T> IQueryOver<T>.ThenBy(Expression<Func<T, object>> path, Func<string, Order> orderDelegate)
+ { return ThenBy(path, orderDelegate); }
+
+ IQueryOver<T> IQueryOver<T>.ThenBy(Expression<Func<object>> path, Func<string, Order> orderDelegate)
+ { return ThenBy(path, orderDelegate); }
+
IQueryOver<U> IQueryOver<T>.JoinQueryOver<U>(Expression<Func<T, U>> path)
{ return JoinQueryOver(path); }
Modified: trunk/nhibernate/src/NHibernate/IQueryOver.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/IQueryOver.cs 2009-07-04 18:58:06 UTC (rev 4573)
+++ trunk/nhibernate/src/NHibernate/IQueryOver.cs 2009-07-04 23:30:11 UTC (rev 4574)
@@ -3,6 +3,8 @@
using System.Collections.Generic;
using System.Linq.Expressions;
+using NHibernate.Criterion;
+
namespace NHibernate
{
@@ -50,6 +52,42 @@
IQueryOver<T> Where(Expression<Func<bool>> expression);
/// <summary>
+ /// Add order expressed as a lambda expression
+ /// </summary>
+ /// <typeparam name="T">Type (same as criteria type)</typeparam>
+ /// <param name="expression">Lambda expression</param>
+ /// <param name="orderDelegate">Order delegate (direction)</param>
+ /// <returns>criteria instance</returns>
+ IQueryOver<T> OrderBy(Expression<Func<T, object>> path, Func<string, Order> orderDelegate);
+
+ /// <summary>
+ /// Add order expressed as a lambda expression
+ /// </summary>
+ /// <typeparam name="T">Type (same as criteria type)</typeparam>
+ /// <param name="expression">Lambda expression</param>
+ /// <param name="orderDelegate">Order delegate (direction)</param>
+ /// <returns>criteria instance</returns>
+ IQueryOver<T> OrderBy(Expression<Func<object>> path, Func<string, Order> orderDelegate);
+
+ /// <summary>
+ /// Add order expressed as a lambda expression
+ /// </summary>
+ /// <typeparam name="T">Type (same as criteria type)</typeparam>
+ /// <param name="expression">Lambda expression</param>
+ /// <param name="orderDelegate">Order delegate (direction)</param>
+ /// <returns>criteria instance</returns>
+ IQueryOver<T> ThenBy(Expression<Func<T, object>> path, Func<string, Order> orderDelegate);
+
+ /// <summary>
+ /// Add order expressed as a lambda expression
+ /// </summary>
+ /// <typeparam name="T">Type (same as criteria type)</typeparam>
+ /// <param name="expression">Lambda expression</param>
+ /// <param name="orderDelegate">Order delegate (direction)</param>
+ /// <returns>criteria instance</returns>
+ IQueryOver<T> ThenBy(Expression<Func<object>> path, Func<string, Order> orderDelegate);
+
+ /// <summary>
/// Creates a new NHibernate.ICriteria<T>, "rooted" at the associated entity
/// </summary>
/// <typeparam name="U">Type of sub-criteria</typeparam>
Modified: trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs 2009-07-04 18:58:06 UTC (rev 4573)
+++ trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs 2009-07-04 23:30:11 UTC (rev 4574)
@@ -177,6 +177,27 @@
AssertCriteriaAreEqual(expected, actual);
}
+ [Test]
+ public void OrderBy()
+ {
+ ICriteria expected =
+ CreateTestCriteria(typeof(Person), "personAlias")
+ .AddOrder(Order.Asc("Name"))
+ .AddOrder(Order.Desc("Age"))
+ .AddOrder(Order.Desc("personAlias.Name"))
+ .AddOrder(Order.Asc("personAlias.Age"));
+
+ Person personAlias = null;
+ IQueryOver<Person> actual =
+ CreateTestQueryOver<Person>(() => personAlias)
+ .OrderBy(p => p.Name, Order.Asc)
+ .ThenBy(p => p.Age, Order.Desc)
+ .ThenBy(() => personAlias.Name, Order.Desc)
+ .ThenBy(() => personAlias.Age, Order.Asc);
+
+ AssertCriteriaAreEqual(expected, actual);
+ }
+
}
}
\ 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-07-04 18:58:09
|
Revision: 4573
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4573&view=rev
Author: fabiomaulo
Date: 2009-07-04 18:58:06 +0000 (Sat, 04 Jul 2009)
Log Message:
-----------
Merge r4572 (fix NH-1857)
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Util/JoinProcessor.cs
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1857/
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1857/Department.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1857/Employee.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1857/FullJoinTest.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1857/Mappings.hbm.xml
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Util/JoinProcessor.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Util/JoinProcessor.cs 2009-07-04 18:53:07 UTC (rev 4572)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Util/JoinProcessor.cs 2009-07-04 18:58:06 UTC (rev 4573)
@@ -54,6 +54,8 @@
return JoinType.InnerJoin;
case HqlSqlWalker.RIGHT_OUTER:
return JoinType.RightOuterJoin;
+ case HqlSqlWalker.FULL:
+ return JoinType.FullJoin;
default:
throw new AssertionFailure("undefined join type " + astJoinType);
}
Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1857/Department.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1857/Department.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1857/Department.cs 2009-07-04 18:58:06 UTC (rev 4573)
@@ -0,0 +1,37 @@
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using Iesi.Collections.Generic;
+
+namespace NHibernate.Test.NHSpecificTest.NH1857
+{
+ public class Department
+ {
+ private Department() {}
+
+ public Department(int id, string name)
+ {
+ Id = id;
+ Name = name;
+ }
+
+ public int Id { get; private set; }
+
+ public string Name { get; set; }
+
+ private ISet<Employee> _employees = new HashedSet<Employee>();
+
+ public ReadOnlyCollection<Employee> Employees
+ {
+ get { return new List<Employee>(_employees).AsReadOnly(); }
+ }
+
+ public void AddEmployee(Employee e)
+ {
+ if (e != null && !_employees.Contains(e))
+ {
+ e.Department = this;
+ _employees.Add(e);
+ }
+ }
+ }
+}
Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1857/Employee.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1857/Employee.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1857/Employee.cs 2009-07-04 18:58:06 UTC (rev 4573)
@@ -0,0 +1,24 @@
+using System;
+
+namespace NHibernate.Test.NHSpecificTest.NH1857
+{
+ public class Employee
+ {
+ private Employee() {}
+
+ public Employee(int id, string name, DateTime d)
+ {
+ Id = id;
+ Name = name;
+ CompanyJoinDate = d;
+ }
+
+ public int Id { get; private set; }
+
+ public string Name { get; set; }
+
+ public DateTime CompanyJoinDate { get; set; }
+
+ public Department Department { get; internal set; }
+ }
+}
Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1857/FullJoinTest.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1857/FullJoinTest.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1857/FullJoinTest.cs 2009-07-04 18:58:06 UTC (rev 4573)
@@ -0,0 +1,58 @@
+using System;
+using System.Collections;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH1857
+{
+ [TestFixture]
+ public class FullJoinTest : BugTestCase
+ {
+ protected override void OnSetUp()
+ {
+ base.OnSetUp();
+ using (ISession session = OpenSession())
+ {
+ var e1 = new Employee(1, "Employee1", new DateTime(1995, 1, 1));
+ var e2 = new Employee(2, "Employee2", new DateTime(2007, 8, 1));
+ var e3 = new Employee(3, "Employee3", new DateTime(2009, 5, 1));
+
+ var d1 = new Department(1, "Department S");
+
+ d1.AddEmployee(e1);
+ d1.AddEmployee(e2);
+
+ session.SaveOrUpdate(d1);
+ session.SaveOrUpdate(e1);
+ session.SaveOrUpdate(e2);
+ session.SaveOrUpdate(e3);
+
+ session.Flush();
+ }
+ }
+
+ protected override void OnTearDown()
+ {
+ base.OnTearDown();
+ using (ISession session = OpenSession())
+ using (ITransaction t = session.BeginTransaction())
+ {
+ session.CreateQuery("delete from Employee").ExecuteUpdate();
+ session.CreateQuery("delete from Department").ExecuteUpdate();
+ t.Commit();
+ }
+ }
+
+ [Test]
+ public void TestFullJoin()
+ {
+ using (ISession s = OpenSession())
+ {
+ IQuery q = s.CreateQuery("from Employee as e full join e.Department");
+
+ IList result = q.List();
+
+ Assert.AreEqual(3, result.Count);
+ }
+ }
+ }
+}
Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1857/Mappings.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1857/Mappings.hbm.xml (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1857/Mappings.hbm.xml 2009-07-04 18:58:06 UTC (rev 4573)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+ assembly="NHibernate.Test"
+ namespace="NHibernate.Test.NHSpecificTest.NH1857"
+ default-lazy="false">
+ <class name="Department">
+ <id name="Id">
+ <generator class="assigned" />
+ </id>
+
+ <property name="Name" />
+
+ <set name="Employees" access="field.camelcase-underscore" inverse="true"
+ cascade="all-delete-orphan" lazy="false">
+ <key column="DepartmentId" />
+ <one-to-many class="Employee"/>
+ </set>
+ </class>
+
+ <class name="Employee">
+ <id name="Id">
+ <generator class="assigned" />
+ </id>
+
+ <property name="Name" />
+
+ <property name="CompanyJoinDate" />
+
+ <many-to-one name="Department" class="Department" />
+ </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-07-04 18:53:07 UTC (rev 4572)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-04 18:58:06 UTC (rev 4573)
@@ -532,6 +532,9 @@
<Compile Include="NHSpecificTest\NH1849\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1850\Customer.cs" />
<Compile Include="NHSpecificTest\NH1850\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1857\Department.cs" />
+ <Compile Include="NHSpecificTest\NH1857\Employee.cs" />
+ <Compile Include="NHSpecificTest\NH1857\FullJoinTest.cs" />
<Compile Include="NHSpecificTest\NH1859\DomainClass.cs" />
<Compile Include="NHSpecificTest\NH1859\SampleTest.cs" />
<Compile Include="NHSpecificTest\NH1864\Fixture.cs" />
@@ -1947,6 +1950,7 @@
<EmbeddedResource Include="DriverTest\MultiTypeEntity.hbm.xml" />
<EmbeddedResource Include="Criteria\Lambda\Mappings.hbm.xml" />
<Content Include="DynamicEntity\package.html" />
+ <EmbeddedResource Include="NHSpecificTest\NH1857\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1859\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1864\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1849\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-07-04 18:53:10
|
Revision: 4572
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4572&view=rev
Author: fabiomaulo
Date: 2009-07-04 18:53:07 +0000 (Sat, 04 Jul 2009)
Log Message:
-----------
Fix NH-1857
Modified Paths:
--------------
branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Util/JoinProcessor.cs
branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1857/
branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1857/Department.cs
branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1857/Employee.cs
branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1857/FullJoinTest.cs
branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1857/Mappings.hbm.xml
Modified: branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Util/JoinProcessor.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Util/JoinProcessor.cs 2009-07-04 18:17:15 UTC (rev 4571)
+++ branches/2.1.x/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Util/JoinProcessor.cs 2009-07-04 18:53:07 UTC (rev 4572)
@@ -54,6 +54,8 @@
return JoinType.InnerJoin;
case HqlSqlWalker.RIGHT_OUTER:
return JoinType.RightOuterJoin;
+ case HqlSqlWalker.FULL:
+ return JoinType.FullJoin;
default:
throw new AssertionFailure("undefined join type " + astJoinType);
}
Added: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1857/Department.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1857/Department.cs (rev 0)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1857/Department.cs 2009-07-04 18:53:07 UTC (rev 4572)
@@ -0,0 +1,37 @@
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using Iesi.Collections.Generic;
+
+namespace NHibernate.Test.NHSpecificTest.NH1857
+{
+ public class Department
+ {
+ private Department() {}
+
+ public Department(int id, string name)
+ {
+ Id = id;
+ Name = name;
+ }
+
+ public int Id { get; private set; }
+
+ public string Name { get; set; }
+
+ private ISet<Employee> _employees = new HashedSet<Employee>();
+
+ public ReadOnlyCollection<Employee> Employees
+ {
+ get { return new List<Employee>(_employees).AsReadOnly(); }
+ }
+
+ public void AddEmployee(Employee e)
+ {
+ if (e != null && !_employees.Contains(e))
+ {
+ e.Department = this;
+ _employees.Add(e);
+ }
+ }
+ }
+}
\ No newline at end of file
Added: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1857/Employee.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1857/Employee.cs (rev 0)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1857/Employee.cs 2009-07-04 18:53:07 UTC (rev 4572)
@@ -0,0 +1,24 @@
+using System;
+
+namespace NHibernate.Test.NHSpecificTest.NH1857
+{
+ public class Employee
+ {
+ private Employee() {}
+
+ public Employee(int id, string name, DateTime d)
+ {
+ Id = id;
+ Name = name;
+ CompanyJoinDate = d;
+ }
+
+ public int Id { get; private set; }
+
+ public string Name { get; set; }
+
+ public DateTime CompanyJoinDate { get; set; }
+
+ public Department Department { get; internal set; }
+ }
+}
\ No newline at end of file
Added: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1857/FullJoinTest.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1857/FullJoinTest.cs (rev 0)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1857/FullJoinTest.cs 2009-07-04 18:53:07 UTC (rev 4572)
@@ -0,0 +1,58 @@
+using System;
+using System.Collections;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH1857
+{
+ [TestFixture]
+ public class FullJoinTest : BugTestCase
+ {
+ protected override void OnSetUp()
+ {
+ base.OnSetUp();
+ using (ISession session = OpenSession())
+ {
+ var e1 = new Employee(1, "Employee1", new DateTime(1995, 1, 1));
+ var e2 = new Employee(2, "Employee2", new DateTime(2007, 8, 1));
+ var e3 = new Employee(3, "Employee3", new DateTime(2009, 5, 1));
+
+ var d1 = new Department(1, "Department S");
+
+ d1.AddEmployee(e1);
+ d1.AddEmployee(e2);
+
+ session.SaveOrUpdate(d1);
+ session.SaveOrUpdate(e1);
+ session.SaveOrUpdate(e2);
+ session.SaveOrUpdate(e3);
+
+ session.Flush();
+ }
+ }
+
+ protected override void OnTearDown()
+ {
+ base.OnTearDown();
+ using (ISession session = OpenSession())
+ using (ITransaction t = session.BeginTransaction())
+ {
+ session.CreateQuery("delete from Employee").ExecuteUpdate();
+ session.CreateQuery("delete from Department").ExecuteUpdate();
+ t.Commit();
+ }
+ }
+
+ [Test]
+ public void TestFullJoin()
+ {
+ using (ISession s = OpenSession())
+ {
+ IQuery q = s.CreateQuery("from Employee as e full join e.Department");
+
+ IList result = q.List();
+
+ Assert.AreEqual(3, result.Count);
+ }
+ }
+ }
+}
\ No newline at end of file
Added: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1857/Mappings.hbm.xml
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1857/Mappings.hbm.xml (rev 0)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1857/Mappings.hbm.xml 2009-07-04 18:53:07 UTC (rev 4572)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+ assembly="NHibernate.Test"
+ namespace="NHibernate.Test.NHSpecificTest.NH1857"
+ default-lazy="false">
+ <class name="Department">
+ <id name="Id">
+ <generator class="assigned" />
+ </id>
+
+ <property name="Name" />
+
+ <set name="Employees" access="field.camelcase-underscore" inverse="true"
+ cascade="all-delete-orphan" lazy="false">
+ <key column="DepartmentId" />
+ <one-to-many class="Employee"/>
+ </set>
+ </class>
+
+ <class name="Employee">
+ <id name="Id">
+ <generator class="assigned" />
+ </id>
+
+ <property name="Name" />
+
+ <property name="CompanyJoinDate" />
+
+ <many-to-one name="Department" class="Department" />
+ </class>
+
+</hibernate-mapping>
Modified: branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-04 18:17:15 UTC (rev 4571)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-04 18:53:07 UTC (rev 4572)
@@ -523,6 +523,9 @@
<Compile Include="NHSpecificTest\NH1837\Order.cs" />
<Compile Include="NHSpecificTest\NH1850\Customer.cs" />
<Compile Include="NHSpecificTest\NH1850\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1857\Department.cs" />
+ <Compile Include="NHSpecificTest\NH1857\Employee.cs" />
+ <Compile Include="NHSpecificTest\NH1857\FullJoinTest.cs" />
<Compile Include="NHSpecificTest\NH1859\DomainClass.cs" />
<Compile Include="NHSpecificTest\NH1859\SampleTest.cs" />
<Compile Include="NHSpecificTest\NH1864\Fixture.cs" />
@@ -1937,6 +1940,7 @@
<EmbeddedResource Include="Bytecode\Lightweight\ProductLine.hbm.xml" />
<EmbeddedResource Include="DriverTest\MultiTypeEntity.hbm.xml" />
<Content Include="DynamicEntity\package.html" />
+ <EmbeddedResource Include="NHSpecificTest\NH1857\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1859\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1864\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1850\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-07-04 18:17:18
|
Revision: 4571
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4571&view=rev
Author: fabiomaulo
Date: 2009-07-04 18:17:15 +0000 (Sat, 04 Jul 2009)
Log Message:
-----------
Minor (reformatted)
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/Customer.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Removed Paths:
-------------
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/CustomDialect.cs
Deleted: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/CustomDialect.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/CustomDialect.cs 2009-07-04 15:45:57 UTC (rev 4570)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/CustomDialect.cs 2009-07-04 18:17:15 UTC (rev 4571)
@@ -1,13 +0,0 @@
-using NHibernate.Dialect;
-using NHibernate.Dialect.Function;
-
-namespace NHibernate.Test.NHSpecificTest.NH1849
-{
- public class CustomDialect : MsSql2005Dialect
- {
- public CustomDialect()
- {
- RegisterFunction("contains", new StandardSQLFunction("contains"));
- }
- }
-}
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/Customer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/Customer.cs 2009-07-04 15:45:57 UTC (rev 4570)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/Customer.cs 2009-07-04 18:17:15 UTC (rev 4571)
@@ -1,8 +1,8 @@
namespace NHibernate.Test.NHSpecificTest.NH1849
{
- public class Customer
- {
- public virtual int Id { get; set; }
- public virtual string Name { get; set; }
- }
-}
+ public class Customer
+ {
+ public virtual int Id { get; set; }
+ public virtual string Name { get; set; }
+ }
+}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/Fixture.cs 2009-07-04 15:45:57 UTC (rev 4570)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/Fixture.cs 2009-07-04 18:17:15 UTC (rev 4571)
@@ -1,41 +1,47 @@
+using NHibernate.Cfg;
using NHibernate.Dialect;
+using NHibernate.Dialect.Function;
using NUnit.Framework;
namespace NHibernate.Test.NHSpecificTest.NH1849
{
- using Criterion;
+ public class CustomDialect : MsSql2005Dialect
+ {
+ public CustomDialect()
+ {
+ RegisterFunction("contains", new StandardSQLFunction("contains", NHibernateUtil.Boolean));
+ }
+ }
[TestFixture]
- public class Fixture:BugTestCase
- {
- protected override bool AppliesTo(NHibernate.Dialect.Dialect dialect)
- {
- return dialect is MsSql2005Dialect;
- }
-
- protected override void Configure(NHibernate.Cfg.Configuration configuration)
- {
- base.Configure(configuration);
+ public class Fixture : BugTestCase
+ {
+ protected override bool AppliesTo(Dialect.Dialect dialect)
+ {
+ return dialect is MsSql2005Dialect;
+ }
- configuration.SetProperty("dialect", "NHibernate.Test.NHSpecificTest.NH1849.CustomDialect, NHibernate.Test");
- }
+ protected override void Configure(Configuration configuration)
+ {
+ base.Configure(configuration);
- /// <summary>
- /// This test may throw an ado exception due to the absence of a full text index,
- /// however the query should compile
- /// </summary>
- [Test,Ignore]
- public void ExecutesCustomSqlFunctionContains()
- {
- sessions.Statistics.Clear();
- using (ISession session = this.OpenSession())
+ configuration.SetProperty("dialect", "NHibernate.Test.NHSpecificTest.NH1849.CustomDialect, NHibernate.Test");
+ }
+
+ /// <summary>
+ /// This test may throw an ado exception due to the absence of a full text index,
+ /// however the query should compile
+ /// </summary>
+ [Test, Ignore]
+ public void ExecutesCustomSqlFunctionContains()
+ {
+ sessions.Statistics.Clear();
+ using (ISession session = OpenSession())
{
- session.CreateQuery("from Customer c where contains(c.Name, :smth)")
- .SetString("smth","aaaa")
- .List();
+ session.CreateQuery("from Customer c where contains(c.Name, :smth)").SetString("smth", "aaaa").List();
- Assert.That(sessions.Statistics.QueryExecutionCount, Is.EqualTo(1));
- }
- }
- }
-}
+ Assert.That(sessions.Statistics.QueryExecutionCount, Is.EqualTo(1));
+ }
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-04 15:45:57 UTC (rev 4570)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-04 18:17:15 UTC (rev 4571)
@@ -528,7 +528,6 @@
<Compile Include="NHSpecificTest\NH1837\Customer.cs" />
<Compile Include="NHSpecificTest\NH1837\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1837\Order.cs" />
- <Compile Include="NHSpecificTest\NH1849\CustomDialect.cs" />
<Compile Include="NHSpecificTest\NH1849\Customer.cs" />
<Compile Include="NHSpecificTest\NH1849\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1850\Customer.cs" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2009-07-04 15:45:58
|
Revision: 4570
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4570&view=rev
Author: fabiomaulo
Date: 2009-07-04 15:45:57 +0000 (Sat, 04 Jul 2009)
Log Message:
-----------
Merge r4569 (fix NH-1859)
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Engine/Query/ParameterParser.cs
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/DomainClass.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/Mappings.hbm.xml
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/SampleTest.cs
Modified: trunk/nhibernate/src/NHibernate/Engine/Query/ParameterParser.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Engine/Query/ParameterParser.cs 2009-07-04 15:42:33 UTC (rev 4569)
+++ trunk/nhibernate/src/NHibernate/Engine/Query/ParameterParser.cs 2009-07-04 15:45:57 UTC (rev 4570)
@@ -56,7 +56,7 @@
// check comments
if (indx + 1 < stringLength && sqlString.Substring(indx,2) == "/*")
{
- var closeCommentIdx = sqlString.IndexOf("*/");
+ var closeCommentIdx = sqlString.IndexOf("*/", indx+2);
recognizer.Other(sqlString.Substring(indx, (closeCommentIdx- indx)+2));
indx = closeCommentIdx + 1;
continue;
Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/DomainClass.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/DomainClass.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/DomainClass.cs 2009-07-04 15:45:57 UTC (rev 4570)
@@ -0,0 +1,7 @@
+namespace NHibernate.Test.NHSpecificTest.NH1859
+{
+ public class DomainClass
+ {
+ public int Id { get; set; }
+ }
+}
Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/Mappings.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/Mappings.hbm.xml (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/Mappings.hbm.xml 2009-07-04 15:45:57 UTC (rev 4570)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="NHibernate.Test"
+ namespace="NHibernate.Test.NHSpecificTest.NH1859"
+ default-lazy="false">
+ <class name="DomainClass">
+ <id name="Id">
+ <generator class="assigned" />
+ </id>
+ </class>
+</hibernate-mapping>
Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/SampleTest.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/SampleTest.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/SampleTest.cs 2009-07-04 15:45:57 UTC (rev 4570)
@@ -0,0 +1,40 @@
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH1859
+{
+ [TestFixture]
+ public class SampleTest : BugTestCase
+ {
+ protected override void OnSetUp()
+ {
+ base.OnSetUp();
+ using (ISession session = OpenSession())
+ {
+ session.Save(new DomainClass {Id = 1});
+ session.Flush();
+ }
+ }
+
+ protected override void OnTearDown()
+ {
+ base.OnTearDown();
+ using (ISession session = OpenSession())
+ {
+ session.Delete("from DomainClass");
+ session.Flush();
+ }
+ }
+
+ [Test]
+ public void NativeQueryWithTwoComments()
+ {
+ using (ISession session = OpenSession())
+ {
+ IQuery qry = session.CreateSQLQuery("select /* first comment */ o.* /* second comment*/ from domainclass o")
+ .AddEntity("o", typeof (DomainClass));
+ var res = qry.List<DomainClass>();
+ Assert.AreEqual(res[0].Id, 1);
+ }
+ }
+ }
+}
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-04 15:42:33 UTC (rev 4569)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-04 15:45:57 UTC (rev 4570)
@@ -533,6 +533,8 @@
<Compile Include="NHSpecificTest\NH1849\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1850\Customer.cs" />
<Compile Include="NHSpecificTest\NH1850\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1859\DomainClass.cs" />
+ <Compile Include="NHSpecificTest\NH1859\SampleTest.cs" />
<Compile Include="NHSpecificTest\NH1864\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1864\Model.cs" />
<Compile Include="NHSpecificTest\NH473\Child.cs" />
@@ -1946,6 +1948,7 @@
<EmbeddedResource Include="DriverTest\MultiTypeEntity.hbm.xml" />
<EmbeddedResource Include="Criteria\Lambda\Mappings.hbm.xml" />
<Content Include="DynamicEntity\package.html" />
+ <EmbeddedResource Include="NHSpecificTest\NH1859\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1864\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1849\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1850\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-07-04 15:42:37
|
Revision: 4569
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4569&view=rev
Author: fabiomaulo
Date: 2009-07-04 15:42:33 +0000 (Sat, 04 Jul 2009)
Log Message:
-----------
Fix NH-1859
Modified Paths:
--------------
branches/2.1.x/nhibernate/src/NHibernate/Engine/Query/ParameterParser.cs
branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/
branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/DomainClass.cs
branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/Mappings.hbm.xml
branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/SampleTest.cs
Modified: branches/2.1.x/nhibernate/src/NHibernate/Engine/Query/ParameterParser.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate/Engine/Query/ParameterParser.cs 2009-07-04 05:06:59 UTC (rev 4568)
+++ branches/2.1.x/nhibernate/src/NHibernate/Engine/Query/ParameterParser.cs 2009-07-04 15:42:33 UTC (rev 4569)
@@ -56,7 +56,7 @@
// check comments
if (indx + 1 < stringLength && sqlString.Substring(indx,2) == "/*")
{
- var closeCommentIdx = sqlString.IndexOf("*/");
+ var closeCommentIdx = sqlString.IndexOf("*/", indx+2);
recognizer.Other(sqlString.Substring(indx, (closeCommentIdx- indx)+2));
indx = closeCommentIdx + 1;
continue;
Added: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/DomainClass.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/DomainClass.cs (rev 0)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/DomainClass.cs 2009-07-04 15:42:33 UTC (rev 4569)
@@ -0,0 +1,7 @@
+namespace NHibernate.Test.NHSpecificTest.NH1859
+{
+ public class DomainClass
+ {
+ public int Id { get; set; }
+ }
+}
\ No newline at end of file
Added: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/Mappings.hbm.xml
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/Mappings.hbm.xml (rev 0)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/Mappings.hbm.xml 2009-07-04 15:42:33 UTC (rev 4569)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="NHibernate.Test"
+ namespace="NHibernate.Test.NHSpecificTest.NH1859"
+ default-lazy="false">
+ <class name="DomainClass">
+ <id name="Id">
+ <generator class="assigned" />
+ </id>
+ </class>
+</hibernate-mapping>
\ No newline at end of file
Added: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/SampleTest.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/SampleTest.cs (rev 0)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/SampleTest.cs 2009-07-04 15:42:33 UTC (rev 4569)
@@ -0,0 +1,40 @@
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH1859
+{
+ [TestFixture]
+ public class SampleTest : BugTestCase
+ {
+ protected override void OnSetUp()
+ {
+ base.OnSetUp();
+ using (ISession session = OpenSession())
+ {
+ session.Save(new DomainClass {Id = 1});
+ session.Flush();
+ }
+ }
+
+ protected override void OnTearDown()
+ {
+ base.OnTearDown();
+ using (ISession session = OpenSession())
+ {
+ session.Delete("from DomainClass");
+ session.Flush();
+ }
+ }
+
+ [Test]
+ public void NativeQueryWithTwoComments()
+ {
+ using (ISession session = OpenSession())
+ {
+ IQuery qry = session.CreateSQLQuery("select /* first comment */ o.* /* second comment*/ from domainclass o")
+ .AddEntity("o", typeof (DomainClass));
+ var res = qry.List<DomainClass>();
+ Assert.AreEqual(res[0].Id, 1);
+ }
+ }
+ }
+}
\ No newline at end of file
Modified: branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-04 05:06:59 UTC (rev 4568)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-04 15:42:33 UTC (rev 4569)
@@ -523,6 +523,8 @@
<Compile Include="NHSpecificTest\NH1837\Order.cs" />
<Compile Include="NHSpecificTest\NH1850\Customer.cs" />
<Compile Include="NHSpecificTest\NH1850\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1859\DomainClass.cs" />
+ <Compile Include="NHSpecificTest\NH1859\SampleTest.cs" />
<Compile Include="NHSpecificTest\NH1864\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1864\Model.cs" />
<Compile Include="NHSpecificTest\NH473\Child.cs" />
@@ -1935,6 +1937,7 @@
<EmbeddedResource Include="Bytecode\Lightweight\ProductLine.hbm.xml" />
<EmbeddedResource Include="DriverTest\MultiTypeEntity.hbm.xml" />
<Content Include="DynamicEntity\package.html" />
+ <EmbeddedResource Include="NHSpecificTest\NH1859\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1864\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1850\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1192\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-07-04 05:07:04
|
Revision: 4568
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4568&view=rev
Author: fabiomaulo
Date: 2009-07-04 05:06:59 +0000 (Sat, 04 Jul 2009)
Log Message:
-----------
Merge r4567 (fix NH-1864)
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Param/ParameterTranslationsImpl.cs
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1864/
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1864/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1864/Mappings.hbm.xml
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1864/Model.cs
Modified: trunk/nhibernate/src/NHibernate/Param/ParameterTranslationsImpl.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Param/ParameterTranslationsImpl.cs 2009-07-04 05:03:54 UTC (rev 4567)
+++ trunk/nhibernate/src/NHibernate/Param/ParameterTranslationsImpl.cs 2009-07-04 05:06:59 UTC (rev 4568)
@@ -69,18 +69,22 @@
public void AdjustNamedParameterLocationsForQueryParameters(QueryParameters parameters)
{
- foreach (int existingParameterLocation in parameters.FilteredParameterLocations)
+ // NH Different behaviour NH-1776
+ // Analyze all named parameters declared after filters
+ //in general all named parameters but depend on the complexity of the query
+ foreach (ParameterInfo entry in _namedParameters.Values)
{
- foreach (ParameterInfo entry in _namedParameters.Values)
+ int amountOfPush = 0;
+ foreach (int existingParameterLocation in parameters.FilteredParameterLocations)
{
- for (int index = 0; index < entry.SqlLocations.Length; index++)
+ // a parameter span, at least, one value; where span more than one all values are cosecutive
+ // the first position determines the position of the others values
+ if (entry.SqlLocations[0] >= existingParameterLocation)
{
- if (entry.SqlLocations[index] >= existingParameterLocation)
- {
- entry.IncrementLocation(index);
- }
+ amountOfPush++;
}
}
+ entry.IncrementLocation(amountOfPush);
}
}
@@ -165,9 +169,16 @@
public IType ExpectedType { get; private set; }
- public void IncrementLocation(int index)
+ public void IncrementLocation(int amountOfPush)
{
- sqlLocations[index] = originalLocation[index] + 1;
+ if(amountOfPush <= 0)
+ {
+ return; // short cut
+ }
+ for (int i = 0; i < sqlLocations.Length; i++)
+ {
+ sqlLocations[i] = originalLocation[i] + amountOfPush;
+ }
}
}
}
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1864/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1864/Fixture.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1864/Fixture.cs 2009-07-04 05:06:59 UTC (rev 4568)
@@ -0,0 +1,50 @@
+using System;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH1864
+{
+ [TestFixture]
+ public class Fixture : BugTestCase
+ {
+ [Test]
+ public void ExecuteQuery(Action<ISession> sessionModifier)
+ {
+ using (ISession session = OpenSession())
+ {
+ using (ITransaction tx = session.BeginTransaction())
+ {
+ sessionModifier(session);
+ session.CreateQuery(
+ @"select cat
+ from Invoice inv, Category cat
+ where cat.ValidUntil = :now and inv.Foo = :foo
+ ")
+ .SetInt32("foo", 42).SetDateTime("now", DateTime.Now).List();
+
+ tx.Commit();
+ }
+ }
+ }
+
+ [Test]
+ public void Bug()
+ {
+ Assert.DoesNotThrow(() => ExecuteQuery(s=> s.EnableFilter("validity").SetParameter("date", DateTime.Now)));
+ }
+
+ [Test]
+ public void FilterOnOffOn()
+ {
+ Assert.DoesNotThrow(() => ExecuteQuery(s => s.EnableFilter("validity").SetParameter("date", DateTime.Now)));
+ Assert.DoesNotThrow(() => ExecuteQuery(s => { }));
+ Assert.DoesNotThrow(() => ExecuteQuery(s => s.EnableFilter("validity").SetParameter("date", DateTime.Now)));
+ }
+
+ [Test]
+ public void FilterQueryTwice()
+ {
+ Assert.DoesNotThrow(() => ExecuteQuery(s => s.EnableFilter("validity").SetParameter("date", DateTime.Now)));
+ Assert.DoesNotThrow(() => ExecuteQuery(s => s.EnableFilter("validity").SetParameter("date", DateTime.Now)));
+ }
+ }
+}
Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1864/Mappings.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1864/Mappings.hbm.xml (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1864/Mappings.hbm.xml 2009-07-04 05:06:59 UTC (rev 4568)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+ assembly="NHibernate.Test"
+ namespace="NHibernate.Test.NHSpecificTest.NH1864">
+
+ <class name="Category">
+ <id name="ID" type="Int32">
+ <generator class="hilo" />
+ </id>
+ <property name="ValidUntil" type="DateTime" />
+ <filter name="validity" condition="ValidUntil > :date" />
+ </class>
+
+ <class name="Invoice">
+ <id name="ID" type="Int32">
+ <generator class="hilo" />
+ </id>
+ <property name="Foo" type="Int32" />
+ <property name="ValidUntil" type="DateTime" />
+ <filter name="validity" condition="ValidUntil > :date" />
+ </class>
+
+ <filter-def name="validity">
+ <filter-param name="date" type="DateTime"/>
+ </filter-def>
+
+</hibernate-mapping>
Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1864/Model.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1864/Model.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1864/Model.cs 2009-07-04 05:06:59 UTC (rev 4568)
@@ -0,0 +1,17 @@
+using System;
+
+namespace NHibernate.Test.NHSpecificTest.NH1864
+{
+ public class Category
+ {
+ public virtual int ID { get; private set; }
+ public virtual DateTime ValidUntil { get; set; }
+ }
+
+ public class Invoice
+ {
+ public virtual int ID { get; private set; }
+ public virtual DateTime ValidUntil { get; set; }
+ public virtual int Foo { get; set; }
+ }
+}
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-04 05:03:54 UTC (rev 4567)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-04 05:06:59 UTC (rev 4568)
@@ -533,6 +533,8 @@
<Compile Include="NHSpecificTest\NH1849\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1850\Customer.cs" />
<Compile Include="NHSpecificTest\NH1850\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1864\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1864\Model.cs" />
<Compile Include="NHSpecificTest\NH473\Child.cs" />
<Compile Include="NHSpecificTest\NH473\Fixture.cs" />
<Compile Include="NHSpecificTest\NH473\Parent.cs" />
@@ -1944,6 +1946,7 @@
<EmbeddedResource Include="DriverTest\MultiTypeEntity.hbm.xml" />
<EmbeddedResource Include="Criteria\Lambda\Mappings.hbm.xml" />
<Content Include="DynamicEntity\package.html" />
+ <EmbeddedResource Include="NHSpecificTest\NH1864\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1849\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1850\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1192\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-07-04 05:03:59
|
Revision: 4567
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4567&view=rev
Author: fabiomaulo
Date: 2009-07-04 05:03:54 +0000 (Sat, 04 Jul 2009)
Log Message:
-----------
Fix NH-1864
Modified Paths:
--------------
branches/2.1.x/nhibernate/src/NHibernate/Param/ParameterTranslationsImpl.cs
branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1864/
branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1864/Fixture.cs
branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1864/Mappings.hbm.xml
branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1864/Model.cs
Modified: branches/2.1.x/nhibernate/src/NHibernate/Param/ParameterTranslationsImpl.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate/Param/ParameterTranslationsImpl.cs 2009-07-03 22:41:57 UTC (rev 4566)
+++ branches/2.1.x/nhibernate/src/NHibernate/Param/ParameterTranslationsImpl.cs 2009-07-04 05:03:54 UTC (rev 4567)
@@ -69,18 +69,22 @@
public void AdjustNamedParameterLocationsForQueryParameters(QueryParameters parameters)
{
- foreach (int existingParameterLocation in parameters.FilteredParameterLocations)
+ // NH Different behaviour NH-1776
+ // Analyze all named parameters declared after filters
+ //in general all named parameters but depend on the complexity of the query
+ foreach (ParameterInfo entry in _namedParameters.Values)
{
- foreach (ParameterInfo entry in _namedParameters.Values)
+ int amountOfPush = 0;
+ foreach (int existingParameterLocation in parameters.FilteredParameterLocations)
{
- for (int index = 0; index < entry.SqlLocations.Length; index++)
+ // a parameter span, at least, one value; where span more than one all values are cosecutive
+ // the first position determines the position of the others values
+ if (entry.SqlLocations[0] >= existingParameterLocation)
{
- if (entry.SqlLocations[index] >= existingParameterLocation)
- {
- entry.IncrementLocation(index);
- }
+ amountOfPush++;
}
}
+ entry.IncrementLocation(amountOfPush);
}
}
@@ -165,9 +169,16 @@
public IType ExpectedType { get; private set; }
- public void IncrementLocation(int index)
+ public void IncrementLocation(int amountOfPush)
{
- sqlLocations[index] = originalLocation[index] + 1;
+ if(amountOfPush <= 0)
+ {
+ return; // short cut
+ }
+ for (int i = 0; i < sqlLocations.Length; i++)
+ {
+ sqlLocations[i] = originalLocation[i] + amountOfPush;
+ }
}
}
}
\ No newline at end of file
Added: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1864/Fixture.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1864/Fixture.cs (rev 0)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1864/Fixture.cs 2009-07-04 05:03:54 UTC (rev 4567)
@@ -0,0 +1,50 @@
+using System;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH1864
+{
+ [TestFixture]
+ public class Fixture : BugTestCase
+ {
+ [Test]
+ public void ExecuteQuery(Action<ISession> sessionModifier)
+ {
+ using (ISession session = OpenSession())
+ {
+ using (ITransaction tx = session.BeginTransaction())
+ {
+ sessionModifier(session);
+ session.CreateQuery(
+ @"select cat
+ from Invoice inv, Category cat
+ where cat.ValidUntil = :now and inv.Foo = :foo
+ ")
+ .SetInt32("foo", 42).SetDateTime("now", DateTime.Now).List();
+
+ tx.Commit();
+ }
+ }
+ }
+
+ [Test]
+ public void Bug()
+ {
+ Assert.DoesNotThrow(() => ExecuteQuery(s=> s.EnableFilter("validity").SetParameter("date", DateTime.Now)));
+ }
+
+ [Test]
+ public void FilterOnOffOn()
+ {
+ Assert.DoesNotThrow(() => ExecuteQuery(s => s.EnableFilter("validity").SetParameter("date", DateTime.Now)));
+ Assert.DoesNotThrow(() => ExecuteQuery(s => { }));
+ Assert.DoesNotThrow(() => ExecuteQuery(s => s.EnableFilter("validity").SetParameter("date", DateTime.Now)));
+ }
+
+ [Test]
+ public void FilterQueryTwice()
+ {
+ Assert.DoesNotThrow(() => ExecuteQuery(s => s.EnableFilter("validity").SetParameter("date", DateTime.Now)));
+ Assert.DoesNotThrow(() => ExecuteQuery(s => s.EnableFilter("validity").SetParameter("date", DateTime.Now)));
+ }
+ }
+}
\ No newline at end of file
Added: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1864/Mappings.hbm.xml
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1864/Mappings.hbm.xml (rev 0)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1864/Mappings.hbm.xml 2009-07-04 05:03:54 UTC (rev 4567)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+ assembly="NHibernate.Test"
+ namespace="NHibernate.Test.NHSpecificTest.NH1864">
+
+ <class name="Category">
+ <id name="ID" type="Int32">
+ <generator class="hilo" />
+ </id>
+ <property name="ValidUntil" type="DateTime" />
+ <filter name="validity" condition="ValidUntil > :date" />
+ </class>
+
+ <class name="Invoice">
+ <id name="ID" type="Int32">
+ <generator class="hilo" />
+ </id>
+ <property name="Foo" type="Int32" />
+ <property name="ValidUntil" type="DateTime" />
+ <filter name="validity" condition="ValidUntil > :date" />
+ </class>
+
+ <filter-def name="validity">
+ <filter-param name="date" type="DateTime"/>
+ </filter-def>
+
+</hibernate-mapping>
Added: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1864/Model.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1864/Model.cs (rev 0)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1864/Model.cs 2009-07-04 05:03:54 UTC (rev 4567)
@@ -0,0 +1,17 @@
+using System;
+
+namespace NHibernate.Test.NHSpecificTest.NH1864
+{
+ public class Category
+ {
+ public virtual int ID { get; private set; }
+ public virtual DateTime ValidUntil { get; set; }
+ }
+
+ public class Invoice
+ {
+ public virtual int ID { get; private set; }
+ public virtual DateTime ValidUntil { get; set; }
+ public virtual int Foo { get; set; }
+ }
+}
\ No newline at end of file
Modified: branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-03 22:41:57 UTC (rev 4566)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-04 05:03:54 UTC (rev 4567)
@@ -523,6 +523,8 @@
<Compile Include="NHSpecificTest\NH1837\Order.cs" />
<Compile Include="NHSpecificTest\NH1850\Customer.cs" />
<Compile Include="NHSpecificTest\NH1850\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1864\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1864\Model.cs" />
<Compile Include="NHSpecificTest\NH473\Child.cs" />
<Compile Include="NHSpecificTest\NH473\Fixture.cs" />
<Compile Include="NHSpecificTest\NH473\Parent.cs" />
@@ -1933,6 +1935,7 @@
<EmbeddedResource Include="Bytecode\Lightweight\ProductLine.hbm.xml" />
<EmbeddedResource Include="DriverTest\MultiTypeEntity.hbm.xml" />
<Content Include="DynamicEntity\package.html" />
+ <EmbeddedResource Include="NHSpecificTest\NH1864\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1850\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1192\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1734\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-07-03 22:41:59
|
Revision: 4566
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4566&view=rev
Author: fabiomaulo
Date: 2009-07-03 22:41:57 +0000 (Fri, 03 Jul 2009)
Log Message:
-----------
Merge r4565
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Util/CollectionHelper.cs
Modified: trunk/nhibernate/src/NHibernate/Util/CollectionHelper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Util/CollectionHelper.cs 2009-07-03 22:40:53 UTC (rev 4565)
+++ trunk/nhibernate/src/NHibernate/Util/CollectionHelper.cs 2009-07-03 22:41:57 UTC (rev 4566)
@@ -8,6 +8,7 @@
{
public sealed class CollectionHelper
{
+ [Serializable]
private class EmptyEnumerator : IDictionaryEnumerator
{
public object Key
@@ -51,9 +52,10 @@
/// <summary>
/// A read-only dictionary that is always empty and permits lookup by <see langword="null" /> key.
/// </summary>
+ [Serializable]
private class EmptyMapClass : IDictionary
{
- private static readonly EmptyEnumerator EmptyEnumerator = new EmptyEnumerator();
+ private static readonly EmptyEnumerator emptyEnumerator = new EmptyEnumerator();
public bool Contains(object key)
{
@@ -72,7 +74,7 @@
IDictionaryEnumerator IDictionary.GetEnumerator()
{
- return EmptyEnumerator;
+ return emptyEnumerator;
}
public void Remove(object key)
@@ -127,10 +129,11 @@
public IEnumerator GetEnumerator()
{
- return EmptyEnumerator;
+ return emptyEnumerator;
}
}
+ [Serializable]
private class EmptyListClass : IList
{
public int Add(object value)
@@ -385,6 +388,7 @@
}
// ~~~~~~~~~~~~~~~~~~~~~~ Generics ~~~~~~~~~~~~~~~~~~~~~~
+ [Serializable]
private class EmptyEnumerator<TKey, TValue> : IEnumerator<KeyValuePair<TKey, TValue>>
{
#region IEnumerator<KeyValuePair<TKey,TValue>> Members
@@ -431,6 +435,7 @@
#endregion
}
+ [Serializable]
public class EmptyEnumerableClass<T> : IEnumerable<T>
{
#region IEnumerable<T> Members
@@ -452,7 +457,8 @@
#endregion
}
- private class EmptyEnumerator<T>: IEnumerator<T>
+ [Serializable]
+ private class EmptyEnumerator<T> : IEnumerator<T>
{
#region IEnumerator<T> Members
@@ -493,9 +499,10 @@
/// <summary>
/// A read-only dictionary that is always empty and permits lookup by <see langword="null" /> key.
/// </summary>
+ [Serializable]
public class EmptyMapClass<TKey, TValue> : IDictionary<TKey, TValue>
{
- private static readonly EmptyEnumerator<TKey, TValue> EmptyEnumerator = new EmptyEnumerator<TKey, TValue>();
+ private static readonly EmptyEnumerator<TKey, TValue> emptyEnumerator = new EmptyEnumerator<TKey, TValue>();
#region IDictionary<TKey,TValue> Members
@@ -580,7 +587,7 @@
IEnumerator<KeyValuePair<TKey, TValue>> IEnumerable<KeyValuePair<TKey, TValue>>.GetEnumerator()
{
- return EmptyEnumerator;
+ return emptyEnumerator;
}
#endregion
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2009-07-03 22:40:53
|
Revision: 4565
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4565&view=rev
Author: fabiomaulo
Date: 2009-07-03 22:40:53 +0000 (Fri, 03 Jul 2009)
Log Message:
-----------
Made serializable some classes may involved in configuration
Modified Paths:
--------------
branches/2.1.x/nhibernate/src/NHibernate/Util/CollectionHelper.cs
Modified: branches/2.1.x/nhibernate/src/NHibernate/Util/CollectionHelper.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate/Util/CollectionHelper.cs 2009-07-02 21:59:53 UTC (rev 4564)
+++ branches/2.1.x/nhibernate/src/NHibernate/Util/CollectionHelper.cs 2009-07-03 22:40:53 UTC (rev 4565)
@@ -8,6 +8,7 @@
{
public sealed class CollectionHelper
{
+ [Serializable]
private class EmptyEnumerator : IDictionaryEnumerator
{
public object Key
@@ -51,9 +52,10 @@
/// <summary>
/// A read-only dictionary that is always empty and permits lookup by <see langword="null" /> key.
/// </summary>
+ [Serializable]
private class EmptyMapClass : IDictionary
{
- private static readonly EmptyEnumerator EmptyEnumerator = new EmptyEnumerator();
+ private static readonly EmptyEnumerator emptyEnumerator = new EmptyEnumerator();
public bool Contains(object key)
{
@@ -72,7 +74,7 @@
IDictionaryEnumerator IDictionary.GetEnumerator()
{
- return EmptyEnumerator;
+ return emptyEnumerator;
}
public void Remove(object key)
@@ -127,10 +129,11 @@
public IEnumerator GetEnumerator()
{
- return EmptyEnumerator;
+ return emptyEnumerator;
}
}
+ [Serializable]
private class EmptyListClass : IList
{
public int Add(object value)
@@ -385,6 +388,7 @@
}
// ~~~~~~~~~~~~~~~~~~~~~~ Generics ~~~~~~~~~~~~~~~~~~~~~~
+ [Serializable]
private class EmptyEnumerator<TKey, TValue> : IEnumerator<KeyValuePair<TKey, TValue>>
{
#region IEnumerator<KeyValuePair<TKey,TValue>> Members
@@ -431,6 +435,7 @@
#endregion
}
+ [Serializable]
public class EmptyEnumerableClass<T> : IEnumerable<T>
{
#region IEnumerable<T> Members
@@ -452,7 +457,8 @@
#endregion
}
- private class EmptyEnumerator<T>: IEnumerator<T>
+ [Serializable]
+ private class EmptyEnumerator<T> : IEnumerator<T>
{
#region IEnumerator<T> Members
@@ -493,9 +499,10 @@
/// <summary>
/// A read-only dictionary that is always empty and permits lookup by <see langword="null" /> key.
/// </summary>
+ [Serializable]
public class EmptyMapClass<TKey, TValue> : IDictionary<TKey, TValue>
{
- private static readonly EmptyEnumerator<TKey, TValue> EmptyEnumerator = new EmptyEnumerator<TKey, TValue>();
+ private static readonly EmptyEnumerator<TKey, TValue> emptyEnumerator = new EmptyEnumerator<TKey, TValue>();
#region IDictionary<TKey,TValue> Members
@@ -580,7 +587,7 @@
IEnumerator<KeyValuePair<TKey, TValue>> IEnumerable<KeyValuePair<TKey, TValue>>.GetEnumerator()
{
- return EmptyEnumerator;
+ return emptyEnumerator;
}
#endregion
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ric...@us...> - 2009-07-02 21:59:56
|
Revision: 4564
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4564&view=rev
Author: ricbrown
Date: 2009-07-02 21:59:53 +0000 (Thu, 02 Jul 2009)
Log Message:
-----------
Implemented IQueryOver interface explicitly to maintain type on fluent methods.
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs
trunk/nhibernate/src/NHibernate/IQueryOver.cs
trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/IntegrationFixture.cs
Modified: trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs 2009-07-02 21:24:11 UTC (rev 4563)
+++ trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs 2009-07-02 21:59:53 UTC (rev 4564)
@@ -42,41 +42,41 @@
get { return _criteria; }
}
- public IQueryOver<T> And(Expression<Func<T, bool>> expression)
+ public QueryOver<T> And(Expression<Func<T, bool>> expression)
{
return Add(expression);
}
- public IQueryOver<T> And(Expression<Func<bool>> expression)
+ public QueryOver<T> And(Expression<Func<bool>> expression)
{
return Add(expression);
}
- public IQueryOver<T> Where(Expression<Func<T, bool>> expression)
+ public QueryOver<T> Where(Expression<Func<T, bool>> expression)
{
return Add(expression);
}
- public IQueryOver<T> Where(Expression<Func<bool>> expression)
+ public QueryOver<T> Where(Expression<Func<bool>> expression)
{
return Add(expression);
}
- public IQueryOver<U> JoinQueryOver<U>(Expression<Func<T, U>> path)
+ public QueryOver<U> JoinQueryOver<U>(Expression<Func<T, U>> path)
{
return new QueryOver<U>(_impl,
_criteria.CreateCriteria(
ExpressionProcessor.FindMemberExpression(path.Body)));
}
- public IQueryOver<U> JoinQueryOver<U>(Expression<Func<T, IEnumerable<U>>> path)
+ public QueryOver<U> JoinQueryOver<U>(Expression<Func<T, IEnumerable<U>>> path)
{
return new QueryOver<U>(_impl,
_criteria.CreateCriteria(
ExpressionProcessor.FindMemberExpression(path.Body)));
}
- public IQueryOver<T> Join(Expression<Func<T, object>> path, Expression<Func<object>> alias)
+ public QueryOver<T> Join(Expression<Func<T, object>> path, Expression<Func<object>> alias)
{
return AddAlias(
ExpressionProcessor.FindMemberExpression(path.Body),
@@ -89,6 +89,9 @@
return _criteria.List<T>();
}
+ /// <summary>
+ /// Get an executable instance of <c>IQueryOver<T></c>,
+ /// to actually run the query.</summary>
public IQueryOver<T> GetExecutableQueryOver(ISession session)
{
_impl.Session = session.GetSessionImplementation();
@@ -113,6 +116,28 @@
return this;
}
+
+ IQueryOver<T> IQueryOver<T>.And(Expression<Func<T, bool>> expression)
+ { return And(expression); }
+
+ IQueryOver<T> IQueryOver<T>.And(Expression<Func<bool>> expression)
+ { return And(expression); }
+
+ IQueryOver<T> IQueryOver<T>.Where(Expression<Func<T, bool>> expression)
+ { return Where(expression); }
+
+ IQueryOver<T> IQueryOver<T>.Where(Expression<Func<bool>> expression)
+ { return Where(expression); }
+
+ IQueryOver<U> IQueryOver<T>.JoinQueryOver<U>(Expression<Func<T, U>> path)
+ { return JoinQueryOver(path); }
+
+ IQueryOver<U> IQueryOver<T>.JoinQueryOver<U>(Expression<Func<T, IEnumerable<U>>> path)
+ { return JoinQueryOver(path); }
+
+ IQueryOver<T> IQueryOver<T>.Join(Expression<Func<T, object>> path, Expression<Func<object>> alias)
+ { return Join(path, alias); }
+
}
}
Modified: trunk/nhibernate/src/NHibernate/IQueryOver.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/IQueryOver.cs 2009-07-02 21:24:11 UTC (rev 4563)
+++ trunk/nhibernate/src/NHibernate/IQueryOver.cs 2009-07-02 21:59:53 UTC (rev 4564)
@@ -80,11 +80,6 @@
/// <returns>The list filled with the results.</returns>
IList<T> List();
- /// <summary>
- /// Get an executable instance of <c>Criteria<T></c>,
- /// to actually run the query.</summary>
- IQueryOver<T> GetExecutableQueryOver(ISession session);
-
}
}
Modified: trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/IntegrationFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/IntegrationFixture.cs 2009-07-02 21:24:11 UTC (rev 4563)
+++ trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/IntegrationFixture.cs 2009-07-02 21:59:53 UTC (rev 4564)
@@ -79,7 +79,7 @@
using (ISession s = OpenSession())
{
- var personQuery =
+ QueryOver<Person> personQuery =
new QueryOver<Person>()
.Where(p => p.Name == "test person 1");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ric...@us...> - 2009-07-02 21:24:12
|
Revision: 4563
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4563&view=rev
Author: ricbrown
Date: 2009-07-02 21:24:11 +0000 (Thu, 02 Jul 2009)
Log Message:
-----------
Migrated some more test coverage over from lambda extensions project.
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Impl/ExpressionProcessor.cs
trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs
Modified: trunk/nhibernate/src/NHibernate/Impl/ExpressionProcessor.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Impl/ExpressionProcessor.cs 2009-07-02 21:02:37 UTC (rev 4562)
+++ trunk/nhibernate/src/NHibernate/Impl/ExpressionProcessor.cs 2009-07-02 21:24:11 UTC (rev 4563)
@@ -142,7 +142,12 @@
MethodCallExpression methodCallExpression = (MethodCallExpression)expression;
if (methodCallExpression.Method.Name == "GetType")
- return FindMemberExpression(methodCallExpression.Object) + ".class";
+ {
+ if (methodCallExpression.Object.NodeType == ExpressionType.MemberAccess)
+ return FindMemberExpression(methodCallExpression.Object) + ".class";
+ else
+ return "class";
+ }
throw new Exception("Unrecognised method call in epression " + expression.ToString());
}
Modified: trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs 2009-07-02 21:02:37 UTC (rev 4562)
+++ trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs 2009-07-02 21:24:11 UTC (rev 4563)
@@ -25,7 +25,8 @@
.Add(Restrictions.Gt("Age", 10))
.Add(Restrictions.Ge("Age", 11))
.Add(Restrictions.Lt("Age", 50))
- .Add(Restrictions.Le("Age", 49));
+ .Add(Restrictions.Le("Age", 49))
+ .Add(Restrictions.Eq("class", typeof(Person)));
IQueryOver<Person> actual =
CreateTestQueryOver<Person>()
@@ -34,7 +35,8 @@
.And(p => p.Age > 10)
.And(p => p.Age >= 11)
.And(p => p.Age < 50)
- .And(p => p.Age <= 49);
+ .And(p => p.Age <= 49)
+ .And(p => p.GetType() == typeof(Person));
AssertCriteriaAreEqual(expected, actual);
}
@@ -103,12 +105,24 @@
{
ICriteria expected =
CreateTestCriteria(typeof(Person), "personAlias")
- .Add(Restrictions.Eq("personAlias.Name", "test name"));
+ .Add(Restrictions.Eq("personAlias.Name", "test name"))
+ .Add(Restrictions.Not(Restrictions.Eq("personAlias.Name", "not test name")))
+ .Add(Restrictions.Gt("personAlias.Age", 10))
+ .Add(Restrictions.Ge("personAlias.Age", 11))
+ .Add(Restrictions.Lt("personAlias.Age", 50))
+ .Add(Restrictions.Le("personAlias.Age", 49))
+ .Add(Restrictions.Eq("personAlias.class", typeof(Person)));
Person personAlias = null;
IQueryOver<Person> actual =
CreateTestQueryOver<Person>(() => personAlias)
- .Where(() => personAlias.Name == "test name");
+ .Where(() => personAlias.Name == "test name")
+ .And(() => personAlias.Name != "not test name")
+ .And(() => personAlias.Age > 10)
+ .And(() => personAlias.Age >= 11)
+ .And(() => personAlias.Age < 50)
+ .And(() => personAlias.Age <= 49)
+ .And(() => personAlias.GetType() == typeof(Person));
AssertCriteriaAreEqual(expected, actual);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ric...@us...> - 2009-07-02 21:02:40
|
Revision: 4562
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4562&view=rev
Author: ricbrown
Date: 2009-07-02 21:02:37 +0000 (Thu, 02 Jul 2009)
Log Message:
-----------
Renamed JoinWalk to JoinQueryOver.
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs
trunk/nhibernate/src/NHibernate/IQueryOver.cs
trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs
Modified: trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs 2009-07-02 20:55:15 UTC (rev 4561)
+++ trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs 2009-07-02 21:02:37 UTC (rev 4562)
@@ -62,14 +62,14 @@
return Add(expression);
}
- public IQueryOver<U> JoinWalk<U>(Expression<Func<T, U>> path)
+ public IQueryOver<U> JoinQueryOver<U>(Expression<Func<T, U>> path)
{
return new QueryOver<U>(_impl,
_criteria.CreateCriteria(
ExpressionProcessor.FindMemberExpression(path.Body)));
}
- public IQueryOver<U> JoinWalk<U>(Expression<Func<T, IEnumerable<U>>> path)
+ public IQueryOver<U> JoinQueryOver<U>(Expression<Func<T, IEnumerable<U>>> path)
{
return new QueryOver<U>(_impl,
_criteria.CreateCriteria(
Modified: trunk/nhibernate/src/NHibernate/IQueryOver.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/IQueryOver.cs 2009-07-02 20:55:15 UTC (rev 4561)
+++ trunk/nhibernate/src/NHibernate/IQueryOver.cs 2009-07-02 21:02:37 UTC (rev 4562)
@@ -55,7 +55,7 @@
/// <typeparam name="U">Type of sub-criteria</typeparam>
/// <param name="path">Lambda expression returning association path</param>
/// <returns>The created "sub criteria"</returns>
- IQueryOver<U> JoinWalk<U>(Expression<Func<T, U>> path);
+ IQueryOver<U> JoinQueryOver<U>(Expression<Func<T, U>> path);
/// <summary>
/// Creates a new NHibernate.ICriteria<T>, "rooted" at the associated entity
@@ -64,7 +64,7 @@
/// <typeparam name="U">Type of sub-criteria (type of the collection)</typeparam>
/// <param name="path">Lambda expression returning association path</param>
/// <returns>The created "sub criteria"</returns>
- IQueryOver<U> JoinWalk<U>(Expression<Func<T, IEnumerable<U>>> path);
+ IQueryOver<U> JoinQueryOver<U>(Expression<Func<T, IEnumerable<U>>> path);
/// <summary>
/// Join an association, assigning an alias to the joined entity
Modified: trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs 2009-07-02 20:55:15 UTC (rev 4561)
+++ trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs 2009-07-02 21:02:37 UTC (rev 4562)
@@ -123,7 +123,7 @@
IQueryOver<Person> actual =
CreateTestQueryOver<Person>()
- .JoinWalk(p => p.Father) // sub-criteria
+ .JoinQueryOver(p => p.Father) // sub-criteria
.Where(f => f.Name == "test name");
AssertCriteriaAreEqual(expected, actual);
@@ -139,7 +139,7 @@
IQueryOver<Child> actual =
CreateTestQueryOver<Person>()
- .JoinWalk<Child>(p => p.Children) // sub-criteria
+ .JoinQueryOver<Child>(p => p.Children) // sub-criteria
.Where(c => c.Nickname == "test name");
AssertCriteriaAreEqual(expected, actual);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ric...@us...> - 2009-07-02 20:55:18
|
Revision: 4561
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4561&view=rev
Author: ricbrown
Date: 2009-07-02 20:55:15 +0000 (Thu, 02 Jul 2009)
Log Message:
-----------
Renamed interface to match class.
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs
trunk/nhibernate/src/NHibernate/ISession.cs
trunk/nhibernate/src/NHibernate/Impl/SessionImpl.cs
trunk/nhibernate/src/NHibernate/NHibernate.csproj
trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/LambdaFixtureBase.cs
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
trunk/nhibernate/src/NHibernate/IQueryOver.cs
trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs
Removed Paths:
-------------
trunk/nhibernate/src/NHibernate/ICriteriaOfT.cs
trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/CriteriaOfTFixture.cs
Modified: trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs 2009-07-02 04:24:50 UTC (rev 4560)
+++ trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs 2009-07-02 20:55:15 UTC (rev 4561)
@@ -10,10 +10,10 @@
{
/// <summary>
- /// Implementation of the <see cref="ICriteria<T>"/> interface
+ /// Implementation of the <see cref="IQueryOver<T>"/> interface
/// </summary>
[Serializable]
- public class QueryOver<T> : ICriteria<T>
+ public class QueryOver<T> : IQueryOver<T>
{
private ICriteria _criteria;
@@ -42,41 +42,41 @@
get { return _criteria; }
}
- public ICriteria<T> And(Expression<Func<T, bool>> expression)
+ public IQueryOver<T> And(Expression<Func<T, bool>> expression)
{
return Add(expression);
}
- public ICriteria<T> And(Expression<Func<bool>> expression)
+ public IQueryOver<T> And(Expression<Func<bool>> expression)
{
return Add(expression);
}
- public ICriteria<T> Where(Expression<Func<T, bool>> expression)
+ public IQueryOver<T> Where(Expression<Func<T, bool>> expression)
{
return Add(expression);
}
- public ICriteria<T> Where(Expression<Func<bool>> expression)
+ public IQueryOver<T> Where(Expression<Func<bool>> expression)
{
return Add(expression);
}
- public ICriteria<U> JoinWalk<U>(Expression<Func<T, U>> path)
+ public IQueryOver<U> JoinWalk<U>(Expression<Func<T, U>> path)
{
return new QueryOver<U>(_impl,
_criteria.CreateCriteria(
ExpressionProcessor.FindMemberExpression(path.Body)));
}
- public ICriteria<U> JoinWalk<U>(Expression<Func<T, IEnumerable<U>>> path)
+ public IQueryOver<U> JoinWalk<U>(Expression<Func<T, IEnumerable<U>>> path)
{
return new QueryOver<U>(_impl,
_criteria.CreateCriteria(
ExpressionProcessor.FindMemberExpression(path.Body)));
}
- public ICriteria<T> Join(Expression<Func<T, object>> path, Expression<Func<object>> alias)
+ public IQueryOver<T> Join(Expression<Func<T, object>> path, Expression<Func<object>> alias)
{
return AddAlias(
ExpressionProcessor.FindMemberExpression(path.Body),
@@ -89,7 +89,7 @@
return _criteria.List<T>();
}
- public ICriteria<T> GetExecutableQueryOver(ISession session)
+ public IQueryOver<T> GetExecutableQueryOver(ISession session)
{
_impl.Session = session.GetSessionImplementation();
return this;
Deleted: trunk/nhibernate/src/NHibernate/ICriteriaOfT.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/ICriteriaOfT.cs 2009-07-02 04:24:50 UTC (rev 4560)
+++ trunk/nhibernate/src/NHibernate/ICriteriaOfT.cs 2009-07-02 20:55:15 UTC (rev 4561)
@@ -1,90 +0,0 @@
-
-using System;
-using System.Collections.Generic;
-using System.Linq.Expressions;
-
-namespace NHibernate
-{
-
- /// <summary>
- /// Criteria<T> is an API for retrieving entities by composing
- /// <see cref="Criterion.Expression" /> objects expressed using Lambda expression syntax.
- /// </summary>
- /// <remarks>
- /// <code>
- /// IList<Cat> cats = session.QueryOver<Cat>()
- /// .Add( c => c.Name == "Tigger" )
- /// .Add( c => c.Weight > minWeight ) )
- /// .List();
- /// </code>
- /// </remarks>
- public interface ICriteria<T>
- {
-
- /// <summary>
- /// Add criterion expressed as a lambda expression
- /// </summary>
- /// <param name="expression">Lambda expression</param>
- /// <returns>criteria instance</returns>
- ICriteria<T> And(Expression<Func<T, bool>> expression);
-
- /// <summary>
- /// Add criterion expressed as a lambda expression
- /// </summary>
- /// <param name="expression">Lambda expression</param>
- /// <returns>criteria instance</returns>
- ICriteria<T> And(Expression<Func<bool>> expression);
-
- /// <summary>
- /// Identical semantics to Add() to allow more readable queries
- /// </summary>
- /// <param name="expression">Lambda expression</param>
- /// <returns>criteria instance</returns>
- ICriteria<T> Where(Expression<Func<T, bool>> expression);
-
- /// <summary>
- /// Identical semantics to Add() to allow more readable queries
- /// </summary>
- /// <param name="expression">Lambda expression</param>
- /// <returns>criteria instance</returns>
- ICriteria<T> Where(Expression<Func<bool>> expression);
-
- /// <summary>
- /// Creates a new NHibernate.ICriteria<T>, "rooted" at the associated entity
- /// </summary>
- /// <typeparam name="U">Type of sub-criteria</typeparam>
- /// <param name="path">Lambda expression returning association path</param>
- /// <returns>The created "sub criteria"</returns>
- ICriteria<U> JoinWalk<U>(Expression<Func<T, U>> path);
-
- /// <summary>
- /// Creates a new NHibernate.ICriteria<T>, "rooted" at the associated entity
- /// specifying a collection for the join.
- /// </summary>
- /// <typeparam name="U">Type of sub-criteria (type of the collection)</typeparam>
- /// <param name="path">Lambda expression returning association path</param>
- /// <returns>The created "sub criteria"</returns>
- ICriteria<U> JoinWalk<U>(Expression<Func<T, IEnumerable<U>>> path);
-
- /// <summary>
- /// Join an association, assigning an alias to the joined entity
- /// </summary>
- /// <param name="path">Lambda expression returning association path</param>
- /// <param name="alias">Lambda expression returning alias reference</param>
- /// <returns>criteria instance</returns>
- ICriteria<T> Join(Expression<Func<T, object>> path, Expression<Func<object>> alias);
-
- /// <summary>
- /// Get the results of the root type and fill the <see cref="IList<T>"/>
- /// </summary>
- /// <returns>The list filled with the results.</returns>
- IList<T> List();
-
- /// <summary>
- /// Get an executable instance of <c>Criteria<T></c>,
- /// to actually run the query.</summary>
- ICriteria<T> GetExecutableQueryOver(ISession session);
-
- }
-
-}
Copied: trunk/nhibernate/src/NHibernate/IQueryOver.cs (from rev 4560, trunk/nhibernate/src/NHibernate/ICriteriaOfT.cs)
===================================================================
--- trunk/nhibernate/src/NHibernate/IQueryOver.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate/IQueryOver.cs 2009-07-02 20:55:15 UTC (rev 4561)
@@ -0,0 +1,90 @@
+
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+
+namespace NHibernate
+{
+
+ /// <summary>
+ /// QueryOver<T> is an API for retrieving entities by composing
+ /// <see cref="Criterion.Expression" /> objects expressed using Lambda expression syntax.
+ /// </summary>
+ /// <remarks>
+ /// <code>
+ /// IList<Cat> cats = session.QueryOver<Cat>()
+ /// .Add( c => c.Name == "Tigger" )
+ /// .Add( c => c.Weight > minWeight ) )
+ /// .List();
+ /// </code>
+ /// </remarks>
+ public interface IQueryOver<T>
+ {
+
+ /// <summary>
+ /// Add criterion expressed as a lambda expression
+ /// </summary>
+ /// <param name="expression">Lambda expression</param>
+ /// <returns>criteria instance</returns>
+ IQueryOver<T> And(Expression<Func<T, bool>> expression);
+
+ /// <summary>
+ /// Add criterion expressed as a lambda expression
+ /// </summary>
+ /// <param name="expression">Lambda expression</param>
+ /// <returns>criteria instance</returns>
+ IQueryOver<T> And(Expression<Func<bool>> expression);
+
+ /// <summary>
+ /// Identical semantics to Add() to allow more readable queries
+ /// </summary>
+ /// <param name="expression">Lambda expression</param>
+ /// <returns>criteria instance</returns>
+ IQueryOver<T> Where(Expression<Func<T, bool>> expression);
+
+ /// <summary>
+ /// Identical semantics to Add() to allow more readable queries
+ /// </summary>
+ /// <param name="expression">Lambda expression</param>
+ /// <returns>criteria instance</returns>
+ IQueryOver<T> Where(Expression<Func<bool>> expression);
+
+ /// <summary>
+ /// Creates a new NHibernate.ICriteria<T>, "rooted" at the associated entity
+ /// </summary>
+ /// <typeparam name="U">Type of sub-criteria</typeparam>
+ /// <param name="path">Lambda expression returning association path</param>
+ /// <returns>The created "sub criteria"</returns>
+ IQueryOver<U> JoinWalk<U>(Expression<Func<T, U>> path);
+
+ /// <summary>
+ /// Creates a new NHibernate.ICriteria<T>, "rooted" at the associated entity
+ /// specifying a collection for the join.
+ /// </summary>
+ /// <typeparam name="U">Type of sub-criteria (type of the collection)</typeparam>
+ /// <param name="path">Lambda expression returning association path</param>
+ /// <returns>The created "sub criteria"</returns>
+ IQueryOver<U> JoinWalk<U>(Expression<Func<T, IEnumerable<U>>> path);
+
+ /// <summary>
+ /// Join an association, assigning an alias to the joined entity
+ /// </summary>
+ /// <param name="path">Lambda expression returning association path</param>
+ /// <param name="alias">Lambda expression returning alias reference</param>
+ /// <returns>criteria instance</returns>
+ IQueryOver<T> Join(Expression<Func<T, object>> path, Expression<Func<object>> alias);
+
+ /// <summary>
+ /// Get the results of the root type and fill the <see cref="IList<T>"/>
+ /// </summary>
+ /// <returns>The list filled with the results.</returns>
+ IList<T> List();
+
+ /// <summary>
+ /// Get an executable instance of <c>Criteria<T></c>,
+ /// to actually run the query.</summary>
+ IQueryOver<T> GetExecutableQueryOver(ISession session);
+
+ }
+
+}
Modified: trunk/nhibernate/src/NHibernate/ISession.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/ISession.cs 2009-07-02 04:24:50 UTC (rev 4560)
+++ trunk/nhibernate/src/NHibernate/ISession.cs 2009-07-02 20:55:15 UTC (rev 4561)
@@ -787,7 +787,7 @@
/// </summary>
/// <typeparam name="T">The entity class</typeparam>
/// <returns>An ICriteria<T> object</returns>
- ICriteria<T> QueryOver<T>() where T : class;
+ IQueryOver<T> QueryOver<T>() where T : class;
/// <summary>
/// Create a new instance of <c>Query</c> for the given query string
Modified: trunk/nhibernate/src/NHibernate/Impl/SessionImpl.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Impl/SessionImpl.cs 2009-07-02 04:24:50 UTC (rev 4560)
+++ trunk/nhibernate/src/NHibernate/Impl/SessionImpl.cs 2009-07-02 20:55:15 UTC (rev 4561)
@@ -1872,7 +1872,7 @@
}
}
- public ICriteria<T> QueryOver<T>() where T : class
+ public IQueryOver<T> QueryOver<T>() where T : class
{
using (new SessionIdLoggingContext(SessionId))
{
Modified: trunk/nhibernate/src/NHibernate/NHibernate.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate/NHibernate.csproj 2009-07-02 04:24:50 UTC (rev 4560)
+++ trunk/nhibernate/src/NHibernate/NHibernate.csproj 2009-07-02 20:55:15 UTC (rev 4561)
@@ -535,7 +535,7 @@
<Compile Include="Hql\Ast\ANTLR\Tree\ASTErrorNode.cs" />
<Compile Include="Hql\Ast\ANTLR\Tree\InsertStatement.cs" />
<Compile Include="Hql\Ast\ANTLR\Tree\UpdateStatement.cs" />
- <Compile Include="ICriteriaOfT.cs" />
+ <Compile Include="IQueryOver.cs" />
<Compile Include="Criterion\QueryOver.cs" />
<Compile Include="Impl\ExpressionProcessor.cs" />
<Compile Include="Impl\SessionIdLoggingContext.cs" />
Deleted: trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/CriteriaOfTFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/CriteriaOfTFixture.cs 2009-07-02 04:24:50 UTC (rev 4560)
+++ trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/CriteriaOfTFixture.cs 2009-07-02 20:55:15 UTC (rev 4561)
@@ -1,168 +0,0 @@
-using System;
-using System.Collections;
-
-using NUnit.Framework;
-
-using NHibernate.Criterion;
-using NHibernate.Transform;
-using NHibernate.Type;
-using NHibernate.Util;
-
-namespace NHibernate.Test.Criteria.Lambda
-{
-
- [TestFixture]
- public class CriteriaOfTFixture : LambdaFixtureBase
- {
-
- [Test]
- public void SimpleCriterion_NoAlias()
- {
- ICriteria expected =
- CreateTestCriteria(typeof(Person))
- .Add(Restrictions.Eq("Name", "test name"))
- .Add(Restrictions.Not(Restrictions.Eq("Name", "not test name")))
- .Add(Restrictions.Gt("Age", 10))
- .Add(Restrictions.Ge("Age", 11))
- .Add(Restrictions.Lt("Age", 50))
- .Add(Restrictions.Le("Age", 49));
-
- ICriteria<Person> actual =
- CreateTestQueryOver<Person>()
- .And(p => p.Name == "test name")
- .And(p => p.Name != "not test name")
- .And(p => p.Age > 10)
- .And(p => p.Age >= 11)
- .And(p => p.Age < 50)
- .And(p => p.Age <= 49);
-
- AssertCriteriaAreEqual(expected, actual);
- }
-
- [Test]
- public void PropertyCriterion_NoAlias()
- {
- ICriteria expected =
- CreateTestCriteria(typeof(Person))
- .Add(Restrictions.EqProperty("Age", "Height"))
- .Add(Restrictions.NotEqProperty("Age", "Height"))
- .Add(Restrictions.GtProperty("Age", "Height"))
- .Add(Restrictions.GeProperty("Age", "Height"))
- .Add(Restrictions.LtProperty("Age", "Height"))
- .Add(Restrictions.LeProperty("Age", "Height"));
-
- ICriteria<Person> actual =
- CreateTestQueryOver<Person>()
- .And(p => p.Age == p.Height)
- .And(p => p.Age != p.Height)
- .And(p => p.Age > p.Height)
- .And(p => p.Age >= p.Height)
- .And(p => p.Age < p.Height)
- .And(p => p.Age <= p.Height);
-
- AssertCriteriaAreEqual(expected, actual);
- }
-
- [Test]
- public void MultipleCriterionExpression()
- {
- ICriteria expected =
- CreateTestCriteria(typeof(Person))
- .Add(Restrictions.And(
- Restrictions.Eq("Name", "test name"),
- Restrictions.Or(
- Restrictions.Gt("Age", 21),
- Restrictions.Eq("HasCar", true))));
-
- ICriteria<Person> actual =
- CreateTestQueryOver<Person>()
- .Where(p => p.Name == "test name" && (p.Age > 21 || p.HasCar));
-
- AssertCriteriaAreEqual(expected, actual);
- }
-
- [Test]
- public void Where_BehavesTheSameAs_And()
- {
- Person personAlias = null;
- QueryOver<Person> expected = (QueryOver<Person>)
- CreateTestQueryOver<Person>(() => personAlias)
- .And(() => personAlias.Name == "test name")
- .And(p => p.Name == "test name");
-
- ICriteria<Person> actual =
- CreateTestQueryOver<Person>(() => personAlias)
- .Where(() => personAlias.Name == "test name")
- .Where(p => p.Name == "test name");
-
- AssertCriteriaAreEqual(expected.UnderlyingCriteria, actual);
- }
-
- [Test]
- public void SimpleCriterion_AliasReferenceSyntax()
- {
- ICriteria expected =
- CreateTestCriteria(typeof(Person), "personAlias")
- .Add(Restrictions.Eq("personAlias.Name", "test name"));
-
- Person personAlias = null;
- ICriteria<Person> actual =
- CreateTestQueryOver<Person>(() => personAlias)
- .Where(() => personAlias.Name == "test name");
-
- AssertCriteriaAreEqual(expected, actual);
- }
-
- [Test]
- public void SubCriteria_JoinWalk_ToOne()
- {
- ICriteria expected =
- CreateTestCriteria(typeof(Person))
- .CreateCriteria("Father")
- .Add(Expression.Eq("Name", "test name"));
-
- ICriteria<Person> actual =
- CreateTestQueryOver<Person>()
- .JoinWalk(p => p.Father) // sub-criteria
- .Where(f => f.Name == "test name");
-
- AssertCriteriaAreEqual(expected, actual);
- }
-
- [Test]
- public void SubCriteria_JoinWalk_ToMany()
- {
- ICriteria expected =
- CreateTestCriteria(typeof(Person))
- .CreateCriteria("Children")
- .Add(Expression.Eq("Nickname", "test name"));
-
- ICriteria<Child> actual =
- CreateTestQueryOver<Person>()
- .JoinWalk<Child>(p => p.Children) // sub-criteria
- .Where(c => c.Nickname == "test name");
-
- AssertCriteriaAreEqual(expected, actual);
- }
-
- [Test]
- public void Alias_Join()
- {
- ICriteria expected =
- CreateTestCriteria(typeof(Person))
- .CreateAlias("Father", "fatherAlias")
- .CreateAlias("Children", "childAlias");
-
- Person fatherAlias = null;
- Child childAlias = null;
- ICriteria<Person> actual =
- CreateTestQueryOver<Person>()
- .Join(p => p.Father, () => fatherAlias)
- .Join(p => p.Children, () => childAlias);
-
- AssertCriteriaAreEqual(expected, actual);
- }
-
- }
-
-}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/LambdaFixtureBase.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/LambdaFixtureBase.cs 2009-07-02 04:24:50 UTC (rev 4560)
+++ trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/LambdaFixtureBase.cs 2009-07-02 20:55:15 UTC (rev 4561)
@@ -30,12 +30,12 @@
return new CriteriaImpl(persistentClass, alias, null);
}
- protected ICriteria<T> CreateTestQueryOver<T>()
+ protected IQueryOver<T> CreateTestQueryOver<T>()
{
return new QueryOver<T>(new CriteriaImpl(typeof(T), null));
}
- protected ICriteria<T> CreateTestQueryOver<T>(Expression<Func<object>> alias)
+ protected IQueryOver<T> CreateTestQueryOver<T>(Expression<Func<object>> alias)
{
string aliasContainer = ExpressionProcessor.FindMemberExpression(alias.Body);
return new QueryOver<T>(new CriteriaImpl(typeof(T), aliasContainer, null));
@@ -51,7 +51,7 @@
AssertObjectsAreEqual(expected, actual);
}
- protected void AssertCriteriaAreEqual<T>(ICriteria expected, ICriteria<T> actual)
+ protected void AssertCriteriaAreEqual<T>(ICriteria expected, IQueryOver<T> actual)
{
AssertObjectsAreEqual(expected, ((QueryOver<T>)actual).UnderlyingCriteria);
}
Copied: trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs (from rev 4560, trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/CriteriaOfTFixture.cs)
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs 2009-07-02 20:55:15 UTC (rev 4561)
@@ -0,0 +1,168 @@
+using System;
+using System.Collections;
+
+using NUnit.Framework;
+
+using NHibernate.Criterion;
+using NHibernate.Transform;
+using NHibernate.Type;
+using NHibernate.Util;
+
+namespace NHibernate.Test.Criteria.Lambda
+{
+
+ [TestFixture]
+ public class QueryOverFixture : LambdaFixtureBase
+ {
+
+ [Test]
+ public void SimpleCriterion_NoAlias()
+ {
+ ICriteria expected =
+ CreateTestCriteria(typeof(Person))
+ .Add(Restrictions.Eq("Name", "test name"))
+ .Add(Restrictions.Not(Restrictions.Eq("Name", "not test name")))
+ .Add(Restrictions.Gt("Age", 10))
+ .Add(Restrictions.Ge("Age", 11))
+ .Add(Restrictions.Lt("Age", 50))
+ .Add(Restrictions.Le("Age", 49));
+
+ IQueryOver<Person> actual =
+ CreateTestQueryOver<Person>()
+ .And(p => p.Name == "test name")
+ .And(p => p.Name != "not test name")
+ .And(p => p.Age > 10)
+ .And(p => p.Age >= 11)
+ .And(p => p.Age < 50)
+ .And(p => p.Age <= 49);
+
+ AssertCriteriaAreEqual(expected, actual);
+ }
+
+ [Test]
+ public void PropertyCriterion_NoAlias()
+ {
+ ICriteria expected =
+ CreateTestCriteria(typeof(Person))
+ .Add(Restrictions.EqProperty("Age", "Height"))
+ .Add(Restrictions.NotEqProperty("Age", "Height"))
+ .Add(Restrictions.GtProperty("Age", "Height"))
+ .Add(Restrictions.GeProperty("Age", "Height"))
+ .Add(Restrictions.LtProperty("Age", "Height"))
+ .Add(Restrictions.LeProperty("Age", "Height"));
+
+ IQueryOver<Person> actual =
+ CreateTestQueryOver<Person>()
+ .And(p => p.Age == p.Height)
+ .And(p => p.Age != p.Height)
+ .And(p => p.Age > p.Height)
+ .And(p => p.Age >= p.Height)
+ .And(p => p.Age < p.Height)
+ .And(p => p.Age <= p.Height);
+
+ AssertCriteriaAreEqual(expected, actual);
+ }
+
+ [Test]
+ public void MultipleCriterionExpression()
+ {
+ ICriteria expected =
+ CreateTestCriteria(typeof(Person))
+ .Add(Restrictions.And(
+ Restrictions.Eq("Name", "test name"),
+ Restrictions.Or(
+ Restrictions.Gt("Age", 21),
+ Restrictions.Eq("HasCar", true))));
+
+ IQueryOver<Person> actual =
+ CreateTestQueryOver<Person>()
+ .Where(p => p.Name == "test name" && (p.Age > 21 || p.HasCar));
+
+ AssertCriteriaAreEqual(expected, actual);
+ }
+
+ [Test]
+ public void Where_BehavesTheSameAs_And()
+ {
+ Person personAlias = null;
+ QueryOver<Person> expected = (QueryOver<Person>)
+ CreateTestQueryOver<Person>(() => personAlias)
+ .And(() => personAlias.Name == "test name")
+ .And(p => p.Name == "test name");
+
+ IQueryOver<Person> actual =
+ CreateTestQueryOver<Person>(() => personAlias)
+ .Where(() => personAlias.Name == "test name")
+ .Where(p => p.Name == "test name");
+
+ AssertCriteriaAreEqual(expected.UnderlyingCriteria, actual);
+ }
+
+ [Test]
+ public void SimpleCriterion_AliasReferenceSyntax()
+ {
+ ICriteria expected =
+ CreateTestCriteria(typeof(Person), "personAlias")
+ .Add(Restrictions.Eq("personAlias.Name", "test name"));
+
+ Person personAlias = null;
+ IQueryOver<Person> actual =
+ CreateTestQueryOver<Person>(() => personAlias)
+ .Where(() => personAlias.Name == "test name");
+
+ AssertCriteriaAreEqual(expected, actual);
+ }
+
+ [Test]
+ public void SubCriteria_JoinWalk_ToOne()
+ {
+ ICriteria expected =
+ CreateTestCriteria(typeof(Person))
+ .CreateCriteria("Father")
+ .Add(Expression.Eq("Name", "test name"));
+
+ IQueryOver<Person> actual =
+ CreateTestQueryOver<Person>()
+ .JoinWalk(p => p.Father) // sub-criteria
+ .Where(f => f.Name == "test name");
+
+ AssertCriteriaAreEqual(expected, actual);
+ }
+
+ [Test]
+ public void SubCriteria_JoinWalk_ToMany()
+ {
+ ICriteria expected =
+ CreateTestCriteria(typeof(Person))
+ .CreateCriteria("Children")
+ .Add(Expression.Eq("Nickname", "test name"));
+
+ IQueryOver<Child> actual =
+ CreateTestQueryOver<Person>()
+ .JoinWalk<Child>(p => p.Children) // sub-criteria
+ .Where(c => c.Nickname == "test name");
+
+ AssertCriteriaAreEqual(expected, actual);
+ }
+
+ [Test]
+ public void Alias_Join()
+ {
+ ICriteria expected =
+ CreateTestCriteria(typeof(Person))
+ .CreateAlias("Father", "fatherAlias")
+ .CreateAlias("Children", "childAlias");
+
+ Person fatherAlias = null;
+ Child childAlias = null;
+ IQueryOver<Person> actual =
+ CreateTestQueryOver<Person>()
+ .Join(p => p.Father, () => fatherAlias)
+ .Join(p => p.Children, () => childAlias);
+
+ AssertCriteriaAreEqual(expected, actual);
+ }
+
+ }
+
+}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-02 04:24:50 UTC (rev 4560)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-02 20:55:15 UTC (rev 4561)
@@ -147,7 +147,7 @@
<Compile Include="Criteria\DetachedCriteriaSerializable.cs" />
<Compile Include="Criteria\Enrolment.cs" />
<Compile Include="Criteria\Lambda\CriteriaAssertFixture.cs" />
- <Compile Include="Criteria\Lambda\CriteriaOfTFixture.cs" />
+ <Compile Include="Criteria\Lambda\QueryOverFixture.cs" />
<Compile Include="Criteria\Lambda\IntegrationFixture.cs" />
<Compile Include="Criteria\Lambda\LambdaFixtureBase.cs" />
<Compile Include="Criteria\Lambda\Model.cs" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Heybrock T. <sl...@tu...> - 2009-07-02 13:29:45
|
Lovers Guide on Hwow to Be hte Best Lover www. med19. com. Marraigae by the Numbers |
|
From: <fab...@us...> - 2009-07-02 04:24:54
|
Revision: 4560
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4560&view=rev
Author: fabiomaulo
Date: 2009-07-02 04:24:50 +0000 (Thu, 02 Jul 2009)
Log Message:
-----------
Configuration through lambdas
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Cfg/Loquacious/ConfigurationExtensions.cs
trunk/nhibernate/src/NHibernate/Cfg/Loquacious/FluentSessionFactoryConfiguration.cs
trunk/nhibernate/src/NHibernate/Cfg/Loquacious/ICacheConfiguration.cs
trunk/nhibernate/src/NHibernate/Cfg/Loquacious/ICommandsConfiguration.cs
trunk/nhibernate/src/NHibernate/Cfg/Loquacious/IDbIntegrationConfiguration.cs
trunk/nhibernate/src/NHibernate/Cfg/Loquacious/IMappingsConfiguration.cs
trunk/nhibernate/src/NHibernate/Cfg/Loquacious/IProxyConfiguration.cs
trunk/nhibernate/src/NHibernate/Cfg/SettingsFactory.cs
trunk/nhibernate/src/NHibernate/NHibernate.csproj
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
trunk/nhibernate/src/NHibernate/Cfg/Hbm2ddlKeyWords.cs
trunk/nhibernate/src/NHibernate/Cfg/Loquacious/CacheConfiguration.cs
trunk/nhibernate/src/NHibernate/Cfg/Loquacious/DbIntegrationConfiguration.cs
trunk/nhibernate/src/NHibernate/Cfg/Loquacious/MappingsConfiguration.cs
trunk/nhibernate/src/NHibernate/Cfg/Loquacious/ProxyConfiguration.cs
trunk/nhibernate/src/NHibernate/Cfg/SchemaAutoAction.cs
trunk/nhibernate/src/NHibernate.Test/CfgTest/Loquacious/LambdaConfigurationFixture.cs
trunk/nhibernate/src/NHibernate.Test/CfgTest/SchemaAutoActionFixture.cs
Added: trunk/nhibernate/src/NHibernate/Cfg/Hbm2ddlKeyWords.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/Hbm2ddlKeyWords.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate/Cfg/Hbm2ddlKeyWords.cs 2009-07-02 04:24:50 UTC (rev 4560)
@@ -0,0 +1,85 @@
+namespace NHibernate.Cfg
+{
+ public class Hbm2DDLKeyWords
+ {
+ private readonly string value;
+
+ private Hbm2DDLKeyWords(string value)
+ {
+ this.value = value;
+ }
+
+ public override string ToString()
+ {
+ return value;
+ }
+
+ public override bool Equals(object obj)
+ {
+ if (ReferenceEquals(null, obj))
+ {
+ return false;
+ }
+ if (ReferenceEquals(this, obj))
+ {
+ return true;
+ }
+ if (obj.GetType() != typeof(Hbm2DDLKeyWords))
+ {
+ return false;
+ }
+ return Equals((Hbm2DDLKeyWords)obj);
+ }
+
+ public bool Equals(string other)
+ {
+ return value.Equals(other);
+ }
+
+ public bool Equals(Hbm2DDLKeyWords other)
+ {
+ if (ReferenceEquals(null, other))
+ {
+ return false;
+ }
+ if (ReferenceEquals(this, other))
+ {
+ return true;
+ }
+ return Equals(other.value, value);
+ }
+
+ public override int GetHashCode()
+ {
+ return (value != null ? value.GetHashCode() : 0);
+ }
+
+ public static bool operator ==(string a, Hbm2DDLKeyWords b)
+ {
+ if (ReferenceEquals(null, b))
+ {
+ return false;
+ }
+ return b.Equals(a);
+ }
+
+ public static bool operator ==(Hbm2DDLKeyWords a, string b)
+ {
+ return b == a;
+ }
+
+ public static bool operator !=(Hbm2DDLKeyWords a, string b)
+ {
+ return !(a == b);
+ }
+
+ public static bool operator !=(string a, Hbm2DDLKeyWords b)
+ {
+ return !(a == b);
+ }
+
+ public static Hbm2DDLKeyWords None = new Hbm2DDLKeyWords("none");
+ public static Hbm2DDLKeyWords Keywords = new Hbm2DDLKeyWords("keywords");
+ public static Hbm2DDLKeyWords AutoQuote = new Hbm2DDLKeyWords("auto-quote");
+ }
+}
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate/Cfg/Loquacious/CacheConfiguration.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/Loquacious/CacheConfiguration.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate/Cfg/Loquacious/CacheConfiguration.cs 2009-07-02 04:24:50 UTC (rev 4560)
@@ -0,0 +1,109 @@
+using NHibernate.Cache;
+
+namespace NHibernate.Cfg.Loquacious
+{
+ internal class CacheConfigurationProperties : ICacheConfigurationProperties
+ {
+ private readonly Configuration cfg;
+
+ public CacheConfigurationProperties(Configuration cfg)
+ {
+ this.cfg = cfg;
+ }
+
+ #region Implementation of ICacheConfigurationProperties
+
+ public bool UseMinimalPuts
+ {
+ set { cfg.SetProperty(Environment.UseMinimalPuts, value.ToString().ToLowerInvariant()); }
+ }
+
+ public string RegionsPrefix
+ {
+ set { cfg.SetProperty(Environment.CacheRegionPrefix, value); }
+ }
+
+ public byte DefaultExpiration
+ {
+ set { cfg.SetProperty(Environment.CacheDefaultExpiration, value.ToString()); }
+ }
+
+ public void Provider<TProvider>() where TProvider : ICacheProvider
+ {
+ cfg.SetProperty(Environment.CacheProvider, typeof (TProvider).AssemblyQualifiedName);
+ }
+
+ public void QueryCache<TFactory>() where TFactory : IQueryCache
+ {
+ cfg.SetProperty(Environment.QueryCacheFactory, typeof (TFactory).AssemblyQualifiedName);
+ }
+
+ #endregion
+ }
+
+ internal class CacheConfiguration : ICacheConfiguration
+ {
+ private readonly FluentSessionFactoryConfiguration fc;
+
+ public CacheConfiguration(FluentSessionFactoryConfiguration parent)
+ {
+ fc = parent;
+ Queries = new QueryCacheConfiguration(this);
+ }
+
+ internal Configuration Configuration
+ {
+ get { return fc.Configuration; }
+ }
+
+ #region Implementation of ICacheConfiguration
+
+ public ICacheConfiguration Through<TProvider>() where TProvider : ICacheProvider
+ {
+ fc.Configuration.SetProperty(Environment.CacheProvider, typeof(TProvider).AssemblyQualifiedName);
+ return this;
+ }
+
+ public ICacheConfiguration PrefixingRegionsWith(string regionPrefix)
+ {
+ fc.Configuration.SetProperty(Environment.CacheRegionPrefix, regionPrefix);
+ return this;
+ }
+
+ public ICacheConfiguration UsingMinimalPuts()
+ {
+ fc.Configuration.SetProperty(Environment.UseMinimalPuts, true.ToString().ToLowerInvariant());
+ return this;
+ }
+
+ public IFluentSessionFactoryConfiguration WithDefaultExpiration(byte seconds)
+ {
+ fc.Configuration.SetProperty(Environment.CacheDefaultExpiration, seconds.ToString());
+ return fc;
+ }
+
+ public IQueryCacheConfiguration Queries { get; private set; }
+
+ #endregion
+ }
+
+ internal class QueryCacheConfiguration : IQueryCacheConfiguration
+ {
+ private readonly CacheConfiguration cc;
+
+ public QueryCacheConfiguration(CacheConfiguration cc)
+ {
+ this.cc = cc;
+ }
+
+ #region Implementation of IQueryCacheConfiguration
+
+ public ICacheConfiguration Through<TFactory>() where TFactory : IQueryCache
+ {
+ cc.Configuration.SetProperty(Environment.QueryCacheFactory, typeof(TFactory).AssemblyQualifiedName);
+ return cc;
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Cfg/Loquacious/ConfigurationExtensions.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/Loquacious/ConfigurationExtensions.cs 2009-07-01 20:36:07 UTC (rev 4559)
+++ trunk/nhibernate/src/NHibernate/Cfg/Loquacious/ConfigurationExtensions.cs 2009-07-02 04:24:50 UTC (rev 4560)
@@ -1,3 +1,5 @@
+using System;
+using NHibernate.Hql;
namespace NHibernate.Cfg.Loquacious
{
public static class ConfigurationExtensions
@@ -6,5 +8,48 @@
{
return new FluentSessionFactoryConfiguration(configuration);
}
+
+ public static Configuration SessionFactoryName(this Configuration configuration, string sessionFactoryName)
+ {
+ configuration.SetProperty(Environment.SessionFactoryName, sessionFactoryName);
+ return configuration;
+ }
+
+ public static Configuration Cache(this Configuration configuration, Action<ICacheConfigurationProperties> cacheProperties)
+ {
+ cacheProperties(new CacheConfigurationProperties(configuration));
+ return configuration;
+ }
+
+ public static Configuration CollectionTypeFactory<TCollecionsFactory>(this Configuration configuration)
+ {
+ configuration.SetProperty(Environment.CollectionTypeFactoryClass,
+ typeof(TCollecionsFactory).AssemblyQualifiedName);
+ return configuration;
+ }
+
+ public static Configuration Proxy(this Configuration configuration, Action<IProxyConfigurationProperties> proxyProperties)
+ {
+ proxyProperties(new ProxyConfigurationProperties(configuration));
+ return configuration;
+ }
+
+ public static Configuration HqlQueryTranslator<TQueryTranslator>(this Configuration configuration) where TQueryTranslator : IQueryTranslatorFactory
+ {
+ configuration.SetProperty(Environment.QueryTranslator, typeof(TQueryTranslator).AssemblyQualifiedName);
+ return configuration;
+ }
+
+ public static Configuration Mappings(this Configuration configuration, Action<IMappingsConfigurationProperties> mappingsProperties)
+ {
+ mappingsProperties(new MappingsConfigurationProperties(configuration));
+ return configuration;
+ }
+
+ public static Configuration DataBaseIntegration(this Configuration configuration, Action<IDbIntegrationConfigurationProperties> dataBaseIntegration)
+ {
+ dataBaseIntegration(new DbIntegrationConfigurationProperties(configuration));
+ return configuration;
+ }
}
}
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate/Cfg/Loquacious/DbIntegrationConfiguration.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/Loquacious/DbIntegrationConfiguration.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate/Cfg/Loquacious/DbIntegrationConfiguration.cs 2009-07-02 04:24:50 UTC (rev 4560)
@@ -0,0 +1,382 @@
+using System.Data;
+using System.Data.Common;
+using NHibernate.Connection;
+using NHibernate.Driver;
+using NHibernate.AdoNet;
+using NHibernate.Exceptions;
+using NHibernate.Transaction;
+
+namespace NHibernate.Cfg.Loquacious
+{
+ internal class DbIntegrationConfiguration : IDbIntegrationConfiguration
+ {
+ private readonly Configuration configuration;
+
+ public DbIntegrationConfiguration(Configuration configuration)
+ {
+ this.configuration = configuration;
+ Connected = new ConnectionConfiguration(this);
+ BatchingQueries = new BatcherConfiguration(this);
+ Transactions = new TransactionConfiguration(this);
+ CreateCommands = new CommandsConfiguration(this);
+ Schema = new DbSchemaIntegrationConfiguration(this);
+ }
+
+ public Configuration Configuration
+ {
+ get { return configuration; }
+ }
+
+ #region Implementation of IDbIntegrationConfiguration
+
+ public IDbIntegrationConfiguration Using<TDialect>() where TDialect : Dialect.Dialect
+ {
+ configuration.SetProperty(Environment.Dialect, typeof(TDialect).AssemblyQualifiedName);
+ return this;
+ }
+
+ public IDbIntegrationConfiguration DisableKeywordsAutoImport()
+ {
+ configuration.SetProperty(Environment.Hbm2ddlKeyWords, "none");
+ return this;
+ }
+
+ public IDbIntegrationConfiguration AutoQuoteKeywords()
+ {
+ configuration.SetProperty(Environment.Hbm2ddlKeyWords, "auto-quote");
+ return this;
+ }
+
+ public IDbIntegrationConfiguration LogSqlInConsole()
+ {
+ configuration.SetProperty(Environment.ShowSql, "true");
+ return this;
+ }
+
+ public IDbIntegrationConfiguration DisableLogFormatedSql()
+ {
+ configuration.SetProperty(Environment.FormatSql, "false");
+ return this;
+ }
+
+ public IConnectionConfiguration Connected { get; private set; }
+ public IBatcherConfiguration BatchingQueries { get; private set; }
+ public ITransactionConfiguration Transactions { get; private set; }
+
+ public ICommandsConfiguration CreateCommands { get; private set; }
+
+ public IDbSchemaIntegrationConfiguration Schema { get; private set; }
+
+ #endregion
+ }
+
+ internal class DbSchemaIntegrationConfiguration : IDbSchemaIntegrationConfiguration
+ {
+ private readonly DbIntegrationConfiguration dbc;
+
+ public DbSchemaIntegrationConfiguration(DbIntegrationConfiguration dbc)
+ {
+ this.dbc = dbc;
+ }
+
+ #region Implementation of IDbSchemaIntegrationConfiguration
+
+ public IDbIntegrationConfiguration Recreating()
+ {
+ dbc.Configuration.SetProperty(Environment.Hbm2ddlAuto, SchemaAutoAction.Recreate.ToString());
+ return dbc;
+ }
+
+ public IDbIntegrationConfiguration Creating()
+ {
+ dbc.Configuration.SetProperty(Environment.Hbm2ddlAuto, SchemaAutoAction.Create.ToString());
+ return dbc;
+ }
+
+ public IDbIntegrationConfiguration Updating()
+ {
+ dbc.Configuration.SetProperty(Environment.Hbm2ddlAuto, SchemaAutoAction.Update.ToString());
+ return dbc;
+ }
+
+ public IDbIntegrationConfiguration Validating()
+ {
+ dbc.Configuration.SetProperty(Environment.Hbm2ddlAuto, SchemaAutoAction.Validate.ToString());
+ return dbc;
+ }
+
+ #endregion
+ }
+
+ internal class CommandsConfiguration : ICommandsConfiguration
+ {
+ private readonly DbIntegrationConfiguration dbc;
+
+ public CommandsConfiguration(DbIntegrationConfiguration dbc)
+ {
+ this.dbc = dbc;
+ }
+
+ #region Implementation of ICommandsConfiguration
+
+ public ICommandsConfiguration Preparing()
+ {
+ dbc.Configuration.SetProperty(Environment.PrepareSql, "true");
+ return this;
+ }
+
+ public ICommandsConfiguration WithTimeout(byte seconds)
+ {
+ dbc.Configuration.SetProperty(Environment.CommandTimeout, seconds.ToString());
+ return this;
+ }
+
+ public ICommandsConfiguration ConvertingExceptionsThrough<TExceptionConverter>()
+ where TExceptionConverter : ISQLExceptionConverter
+ {
+ dbc.Configuration.SetProperty(Environment.SqlExceptionConverter, typeof(TExceptionConverter).AssemblyQualifiedName);
+ return this;
+ }
+
+ public ICommandsConfiguration AutoCommentingSql()
+ {
+ dbc.Configuration.SetProperty(Environment.UseSqlComments, "true");
+ return this;
+ }
+
+ public IDbIntegrationConfiguration WithHqlToSqlSubstitutions(string csvQuerySubstitutions)
+ {
+ dbc.Configuration.SetProperty(Environment.QuerySubstitutions, csvQuerySubstitutions);
+ return dbc;
+ }
+
+ public IDbIntegrationConfiguration WithDefaultHqlToSqlSubstitutions()
+ {
+ return dbc;
+ }
+
+ public ICommandsConfiguration WithMaximumDepthOfOuterJoinFetching(byte maxFetchDepth)
+ {
+ dbc.Configuration.SetProperty(Environment.MaxFetchDepth, maxFetchDepth.ToString());
+ return this;
+ }
+
+ #endregion
+ }
+
+ internal class TransactionConfiguration : ITransactionConfiguration
+ {
+ private readonly DbIntegrationConfiguration dbc;
+
+ public TransactionConfiguration(DbIntegrationConfiguration dbc)
+ {
+ this.dbc = dbc;
+ }
+
+ #region Implementation of ITransactionConfiguration
+
+ public IDbIntegrationConfiguration Through<TFactory>() where TFactory : ITransactionFactory
+ {
+ dbc.Configuration.SetProperty(Environment.TransactionStrategy, typeof(TFactory).AssemblyQualifiedName);
+ return dbc;
+ }
+
+ #endregion
+ }
+
+ internal class BatcherConfiguration : IBatcherConfiguration
+ {
+ private readonly DbIntegrationConfiguration dbc;
+
+ public BatcherConfiguration(DbIntegrationConfiguration dbc)
+ {
+ this.dbc = dbc;
+ }
+
+ #region Implementation of IBatcherConfiguration
+
+ public IBatcherConfiguration Through<TBatcher>() where TBatcher : IBatcherFactory
+ {
+ dbc.Configuration.SetProperty(Environment.BatchStrategy, typeof(TBatcher).AssemblyQualifiedName);
+ return this;
+ }
+
+ public IDbIntegrationConfiguration Each(short batchSize)
+ {
+ dbc.Configuration.SetProperty(Environment.BatchSize, batchSize.ToString());
+ return dbc;
+ }
+
+ #endregion
+ }
+
+ internal class ConnectionConfiguration : IConnectionConfiguration
+ {
+ private readonly DbIntegrationConfiguration dbc;
+
+ public ConnectionConfiguration(DbIntegrationConfiguration dbc)
+ {
+ this.dbc = dbc;
+ }
+
+ #region Implementation of IConnectionConfiguration
+
+ public IConnectionConfiguration Through<TProvider>() where TProvider : IConnectionProvider
+ {
+ dbc.Configuration.SetProperty(Environment.ConnectionProvider, typeof(TProvider).AssemblyQualifiedName);
+ return this;
+ }
+
+ public IConnectionConfiguration By<TDriver>() where TDriver : IDriver
+ {
+ dbc.Configuration.SetProperty(Environment.ConnectionDriver, typeof(TDriver).AssemblyQualifiedName);
+ return this;
+ }
+
+ public IConnectionConfiguration With(IsolationLevel level)
+ {
+ dbc.Configuration.SetProperty(Environment.Isolation, level.ToString());
+ return this;
+ }
+
+ public IConnectionConfiguration Releasing(ConnectionReleaseMode releaseMode)
+ {
+ dbc.Configuration.SetProperty(Environment.ReleaseConnections, ConnectionReleaseModeParser.ToString(releaseMode));
+ return this;
+ }
+
+ public IDbIntegrationConfiguration Using(string connectionString)
+ {
+ dbc.Configuration.SetProperty(Environment.ConnectionString, connectionString);
+ return dbc;
+ }
+
+ public IDbIntegrationConfiguration Using(DbConnectionStringBuilder connectionStringBuilder)
+ {
+ dbc.Configuration.SetProperty(Environment.ConnectionString, connectionStringBuilder.ConnectionString);
+ return dbc;
+ }
+
+ public IDbIntegrationConfiguration ByAppConfing(string connectionStringName)
+ {
+ dbc.Configuration.SetProperty(Environment.ConnectionStringName, connectionStringName);
+ return dbc;
+ }
+
+ #endregion
+ }
+
+ internal class DbIntegrationConfigurationProperties: IDbIntegrationConfigurationProperties
+ {
+ private readonly Configuration configuration;
+
+ public DbIntegrationConfigurationProperties(Configuration configuration)
+ {
+ this.configuration = configuration;
+ }
+
+ #region Implementation of IDbIntegrationConfigurationProperties
+
+ public void Dialect<TDialect>() where TDialect : Dialect.Dialect
+ {
+ configuration.SetProperty(Environment.Dialect, typeof(TDialect).AssemblyQualifiedName);
+ }
+
+ public Hbm2DDLKeyWords KeywordsAutoImport
+ {
+ set { configuration.SetProperty(Environment.Hbm2ddlKeyWords, value.ToString()); }
+ }
+
+ public bool LogSqlInConsole
+ {
+ set { configuration.SetProperty(Environment.ShowSql, value.ToString().ToLowerInvariant()); }
+ }
+
+ public bool LogFormatedSql
+ {
+ set { configuration.SetProperty(Environment.FormatSql, value.ToString().ToLowerInvariant()); }
+ }
+
+ public void ConnectionProvider<TProvider>() where TProvider : IConnectionProvider
+ {
+ configuration.SetProperty(Environment.ConnectionProvider, typeof(TProvider).AssemblyQualifiedName);
+ }
+
+ public void Driver<TDriver>() where TDriver : IDriver
+ {
+ configuration.SetProperty(Environment.ConnectionDriver, typeof(TDriver).AssemblyQualifiedName);
+ }
+
+ public IsolationLevel IsolationLevel
+ {
+ set { configuration.SetProperty(Environment.Isolation, value.ToString()); }
+ }
+
+ public ConnectionReleaseMode ConnectionReleaseMode
+ {
+ set { configuration.SetProperty(Environment.ReleaseConnections, ConnectionReleaseModeParser.ToString(value)); }
+ }
+
+ public string ConnectionString
+ {
+ set { configuration.SetProperty(Environment.ConnectionString, value); }
+ }
+
+ public string ConnectionStringName
+ {
+ set { configuration.SetProperty(Environment.ConnectionStringName, value); }
+ }
+
+ public void Batcher<TBatcher>() where TBatcher : IBatcherFactory
+ {
+ configuration.SetProperty(Environment.BatchStrategy, typeof(TBatcher).AssemblyQualifiedName);
+ }
+
+ public short BatchSize
+ {
+ set { configuration.SetProperty(Environment.BatchSize, value.ToString()); }
+ }
+
+ public void TransactionFactory<TFactory>() where TFactory : ITransactionFactory
+ {
+ configuration.SetProperty(Environment.TransactionStrategy, typeof(TFactory).AssemblyQualifiedName);
+ }
+
+ public bool PrepareCommands
+ {
+ set { configuration.SetProperty(Environment.PrepareSql, value.ToString().ToLowerInvariant()); }
+ }
+
+ public byte Timeout
+ {
+ set { configuration.SetProperty(Environment.CommandTimeout, value.ToString()); }
+ }
+
+ public void ExceptionConverter<TExceptionConverter>() where TExceptionConverter : ISQLExceptionConverter
+ {
+ configuration.SetProperty(Environment.SqlExceptionConverter, typeof(TExceptionConverter).AssemblyQualifiedName);
+ }
+
+ public bool AutoCommentSql
+ {
+ set { configuration.SetProperty(Environment.UseSqlComments, value.ToString().ToLowerInvariant()); }
+ }
+
+ public string HqlToSqlSubstitutions
+ {
+ set { configuration.SetProperty(Environment.QuerySubstitutions, value); }
+ }
+
+ public byte MaximumDepthOfOuterJoinFetching
+ {
+ set { configuration.SetProperty(Environment.MaxFetchDepth, value.ToString()); }
+ }
+
+ public SchemaAutoAction SchemaAction
+ {
+ set { configuration.SetProperty(Environment.Hbm2ddlAuto, value.ToString()); }
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Cfg/Loquacious/FluentSessionFactoryConfiguration.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/Loquacious/FluentSessionFactoryConfiguration.cs 2009-07-01 20:36:07 UTC (rev 4559)
+++ trunk/nhibernate/src/NHibernate/Cfg/Loquacious/FluentSessionFactoryConfiguration.cs 2009-07-02 04:24:50 UTC (rev 4560)
@@ -1,13 +1,5 @@
-using System.Data;
-using System.Data.Common;
-using NHibernate.AdoNet;
using NHibernate.Bytecode;
-using NHibernate.Cache;
-using NHibernate.Connection;
-using NHibernate.Driver;
-using NHibernate.Exceptions;
using NHibernate.Hql;
-using NHibernate.Transaction;
namespace NHibernate.Cfg.Loquacious
{
@@ -68,358 +60,6 @@
#endregion
}
- internal class DbIntegrationConfiguration : IDbIntegrationConfiguration
- {
- private readonly Configuration configuration;
-
- public DbIntegrationConfiguration(Configuration configuration)
- {
- this.configuration = configuration;
- Connected = new ConnectionConfiguration(this);
- BatchingQueries = new BatcherConfiguration(this);
- Transactions = new TransactionConfiguration(this);
- CreateCommands = new CommandsConfiguration(this);
- Schema = new DbSchemaIntegrationConfiguration(this);
- }
-
- public Configuration Configuration
- {
- get { return configuration; }
- }
-
- #region Implementation of IDbIntegrationConfiguration
-
- public IDbIntegrationConfiguration Using<TDialect>() where TDialect : Dialect.Dialect
- {
- configuration.SetProperty(Environment.Dialect, typeof (TDialect).AssemblyQualifiedName);
- return this;
- }
-
- public IDbIntegrationConfiguration DisableKeywordsAutoImport()
- {
- configuration.SetProperty(Environment.Hbm2ddlKeyWords, "none");
- return this;
- }
-
- public IDbIntegrationConfiguration AutoQuoteKeywords()
- {
- configuration.SetProperty(Environment.Hbm2ddlKeyWords, "auto-quote");
- return this;
- }
-
- public IDbIntegrationConfiguration LogSqlInConsole()
- {
- configuration.SetProperty(Environment.ShowSql, "true");
- return this;
- }
-
- public IDbIntegrationConfiguration DisableLogFormatedSql()
- {
- configuration.SetProperty(Environment.FormatSql, "false");
- return this;
- }
-
- public IConnectionConfiguration Connected { get; private set; }
- public IBatcherConfiguration BatchingQueries { get; private set; }
- public ITransactionConfiguration Transactions { get; private set; }
-
- public ICommandsConfiguration CreateCommands { get; private set; }
-
- public IDbSchemaIntegrationConfiguration Schema { get; private set; }
-
- #endregion
- }
-
- internal class DbSchemaIntegrationConfiguration : IDbSchemaIntegrationConfiguration
- {
- private readonly DbIntegrationConfiguration dbc;
-
- public DbSchemaIntegrationConfiguration(DbIntegrationConfiguration dbc)
- {
- this.dbc = dbc;
- }
-
- #region Implementation of IDbSchemaIntegrationConfiguration
-
- public IDbIntegrationConfiguration Recreating()
- {
- dbc.Configuration.SetProperty(Environment.Hbm2ddlAuto, "create-drop");
- return dbc;
- }
-
- public IDbIntegrationConfiguration Creating()
- {
- dbc.Configuration.SetProperty(Environment.Hbm2ddlAuto, "create");
- return dbc;
- }
-
- public IDbIntegrationConfiguration Updating()
- {
- dbc.Configuration.SetProperty(Environment.Hbm2ddlAuto, "update");
- return dbc;
- }
-
- public IDbIntegrationConfiguration Validating()
- {
- dbc.Configuration.SetProperty(Environment.Hbm2ddlAuto, "validate");
- return dbc;
- }
-
- #endregion
- }
-
- internal class CommandsConfiguration : ICommandsConfiguration
- {
- private readonly DbIntegrationConfiguration dbc;
-
- public CommandsConfiguration(DbIntegrationConfiguration dbc)
- {
- this.dbc = dbc;
- }
-
- #region Implementation of ICommandsConfiguration
-
- public ICommandsConfiguration Preparing()
- {
- dbc.Configuration.SetProperty(Environment.PrepareSql, "true");
- return this;
- }
-
- public ICommandsConfiguration WithTimeout(int seconds)
- {
- dbc.Configuration.SetProperty(Environment.CommandTimeout, seconds.ToString());
- return this;
- }
-
- public ICommandsConfiguration ConvertingExceptionsThrough<TExceptionConverter>()
- where TExceptionConverter : ISQLExceptionConverter
- {
- dbc.Configuration.SetProperty(Environment.SqlExceptionConverter, typeof (TExceptionConverter).AssemblyQualifiedName);
- return this;
- }
-
- public ICommandsConfiguration AutoCommentingSql()
- {
- dbc.Configuration.SetProperty(Environment.UseSqlComments, "true");
- return this;
- }
-
- public IDbIntegrationConfiguration WithHqlToSqlSubstitutions(string csvQuerySubstitutions)
- {
- dbc.Configuration.SetProperty(Environment.QuerySubstitutions, csvQuerySubstitutions);
- return dbc;
- }
-
- public IDbIntegrationConfiguration WithDefaultHqlToSqlSubstitutions()
- {
- return dbc;
- }
-
- public ICommandsConfiguration WithMaximumDepthOfOuterJoinFetching(byte maxFetchDepth)
- {
- dbc.Configuration.SetProperty(Environment.MaxFetchDepth, maxFetchDepth.ToString());
- return this;
- }
-
- #endregion
- }
-
- internal class TransactionConfiguration : ITransactionConfiguration
- {
- private readonly DbIntegrationConfiguration dbc;
-
- public TransactionConfiguration(DbIntegrationConfiguration dbc)
- {
- this.dbc = dbc;
- }
-
- #region Implementation of ITransactionConfiguration
-
- public IDbIntegrationConfiguration Through<TFactory>() where TFactory : ITransactionFactory
- {
- dbc.Configuration.SetProperty(Environment.TransactionStrategy, typeof (TFactory).AssemblyQualifiedName);
- return dbc;
- }
-
- #endregion
- }
-
- internal class BatcherConfiguration : IBatcherConfiguration
- {
- private readonly DbIntegrationConfiguration dbc;
-
- public BatcherConfiguration(DbIntegrationConfiguration dbc)
- {
- this.dbc = dbc;
- }
-
- #region Implementation of IBatcherConfiguration
-
- public IBatcherConfiguration Through<TBatcher>() where TBatcher : IBatcherFactory
- {
- dbc.Configuration.SetProperty(Environment.BatchStrategy, typeof (TBatcher).AssemblyQualifiedName);
- return this;
- }
-
- public IDbIntegrationConfiguration Each(short batchSize)
- {
- dbc.Configuration.SetProperty(Environment.BatchSize, batchSize.ToString());
- return dbc;
- }
-
- #endregion
- }
-
- internal class ConnectionConfiguration : IConnectionConfiguration
- {
- private readonly DbIntegrationConfiguration dbc;
-
- public ConnectionConfiguration(DbIntegrationConfiguration dbc)
- {
- this.dbc = dbc;
- }
-
- #region Implementation of IConnectionConfiguration
-
- public IConnectionConfiguration Through<TProvider>() where TProvider : IConnectionProvider
- {
- dbc.Configuration.SetProperty(Environment.ConnectionProvider, typeof (TProvider).AssemblyQualifiedName);
- return this;
- }
-
- public IConnectionConfiguration By<TDriver>() where TDriver : IDriver
- {
- dbc.Configuration.SetProperty(Environment.ConnectionDriver, typeof (TDriver).AssemblyQualifiedName);
- return this;
- }
-
- public IConnectionConfiguration With(IsolationLevel level)
- {
- dbc.Configuration.SetProperty(Environment.Isolation, level.ToString());
- return this;
- }
-
- public IConnectionConfiguration Releasing(ConnectionReleaseMode releaseMode)
- {
- dbc.Configuration.SetProperty(Environment.ReleaseConnections, ConnectionReleaseModeParser.ToString(releaseMode));
- return this;
- }
-
- public IDbIntegrationConfiguration Using(string connectionString)
- {
- dbc.Configuration.SetProperty(Environment.ConnectionString, connectionString);
- return dbc;
- }
-
- public IDbIntegrationConfiguration Using(DbConnectionStringBuilder connectionStringBuilder)
- {
- dbc.Configuration.SetProperty(Environment.ConnectionString, connectionStringBuilder.ConnectionString);
- return dbc;
- }
-
- public IDbIntegrationConfiguration ByAppConfing(string connectionStringName)
- {
- dbc.Configuration.SetProperty(Environment.ConnectionStringName, connectionStringName);
- return dbc;
- }
-
- #endregion
- }
-
- internal class CacheConfiguration : ICacheConfiguration
- {
- private readonly FluentSessionFactoryConfiguration fc;
-
- public CacheConfiguration(FluentSessionFactoryConfiguration parent)
- {
- fc = parent;
- Queries = new QueryCacheConfiguration(this);
- }
-
- internal Configuration Configuration
- {
- get { return fc.Configuration; }
- }
-
- #region Implementation of ICacheConfiguration
-
- public ICacheConfiguration Through<TProvider>() where TProvider : ICacheProvider
- {
- fc.Configuration.SetProperty(Environment.CacheProvider, typeof (TProvider).AssemblyQualifiedName);
- return this;
- }
-
- public ICacheConfiguration PrefixingRegionsWith(string regionPrefix)
- {
- fc.Configuration.SetProperty(Environment.CacheRegionPrefix, regionPrefix);
- return this;
- }
-
- public ICacheConfiguration UsingMinimalPuts()
- {
- fc.Configuration.SetProperty(Environment.UseMinimalPuts, "true");
- return this;
- }
-
- public IFluentSessionFactoryConfiguration WithDefaultExpiration(byte seconds)
- {
- fc.Configuration.SetProperty(Environment.CacheDefaultExpiration, seconds.ToString());
- return fc;
- }
-
- public IQueryCacheConfiguration Queries { get; private set; }
-
- #endregion
- }
-
- internal class QueryCacheConfiguration : IQueryCacheConfiguration
- {
- private readonly CacheConfiguration cc;
-
- public QueryCacheConfiguration(CacheConfiguration cc)
- {
- this.cc = cc;
- }
-
- #region Implementation of IQueryCacheConfiguration
-
- public ICacheConfiguration Through<TFactory>() where TFactory : IQueryCache
- {
- cc.Configuration.SetProperty(Environment.QueryCacheFactory, typeof (TFactory).AssemblyQualifiedName);
- return cc;
- }
-
- #endregion
- }
-
- internal class ProxyConfiguration : IProxyConfiguration
- {
- private readonly FluentSessionFactoryConfiguration fc;
-
- public ProxyConfiguration(FluentSessionFactoryConfiguration parent)
- {
- fc = parent;
- }
-
- #region Implementation of IProxyConfiguration
-
- public IProxyConfiguration DisableValidation()
- {
- fc.Configuration.SetProperty(Environment.UseProxyValidator, "false");
- return this;
- }
-
- public IFluentSessionFactoryConfiguration Through<TProxyFactoryFactory>()
- where TProxyFactoryFactory : IProxyFactoryFactory
- {
- fc.Configuration.SetProperty(Environment.ProxyFactoryFactoryClass,
- typeof (TProxyFactoryFactory).AssemblyQualifiedName);
- return fc;
- }
-
- #endregion
- }
-
internal class CollectionFactoryConfiguration : ICollectionFactoryConfiguration
{
private readonly FluentSessionFactoryConfiguration fc;
@@ -441,30 +81,4 @@
#endregion
}
-
- internal class MappingsConfiguration : IMappingsConfiguration
- {
- private readonly FluentSessionFactoryConfiguration fc;
-
- public MappingsConfiguration(FluentSessionFactoryConfiguration parent)
- {
- fc = parent;
- }
-
- #region Implementation of IMappingsConfiguration
-
- public IMappingsConfiguration UsingDefaultCatalog(string defaultCatalogName)
- {
- fc.Configuration.SetProperty(Environment.DefaultCatalog, defaultCatalogName);
- return this;
- }
-
- public IFluentSessionFactoryConfiguration UsingDefaultSchema(string defaultSchemaName)
- {
- fc.Configuration.SetProperty(Environment.DefaultSchema, defaultSchemaName);
- return fc;
- }
-
- #endregion
- }
}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Cfg/Loquacious/ICacheConfiguration.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/Loquacious/ICacheConfiguration.cs 2009-07-01 20:36:07 UTC (rev 4559)
+++ trunk/nhibernate/src/NHibernate/Cfg/Loquacious/ICacheConfiguration.cs 2009-07-02 04:24:50 UTC (rev 4560)
@@ -9,4 +9,13 @@
IFluentSessionFactoryConfiguration WithDefaultExpiration(byte seconds);
IQueryCacheConfiguration Queries { get; }
}
+
+ public interface ICacheConfigurationProperties
+ {
+ bool UseMinimalPuts { set; }
+ string RegionsPrefix { set; }
+ byte DefaultExpiration { set; }
+ void Provider<TProvider>() where TProvider : ICacheProvider;
+ void QueryCache<TFactory>() where TFactory : IQueryCache;
+ }
}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Cfg/Loquacious/ICommandsConfiguration.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/Loquacious/ICommandsConfiguration.cs 2009-07-01 20:36:07 UTC (rev 4559)
+++ trunk/nhibernate/src/NHibernate/Cfg/Loquacious/ICommandsConfiguration.cs 2009-07-02 04:24:50 UTC (rev 4560)
@@ -4,7 +4,7 @@
public interface ICommandsConfiguration
{
ICommandsConfiguration Preparing();
- ICommandsConfiguration WithTimeout(int seconds);
+ ICommandsConfiguration WithTimeout(byte seconds);
ICommandsConfiguration ConvertingExceptionsThrough<TExceptionConverter>() where TExceptionConverter : ISQLExceptionConverter;
ICommandsConfiguration AutoCommentingSql();
IDbIntegrationConfiguration WithHqlToSqlSubstitutions(string csvQuerySubstitutions);
Modified: trunk/nhibernate/src/NHibernate/Cfg/Loquacious/IDbIntegrationConfiguration.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/Loquacious/IDbIntegrationConfiguration.cs 2009-07-01 20:36:07 UTC (rev 4559)
+++ trunk/nhibernate/src/NHibernate/Cfg/Loquacious/IDbIntegrationConfiguration.cs 2009-07-02 04:24:50 UTC (rev 4560)
@@ -1,3 +1,10 @@
+using System.Data;
+using NHibernate.AdoNet;
+using NHibernate.Driver;
+using NHibernate.Connection;
+using NHibernate.Transaction;
+using NHibernate.Exceptions;
+
namespace NHibernate.Cfg.Loquacious
{
public interface IDbIntegrationConfiguration
@@ -22,6 +29,34 @@
ICommandsConfiguration CreateCommands { get; }
IDbSchemaIntegrationConfiguration Schema { get; }
+ }
+ public interface IDbIntegrationConfigurationProperties
+ {
+ void Dialect<TDialect>() where TDialect : Dialect.Dialect;
+ Hbm2DDLKeyWords KeywordsAutoImport { set; }
+ bool LogSqlInConsole { set; }
+ bool LogFormatedSql { set; }
+
+ void ConnectionProvider<TProvider>() where TProvider : IConnectionProvider;
+ void Driver<TDriver>() where TDriver : IDriver;
+ IsolationLevel IsolationLevel { set; }
+ ConnectionReleaseMode ConnectionReleaseMode { set; }
+ string ConnectionString { set; }
+ string ConnectionStringName { set; }
+
+ void Batcher<TBatcher>() where TBatcher : IBatcherFactory;
+ short BatchSize { set; }
+
+ void TransactionFactory<TFactory>() where TFactory : ITransactionFactory;
+
+ bool PrepareCommands { set; }
+ byte Timeout { set; }
+ void ExceptionConverter<TExceptionConverter>() where TExceptionConverter : ISQLExceptionConverter;
+ bool AutoCommentSql { set; }
+ string HqlToSqlSubstitutions { set; }
+ byte MaximumDepthOfOuterJoinFetching { set; }
+
+ SchemaAutoAction SchemaAction { set; }
}
}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Cfg/Loquacious/IMappingsConfiguration.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/Loquacious/IMappingsConfiguration.cs 2009-07-01 20:36:07 UTC (rev 4559)
+++ trunk/nhibernate/src/NHibernate/Cfg/Loquacious/IMappingsConfiguration.cs 2009-07-02 04:24:50 UTC (rev 4560)
@@ -5,4 +5,10 @@
IMappingsConfiguration UsingDefaultCatalog(string defaultCatalogName);
IFluentSessionFactoryConfiguration UsingDefaultSchema(string defaultSchemaName);
}
+
+ public interface IMappingsConfigurationProperties
+ {
+ string DefaultCatalog { set; }
+ string DefaultSchema { set; }
+ }
}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Cfg/Loquacious/IProxyConfiguration.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/Loquacious/IProxyConfiguration.cs 2009-07-01 20:36:07 UTC (rev 4559)
+++ trunk/nhibernate/src/NHibernate/Cfg/Loquacious/IProxyConfiguration.cs 2009-07-02 04:24:50 UTC (rev 4560)
@@ -6,4 +6,10 @@
IProxyConfiguration DisableValidation();
IFluentSessionFactoryConfiguration Through<TProxyFactoryFactory>() where TProxyFactoryFactory : IProxyFactoryFactory;
}
+
+ public interface IProxyConfigurationProperties
+ {
+ bool Validation { set; }
+ void ProxyFactoryFactory<TProxyFactoryFactory>() where TProxyFactoryFactory : IProxyFactoryFactory;
+ }
}
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate/Cfg/Loquacious/MappingsConfiguration.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/Loquacious/MappingsConfiguration.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate/Cfg/Loquacious/MappingsConfiguration.cs 2009-07-02 04:24:50 UTC (rev 4560)
@@ -0,0 +1,54 @@
+using System;
+
+namespace NHibernate.Cfg.Loquacious
+{
+ internal class MappingsConfiguration : IMappingsConfiguration
+ {
+ private readonly FluentSessionFactoryConfiguration fc;
+
+ public MappingsConfiguration(FluentSessionFactoryConfiguration parent)
+ {
+ fc = parent;
+ }
+
+ #region Implementation of IMappingsConfiguration
+
+ public IMappingsConfiguration UsingDefaultCatalog(string defaultCatalogName)
+ {
+ fc.Configuration.SetProperty(Environment.DefaultCatalog, defaultCatalogName);
+ return this;
+ }
+
+ public IFluentSessionFactoryConfiguration UsingDefaultSchema(string defaultSchemaName)
+ {
+ fc.Configuration.SetProperty(Environment.DefaultSchema, defaultSchemaName);
+ return fc;
+ }
+
+ #endregion
+ }
+
+ internal class MappingsConfigurationProperties:IMappingsConfigurationProperties
+ {
+ private readonly Configuration configuration;
+
+ public MappingsConfigurationProperties(Configuration configuration)
+ {
+ this.configuration = configuration;
+ }
+
+ #region Implementation of IMappingsConfigurationProperties
+
+ public string DefaultCatalog
+ {
+ set { configuration.SetProperty(Environment.DefaultCatalog, value); }
+ }
+
+ public string DefaultSchema
+ {
+ set { configuration.SetProperty(Environment.DefaultSchema, value); }
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate/Cfg/Loquacious/ProxyConfiguration.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/Loquacious/ProxyConfiguration.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate/Cfg/Loquacious/ProxyConfiguration.cs 2009-07-02 04:24:50 UTC (rev 4560)
@@ -0,0 +1,57 @@
+using NHibernate.Bytecode;
+
+namespace NHibernate.Cfg.Loquacious
+{
+ internal class ProxyConfiguration : IProxyConfiguration
+ {
+ private readonly FluentSessionFactoryConfiguration fc;
+
+ public ProxyConfiguration(FluentSessionFactoryConfiguration parent)
+ {
+ fc = parent;
+ }
+
+ #region Implementation of IProxyConfiguration
+
+ public IProxyConfiguration DisableValidation()
+ {
+ fc.Configuration.SetProperty(Environment.UseProxyValidator, "false");
+ return this;
+ }
+
+ public IFluentSessionFactoryConfiguration Through<TProxyFactoryFactory>()
+ where TProxyFactoryFactory : IProxyFactoryFactory
+ {
+ fc.Configuration.SetProperty(Environment.ProxyFactoryFactoryClass,
+ typeof(TProxyFactoryFactory).AssemblyQualifiedName);
+ return fc;
+ }
+
+ #endregion
+ }
+
+ internal class ProxyConfigurationProperties: IProxyConfigurationProperties
+ {
+ private readonly Configuration configuration;
+
+ public ProxyConfigurationProperties(Configuration configuration)
+ {
+ this.configuration = configuration;
+ }
+
+ #region Implementation of IProxyConfigurationProperties
+
+ public bool Validation
+ {
+ set { configuration.SetProperty(Environment.UseProxyValidator, value.ToString().ToLowerInvariant()); }
+ }
+
+ public void ProxyFactoryFactory<TProxyFactoryFactory>() where TProxyFactoryFactory : IProxyFactoryFactory
+ {
+ configuration.SetProperty(Environment.ProxyFactoryFactoryClass,
+ typeof(TProxyFactoryFactory).AssemblyQualifiedName);
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate/Cfg/SchemaAutoAction.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/SchemaAutoAction.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate/Cfg/SchemaAutoAction.cs 2009-07-02 04:24:50 UTC (rev 4560)
@@ -0,0 +1,86 @@
+namespace NHibernate.Cfg
+{
+ public class SchemaAutoAction
+ {
+ private readonly string value;
+
+ private SchemaAutoAction(string value)
+ {
+ this.value = value;
+ }
+
+ public override string ToString()
+ {
+ return value;
+ }
+
+ public override bool Equals(object obj)
+ {
+ if (ReferenceEquals(null, obj))
+ {
+ return false;
+ }
+ if (ReferenceEquals(this, obj))
+ {
+ return true;
+ }
+ if (obj.GetType() != typeof(SchemaAutoAction))
+ {
+ return false;
+ }
+ return Equals((SchemaAutoAction)obj);
+ }
+
+ public bool Equals(string other)
+ {
+ return value.Equals(other);
+ }
+
+ public bool Equals(SchemaAutoAction other)
+ {
+ if (ReferenceEquals(null, other))
+ {
+ return false;
+ }
+ if (ReferenceEquals(this, other))
+ {
+ return true;
+ }
+ return Equals(other.value, value);
+ }
+
+ public override int GetHashCode()
+ {
+ return (value != null ? value.GetHashCode() : 0);
+ }
+
+ public static bool operator ==(string a, SchemaAutoAction b)
+ {
+ if (ReferenceEquals(null, b))
+ {
+ return false;
+ }
+ return b.Equals(a);
+ }
+
+ public static bool operator ==(SchemaAutoAction a, string b)
+ {
+ return b == a;
+ }
+
+ public static bool operator !=(SchemaAutoAction a, string b)
+ {
+ return !(a == b);
+ }
+
+ public static bool operator !=(string a, SchemaAutoAction b)
+ {
+ return !(a == b);
+ }
+
+ public static SchemaAutoAction Recreate = new SchemaAutoAction("create-drop");
+ public static SchemaAutoAction Create = new SchemaAutoAction("create");
+ public static SchemaAutoAction Update = new SchemaAutoAction("update");
+ public static SchemaAutoAction Validate = new SchemaAutoAction("validate");
+ }
+}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Cfg/SettingsFactory.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/SettingsFactory.cs 2009-07-01 20:36:07 UTC (rev 4559)
+++ trunk/nhibernate/src/NHibernate/Cfg/SettingsFactory.cs 2009-07-02 04:24:50 UTC (rev 4560)
@@ -142,43 +142,45 @@
#region Hbm2DDL
string autoSchemaExport = PropertiesHelper.GetString(Environment.Hbm2ddlAuto, properties, null);
- if ("update" == autoSchemaExport)
+ if (SchemaAutoAction.Update == autoSchemaExport)
{
settings.IsAutoUpdateSchema = true;
}
- if ("create" == autoSchemaExport)
+ else if (SchemaAutoAction.Create == autoSchemaExport)
{
settings.IsAutoCreateSchema = true;
}
- if ("create-drop" == autoSchemaExport)
+ else if (SchemaAutoAction.Recreate == autoSchemaExport)
{
settings.IsAutoCreateSchema = true;
settings.IsAutoDropSchema = true;
}
- if ("validate" == autoSchemaExport)
+ else if (SchemaAutoAction.Validate == autoSchemaExport)
{
settings.IsAutoValidateSchema = true;
}
string autoKeyWordsImport = PropertiesHelper.GetString(Environment.Hbm2ddlKeyWords, properties, "not-defined");
- switch (autoKeyWordsImport.ToLowerInvariant())
+ autoKeyWordsImport = autoKeyWordsImport.ToLowerInvariant();
+ if (autoKeyWordsImport == Hbm2DDLKeyWords.None)
{
- case "none":
- settings.IsKeywordsImportEnabled = false;
- settings.IsAutoQuoteEnabled = false;
- break;
- case "keywords":
- settings.IsKeywordsImportEnabled = true;
- break;
- case "auto-quote":
- settings.IsKeywordsImportEnabled = true;
- settings.IsAutoQuoteEnabled = true;
- break;
- case "not-defined":
- settings.IsKeywordsImportEnabled = true;
- settings.IsAutoQuoteEnabled = false;
- break;
+ settings.IsKeywordsImportEnabled = false;
+ settings.IsAutoQuoteEnabled = false;
}
+ else if (autoKeyWordsImport == Hbm2DDLKeyWords.Keywords)
+ {
+ settings.IsKeywordsImportEnabled = true;
+ }
+ else if (autoKeyWordsImport == Hbm2DDLKeyWords.AutoQuote)
+ {
+ settings.IsKeywordsImportEnabled = true;
+ settings.IsAutoQuoteEnabled = true;
+ }
+ else if (autoKeyWordsImport == "not-defined")
+ {
+ settings.IsKeywordsImportEnabled = true;
+ settings.IsAutoQuoteEnabled = false;
+ }
#endregion
Modified: trunk/nhibernate/src/NHibernate/NHibernate.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate/NHibernate.csproj 2009-07-01 20:36:07 UTC (rev 4559)
+++ trunk/nhibernate/src/NHibernate/NHibernate.csproj 2009-07-02 04:24:50 UTC (rev 4560)
@@ -459,7 +459,10 @@
<Compile Include="Bytecode\ProxyFactoryFactoryNotConfiguredException.cs" />
<Compile Include="Bytecode\UnableToLoadProxyFactoryFactoryException.cs" />
<Compile Include="Cache\FakeCache.cs" />
+ <Compile Include="Cfg\Hbm2ddlKeyWords.cs" />
+ <Compile Include="Cfg\Loquacious\CacheConfiguration.cs" />
<Compile Include="Cfg\Loquacious\ConfigurationExtensions.cs" />
+ <Compile Include="Cfg\Loquacious\DbIntegrationConfiguration.cs" />
<Compile Include="Cfg\Loquacious\FluentSessionFactoryConfiguration.cs" />
<Compile Include="Cfg\Loquacious\IBatcherConfiguration.cs" />
<Compile Include="Cfg\Loquacious\ICacheConfiguration.cs" />
@@ -473,6 +476,9 @@
<Compile Include="Cfg\Loquacious\IProxyConfiguration.cs" />
<Compile Include="Cfg\Loquacious\IQueryCacheConfiguration.cs" />
<Compile Include="Cfg\Loquacious\ITransactionConfiguration.cs" />
+ <Compile Include="Cfg\Loquacious\MappingsConfiguration.cs" />
+ <Compile Include="Cfg\Loquacious\ProxyConfiguration.cs" />
+ <Compile Include="Cfg\SchemaAutoAction.cs" />
<Compile Include="Cfg\SessionFactoryConfigurationBase.cs" />
<Compile Include="Cfg\ISessionFactoryConfiguration.cs" />
<Compile Include="Cfg\MappingSchema\AbstractDecoratable.cs" />
Added: trunk/nhibernate/src/NHibernate.Test/CfgTest/Loquacious/LambdaConfigurationFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/CfgTest/Loquacious/LambdaConfigurationFixture.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/CfgTest/Loquacious/LambdaConfigurationFixture.cs 2009-07-02 04:24:50 UTC (rev 4560)
@@ -0,0 +1,104 @@
+using NHibernate.AdoNet;
+using NHibernate.Cache;
+using NHibernate.Cfg;
+using NHibernate.Dialect;
+using NHibernate.Driver;
+using NHibernate.Hql.Classic;
+using NHibernate.Type;
+using NUnit.Framework;
+using NHibernate.Cfg.Loquacious;
+using System.Data;
+using NHibernate.Exceptions;
+
+namespace NHibernate.Test.CfgTest.Loquacious
+{
+ [TestFixture]
+ public class LambdaConfigurationFixture
+ {
+ [Test]
+ public void FullConfiguration()
+ {
+ var configure = new Configuration();
+ configure.SessionFactoryName("SomeName");
+ configure.Cache(c =>
+ {
+ c.UseMinimalPuts = true;
+ c.DefaultExpiration = 15;
+ c.RegionsPrefix = "xyz";
+ c.Provider<HashtableCacheProvider>();
+ c.QueryCache<StandardQueryCache>();
+ });
+ configure.CollectionTypeFactory<DefaultCollectionTypeFactory>();
+ configure.HqlQueryTranslator<ClassicQueryTranslatorFactory>();
+ configure.Proxy(p =>
+ {
+ p.Validation = false;
+ p.ProxyFactoryFactory<ByteCode.LinFu.ProxyFactoryFactory>();
+ });
+ configure.Mappings(m=>
+ {
+ m.DefaultCatalog = "MyCatalog";
+ m.DefaultSchema = "MySche";
+ });
+ configure.DataBaseIntegration(db =>
+ {
+ db.Dialect<MsSql2000Dialect>();
+ db.KeywordsAutoImport = Hbm2DDLKeyWords.AutoQuote;
+ db.Batcher<SqlClientBatchingBatcherFactory>();
+ db.BatchSize = 15;
+ db.ConnectionProvider<DebugConnectionProvider>();
+ db.Driver<SqlClientDriver>();
+ db.ConnectionReleaseMode = ConnectionReleaseMode.AfterTransaction;
+ db.IsolationLevel = IsolationLevel.ReadCommitted;
+ db.ConnectionString = "The connection string";
+ db.AutoCommentSql = true;
+ db.ExceptionConverter<SQLStateConverter>();
+ db.PrepareCommands = true;
+ db.Timeout = 10;
+ db.MaximumDepthOfOuterJoinFetching = 11;
+ db.HqlToSqlSubstitutions = "true 1, false 0, yes 'Y', no 'N'";
+ db.SchemaAction = SchemaAutoAction.Validate;
+ });
+
+ Assert.That(configure.Properties[Environment.SessionFactoryName], Is.EqualTo("SomeName"));
+ Assert.That(configure.Properties[Environment.CacheProvider],
+ Is.EqualTo(typeof(HashtableCacheProvider).AssemblyQualifiedName));
+ Assert.That(configure.Properties[Environment.CacheRegionPrefix], Is.EqualTo("xyz"));
+ Assert.That(configure.Properties[Environment.QueryCacheFactory],
+ Is.EqualTo(typeof(StandardQueryCache).AssemblyQualifiedName));
+ Assert.That(configure.Properties[Environment.UseMinimalPuts], Is.EqualTo("true"));
+ Assert.That(configure.Properties[Environment.CacheDefaultExpiration], Is.EqualTo("15"));
+ Assert.That(configure.Properties[Environment.CollectionTypeFactoryClass],
+ Is.EqualTo(typeof(DefaultCollectionTypeFactory).AssemblyQualifiedName));
+ Assert.That(configure.Properties[Environment.UseProxyValidator], Is.EqualTo("false"));
+ Assert.That(configure.Properties[Environment.ProxyFactoryFactoryClass],
+ Is.EqualTo(typeof(ByteCode.LinFu.ProxyFactoryFactory).AssemblyQualifiedName));
+ Assert.That(configure.Properties[Environment.QueryTranslator],
+ Is.EqualTo(typeof(ClassicQueryTranslatorFactory).AssemblyQualifiedName));
+ Assert.That(configure.Properties[Environment.DefaultCatalog], Is.EqualTo("MyCatalog"));
+ Assert.That(configure.Properties[Environment.DefaultSchema], Is.EqualTo("MySche"));
+ Assert.That(configure.Properties[Environment.Dialect],
+ Is.EqualTo(typeof(MsSql2000Dialect).AssemblyQualifiedName));
+ Assert.That(configure.Properties[Environment.Hbm2ddlKeyWords], Is.EqualTo("auto-quote"));
+ Assert.That(configure.Properties[Environment.BatchStrategy],
+ Is.EqualTo(typeof(SqlClientBatchingBatcherFactory).AssemblyQualifiedName));
+ Assert.That(configure.Properties[Environment.BatchSize], Is.EqualTo("15"));
+ Assert.That(configure.Properties[Environment.ConnectionProvider],
+ Is.EqualTo(typeof(DebugConnectionProvider).AssemblyQualifiedName));
+ Assert.That(configure.Properties[Environment.ConnectionDriver],
+ Is.EqualTo(typeof(SqlClientDriver).AssemblyQualifiedName));
+ Assert.That(configure.Properties[Environment.ReleaseConnections],
+ Is.EqualTo(ConnectionReleaseModeParser.ToString(ConnectionReleaseMode.AfterTransaction)));
+ Assert.That(configure.Properties[Environment.Isolation], Is.EqualTo("ReadCommitted"));
+ Assert.That(configure.Properties[Environment.ConnectionString], Is.EqualTo("The connection string"));
+ Assert.That(configure.Properties[Environment.UseSqlComments], Is.EqualTo("true"));
+ Assert.That(configure.Properties[Environment.SqlExceptionConverter],
+ Is.EqualTo(typeof(SQLStateConverter).AssemblyQualifiedName));
+ Assert.That(configure.Properties[Environment.PrepareSql], Is.EqualTo("true"));
+ Assert.That(configure.Properties[Environment.CommandTimeout], Is.EqualTo("10"));
+ Assert.That(configure.Properties[Environment.MaxFetchDepth], Is.EqualTo("11"));
+ Assert.That(configure.Properties[Environment.QuerySubstitutions], Is.EqualTo("true 1, false 0, yes 'Y', no 'N'"));
+ Assert.That(configure.Properties[Environment.Hbm2ddlAuto], Is.EqualTo("validate"));
+ }
+ }
+}
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate.Test/CfgTest/SchemaAutoActionFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/CfgTest/SchemaAutoActionFixture.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/CfgTest/SchemaAutoActionFixture.cs 2009-07-02 04:24:50 UTC (rev 4560)
@@ -0,0 +1,22 @@
+using NHibernate.Cfg;
+using NUnit.Framework;
+
+namespace NHibernate.Test.CfgTest
+{
+ [TestFixture]
+ public class SchemaAutoActionFixture
+ {
+ [Test]
+ public void Equality()
+ {
+ Assert.That(SchemaAutoAction.Recreate.Equals("create-drop"));
+ Assert.That(SchemaAutoAction.Recreate == "create-drop");
+ Assert.That(SchemaAutoAction.Create.Equals("create"));
+ Assert.That(SchemaAutoAction.Create == "create");
+ Assert.That(SchemaAutoAction.Update.Equals("update"));
+ Assert.That(SchemaAutoAction.Update == "update");
+ Assert.That(SchemaAutoAction.Validate.Equals("validate"));
+ Assert.That(SchemaAutoAction.Validate == "validate");
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-01 20:36:07 UTC (rev 4559)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-02 04:24:50 UTC (rev 4560)
@@ -108,8 +108,10 @@
<Compile Include="CfgTest\HbmOrderingFixture.cs" />
<Compile Include="CfgTest\LocatedInTestAssembly.cs" />
<Compile Include="CfgTest\Loquacious\ConfigurationFixture.cs" />
+ <Compile Include="CfgTest\Loquacious\LambdaConfigurationFixture.cs" />
<Compile Include="CfgTest\MappingDocumentAggregatorTests.cs" />
<Compile Include="CfgTest\MappingDocumentParserTests.cs" />
+ <Compile Include="CfgTest\SchemaAutoActionFixture.cs" />
<Compile Include="CfgTest\SettingsFactoryFixture.cs" />
<Compile Include="Classic\EntityWithLifecycle.cs" />
<Compile Include="Classic\LifecycleFixture.cs" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <te...@us...> - 2009-07-01 20:36:09
|
Revision: 4559
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4559&view=rev
Author: tehlike
Date: 2009-07-01 20:36:07 +0000 (Wed, 01 Jul 2009)
Log Message:
-----------
Adding tests for NH-1849
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/CustomDialect.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/Customer.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/Mappings.hbm.xml
Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/CustomDialect.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/CustomDialect.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/CustomDialect.cs 2009-07-01 20:36:07 UTC (rev 4559)
@@ -0,0 +1,13 @@
+using NHibernate.Dialect;
+using NHibernate.Dialect.Function;
+
+namespace NHibernate.Test.NHSpecificTest.NH1849
+{
+ public class CustomDialect : MsSql2005Dialect
+ {
+ public CustomDialect()
+ {
+ RegisterFunction("contains", new StandardSQLFunction("contains"));
+ }
+ }
+}
Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/Customer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/Customer.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/Customer.cs 2009-07-01 20:36:07 UTC (rev 4559)
@@ -0,0 +1,8 @@
+namespace NHibernate.Test.NHSpecificTest.NH1849
+{
+ public class Customer
+ {
+ public virtual int Id { get; set; }
+ public virtual string Name { get; set; }
+ }
+}
Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/Fixture.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/Fixture.cs 2009-07-01 20:36:07 UTC (rev 4559)
@@ -0,0 +1,41 @@
+using NHibernate.Dialect;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH1849
+{
+ using Criterion;
+
+ [TestFixture]
+ public class Fixture:BugTestCase
+ {
+ protected override bool AppliesTo(NHibernate.Dialect.Dialect dialect)
+ {
+ return dialect is MsSql2005Dialect;
+ }
+
+ protected override void Configure(NHibernate.Cfg.Configuration configuration)
+ {
+ base.Configure(configuration);
+
+ configuration.SetProperty("dialect", "NHibernate.Test.NHSpecificTest.NH1849.CustomDialect, NHibernate.Test");
+ }
+
+ /// <summary>
+ /// This test may throw an ado exception due to the absence of a full text index,
+ /// however the query should compile
+ /// </summary>
+ [Test,Ignore]
+ public void ExecutesCustomSqlFunctionContains()
+ {
+ sessions.Statistics.Clear();
+ using (ISession session = this.OpenSession())
+ {
+ session.CreateQuery("from Customer c where contains(c.Name, :smth)")
+ .SetString("smth","aaaa")
+ .List();
+
+ Assert.That(sessions.Statistics.QueryExecutionCount, Is.EqualTo(1));
+ }
+ }
+ }
+}
Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/Mappings.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/Mappings.hbm.xml (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1849/Mappings.hbm.xml 2009-07-01 20:36:07 UTC (rev 4559)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="NHibernate.Test"
+ namespace="NHibernate.Test.NHSpecificTest.NH1849"
+ default-lazy="false">
+
+ <class name="Customer">
+ <id name="Id">
+ <generator class="native"/>
+ </id>
+ <property name="Name"/>
+ </class>
+</hibernate-mapping>
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-01 20:17:23 UTC (rev 4558)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-01 20:36:07 UTC (rev 4559)
@@ -526,6 +526,9 @@
<Compile Include="NHSpecificTest\NH1837\Customer.cs" />
<Compile Include="NHSpecificTest\NH1837\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1837\Order.cs" />
+ <Compile Include="NHSpecificTest\NH1849\CustomDialect.cs" />
+ <Compile Include="NHSpecificTest\NH1849\Customer.cs" />
+ <Compile Include="NHSpecificTest\NH1849\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1850\Customer.cs" />
<Compile Include="NHSpecificTest\NH1850\Fixture.cs" />
<Compile Include="NHSpecificTest\NH473\Child.cs" />
@@ -1939,6 +1942,7 @@
<EmbeddedResource Include="DriverTest\MultiTypeEntity.hbm.xml" />
<EmbeddedResource Include="Criteria\Lambda\Mappings.hbm.xml" />
<Content Include="DynamicEntity\package.html" />
+ <EmbeddedResource Include="NHSpecificTest\NH1849\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1850\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1192\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1734\Mappings.hbm.xml" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ric...@us...> - 2009-07-01 20:17:28
|
Revision: 4558
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4558&view=rev
Author: ricbrown
Date: 2009-07-01 20:17:23 +0000 (Wed, 01 Jul 2009)
Log Message:
-----------
Move to single QueryOver class (instead of impl and detached-impl).
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Criterion/DetachedCriteria.cs
trunk/nhibernate/src/NHibernate/ICriteriaOfT.cs
trunk/nhibernate/src/NHibernate/Impl/SessionImpl.cs
trunk/nhibernate/src/NHibernate/NHibernate.csproj
trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/CriteriaOfTFixture.cs
trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/IntegrationFixture.cs
trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/LambdaFixtureBase.cs
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs
Removed Paths:
-------------
trunk/nhibernate/src/NHibernate/Criterion/DetachedCriteriaOfT.cs
trunk/nhibernate/src/NHibernate/Impl/CriteriaOfTImpl.cs
trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/DetachedCriteriaOfTFixture.cs
Modified: trunk/nhibernate/src/NHibernate/Criterion/DetachedCriteria.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Criterion/DetachedCriteria.cs 2009-07-01 18:48:00 UTC (rev 4557)
+++ trunk/nhibernate/src/NHibernate/Criterion/DetachedCriteria.cs 2009-07-01 20:17:23 UTC (rev 4558)
@@ -95,11 +95,6 @@
return new DetachedCriteria(entityName, alias);
}
- public static DetachedCriteria<T> QueryOver<T>()
- {
- return new DetachedCriteria<T>(new DetachedCriteria(typeof(T)));
- }
-
public DetachedCriteria Add(ICriterion criterion)
{
criteria.Add(criterion);
Deleted: trunk/nhibernate/src/NHibernate/Criterion/DetachedCriteriaOfT.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Criterion/DetachedCriteriaOfT.cs 2009-07-01 18:48:00 UTC (rev 4557)
+++ trunk/nhibernate/src/NHibernate/Criterion/DetachedCriteriaOfT.cs 2009-07-01 20:17:23 UTC (rev 4558)
@@ -1,61 +0,0 @@
-
-using System;
-using System.Linq.Expressions;
-
-using NHibernate.Impl;
-
-namespace NHibernate.Criterion
-{
-
- /// <summary>
- /// Some applications need to create criteria queries in "detached
- /// mode", where the Hibernate session is not available. This class
- /// may be instantiated anywhere, and then a <c>ICriteria</c>
- /// may be obtained by passing a session to
- /// <c>GetExecutableCriteria()</c>. All methods have the
- /// same semantics and behavior as the corresponding methods of the
- /// <c>ICriteria<T></c> interface.
- /// </summary>
- [Serializable]
- public class DetachedCriteria<T>
- {
-
- private DetachedCriteria _criteria;
-
- protected internal DetachedCriteria(DetachedCriteria detachedCriteria)
- {
- _criteria = detachedCriteria;
- }
-
- /// <summary>
- /// Get an executable instance of <c>Criteria<T></c>,
- /// to actually run the query.</summary>
- public ICriteria<T> GetExecutableCriteria(ISession session)
- {
- return new CriteriaImpl<T>(_criteria.GetExecutableCriteria(session));
- }
-
- public DetachedCriteria<T> And(Expression<Func<T, bool>> expression)
- {
- return Add(expression);
- }
-
- public DetachedCriteria<T> Where(Expression<Func<T, bool>> expression)
- {
- return Add(expression);
- }
-
- private DetachedCriteria<T> Add(Expression<Func<T, bool>> expression)
- {
- _criteria.Add(ExpressionProcessor.ProcessExpression<T>(expression));
- return this;
- }
-
- public static implicit operator DetachedCriteria(DetachedCriteria<T> detachedCriteria)
- {
- return detachedCriteria._criteria;
- }
-
- }
-
-}
\ No newline at end of file
Copied: trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs (from rev 4557, trunk/nhibernate/src/NHibernate/Impl/CriteriaOfTImpl.cs)
===================================================================
--- trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs 2009-07-01 20:17:23 UTC (rev 4558)
@@ -0,0 +1,118 @@
+
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+
+using NHibernate.Impl;
+using NHibernate.SqlCommand;
+
+namespace NHibernate.Criterion
+{
+
+ /// <summary>
+ /// Implementation of the <see cref="ICriteria<T>"/> interface
+ /// </summary>
+ [Serializable]
+ public class QueryOver<T> : ICriteria<T>
+ {
+
+ private ICriteria _criteria;
+ private CriteriaImpl _impl;
+
+ public QueryOver()
+ {
+ _impl = new CriteriaImpl(typeof(T), null);
+ _criteria = _impl;
+ }
+
+ public QueryOver(CriteriaImpl impl)
+ {
+ _impl = impl;
+ _criteria = impl;
+ }
+
+ public QueryOver(CriteriaImpl rootImpl, ICriteria criteria)
+ {
+ _impl = rootImpl;
+ _criteria = criteria;
+ }
+
+ public ICriteria UnderlyingCriteria
+ {
+ get { return _criteria; }
+ }
+
+ public ICriteria<T> And(Expression<Func<T, bool>> expression)
+ {
+ return Add(expression);
+ }
+
+ public ICriteria<T> And(Expression<Func<bool>> expression)
+ {
+ return Add(expression);
+ }
+
+ public ICriteria<T> Where(Expression<Func<T, bool>> expression)
+ {
+ return Add(expression);
+ }
+
+ public ICriteria<T> Where(Expression<Func<bool>> expression)
+ {
+ return Add(expression);
+ }
+
+ public ICriteria<U> JoinWalk<U>(Expression<Func<T, U>> path)
+ {
+ return new QueryOver<U>(_impl,
+ _criteria.CreateCriteria(
+ ExpressionProcessor.FindMemberExpression(path.Body)));
+ }
+
+ public ICriteria<U> JoinWalk<U>(Expression<Func<T, IEnumerable<U>>> path)
+ {
+ return new QueryOver<U>(_impl,
+ _criteria.CreateCriteria(
+ ExpressionProcessor.FindMemberExpression(path.Body)));
+ }
+
+ public ICriteria<T> Join(Expression<Func<T, object>> path, Expression<Func<object>> alias)
+ {
+ return AddAlias(
+ ExpressionProcessor.FindMemberExpression(path.Body),
+ ExpressionProcessor.FindMemberExpression(alias.Body),
+ JoinType.InnerJoin);
+ }
+
+ public IList<T> List()
+ {
+ return _criteria.List<T>();
+ }
+
+ public ICriteria<T> GetExecutableQueryOver(ISession session)
+ {
+ _impl.Session = session.GetSessionImplementation();
+ return this;
+ }
+
+ private QueryOver<T> AddAlias(string path, string alias, JoinType joinType)
+ {
+ _criteria.CreateAlias(path, alias, joinType);
+ return this;
+ }
+
+ private QueryOver<T> Add(Expression<Func<T, bool>> expression)
+ {
+ _criteria.Add(ExpressionProcessor.ProcessExpression<T>(expression));
+ return this;
+ }
+
+ private QueryOver<T> Add(Expression<Func<bool>> expression)
+ {
+ _criteria.Add(ExpressionProcessor.ProcessExpression(expression));
+ return this;
+ }
+
+ }
+
+}
Modified: trunk/nhibernate/src/NHibernate/ICriteriaOfT.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/ICriteriaOfT.cs 2009-07-01 18:48:00 UTC (rev 4557)
+++ trunk/nhibernate/src/NHibernate/ICriteriaOfT.cs 2009-07-01 20:17:23 UTC (rev 4558)
@@ -80,6 +80,11 @@
/// <returns>The list filled with the results.</returns>
IList<T> List();
+ /// <summary>
+ /// Get an executable instance of <c>Criteria<T></c>,
+ /// to actually run the query.</summary>
+ ICriteria<T> GetExecutableQueryOver(ISession session);
+
}
}
Deleted: trunk/nhibernate/src/NHibernate/Impl/CriteriaOfTImpl.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Impl/CriteriaOfTImpl.cs 2009-07-01 18:48:00 UTC (rev 4557)
+++ trunk/nhibernate/src/NHibernate/Impl/CriteriaOfTImpl.cs 2009-07-01 20:17:23 UTC (rev 4558)
@@ -1,96 +0,0 @@
-
-using System;
-using System.Collections.Generic;
-using System.Linq.Expressions;
-using NHibernate.SqlCommand;
-
-namespace NHibernate.Impl
-{
-
- /// <summary>
- /// Implementation of the <see cref="ICriteria<T>"/> interface
- /// </summary>
- [Serializable]
- public class CriteriaImpl<T> : ICriteria<T>
- {
-
- private ICriteria _criteria;
-
- public CriteriaImpl(ICriteria criteria)
- {
- _criteria = criteria;
- }
-
- public ICriteria UnderlyingCriteria
- {
- get { return _criteria; }
- }
-
- ICriteria<T> ICriteria<T>.And(Expression<Func<T, bool>> expression)
- {
- return Add(expression);
- }
-
- ICriteria<T> ICriteria<T>.And(Expression<Func<bool>> expression)
- {
- return Add(expression);
- }
-
- ICriteria<T> ICriteria<T>.Where(Expression<Func<T, bool>> expression)
- {
- return Add(expression);
- }
-
- ICriteria<T> ICriteria<T>.Where(Expression<Func<bool>> expression)
- {
- return Add(expression);
- }
-
- ICriteria<U> ICriteria<T>.JoinWalk<U>(Expression<Func<T, U>> path)
- {
- return new CriteriaImpl<U>(
- _criteria.CreateCriteria(
- ExpressionProcessor.FindMemberExpression(path.Body)));
- }
-
- ICriteria<U> ICriteria<T>.JoinWalk<U>(Expression<Func<T, IEnumerable<U>>> path)
- {
- return new CriteriaImpl<U>(
- _criteria.CreateCriteria(
- ExpressionProcessor.FindMemberExpression(path.Body)));
- }
-
- ICriteria<T> ICriteria<T>.Join(Expression<Func<T, object>> path, Expression<Func<object>> alias)
- {
- return AddAlias(
- ExpressionProcessor.FindMemberExpression(path.Body),
- ExpressionProcessor.FindMemberExpression(alias.Body),
- JoinType.InnerJoin);
- }
-
- IList<T> ICriteria<T>.List()
- {
- return _criteria.List<T>();
- }
-
- private CriteriaImpl<T> AddAlias(string path, string alias, JoinType joinType)
- {
- _criteria.CreateAlias(path, alias, joinType);
- return this;
- }
-
- private CriteriaImpl<T> Add(Expression<Func<T, bool>> expression)
- {
- _criteria.Add(ExpressionProcessor.ProcessExpression<T>(expression));
- return this;
- }
-
- private CriteriaImpl<T> Add(Expression<Func<bool>> expression)
- {
- _criteria.Add(ExpressionProcessor.ProcessExpression(expression));
- return this;
- }
-
- }
-
-}
Modified: trunk/nhibernate/src/NHibernate/Impl/SessionImpl.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Impl/SessionImpl.cs 2009-07-01 18:48:00 UTC (rev 4557)
+++ trunk/nhibernate/src/NHibernate/Impl/SessionImpl.cs 2009-07-01 20:17:23 UTC (rev 4558)
@@ -8,6 +8,7 @@
using log4net;
using NHibernate.AdoNet;
using NHibernate.Collection;
+using NHibernate.Criterion;
using NHibernate.Engine;
using NHibernate.Engine.Query;
using NHibernate.Engine.Query.Sql;
@@ -1875,7 +1876,8 @@
{
using (new SessionIdLoggingContext(SessionId))
{
- return new CriteriaImpl<T>(CreateCriteria(typeof(T)));
+ CheckAndUpdateSessionStatus();
+ return new QueryOver<T>(new CriteriaImpl(typeof(T), this));
}
}
Modified: trunk/nhibernate/src/NHibernate/NHibernate.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate/NHibernate.csproj 2009-07-01 18:48:00 UTC (rev 4557)
+++ trunk/nhibernate/src/NHibernate/NHibernate.csproj 2009-07-01 20:17:23 UTC (rev 4558)
@@ -479,7 +479,6 @@
<Compile Include="Cfg\MappingSchema\HbmTimestamp.cs" />
<Compile Include="Cfg\MappingSchema\HbmVersion.cs" />
<Compile Include="Cfg\MappingSchema\IDecoratable.cs" />
- <Compile Include="Criterion\DetachedCriteriaOfT.cs" />
<Compile Include="Criterion\IPropertyProjection.cs" />
<Compile Include="Dialect\MsSql2008Dialect.cs" />
<Compile Include="Dialect\InformixDialect0940.cs" />
@@ -531,7 +530,7 @@
<Compile Include="Hql\Ast\ANTLR\Tree\InsertStatement.cs" />
<Compile Include="Hql\Ast\ANTLR\Tree\UpdateStatement.cs" />
<Compile Include="ICriteriaOfT.cs" />
- <Compile Include="Impl\CriteriaOfTImpl.cs" />
+ <Compile Include="Criterion\QueryOver.cs" />
<Compile Include="Impl\ExpressionProcessor.cs" />
<Compile Include="Impl\SessionIdLoggingContext.cs" />
<Compile Include="Param\AbstractExplicitParameterSpecification.cs" />
Modified: trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/CriteriaOfTFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/CriteriaOfTFixture.cs 2009-07-01 18:48:00 UTC (rev 4557)
+++ trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/CriteriaOfTFixture.cs 2009-07-01 20:17:23 UTC (rev 4558)
@@ -85,7 +85,7 @@
public void Where_BehavesTheSameAs_And()
{
Person personAlias = null;
- Impl.CriteriaImpl<Person> expected = (Impl.CriteriaImpl<Person>)
+ QueryOver<Person> expected = (QueryOver<Person>)
CreateTestQueryOver<Person>(() => personAlias)
.And(() => personAlias.Name == "test name")
.And(p => p.Name == "test name");
Deleted: trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/DetachedCriteriaOfTFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/DetachedCriteriaOfTFixture.cs 2009-07-01 18:48:00 UTC (rev 4557)
+++ trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/DetachedCriteriaOfTFixture.cs 2009-07-01 20:17:23 UTC (rev 4558)
@@ -1,48 +0,0 @@
-using System;
-using System.Collections;
-
-using NUnit.Framework;
-
-using NHibernate.Criterion;
-using NHibernate.Transform;
-using NHibernate.Type;
-using NHibernate.Util;
-
-namespace NHibernate.Test.Criteria.Lambda
-{
-
- [TestFixture]
- public class DetachedCriteriaOfTFixture : LambdaFixtureBase
- {
-
- [Test]
- public void SimpleCriterion_NoAlias()
- {
- DetachedCriteria expected =
- DetachedCriteria.For<Person>()
- .Add(Restrictions.Eq("Name", "test name"));
-
- DetachedCriteria<Person> actual =
- DetachedCriteria.QueryOver<Person>()
- .Where(p => p.Name == "test name");
-
- AssertCriteriaAreEqual(expected, actual);
- }
-
- [Test]
- public void Where_BehavesTheSameAs_And()
- {
- DetachedCriteria<Person> expected =
- DetachedCriteria.QueryOver<Person>()
- .And(p => p.Name == "test name");
-
- DetachedCriteria<Person> actual =
- DetachedCriteria.QueryOver<Person>()
- .Where(p => p.Name == "test name");
-
- AssertCriteriaAreEqual(expected, actual);
- }
-
- }
-
-}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/IntegrationFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/IntegrationFixture.cs 2009-07-01 18:48:00 UTC (rev 4557)
+++ trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/IntegrationFixture.cs 2009-07-01 20:17:23 UTC (rev 4558)
@@ -68,7 +68,7 @@
}
[Test]
- public void DetachedCriteriaOfT_SimpleCriterion()
+ public void DetachedQuery_SimpleCriterion()
{
using (ISession s = OpenSession())
using (ITransaction t = s.BeginTransaction())
@@ -80,11 +80,11 @@
using (ISession s = OpenSession())
{
var personQuery =
- DetachedCriteria.QueryOver<Person>()
+ new QueryOver<Person>()
.Where(p => p.Name == "test person 1");
IList<Person> actual =
- personQuery.GetExecutableCriteria(s)
+ personQuery.GetExecutableQueryOver(s)
.List();
Assert.That(actual[0].Age, Is.EqualTo(20));
Modified: trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/LambdaFixtureBase.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/LambdaFixtureBase.cs 2009-07-01 18:48:00 UTC (rev 4557)
+++ trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/LambdaFixtureBase.cs 2009-07-01 20:17:23 UTC (rev 4558)
@@ -32,13 +32,13 @@
protected ICriteria<T> CreateTestQueryOver<T>()
{
- return new CriteriaImpl<T>(new CriteriaImpl(typeof(T), null));
+ return new QueryOver<T>(new CriteriaImpl(typeof(T), null));
}
protected ICriteria<T> CreateTestQueryOver<T>(Expression<Func<object>> alias)
{
string aliasContainer = ExpressionProcessor.FindMemberExpression(alias.Body);
- return new CriteriaImpl<T>(new CriteriaImpl(typeof(T), aliasContainer, null));
+ return new QueryOver<T>(new CriteriaImpl(typeof(T), aliasContainer, null));
}
protected void AssertCriteriaAreEqual(ICriteria expected, ICriteria actual)
@@ -53,7 +53,7 @@
protected void AssertCriteriaAreEqual<T>(ICriteria expected, ICriteria<T> actual)
{
- AssertObjectsAreEqual(expected, ((CriteriaImpl<T>)actual).UnderlyingCriteria);
+ AssertObjectsAreEqual(expected, ((QueryOver<T>)actual).UnderlyingCriteria);
}
private void AssertDictionariesAreEqual(IDictionary expected, IDictionary actual)
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-01 18:48:00 UTC (rev 4557)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-01 20:17:23 UTC (rev 4558)
@@ -146,7 +146,6 @@
<Compile Include="Criteria\Enrolment.cs" />
<Compile Include="Criteria\Lambda\CriteriaAssertFixture.cs" />
<Compile Include="Criteria\Lambda\CriteriaOfTFixture.cs" />
- <Compile Include="Criteria\Lambda\DetachedCriteriaOfTFixture.cs" />
<Compile Include="Criteria\Lambda\IntegrationFixture.cs" />
<Compile Include="Criteria\Lambda\LambdaFixtureBase.cs" />
<Compile Include="Criteria\Lambda\Model.cs" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dar...@us...> - 2009-07-01 18:48:29
|
Revision: 4557
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4557&view=rev
Author: darioquintana
Date: 2009-07-01 18:48:00 +0000 (Wed, 01 Jul 2009)
Log Message:
-----------
minor: marking as abstract to avoid the CI run this fixture
Modified Paths:
--------------
branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH645/HQLFunctionFixture.cs
Modified: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH645/HQLFunctionFixture.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH645/HQLFunctionFixture.cs 2009-07-01 18:45:34 UTC (rev 4556)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH645/HQLFunctionFixture.cs 2009-07-01 18:48:00 UTC (rev 4557)
@@ -31,7 +31,7 @@
}
}
- public class HQLFunctionFixtureBase : TestCase
+ public abstract class HQLFunctionFixtureBase : TestCase
{
private bool appliesToThisDialect = true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Tuna T. <te...@gm...> - 2009-07-01 18:48:06
|
It is a bug with NUnit Console Runner. Tuna Toksöz Eternal sunshine of the open source mind. http://devlicio.us/blogs/tuna_toksoz http://tunatoksoz.com http://twitter.com/tehlike On Wed, Jul 1, 2009 at 9:45 PM, <dar...@us...> wrote: > > minor: marking as abstract to avoid the CI run this fixture |
|
From: <dar...@us...> - 2009-07-01 18:46:04
|
Revision: 4556
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4556&view=rev
Author: darioquintana
Date: 2009-07-01 18:45:34 +0000 (Wed, 01 Jul 2009)
Log Message:
-----------
minor: marking as abstract to avoid the CI run this fixture
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH645/HQLFunctionFixture.cs
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH645/HQLFunctionFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH645/HQLFunctionFixture.cs 2009-07-01 18:37:12 UTC (rev 4555)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH645/HQLFunctionFixture.cs 2009-07-01 18:45:34 UTC (rev 4556)
@@ -31,7 +31,7 @@
}
}
- public class HQLFunctionFixtureBase : TestCase
+ public abstract class HQLFunctionFixtureBase : TestCase
{
private bool appliesToThisDialect = true;
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.
