From f66d76c4b5d4ec16c03e0211e16cc8881511a9fa Mon Sep 17 00:00:00 2001
From: sunkaixuan <610262374@qq.com>
Date: Mon, 21 Feb 2022 00:34:20 +0800
Subject: [PATCH] Update accress

---
 .../AccessTest/Demo/Demo1_Queryable.cs        |   4 +-
 Src/Asp.Net/AccessTest/Test.accdb             | Bin 528384 -> 532480 bytes
 .../SqlBuilder/AccessExpressionContext.cs     |  50 ++++++++++++++++++
 3 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/Src/Asp.Net/AccessTest/Demo/Demo1_Queryable.cs b/Src/Asp.Net/AccessTest/Demo/Demo1_Queryable.cs
index 8f3461488..3b139e5ab 100644
--- a/Src/Asp.Net/AccessTest/Demo/Demo1_Queryable.cs
+++ b/Src/Asp.Net/AccessTest/Demo/Demo1_Queryable.cs
@@ -121,7 +121,7 @@ namespace OrmTest
             //var test02 = db.Union(q1, q2).ToList();
             var test03 = db.Queryable<Order>().Take(1).ToList();
             var dp = DateTime.Now;
-            //var test05 = db.Queryable<Order>().Where(it => it.CreateTime.Month==  dp.Month).ToList();
+            var test05 = db.Queryable<Order>().Where(it => it.CreateTime.Month==  dp.Month).ToList();
             var test06 = db.Queryable<Order>()
                    .ToPivotTable(it => it.Id, it => it.Name, it => it.Sum(x => x.Price));
 
@@ -153,7 +153,7 @@ namespace OrmTest
               JoinType.Left, o.Name == SqlFunc.ToString(SqlFunc.MergeString(",", i.Name, ","))
             ))
             .Select<ViewOrder>().ToList();
-            var test16 = db.Queryable<Order>().Select(it => SqlFunc.SqlServer_DateDiff("day", DateTime.Now.AddDays(-1), DateTime.Now)).ToList();
+           // var test16 = db.Queryable<Order>().Select(it => SqlFunc.SqlServer_DateDiff("day", DateTime.Now.AddDays(-1), DateTime.Now)).ToList();
             var test17 =  
                db.Queryable<Order>()
                .Select<Order>()
diff --git a/Src/Asp.Net/AccessTest/Test.accdb b/Src/Asp.Net/AccessTest/Test.accdb
index 8394fe3a8eeb4079a5b78897f804f94b6da42243..47b8c07fee37d90fc993e3bebd53b8cceab95f9e 100644
GIT binary patch
delta 4048
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
P`i`HZ9X`GNE?xV7LDFS?

delta 371
zcmXYrJ4*vm5QTU4;lylq-GD}23>&bq5FY^pYN0~V((P<*1VIE-sD&1h5G>MU3CSQv
z$hEP}8t^tEY3!39Ago43Y}CR=LA*W&J_gP?bC_&1k*y`_vI*CXsQCh=glV2ztseNw
zwVlJZ0|Hr~2vmW_+fLWqt7c1*WK*AoV_@^Ng;(QB%E)-EzciGM`|J!TSionWrHqP;
zmX;Io0`<8fp5tj3mz>h*MjC+L7GOeCA>Y0Ids{2<ku7Bsc#y$k)o1zci!92P9*bl|
z!_U}c6miODv52Bdw#NqOMGl4dUKPv35TR%jlVZ6ot)G@%In39Zc;YDQ`o72FR0(i~
z<^qiKR)7|G^%V+kafga`I891Nn7bW(qN979CG$aO?+-$|dBka-t?LFrMc@B>LyC~`
tii3^h>POhCSNY{9E~<I}+yC}_*$5rb>86_Y>s3%tDtN4y=jG6z@eL;;dW!%6

diff --git a/Src/Asp.Net/SqlSugar.Access/Access/SqlBuilder/AccessExpressionContext.cs b/Src/Asp.Net/SqlSugar.Access/Access/SqlBuilder/AccessExpressionContext.cs
index ae8ee96f2..f30ecb5ec 100644
--- a/Src/Asp.Net/SqlSugar.Access/Access/SqlBuilder/AccessExpressionContext.cs
+++ b/Src/Asp.Net/SqlSugar.Access/Access/SqlBuilder/AccessExpressionContext.cs
@@ -20,6 +20,56 @@ namespace SqlSugar.Access
     }
     public partial class AccessMethod : DefaultDbMethod, IDbMethods
     {
+        public override string ToDate(MethodCallExpressionModel model)
+        {
+            var parameter = model.Args[0];
+            return string.Format(" CDate({0}) ", parameter.MemberName);
+        }
+        public override string ToBool(MethodCallExpressionModel model)
+        {
+            var parameter = model.Args[0];
+            return string.Format(" CDate({0}) ", parameter.MemberName);
+        }
+        public override string ToInt32(MethodCallExpressionModel model)
+        {
+            var parameter = model.Args[0];
+            return string.Format(" CInt({0}) ", parameter.MemberName);
+        }
+        public override string ToString(MethodCallExpressionModel model)
+        {
+            var parameter = model.Args[0];
+            return string.Format(" CVar({0}) ", parameter.MemberName);
+        }
+        public override string ToDateShort(MethodCallExpressionModel model)
+        {
+            var parameter = model.Args[0];
+            return string.Format(" Format$({0},\"Long Date\") ", parameter.MemberName);
+        }
+        public override string DateValue(MethodCallExpressionModel model)
+        {
+            var type = "";
+            if (model.Args[1].MemberValue.ObjToString() == "Day") 
+            {
+                type = "d";
+            }
+            if (model.Args[1].MemberValue.ObjToString() == "Month")
+            {
+                type = "m";
+            }
+            if (model.Args[1].MemberValue.ObjToString() == "Year")
+            {
+                type = "yyyy";
+            }
+            if (model.Args[1].MemberValue.ObjToString() == DateType.Minute.ToString())
+            {
+                type = "M";
+            }
+            if (model.Args[1].MemberValue.ObjToString() == DateType.Second.ToString())
+            {
+                type = "s";
+            }
+            return "DATEPART(\""+ type + "\", date())";
+        }
         public override string GetRandom()
         {
             return " rnd() ";