fix model save signal

strongbugman · Jun 12, 2023 · a4a46e2 · a4a46e2
1 parent f104456
commit a4a46e2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/danio/model.py b/danio/model.py
@@ -90,18 +90,20 @@ async def after_read(self):
  pass
 
  async def before_create(self, validate: bool = True):
+ await self.before_save()
  if validate:
  await self.validate()
 
  async def after_create(self):
- pass
+ await self.after_save()
 
  async def before_update(self, validate: bool = True):
+ await self.before_save()
  if validate:
  await self.validate()
 
  async def after_update(self):
- pass
+ await self.after_save()
 
  async def before_save(self):
  pass
@@ -204,7 +206,6 @@ async def save(
  force_insert=False,
  validate: bool = True,
  ) -> MODEL_TV:
- await self.before_save()
  if self.primary and not force_insert:
  await self.update(
  database=database,
@@ -219,7 +220,6 @@ async def save(
  ignore_fields=ignore_fields,
  validate=validate,
  )
- await self.after_save()
  return self
 
  async def delete(

diff --git a/tests/test_mysql.py b/tests/test_mysql.py
@@ -51,8 +51,8 @@ class User(danio.Model):
  danio.Field
  ] # `updated_at` datetime NOT NULL COMMENT 'when updated'
  GENDER: typing.ClassVar[danio.Field] # `gender` int NOT NULL COMMENT ''
- # TABLE INDEX: created_at_1469_idx(created_at)
- # TABLE INDEX: updated_at_3542_idx(updated_at)
+ # TABLE INDEX: created_at_3693_idx(created_at)
+ # TABLE INDEX: updated_at_4134_idx(updated_at)
  # --------------------Danio Hints--------------------
 
  class Gender(enum.Enum):

diff --git a/tests/test_sqlite.py b/tests/test_sqlite.py
@@ -24,8 +24,8 @@ class User(danio.Model):
  NAME: typing.ClassVar[danio.Field] # `name` CHAR(255) NOT NULL
  AGE: typing.ClassVar[danio.Field] # `age` int NOT NULL
  GENDER: typing.ClassVar[danio.Field] # `gender` int NOT NULL
- # TABLE INDEX: name_282_idx(name)
- # TABLE UNIQUE INDEX: name_id_267_uiq(name,id)
+ # TABLE INDEX: name_4935_idx(name)
+ # TABLE UNIQUE INDEX: name_id_8245_uiq(name,id)
  # --------------------Danio Hints--------------------
 
  class Gender(enum.Enum):