From 7794723d37061f026e7a8338712ee2933eb21275 Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Tue, 5 Sep 2017 11:31:34 +0800 Subject: [PATCH] Update Demo --- Src/Asp.Net/SqlServerTest/Demos/1_Query.cs | 12 ++++++++++++ .../QueryableProvider/QueryableProvider.cs | 16 ++++++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/Src/Asp.Net/SqlServerTest/Demos/1_Query.cs b/Src/Asp.Net/SqlServerTest/Demos/1_Query.cs index ef6abaae9..54f20ad42 100644 --- a/Src/Asp.Net/SqlServerTest/Demos/1_Query.cs +++ b/Src/Asp.Net/SqlServerTest/Demos/1_Query.cs @@ -35,6 +35,18 @@ namespace OrmTest.Demo var list= db.Queryable().Where(it => it.Id == 1).SingleAsync(); list.Start(); list.Wait(); + + var list2 = db.Queryable().SingleAsync(it => it.Id == 1); + list2.Start(); + list2.Wait(); + + var list3= db.Queryable().Where(it => it.Id == 1).ToListAsync(); + list3.Start(); + list3.Wait(); + + var list4= db.Queryable().Where(it => it.Id == 1).ToPageListAsync(1,2); + list4.Start(); + list4.Wait(); } private static void Simple() diff --git a/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs b/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs index 6d9968e8e..293affd66 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs @@ -336,9 +336,16 @@ namespace SqlSugar { QueryBuilder.OrderByValue = QueryBuilder.DefaultOrderByTemplate; } - QueryBuilder.Skip = 0; - QueryBuilder.Take = 2; + var oldSkip = QueryBuilder.Skip; + var oldTake = QueryBuilder.Take; + var oldOrderBy = QueryBuilder.OrderByValue; + QueryBuilder.Skip = null; + QueryBuilder.Take = null; + QueryBuilder.OrderByValue = null; var reval = this.ToList(); + QueryBuilder.Skip = oldSkip; + QueryBuilder.Take = oldTake; + QueryBuilder.OrderByValue = oldOrderBy; if (reval == null || reval.Count == 0) { return default(T); @@ -1004,6 +1011,11 @@ namespace SqlSugar private ISugarQueryable CopyQueryable() { var asyncContext = this.Context.CopyContext(this.Context.CurrentConnectionConfig); + asyncContext.Ado.IsEnableLogEvent = this.Context.Ado.IsEnableLogEvent; + asyncContext.Ado.LogEventStarting = this.Context.Ado.LogEventStarting; + asyncContext.Ado.LogEventCompleted = this.Context.Ado.LogEventCompleted; + asyncContext.Ado.ProcessingEventStartingSQL = this.Context.Ado.ProcessingEventStartingSQL; + var asyncQueryable = asyncContext.Queryable().Select(string.Empty); var asyncQueryableBuilder = asyncQueryable.QueryBuilder; asyncQueryableBuilder.Take = this.QueryBuilder.Take;