SQL Check bug fixing: removed

Author: nricciardi

lib/db/component.py

@@ -76,14 +76,12 @@ def datetime_now(cls, name: str, use_localtime: bool = False) -> 'Field':
         return cls(name=name, type="DATETIME", default=SqlUtils.datetime_strf_now(use_localtime))
 
     @classmethod
-    def nullable_date_with_now_check_field(cls, name: str, default: str | None = 'NULL', use_localtime: bool = False) -> 'Field':
-        return cls(name=name, type="DATE", default=default, nullable=True,
-                   check=f"{name} IS NULL OR {SqlUtils.date_str_format(name, use_localtime=use_localtime)} > {SqlUtils.date_strf_now(use_localtime=use_localtime)}")
+    def nullable_date(cls, name: str, default: str | None = 'NULL') -> 'Field':
+        return cls(name=name, type="DATE", default=default, nullable=True)
 
     @classmethod
-    def nullable_datetime_with_now_check_field(cls, name: str, default: str | None = 'NULL', use_localtime: bool = False) -> 'Field':
-        return cls(name=name, type="DATETIME", default=default, nullable=True,
-                   check=f"{name} IS NULL OR {SqlUtils.datetime_str_format(name, use_localtime=use_localtime)} > {SqlUtils.datetime_strf_now(use_localtime=use_localtime)}")
+    def nullable_datetime(cls, name: str, default: str | None = 'NULL') -> 'Field':
+        return cls(name=name, type="DATETIME", default=default, nullable=True)
 
     @classmethod
     def hex_color(cls, name: str = "hex_color", nullable: bool = False, default: Optional[str] = None):
@@ -97,10 +95,14 @@ def to_sql(self) -> str:
         :rtype str:
         """
 
-        return f"{self.name} {self.type} {'DEFAULT (' + self.default + ')' if self.default is not None else ''} " + \
-            f"{'UNIQUE' if self.unique else ''} {'PRIMARY KEY' if self.pk else ''} {'AUTOINCREMENT' if self.autoincrement else ''} " + \
-            f"{'NULL' if self.nullable and not self.pk else 'NOT NULL'}" + \
-            f"CHECK({self.check})"
+        query = f"{self.name} {self.type} {'DEFAULT (' + self.default + ')' if self.default is not None else ''} " + \
+                f"{'UNIQUE' if self.unique else ''} {'PRIMARY KEY' if self.pk else ''} {'AUTOINCREMENT' if self.autoincrement else ''} " + \
+                f"{'NULL' if self.nullable and not self.pk else 'NOT NULL'} "
+
+        if self.check is not None:
+            query += f"CHECK({self.check})"
+
+        return query
 
 
 @dataclass

lib/db/db.py

@@ -258,7 +258,7 @@ def tables(self) -> Dict[str, Table]:
                 Field(name="password", type="VARCHAR(256)", unique=False),
                 Field.hex_color(name="avatar_hex_color", default="'#cfcfcf'", nullable=False),
                 Field(name="phone", type="VARCHAR(30)", nullable=True),
-                Field.nullable_datetime_with_now_check_field("last_visit_at", use_localtime=self.use_localtime, default=None),
+                Field.nullable_datetime("last_visit_at", default=None),
                 Field.fk_field(name="role_id"),
             ], fk_constraints=[
                 FKConstraint.on_id(fk_field="role_id", on_table=self.role_table_name, on_update="CASCADE", on_delete="RESTRICT")
@@ -303,7 +303,7 @@ def tables(self) -> Dict[str, Table]:
                 Field.id_field(),
                 Field.name_field(unique=False),
                 Field.description_field(),
-                Field.nullable_datetime_with_now_check_field(name="deadline"),
+                Field.nullable_datetime(name="deadline"),
                 Field(name="priority", type="INTEGER", default="0"),
                 Field.created_at_field(use_localtime=self.use_localtime),
                 Field.updated_at_field(use_localtime=self.use_localtime),
@@ -330,7 +330,7 @@ def tables(self) -> Dict[str, Table]:
                 self.task_table_name
             ], other_fields=[
                 Field.datetime_now("assigned_at", use_localtime=self.use_localtime),
-                Field.nullable_datetime_with_now_check_field("last_watched_at", use_localtime=self.use_localtime, default=None),
+                Field.nullable_datetime("last_watched_at", default=None),
             ], with_triggers=[
                 Trigger(
                     name=f"{self.task_assignment_table_name}_on_insert_updater_trigger",
@@ -352,7 +352,7 @@ def tables(self) -> Dict[str, Table]:
             self.todo_item_table_name: Table(self.todo_item_table_name, [
                 Field.id_field(),
                 Field.description_field(nullable=False),
-                Field.nullable_datetime_with_now_check_field(name="deadline"),
+                Field.nullable_datetime(name="deadline"),
                 Field.created_at_field(use_localtime=self.use_localtime),
                 Field.updated_at_field(use_localtime=self.use_localtime),
                 Field(name="done", type="INTEGER", default="0"),