@@ -308,11 +308,11 @@ private void CommaBetweenParameters(String comma)
308
308
writer . CommaBetweenParameters ( comma ) ;
309
309
}
310
310
311
- private void StartQuery ( )
312
- {
313
- outputStack . Insert ( 0 , writer ) ;
314
- writer = new QueryWriter ( ) ;
315
- }
311
+ private void StartQuery ( )
312
+ {
313
+ outputStack . Insert ( 0 , writer ) ;
314
+ writer = new QueryWriter ( ) ;
315
+ }
316
316
317
317
private void EndQuery ( )
318
318
{
@@ -327,7 +327,7 @@ private SqlString GetSqlStringWithLimitsIfNeeded(QueryWriter queryWriter)
327
327
{
328
328
Parameter skipParameter = null ;
329
329
Parameter takeParameter = null ;
330
- if ( queryWriter . SkipParameter != null )
330
+ if ( queryWriter . SkipParameter != null )
331
331
{
332
332
queryWriter . SkipParameter . ExpectedType = NHibernateUtil . Int32 ;
333
333
queryWriter . SkipParameter . IsSkipParameter ( ) ;
@@ -346,19 +346,23 @@ private SqlString GetSqlStringWithLimitsIfNeeded(QueryWriter queryWriter)
346
346
// The dialect can move the given parameters where he need, what it can't do is generates new parameters, losing the BackTrack.
347
347
var dialect = sessionFactory . Dialect ;
348
348
return dialect . GetLimitString ( queryWriter . ToSqlString ( ) ,
349
- queryWriter . Skip . HasValue ? ( int ? ) dialect . GetOffsetValue ( queryWriter . Skip . Value ) : null ,
350
- queryWriter . Take . HasValue ? ( int ? ) dialect . GetLimitValue ( queryWriter . Skip ?? 0 , queryWriter . Take . Value ) : null ,
349
+ queryWriter . Skip . HasValue
350
+ ? ( int ? ) dialect . GetOffsetValue ( queryWriter . Skip . Value )
351
+ : null ,
352
+ queryWriter . Take . HasValue
353
+ ? ( int ? ) dialect . GetLimitValue ( queryWriter . Skip ?? 0 , queryWriter . Take . Value )
354
+ : null ,
351
355
skipParameter ,
352
356
takeParameter ) ;
353
357
}
354
358
355
359
private void Skip ( IASTNode node )
356
360
{
357
- var queryWriter = ( QueryWriter ) writer ;
361
+ var queryWriter = ( QueryWriter ) writer ;
358
362
var pnode = node as ParameterNode ;
359
363
if ( pnode != null )
360
364
{
361
- queryWriter . SkipParameter = ( IPageableParameterSpecification ) pnode . HqlParameterSpecification ;
365
+ queryWriter . SkipParameter = ( IPageableParameterSpecification ) pnode . HqlParameterSpecification ;
362
366
collectedParameters . Add ( pnode . HqlParameterSpecification ) ;
363
367
return ;
364
368
}
@@ -367,11 +371,11 @@ private void Skip(IASTNode node)
367
371
368
372
private void Take ( IASTNode node )
369
373
{
370
- var queryWriter = ( QueryWriter ) writer ;
374
+ var queryWriter = ( QueryWriter ) writer ;
371
375
var pnode = node as ParameterNode ;
372
376
if ( pnode != null )
373
377
{
374
- queryWriter . TakeParameter = ( IPageableParameterSpecification ) pnode . HqlParameterSpecification ;
378
+ queryWriter . TakeParameter = ( IPageableParameterSpecification ) pnode . HqlParameterSpecification ;
375
379
collectedParameters . Add ( pnode . HqlParameterSpecification ) ;
376
380
return ;
377
381
}
@@ -419,54 +423,54 @@ public void CommaBetweenParameters(String comma)
419
423
420
424
#endregion
421
425
422
- #region Nested type: QueryWriter
426
+ #region Nested type: QueryWriter
423
427
424
- /// <summary>
425
- /// The default SQL writer.
426
- /// </summary>
427
- private class QueryWriter : ISqlWriter
428
- {
429
- private readonly SqlStringBuilder builder = new SqlStringBuilder ( ) ;
428
+ /// <summary>
429
+ /// The default SQL writer.
430
+ /// </summary>
431
+ private class QueryWriter : ISqlWriter
432
+ {
433
+ private readonly SqlStringBuilder builder = new SqlStringBuilder ( ) ;
430
434
431
- public IPageableParameterSpecification TakeParameter { get ; set ; }
432
- public IPageableParameterSpecification SkipParameter { get ; set ; }
433
- public int ? Skip { get ; set ; }
434
- public int ? Take { get ; set ; }
435
+ public IPageableParameterSpecification TakeParameter { get ; set ; }
436
+ public IPageableParameterSpecification SkipParameter { get ; set ; }
437
+ public int ? Skip { get ; set ; }
438
+ public int ? Take { get ; set ; }
435
439
436
- #region ISqlWriter Members
440
+ #region ISqlWriter Members
437
441
438
- public void Clause ( String clause )
439
- {
440
- builder . Add ( clause ) ;
441
- }
442
+ public void Clause ( String clause )
443
+ {
444
+ builder . Add ( clause ) ;
445
+ }
442
446
443
- public void Clause ( SqlString clause )
444
- {
445
- builder . Add ( clause ) ;
446
- }
447
+ public void Clause ( SqlString clause )
448
+ {
449
+ builder . Add ( clause ) ;
450
+ }
447
451
448
- public void PushParameter ( Parameter parameter )
449
- {
450
- builder . Add ( parameter ) ;
451
- }
452
+ public void PushParameter ( Parameter parameter )
453
+ {
454
+ builder . Add ( parameter ) ;
455
+ }
452
456
453
- public void CommaBetweenParameters ( String comma )
454
- {
455
- builder . Add ( comma ) ;
456
- }
457
+ public void CommaBetweenParameters ( String comma )
458
+ {
459
+ builder . Add ( comma ) ;
460
+ }
457
461
458
- public SqlString ToSqlString ( )
459
- {
460
- return builder . ToSqlString ( ) ;
461
- }
462
+ public SqlString ToSqlString ( )
463
+ {
464
+ return builder . ToSqlString ( ) ;
465
+ }
462
466
463
467
464
- #endregion
465
- }
468
+ #endregion
469
+ }
466
470
467
- #endregion
471
+ #endregion
468
472
469
- #region Nested type: FunctionArguments
473
+ #region Nested type: FunctionArguments
470
474
471
475
private class FunctionArguments : ISqlWriter
472
476
{
0 commit comments