From da7bcf441f8a5f9137adfe996d9a90aad5234810 Mon Sep 17 00:00:00 2001
From: sunkaixuan <610262374@qq.com>
Date: Mon, 21 Feb 2022 00:04:23 +0800
Subject: [PATCH] Update Access

---
 .../AccessTest/Demo/Demo0_SqlSugarClient.cs   | 190 +++++++++---------
 .../AccessTest/Demo/Demo1_Queryable.cs        |  12 +-
 Src/Asp.Net/AccessTest/Test.accdb             | Bin 507904 -> 528384 bytes
 Src/Asp.Net/AccessTest/Test.laccdb            | Bin 0 -> 64 bytes
 .../Access/SqlBuilder/AccessBuilder.cs        |   2 +
 .../SqlBuilder/AccessExpressionContext.cs     |  10 +-
 .../Access/SqlBuilder/AccessQueryBuilder.cs   |  10 +-
 7 files changed, 119 insertions(+), 105 deletions(-)
 create mode 100644 Src/Asp.Net/AccessTest/Test.laccdb

diff --git a/Src/Asp.Net/AccessTest/Demo/Demo0_SqlSugarClient.cs b/Src/Asp.Net/AccessTest/Demo/Demo0_SqlSugarClient.cs
index 2f2bd041b..ea2a54661 100644
--- a/Src/Asp.Net/AccessTest/Demo/Demo0_SqlSugarClient.cs
+++ b/Src/Asp.Net/AccessTest/Demo/Demo0_SqlSugarClient.cs
@@ -222,120 +222,120 @@ namespace OrmTest
 
         private static void DistributedTransactionExample()
         {
-            Console.WriteLine("");
-            Console.WriteLine("#### Distributed TransactionExample Start ####");
-            SqlSugarClient db = new SqlSugarClient(new List<ConnectionConfig>()
-            {
-                new ConnectionConfig(){ ConfigId="1", DbType=DbType.Access, ConnectionString=Config.ConnectionString,InitKeyType=InitKeyType.Attribute,IsAutoCloseConnection=true },
-                new ConnectionConfig(){ ConfigId="2", DbType=DbType.Access, ConnectionString=Config.ConnectionString2 ,InitKeyType=InitKeyType.Attribute ,IsAutoCloseConnection=true}
-            });
+            //Console.WriteLine("");
+            //Console.WriteLine("#### Distributed TransactionExample Start ####");
+            //SqlSugarClient db = new SqlSugarClient(new List<ConnectionConfig>()
+            //{
+            //    new ConnectionConfig(){ ConfigId="1", DbType=DbType.Access, ConnectionString=Config.ConnectionString,InitKeyType=InitKeyType.Attribute,IsAutoCloseConnection=true },
+            //    new ConnectionConfig(){ ConfigId="2", DbType=DbType.Access, ConnectionString=Config.ConnectionString2 ,InitKeyType=InitKeyType.Attribute ,IsAutoCloseConnection=true}
+            //});
 
-            //use db1
-            db.CodeFirst.SetStringDefaultLength(200).InitTables(typeof(Order), typeof(OrderItem));//
-            db.Insertable(new Order() { Name = "order1", CreateTime = DateTime.Now }).ExecuteCommand();
-            Console.WriteLine(db.CurrentConnectionConfig.DbType + ":" + db.Queryable<Order>().Count());
+            ////use db1
+            //db.CodeFirst.SetStringDefaultLength(200).InitTables(typeof(Order), typeof(OrderItem));//
+            //db.Insertable(new Order() { Name = "order1", CreateTime = DateTime.Now }).ExecuteCommand();
+            //Console.WriteLine(db.CurrentConnectionConfig.DbType + ":" + db.Queryable<Order>().Count());
 
-            //use db2
-            db.ChangeDatabase("2");
-            db.DbMaintenance.CreateDatabase();//Create Database2
-            db.CodeFirst.SetStringDefaultLength(200).InitTables(typeof(Order), typeof(OrderItem));
-            db.Insertable(new Order() { Name = "order1", CreateTime = DateTime.Now }).ExecuteCommand();
-            Console.WriteLine(db.CurrentConnectionConfig.DbType + ":" + db.Queryable<Order>().Count());
+            ////use db2
+            //db.ChangeDatabase("2");
+            //db.DbMaintenance.CreateDatabase();//Create Database2
+            //db.CodeFirst.SetStringDefaultLength(200).InitTables(typeof(Order), typeof(OrderItem));
+            //db.Insertable(new Order() { Name = "order1", CreateTime = DateTime.Now }).ExecuteCommand();
+            //Console.WriteLine(db.CurrentConnectionConfig.DbType + ":" + db.Queryable<Order>().Count());
 
-            // Example 1
-            Console.WriteLine("Example 1");
-            try
-            {
-                db.BeginTran();
+            //// Example 1
+            //Console.WriteLine("Example 1");
+            //try
+            //{
+            //    db.BeginTran();
 
-                db.ChangeDatabase("1");//use db1
-                db.Deleteable<Order>().ExecuteCommand();
-                Console.WriteLine("---Delete all " + db.CurrentConnectionConfig.DbType);
-                Console.WriteLine(db.Queryable<Order>().Count());
+            //    db.ChangeDatabase("1");//use db1
+            //    db.Deleteable<Order>().ExecuteCommand();
+            //    Console.WriteLine("---Delete all " + db.CurrentConnectionConfig.DbType);
+            //    Console.WriteLine(db.Queryable<Order>().Count());
 
-                db.ChangeDatabase("2");//use db2
-                db.Deleteable<Order>().ExecuteCommand();
-                Console.WriteLine("---Delete all " + db.CurrentConnectionConfig.DbType);
-                Console.WriteLine(db.Queryable<Order>().Count());
+            //    db.ChangeDatabase("2");//use db2
+            //    db.Deleteable<Order>().ExecuteCommand();
+            //    Console.WriteLine("---Delete all " + db.CurrentConnectionConfig.DbType);
+            //    Console.WriteLine(db.Queryable<Order>().Count());
 
-                throw new Exception();
-                db.CommitTran();
-            }
-            catch
-            {
-                db.RollbackTran();
-                Console.WriteLine("---Roll back");
-                db.ChangeDatabase("1");//use db1
-                Console.WriteLine(db.CurrentConnectionConfig.DbType);
-                Console.WriteLine(db.Queryable<Order>().Count());
+            //    throw new Exception();
+            //    db.CommitTran();
+            //}
+            //catch
+            //{
+            //    db.RollbackTran();
+            //    Console.WriteLine("---Roll back");
+            //    db.ChangeDatabase("1");//use db1
+            //    Console.WriteLine(db.CurrentConnectionConfig.DbType);
+            //    Console.WriteLine(db.Queryable<Order>().Count());
 
-                db.ChangeDatabase("2");//use db2
-                Console.WriteLine(db.CurrentConnectionConfig.DbType);
-                Console.WriteLine(db.Queryable<Order>().Count());
-            }
+            //    db.ChangeDatabase("2");//use db2
+            //    Console.WriteLine(db.CurrentConnectionConfig.DbType);
+            //    Console.WriteLine(db.Queryable<Order>().Count());
+            //}
 
 
 
-            // Example 2
-            Console.WriteLine("Example 2");
+            //// Example 2
+            //Console.WriteLine("Example 2");
 
-            var result = db.UseTran(() =>
-            {
+            //var result = db.UseTran(() =>
+            //{
 
-                db.ChangeDatabase("1");//use db1
-                db.Deleteable<Order>().ExecuteCommand();
-                Console.WriteLine("---Delete all " + db.CurrentConnectionConfig.DbType);
-                Console.WriteLine(db.Queryable<Order>().Count());
+            //    db.ChangeDatabase("1");//use db1
+            //    db.Deleteable<Order>().ExecuteCommand();
+            //    Console.WriteLine("---Delete all " + db.CurrentConnectionConfig.DbType);
+            //    Console.WriteLine(db.Queryable<Order>().Count());
 
-                db.ChangeDatabase("2");//use db2
-                db.Deleteable<Order>().ExecuteCommand();
-                Console.WriteLine("---Delete all " + db.CurrentConnectionConfig.DbType);
-                Console.WriteLine(db.Queryable<Order>().Count());
-                throw new Exception("");
+            //    db.ChangeDatabase("2");//use db2
+            //    db.Deleteable<Order>().ExecuteCommand();
+            //    Console.WriteLine("---Delete all " + db.CurrentConnectionConfig.DbType);
+            //    Console.WriteLine(db.Queryable<Order>().Count());
+            //    throw new Exception("");
 
-            });
-            if (result.IsSuccess == false)
-            {
-                Console.WriteLine("---Roll back");
-                db.ChangeDatabase("1");//use db1
-                Console.WriteLine(db.CurrentConnectionConfig.DbType);
-                Console.WriteLine(db.Queryable<Order>().Count());
+            //});
+            //if (result.IsSuccess == false)
+            //{
+            //    Console.WriteLine("---Roll back");
+            //    db.ChangeDatabase("1");//use db1
+            //    Console.WriteLine(db.CurrentConnectionConfig.DbType);
+            //    Console.WriteLine(db.Queryable<Order>().Count());
 
-                db.ChangeDatabase("2");//use db2
-                Console.WriteLine(db.CurrentConnectionConfig.DbType);
-                Console.WriteLine(db.Queryable<Order>().Count());
-            }
+            //    db.ChangeDatabase("2");//use db2
+            //    Console.WriteLine(db.CurrentConnectionConfig.DbType);
+            //    Console.WriteLine(db.Queryable<Order>().Count());
+            //}
 
-            // Example 3
-            Console.WriteLine("Example 3");
-            Task<DbResult<bool>> result2 = AsyncTranDemo(db);
-            result2.Wait();
+            //// Example 3
+            //Console.WriteLine("Example 3");
+            //Task<DbResult<bool>> result2 = AsyncTranDemo(db);
+            //result2.Wait();
  
-            // Example 4
-            Console.WriteLine("Example 4");
-            var mysqldb = db.GetConnection("1");//获取ConfigId为1的数据库对象
-            var sqlServerdb = db.GetConnection("2");//获取默认对象  
-            Console.WriteLine(mysqldb.Queryable<Order>().Count());
-            Console.WriteLine(sqlServerdb.Queryable<Order>().Count());
-            try
-            {
-                db.BeginTran();
+            //// Example 4
+            //Console.WriteLine("Example 4");
+            //var mysqldb = db.GetConnection("1");//获取ConfigId为1的数据库对象
+            //var sqlServerdb = db.GetConnection("2");//获取默认对象  
+            //Console.WriteLine(mysqldb.Queryable<Order>().Count());
+            //Console.WriteLine(sqlServerdb.Queryable<Order>().Count());
+            //try
+            //{
+            //    db.BeginTran();
 
-                sqlServerdb.Deleteable<Order>().ExecuteCommand();
-                mysqldb.Deleteable<Order>().ExecuteCommand();
-                Console.WriteLine(mysqldb.Queryable<Order>().Count());
-                Console.WriteLine(sqlServerdb.Queryable<Order>().Count());
+            //    sqlServerdb.Deleteable<Order>().ExecuteCommand();
+            //    mysqldb.Deleteable<Order>().ExecuteCommand();
+            //    Console.WriteLine(mysqldb.Queryable<Order>().Count());
+            //    Console.WriteLine(sqlServerdb.Queryable<Order>().Count());
 
-                throw new Exception("");
-                db.CommitTran();
-            }
-            catch (Exception)
-            {
-                db.RollbackTran();//数据回滚
-                Console.WriteLine(mysqldb.Queryable<Order>().Count());
-                Console.WriteLine(sqlServerdb.Queryable<Order>().Count());
-            }
-            Console.WriteLine("#### Distributed TransactionExample End ####");
+            //    throw new Exception("");
+            //    db.CommitTran();
+            //}
+            //catch (Exception)
+            //{
+            //    db.RollbackTran();//数据回滚
+            //    Console.WriteLine(mysqldb.Queryable<Order>().Count());
+            //    Console.WriteLine(sqlServerdb.Queryable<Order>().Count());
+            //}
+            //Console.WriteLine("#### Distributed TransactionExample End ####");
         }
 
         /// <summary>
diff --git a/Src/Asp.Net/AccessTest/Demo/Demo1_Queryable.cs b/Src/Asp.Net/AccessTest/Demo/Demo1_Queryable.cs
index a4a9df76c..8f3461488 100644
--- a/Src/Asp.Net/AccessTest/Demo/Demo1_Queryable.cs
+++ b/Src/Asp.Net/AccessTest/Demo/Demo1_Queryable.cs
@@ -111,17 +111,17 @@ namespace OrmTest
             var getByWhere = db.Queryable<Order>().Where(it => it.Id == 1 || it.Name == "a").ToList();
             var getByWhere2 = db.Queryable<Order>().Where(it => it.Id == DateTime.Now.Year).ToList();
             var getByFuns = db.Queryable<Order>().Where(it => SqlFunc.IsNullOrEmpty(it.Name)).ToList();
-            var getByFuns2 = db.Queryable<Order>().GroupBy(it => it.Name).Select(it => SqlFunc.AggregateDistinctCount(it.Price)).ToList();
+           // var getByFuns2 = db.Queryable<Order>().GroupBy(it => it.Name).Select(it => SqlFunc.AggregateDistinctCount(it.Price)).ToList();
             var getDicionary = db.Queryable<Order>().ToDictionary(it => it.Id, it => it.Name);
             var getDicionaryList = db.Queryable<Order>().ToDictionaryList();
             var getTest = db.Queryable<Order>().Where(it =>string.IsNullOrWhiteSpace( it.Name)).ToList();
-            var test01 = db.Queryable<Order>().PartitionBy(it => it.Id).ToList();
+           // var test01 = db.Queryable<Order>().PartitionBy(it => it.Id).ToList();
             var q1 = db.Queryable<Order>().Take(1);
             var q2 = db.Queryable<Order>().Take(2);
-            var test02 = db.Union(q1, q2).ToList();
+            //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));
 
@@ -131,8 +131,8 @@ namespace OrmTest
             var test08 = db.Queryable<Order>()
             .ToPivotJson(it => it.Id, it => it.Name, it => it.Sum(x => x.Price));
 
-            var test09 = db.Queryable<Order>().PartitionBy(it=>it.Id).ToPageListAsync(1,2,0);
-            test09.Wait();
+            //var test09 = db.Queryable<Order>().PartitionBy(it=>it.Id).ToPageListAsync(1,2,0);
+            //test09.Wait();
 
             int c = 0;
             var test10 = db.Queryable<Order>().ToPageList(1, 2, ref c);
diff --git a/Src/Asp.Net/AccessTest/Test.accdb b/Src/Asp.Net/AccessTest/Test.accdb
index 21d35872ac730c5a9aecd5663ddadc553a7a8110..8394fe3a8eeb4079a5b78897f804f94b6da42243 100644
GIT binary patch
delta 10265
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
Ole$z1sAk>3*8c;-Ycbpa

delta 816
zcmYLGT}TvB6h8OP&)pw)ej;sIH+TFaq}<k}tcY?gUrMvBhafO8vbV(DO2htKjq*jb
zb+G$VyDOAQppFhSK1Gi~hDJdJVJp$AS<#C`c4u|-gLBUP=6vU#Gv_8US|SlJu!I7p
zDt$+~CP_2Oyo^?;S}cTyH3jX`RW0lZ!X|=dRC_6-ySf?*qoCdr)y%d~st)gS>b+^7
zUJ~mm!~h5shyZB7Vh#>^Xh>{K8eh$9T;xsM_1Bp+{5+2y6|g$5?oWiQsTiq2N#lZ<
z?QKQou{%~l(s0h)#|k&-<dUP?bbn^pIuIdYWM)Tq@MhWABD<ux&v<Siyy9N<G@Yq$
zvb&X0PX^a>DXGa)7r2DOdOMC?0zJ_##;H7o{q)l$K5e^NnwrE1t({Z&L#um0;MQk_
z{nVpy@#)b4q2E=+G2@vDma9k<R}rRaO!U$!h4>J*8Wi#(pnj3qKj*+fT0SoSvinv`
zN#ph&6|S=c0+10jr)wHhuf9d@Jz0--#Zl;lD{vJ$pdBja_5vgT=+DFC()MNdpN|ii
z+E$%}%g_cFnXj0O14J}>qmJ}*k`!lqvHTJA8o9cmht;w{x~(7Qkt!YOlkCzi*88jo
zK-gJk#%K;a^Y+xu0{dj!MyiWNW;O_Ih>}WrE<?7`TT$|uu1sT550&$dwKc#@bZsQb
zS6MBmNU%hoTx`%M7Q+IMmOP!g*J6vWUBJ)SlWw8eIH@yBjU`VpLJy_R_50aO@8xm%
zrW}=h^0G9W-&za{psPwD?HD9p*KR0h(**>O===~Vb5`a#EzJsr^f%Ku@)}w*L@HeW
t74BTcCU@qzBcG>lnA*F+5E_%&YIDHwS)Mgj<*AJLky7Nd-la*k_7B6P&^!PD

diff --git a/Src/Asp.Net/AccessTest/Test.laccdb b/Src/Asp.Net/AccessTest/Test.laccdb
new file mode 100644
index 0000000000000000000000000000000000000000..c32ba73bffcf40569225158646105750ebeaeca7
GIT binary patch
literal 64
icmZ>94fYQ4570I7H8=M%abr+G1CA-VnRytZ2t@#z6bmE(

literal 0
HcmV?d00001

diff --git a/Src/Asp.Net/SqlSugar.Access/Access/SqlBuilder/AccessBuilder.cs b/Src/Asp.Net/SqlSugar.Access/Access/SqlBuilder/AccessBuilder.cs
index 2492c8bfd..1e268e2e7 100644
--- a/Src/Asp.Net/SqlSugar.Access/Access/SqlBuilder/AccessBuilder.cs
+++ b/Src/Asp.Net/SqlSugar.Access/Access/SqlBuilder/AccessBuilder.cs
@@ -11,5 +11,7 @@ namespace SqlSugar.Access
     {
         public override string SqlTranslationLeft { get { return "["; } }
         public override string SqlTranslationRight { get { return "]"; } }
+        public override string SqlDateNow { get { return " NOW()"; } }
+        public override string FullSqlDateNow { get { return "SELECT NOW()"; } }
     }
 }
diff --git a/Src/Asp.Net/SqlSugar.Access/Access/SqlBuilder/AccessExpressionContext.cs b/Src/Asp.Net/SqlSugar.Access/Access/SqlBuilder/AccessExpressionContext.cs
index 2ab60719b..ae8ee96f2 100644
--- a/Src/Asp.Net/SqlSugar.Access/Access/SqlBuilder/AccessExpressionContext.cs
+++ b/Src/Asp.Net/SqlSugar.Access/Access/SqlBuilder/AccessExpressionContext.cs
@@ -14,12 +14,20 @@ namespace SqlSugar.Access
         public SqlSugarProvider Context { get; set; }
         public AccessExpressionContext()
         {
-            base.DbMehtods = new SqlServerMethod();
+            base.DbMehtods = new AccessMethod();
         }
 
     }
     public partial class AccessMethod : DefaultDbMethod, IDbMethods
     {
+        public override string GetRandom()
+        {
+            return " rnd() ";
+        }
+        public override string GetDate()
+        {
+            return " NOW()";
+        }
         public override string HasValue(MethodCallExpressionModel model)
         {
             if (model.Args[0].Type == UtilConstants.GuidType)
diff --git a/Src/Asp.Net/SqlSugar.Access/Access/SqlBuilder/AccessQueryBuilder.cs b/Src/Asp.Net/SqlSugar.Access/Access/SqlBuilder/AccessQueryBuilder.cs
index 5d8e46fcc..069ccf6d5 100644
--- a/Src/Asp.Net/SqlSugar.Access/Access/SqlBuilder/AccessQueryBuilder.cs
+++ b/Src/Asp.Net/SqlSugar.Access/Access/SqlBuilder/AccessQueryBuilder.cs
@@ -23,13 +23,17 @@ namespace SqlSugar.Access
             var isIgnoreOrderBy = this.IsCount && this.PartitionByValue.IsNullOrEmpty();
             AppendFilter();
             sql = new StringBuilder();
-            if (this.OrderByValue == null && (Skip != null || Take != null)) this.OrderByValue = " ORDER BY GetDate() ";
+            if (this.OrderByValue == null && (Skip != null || Take != null)) this.OrderByValue = " ORDER BY now() ";
             if (this.PartitionByValue.HasValue())
             {
                 this.OrderByValue = this.PartitionByValue + this.OrderByValue;
             }
             var isFirst = (Skip == 0 || Skip == null) && Take == 1 && DisableTop == false;
             var isRowNumber = (Skip != null || Take != null) && !isFirst;
+            var isPage = isRowNumber;
+            isRowNumber = false;
+            Skip = null;
+            Take = null;
             var rowNumberString = string.Format(",ROW_NUMBER() OVER({0}) AS RowIndex ", GetOrderByString);
             string groupByValue = GetGroupByString + HavingInfos;
             string orderByValue = (!isRowNumber && this.OrderByValue.HasValue()) ? GetOrderByString : null;
@@ -42,7 +46,7 @@ namespace SqlSugar.Access
             {
                 if (externalOrderBy.IsNullOrEmpty())
                 {
-                    externalOrderBy = " ORDER BY GetDate() ";
+                    externalOrderBy = " ORDER BY now() ";
                 }
                 result = string.Format("SELECT *,ROW_NUMBER() OVER({0}) AS RowIndex2 FROM ({1}) ExternalTable ", GetExternalOrderBy(externalOrderBy), result);
                 result = ToPageSql2(result, ExternalPageIndex, ExternalPageSize, true);
@@ -52,7 +56,7 @@ namespace SqlSugar.Access
             {
                 if (this.OrderByValue.IsNullOrEmpty())
                 {
-                    result += " ORDER BY GETDATE() ";
+                    result += " ORDER BY now() ";
                 }
                 result += this.Offset;
             }