voussoir/voussoirkit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move get_tables into alphabetical order.

Browse source
This commit is contained in:
voussoir 2022-03-15 13:37:28 -07:00
parent 05b009a7c6
commit 5f5f41885e
No known key found for this signature in database
GPG key ID: 5F7554F8C26DACCB
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
voussoirkit/worms.py
View file

@ -154,15 +154,6 @@ class Database(metaclass=abc.ABCMeta):
self.sql.commit()
self.last_commit_id = RNG.getrandbits(32)
def get_tables(self) -> set[str]:
'''
Return the set of all table names in the database.
'''
query = 'SELECT name FROM sqlite_master WHERE type = "table"'
table_rows = self.select(query)
tables = set(name for (name,) in table_rows)
return tables
def delete(self, table, pairs) -> None:
if isinstance(table, type) and issubclass(table, Object):
table = table.table
@ -267,6 +258,15 @@ class Database(metaclass=abc.ABCMeta):
for object_row in object_rows:
yield object_class(self, object_row)
def get_tables(self) -> set[str]:
'''
Return the set of all table names in the database.
'''
query = 'SELECT name FROM sqlite_master WHERE type = "table"'
table_rows = self.select(query)
tables = set(name for (name,) in table_rows)
return tables
def insert(self, table, data) -> None:
if isinstance(table, type) and issubclass(table, Object):
table = table.table
@ -597,6 +597,9 @@ class Object(metaclass=abc.ABCMeta):
Initialized with a single argument, the requested ID.
'''
def __init__(self, database):
'''
Your subclass should call super().__init__(database).
'''
# Used for transaction
self._worms_database = database
self.deleted = False
@ -632,6 +635,9 @@ class Object(metaclass=abc.ABCMeta):
def assert_not_deleted(self) -> None:
'''
Raises DeletedObject if this object is deleted.
You need to set self.deleted during any method that deletes the object
from the database.
'''
if self.deleted:
raise DeletedObject(self)