From ea7dae2fe8d1e3a580247bf173816f80c007111a Mon Sep 17 00:00:00 2001
From: 2881099 <2881099@qq.com>
Date: Wed, 28 Jun 2023 16:19:57 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E8=B0=83=E6=95=B4=20QuestDB=20SampleUnits?=
 =?UTF-8?q?=20=E5=91=BD=E5=90=8D=EF=BC=8C=E5=8E=BB=E6=8E=89=20s=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../QuestDbGlobalExtensions.cs                |  8 ++--
 .../FreeSql.Provider.QuestDb/QuestDbUtils.cs  | 44 ++++---------------
 2 files changed, 12 insertions(+), 40 deletions(-)

diff --git a/Providers/FreeSql.Provider.QuestDb/QuestDbGlobalExtensions.cs b/Providers/FreeSql.Provider.QuestDb/QuestDbGlobalExtensions.cs
index aed7de90..92483dd9 100644
--- a/Providers/FreeSql.Provider.QuestDb/QuestDbGlobalExtensions.cs
+++ b/Providers/FreeSql.Provider.QuestDb/QuestDbGlobalExtensions.cs
@@ -113,15 +113,13 @@ public static partial class QuestDbGlobalExtensions
     /// <param name="unit">单位</param>
     /// <param name="alignToCalendar">对准日历</param>
     /// <returns></returns>
-    public static ISelect<T> SampleBy<T>(this ISelect<T> select, double time, SampleUnits unit, bool alignToCalendar = false)
+    public static ISelect<T> SampleBy<T>(this ISelect<T> select, double time, SampleUnit unit, bool alignToCalendar = false)
     {
-        var _unit = Enum.GetName(typeof(SampleUnits), unit);
         SampleByExtension.IsExistence.Value = true;
         var samoleByTemple = $"{Environment.NewLine}SAMPLE BY {{0}}{{1}} {{2}}";
         string alignToCalendarTemple = "";
-        if (alignToCalendar)
-            alignToCalendarTemple = "ALIGN TO CALENDAR ";
-        SampleByExtension.SamoleByString.Value = string.Format(samoleByTemple, time.ToString(), _unit, alignToCalendarTemple);
+        if (alignToCalendar) alignToCalendarTemple = "ALIGN TO CALENDAR ";
+        SampleByExtension.SamoleByString.Value = string.Format(samoleByTemple, time.ToString(), (char)unit, alignToCalendarTemple);
         return select;
     }
 
diff --git a/Providers/FreeSql.Provider.QuestDb/QuestDbUtils.cs b/Providers/FreeSql.Provider.QuestDb/QuestDbUtils.cs
index ea2c4147..4d71da00 100644
--- a/Providers/FreeSql.Provider.QuestDb/QuestDbUtils.cs
+++ b/Providers/FreeSql.Provider.QuestDb/QuestDbUtils.cs
@@ -301,41 +301,15 @@ namespace FreeSql.QuestDb
 
 namespace FreeSql
 {
-    public enum SampleUnits
+    public enum SampleUnit
     {
-        /// <summary>
-        /// 微秒
-        /// </summary>
-        U,
-
-        /// <summary>
-        /// 毫秒
-        /// </summary>
-        T,
-
-        /// <summary>
-        /// 秒
-        /// </summary>
-        s,
-
-        /// <summary>
-        /// 分钟
-        /// </summary>
-        m,
-
-        /// <summary>
-        /// 时
-        /// </summary>
-        h,
-
-        /// <summary>
-        /// 天
-        /// </summary>
-        d,
-
-        /// <summary>
-        /// 月
-        /// </summary>
-        M
+        microsecond = 'U',
+        millisecond = 'T',
+        second = 's',
+        minute = 'm',
+        hour = 'h',
+        day = 'd',
+        month = 'M',
+        year = 'y',
     }
 }
\ No newline at end of file