Native gui usable for data editing. Lots of fixes and improvenemts
This commit is contained in:
1 parent
a6abdaa614
commit
09387280fc
52 files changed
+1579
-294
No files matched your search
+34
-14
@@ -3,20 +3,24 @@
|
||||
"""
|
||||
No commits here: Has to be done elsewhere to support transactions!
|
||||
|
||||
Fields has to be a tuple to have fixed order which simplifies debugging
|
||||
|
||||
TODO primary keys can be multiple fields, stored as tuple
|
||||
do not include pk auto fields in inserts and updates!
|
||||
"""
|
||||
|
||||
from datetime import datetime
|
||||
|
||||
class DbRecord:
|
||||
|
||||
def __init__(self, db, record_id=None):
|
||||
if not hasattr(self, "table"):
|
||||
raise TypeError("DbRecord subclass must define 'table'")
|
||||
if not hasattr(self, "pk_field"):
|
||||
raise TypeError("DbRecord subclass must define 'pk_field'")
|
||||
if not hasattr(self, "fields"):
|
||||
raise TypeError("DbRecord subclass must define 'fields'")
|
||||
REQUIRED = ('table', 'pk_field', 'pk_is_auto', 'fields')
|
||||
|
||||
def __init_subclass__(cls, **kwargs):
|
||||
for variable in DbRecord.REQUIRED:
|
||||
if variable not in cls.__dict__:
|
||||
raise TypeError(f"{cls.__name__} subclass must define '{variable}'")
|
||||
|
||||
def __init__(self, db, record_id=None):
|
||||
self.db = db
|
||||
self.cur = db.cur
|
||||
self.dcur = db.dcur
|
||||
@@ -25,6 +29,7 @@ class DbRecord:
|
||||
|
||||
self._title = _("DbRecord({})") # for pretty print
|
||||
|
||||
self.pk_value = None
|
||||
if record_id is not None:
|
||||
self.pk_value = int(record_id)
|
||||
self.load()
|
||||
@@ -81,7 +86,14 @@ class DbRecord:
|
||||
def _update(self):
|
||||
sqlfield = []
|
||||
values = []
|
||||
for field in self.fields:
|
||||
if self.pk_is_auto:
|
||||
if type(self.pk_field) == tuple:
|
||||
flist = set(self.fields) - set(self.pk_field)
|
||||
else:
|
||||
flist = set(self.fields) - {self.pk_field}
|
||||
else:
|
||||
flist = self.fields
|
||||
for field in flist:
|
||||
newdata = getattr(self, field)
|
||||
if self.data[field] != newdata:
|
||||
sqlfield.append("{}=%s".format(field))
|
||||
@@ -94,7 +106,7 @@ class DbRecord:
|
||||
)
|
||||
values.append(self.pk_value)
|
||||
try:
|
||||
self.dcur.execute(sql, values)
|
||||
self.cur.execute(sql, values)
|
||||
except Exception as e:
|
||||
print(e)
|
||||
print(sql)
|
||||
@@ -106,28 +118,36 @@ class DbRecord:
|
||||
return True
|
||||
|
||||
def _insert(self):
|
||||
if self.pk_is_auto:
|
||||
if type(self.pk_field) == tuple:
|
||||
flist = set(self.fields) - set(self.pk_field)
|
||||
else:
|
||||
flist = set(self.fields) - {self.pk_field}
|
||||
else:
|
||||
flist = self.fields
|
||||
sql = (
|
||||
"INSERT INTO {} ({}) "
|
||||
"VALUES ({})"
|
||||
).format(
|
||||
self.table,
|
||||
','.join(self.fields),
|
||||
','.join(["%s"] * len(self.fields))
|
||||
','.join(flist),
|
||||
','.join(["%s"] * len(flist))
|
||||
)
|
||||
values = []
|
||||
for field in self.fields:
|
||||
for field in flist:
|
||||
newdata = getattr(self, field)
|
||||
values.append(newdata)
|
||||
self.data[field] = newdata
|
||||
try:
|
||||
self.dcur.execute(sql, values)
|
||||
self.cur.execute(sql, values)
|
||||
except Exception as e:
|
||||
print(e)
|
||||
print(sql)
|
||||
print(values)
|
||||
self.db.error = e
|
||||
return False
|
||||
self.pk_value = self.dcur.lastrowid
|
||||
self.pk_value = self.cur.lastrowid
|
||||
setattr(self, self.pk_field, self.pk_value)
|
||||
return True
|
||||
|
||||
def delete(self, record_id=None):
|
||||
|
||||
Reference in new issue
Block a user