Merge branch 'main' of https://github.com/vnpy/vnpy_dolphindb

vnpy · Dec 8, 2021 · 42d6529 · 42d6529
2 parents cb1c6ea + 606ce88
commit 42d6529
Showing 1 changed file with 27 additions and 27 deletions.
diff --git a/vnpy_dolphindb/dolphindb_database.py b/vnpy_dolphindb/dolphindb_database.py
@@ -88,27 +88,27 @@ def save_bar_data(self, bars: List[BarData]) -> bool:
 
         df_start: pd.DataFrame = (
             table.select("*")
-            .where(f"symbol='{symbol}'")
-            .where(f"exchange='{exchange.value}'")
-            .where(f"interval='{interval.value}'")
+            .where(f"symbol=`{symbol}")
+            .where(f"exchange=`{exchange.value}")
+            .where(f"interval=`{interval.value}")
             .sort(bys=["datetime"]).top(1)
             .toDF()
         )
 
         df_end: pd.DataFrame = (
             table.select("*")
-            .where(f"symbol='{symbol}'")
-            .where(f"exchange='{exchange.value}'")
-            .where(f"interval='{interval.value}'")
+            .where(f"symbol=`{symbol}")
+            .where(f"exchange=`{exchange.value}")
+            .where(f"interval=`{interval.value}")
             .sort(bys=["datetime desc"]).top(1)
             .toDF()
         )
 
         df_count: pd.DataFrame = (
             table.select("count(*)")
-            .where(f"symbol='{symbol}'")
-            .where(f"exchange='{exchange.value}'")
-            .where(f"interval='{interval.value}'")
+            .where(f"symbol=`{symbol}")
+            .where(f"exchange=`{exchange.value}")
+            .where(f"interval=`{interval.value}")
             .toDF()
         )
 
@@ -221,9 +221,9 @@ def load_bar_data(
 
         df: pd.DataFrame = (
             table.select("*")
-            .where(f"symbol='{symbol}'")
-            .where(f"exchange='{exchange.value}'")
-            .where(f"interval='{interval.value}'")
+            .where(f"symbol=`{symbol}")
+            .where(f"exchange=`{exchange.value}")
+            .where(f"interval=`{interval.value}")
             .where(f"datetime>={start}")
             .where(f"datetime<={end}")
             .toDF()
@@ -277,8 +277,8 @@ def load_tick_data(
 
         df: pd.DataFrame = (
             table.select("*")
-            .where(f"symbol='{symbol}'")
-            .where(f"exchange='{exchange.value}'")
+            .where(f"symbol=`{symbol}")
+            .where(f"exchange=`{exchange.value}")
             .where(f"datetime>={start}")
             .where(f"datetime<={end}")
             .toDF()
@@ -350,29 +350,29 @@ def delete_bar_data(
         # 统计数据量
         df: pd.DataFrame = (
             table.select("count(*)")
-            .where(f"symbol='{symbol}'")
-            .where(f"exchange='{exchange.value}'")
-            .where(f"interval='{interval.value}'")
+            .where(f"symbol=`{symbol}")
+            .where(f"exchange=`{exchange.value}")
+            .where(f"interval=`{interval.value}")
             .toDF()
         )
         count = df["count"][0]
 
         # 删除K线数据
         (
             table.delete()
-            .where(f"symbol='{symbol}'")
-            .where(f"exchange='{exchange.value}'")
-            .where(f"interval='{interval.value}'")
+            .where(f"symbol=`{symbol}")
+            .where(f"exchange=`{exchange.value}")
+            .where(f"interval=`{interval.value}")
             .execute()
         )
 
         # 删除K线汇总
         table = self.session.loadTable(tableName="overview", dbPath=self.db_path)
         (
             table.delete()
-            .where(f"symbol='{symbol}'")
-            .where(f"exchange='{exchange.value}'")
-            .where(f"interval='{interval.value}'")
+            .where(f"symbol=`{symbol}")
+            .where(f"exchange=`{exchange.value}")
+            .where(f"interval=`{interval.value}")
             .execute()
         )
 
@@ -390,17 +390,17 @@ def delete_tick_data(
         # 统计数据量
         df: pd.DataFrame = (
             table.select("count(*)")
-            .where(f"symbol='{symbol}'")
-            .where(f"exchange='{exchange.value}'")
+            .where(f"symbol=`{symbol}")
+            .where(f"exchange=`{exchange.value}")
             .toDF()
         )
         count: int = df["count"][0]
 
         # 删除Tick数据
         (
             table.delete()
-            .where(f"symbol='{symbol}'")
-            .where(f"exchange='{exchange.value}'")
+            .where(f"symbol=`{symbol}")
+            .where(f"exchange=`{exchange.value}")
             .execute()
         )