From c88e7e62babb8a64b990e54f2c7e1d3822cac22b Mon Sep 17 00:00:00 2001 From: Abdelaziz Elrashed Date: Mon, 14 Oct 2024 11:35:57 +0300 Subject: [PATCH] =?UTF-8?q?=D8=B9=D8=AF=D9=85=20=D8=A7=D9=84=D8=B3=D9=85?= =?UTF-8?q?=D8=A7=D8=AD=20=D8=A8=D8=A7=D9=84=D8=AD=D8=B0=D9=81=20=D8=A7?= =?UTF-8?q?=D9=84=D8=B4=D8=AC=D8=B1=D9=8A=D8=8C=20=D9=8A=D8=AC=D8=A8=20?= =?UTF-8?q?=D8=AD=D8=B0=D9=81=20=D8=A7=D9=84=D8=A3=D8=B7=D8=B1=D8=A7=D9=81?= =?UTF-8?q?=20=D8=AB=D9=85=20=D8=A7=D9=84=D9=81=D8=B1=D9=88=D8=B9=20=D9=88?= =?UTF-8?q?=D8=B0=D9=84=D9=83=20=D9=84=D8=AD=D9=85=D8=A7=D9=8A=D8=A9=20?= =?UTF-8?q?=D8=A7=D9=84=D8=A8=D9=8A=D8=A7=D9=86=D8=A7=D8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zakat/zakat_tracker.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/zakat/zakat_tracker.py b/zakat/zakat_tracker.py index 24df820..eb49831 100644 --- a/zakat/zakat_tracker.py +++ b/zakat/zakat_tracker.py @@ -2498,10 +2498,10 @@ class Account(db.Entity): zakatable = pony.Optional(bool, default=True) created_at = pony.Required(datetime.datetime, default=lambda: datetime.datetime.now()) updated_at = pony.Optional(datetime.datetime) - box = pony.Set('Box') - log = pony.Set('Log') - exchange = pony.Set('Exchange') - history = pony.Set('History') + box = pony.Set('Box', cascade_delete=False) + log = pony.Set('Log', cascade_delete=False) + exchange = pony.Set('Exchange', cascade_delete=False) + history = pony.Set('History', cascade_delete=False) class Box(db.Entity): @@ -2529,7 +2529,7 @@ class Log(db.Entity): desc = pony.Required(pony.LongStr) ref = pony.Optional(int, size=64) created_at = pony.Required(datetime.datetime, default=lambda: datetime.datetime.now()) - file = pony.Set('File') + file = pony.Set('File', cascade_delete=False) class File(db.Entity): @@ -2559,7 +2559,7 @@ class Action(db.Entity): id = pony.PrimaryKey(int, auto=True) name = pony.Required(str, unique=True) created_at = pony.Required(datetime.datetime, default=lambda: datetime.datetime.now()) - history = pony.Set('History') + history = pony.Set('History', cascade_delete=False) class Math(db.Entity): @@ -2567,7 +2567,7 @@ class Math(db.Entity): id = pony.PrimaryKey(int, auto=True) name = pony.Required(str, unique=True) created_at = pony.Required(datetime.datetime, default=lambda: datetime.datetime.now()) - history = pony.Set('History') + history = pony.Set('History', cascade_delete=False) class History(db.Entity): @@ -2989,7 +2989,9 @@ def recall(self, dry=True, debug=False) -> bool: pass def reset(self) -> None: - pass + db.drop_all_tables(with_all_data=True) + db.create_tables() + SQLModel.create_db() def check(self, silver_gram_price: float, unscaled_nisab: float | int | Decimal = None, debug: bool = False, now: int = None, cycle: float = None) -> tuple: @@ -3656,7 +3658,7 @@ def _test_core(self, restore=False, debug=False): account_xz_ref, account_xz_name = self.db.account(name='xz') assert account_xz_ref == 27 assert account_xz_name == 'xz' - assert self.db.account(ref=321) is None + assert self.db.account(ref=123) is None use_same_account_name_failed = False try: self.db.account(name='z', ref=321) @@ -3885,7 +3887,7 @@ def _test_core(self, restore=False, debug=False): if debug: print('history-count', count) assert count == 0 - self.db.reset() + self.db.reset() def test(self, debug: bool = False) -> bool: if debug: