From 7903c0019606e9394ef6339e4593e72fa6ddf1c5 Mon Sep 17 00:00:00 2001 From: yumoqing Date: Thu, 11 May 2023 16:43:14 +0800 Subject: [PATCH] bugfix --- dataloader/README.md | 0 dataloader/database.png | Bin dataloader/dataloader.py | 2 ++ dataloader/macos/dataloader.spec | 0 dataloader/table1.png | Bin dataloader/table2.png | Bin dataloader/typeconv.py | 2 +- dataloader/ubuntu/dataloader.spec | 0 dataloader/windows/dataloader.spec | 0 sqlor/const.py | 0 10 files changed, 3 insertions(+), 1 deletion(-) mode change 100644 => 100755 dataloader/README.md mode change 100644 => 100755 dataloader/database.png mode change 100644 => 100755 dataloader/macos/dataloader.spec mode change 100644 => 100755 dataloader/table1.png mode change 100644 => 100755 dataloader/table2.png mode change 100644 => 100755 dataloader/typeconv.py mode change 100644 => 100755 dataloader/ubuntu/dataloader.spec mode change 100644 => 100755 dataloader/windows/dataloader.spec mode change 100644 => 100755 sqlor/const.py diff --git a/dataloader/README.md b/dataloader/README.md old mode 100644 new mode 100755 diff --git a/dataloader/database.png b/dataloader/database.png old mode 100644 new mode 100755 diff --git a/dataloader/dataloader.py b/dataloader/dataloader.py index 7953e77..064176c 100755 --- a/dataloader/dataloader.py +++ b/dataloader/dataloader.py @@ -14,6 +14,8 @@ class CBObject: async def handle(self,ws): db = DBPools() async with db.sqlorContext(self.db) as sor: + delete_sql = "delete from %s" % self.tbl + await sor.sqlExe(delete_sql, {}) info = await sor.I(self.tbl) for rec in getRecord(ws): r = [ v for v in rec.values() if v is not None ] diff --git a/dataloader/macos/dataloader.spec b/dataloader/macos/dataloader.spec old mode 100644 new mode 100755 diff --git a/dataloader/table1.png b/dataloader/table1.png old mode 100644 new mode 100755 diff --git a/dataloader/table2.png b/dataloader/table2.png old mode 100644 new mode 100755 diff --git a/dataloader/typeconv.py b/dataloader/typeconv.py old mode 100644 new mode 100755 index 337da1a..d10173f --- a/dataloader/typeconv.py +++ b/dataloader/typeconv.py @@ -14,7 +14,7 @@ def conv(info, name, value): for f in fields: if f['name'] == name: f = convfuncs.get(f['type'], None) - if f is None: + if f is None or value is None: return value return f(value) return value diff --git a/dataloader/ubuntu/dataloader.spec b/dataloader/ubuntu/dataloader.spec old mode 100644 new mode 100755 diff --git a/dataloader/windows/dataloader.spec b/dataloader/windows/dataloader.spec old mode 100644 new mode 100755 diff --git a/sqlor/const.py b/sqlor/const.py old mode 100644 new mode 100755