tdm
/
vmm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix None handling in SQL

This commit is contained in:
Tom Marshall 2021-04-28 16:25:46 -07:00
parent 0b0d4944fd
commit dfc50fa05f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vmmd
View File

@ -602,6 +602,9 @@ class DbTable:
query = "CREATE TABLE IF NOT EXISTS %s (%s)" % (self._name, sql)
self._dbconn.execute(query)
def _sql_val_str(self, v):
return 'NULL' if v is None else "'%s'" % (v)
def empty(self):
query = "SELECT COUNT(*) FROM %s" % (self._name)
cursor = self._dbconn.execute(query)
@ -648,7 +651,7 @@ class DbTable:
def insert(self, obj):
locker = ScopedLocker(self._lock)
keystr = ','.join(obj.keys())
valstr = ','.join(["'%s'" % (v) for v in obj.values()])
valstr = ','.join([self._sql_val_str(v) for v in obj.values()])
query = "INSERT INTO %s (%s) values (%s)" % (self._name, keystr, valstr)
print("query=%s" % (query))
cursor = dbconn.execute(query)
@ -664,7 +667,7 @@ class DbTable:
for k in obj._changed:
if k == 'id':
continue
change_vec.append("%s='%s'" % (k, obj._dict[k]))
change_vec.append("%s=%s" % (k, self._sql_val_str(obj._dict[k])))
query += ','.join(change_vec)
query += " WHERE id=%d" % (obj._dict['id'])
self._dbconn.execute(query)