sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't allow blank property values in find(); handle property deletion

Browse Source
This commit is contained in:
Dan Williams 2006-12-11 10:59:30 -05:00
parent 74d9555796
commit dbca112368
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
services/datastore/datastore.py
View File

@ -233,6 +233,8 @@ class DataStore(object):
subquery = "" subquery = ""
for (key, value) in prop_dict.items(): for (key, value) in prop_dict.items():
safe_key = key.replace("'", "''") safe_key = key.replace("'", "''")
if not len(value):
raise ValueError("Property values must not be blank.")
value = str(value) value = str(value)
substr = "key='%s' AND value='%s'" % (safe_key, sqlite.encode(value)) substr = "key='%s' AND value='%s'" % (safe_key, sqlite.encode(value))
if len(subquery) > 0: if len(subquery) > 0:
@ -280,12 +282,16 @@ class DataStore(object):
for (key, value) in prop_dict.items(): for (key, value) in prop_dict.items():
safe_key = key.replace("'", "''") safe_key = key.replace("'", "''")
enc_value = sqlite.encode(_get_data_as_string(value)) if not len(value):
curs.execute("SELECT objid FROM properties WHERE (objid=%d AND key='%s');" % (uid, safe_key)) # delete the property
if len(curs.fetchall()) > 0: curs.execute("DELETE FROM properties WHERE (objid=%d AND key='%s');" % (uid, safe_key))
curs.execute("UPDATE properties SET value='%s' WHERE (objid=%d AND key='%s');" % (enc_value, uid, safe_key))
else: else:
curs.execute("INSERT INTO properties (objid, key, value) VALUES (%d, '%s', '%s');" % (uid, safe_key, enc_value)) enc_value = sqlite.encode(_get_data_as_string(value))
curs.execute("SELECT objid FROM properties WHERE (objid=%d AND key='%s');" % (uid, safe_key))
if len(curs.fetchall()) > 0:
curs.execute("UPDATE properties SET value='%s' WHERE (objid=%d AND key='%s');" % (enc_value, uid, safe_key))
else:
curs.execute("INSERT INTO properties (objid, key, value) VALUES (%d, '%s', '%s');" % (uid, safe_key, enc_value))
self._dbcx.commit() self._dbcx.commit()
del curs del curs
self._dbus_obj_helper.Updated(False, {}, False, uid=uid) self._dbus_obj_helper.Updated(False, {}, False, uid=uid)