Revize 3f01285b

Re #8652 - Removed redundant "== ''" checks for date types.

src/dao/certificate_repository.py

@@ -124 +124 @@
 
         try:
             sql = (f"SELECT * FROM {TAB_CERTIFICATES} "
-                   f"WHERE {COL_ID} = ? AND ({COL_DELETION_DATE} IS NULL OR {COL_DELETION_DATE} = '')")
+                   f"WHERE {COL_ID} = ? AND ({COL_DELETION_DATE} IS NULL)")
             values = [certificate_id]
             self.cursor.execute(sql, values)
             certificate_row = self.cursor.fetchone()
@@ -200 +200 @@
                 values = [filter_type]
 
             sql = (f"SELECT * FROM {TAB_CERTIFICATES} "
-                   f"WHERE ({COL_DELETION_DATE} IS NULL OR {COL_DELETION_DATE} = ''){sql_extension}")
+                   f"WHERE ({COL_DELETION_DATE} IS NULL){sql_extension}")
             self.cursor.execute(sql, values)
             certificate_rows = self.cursor.fetchall()
 
@@ -275 +275 @@
             sql = (
                 f"SELECT * "
                 f"FROM {TAB_CERTIFICATES} a "
-                f"WHERE (a.{COL_DELETION_DATE} IS NULL OR a.{COL_DELETION_DATE} = '') "
+                f"WHERE (a.{COL_DELETION_DATE} IS NULL) "
                 f"AND a.{COL_TYPE_ID} IN ({','.join('?' * len(target_types))}) "
             )
             
@@ -446 +446 @@
         try:
             sql = (f"UPDATE {TAB_CERTIFICATES} "
                    f"SET {COL_DELETION_DATE} = ? "
-                   f"WHERE {COL_ID} = ? AND ({COL_DELETION_DATE} IS NULL OR {COL_DELETION_DATE} = '')")
+                   f"WHERE {COL_ID} = ? AND ({COL_DELETION_DATE} IS NULL)")
             values = [int(time.time()),
                       certificate_id]
             self.cursor.execute(sql, values)
@@ -473 +473 @@
         return self.cursor.rowcount > 0
 
     def set_certificate_revoked(
-            self, certificate_id: int, revocation_date: str, revocation_reason: str = REV_REASON_UNSPECIFIED):
+            self, certificate_id: int, revocation_date: int, revocation_reason: str = REV_REASON_UNSPECIFIED):
         """
         Revoke a certificate
 
@@ -497 +497 @@
             sql = (f"UPDATE {TAB_CERTIFICATES} "
                    f"SET {COL_REVOCATION_DATE} = ?, "
                    f"{COL_REVOCATION_REASON} = ? "
-                   f"WHERE {COL_ID} = ? AND ({COL_REVOCATION_DATE} IS NULL OR {COL_REVOCATION_DATE} = '')")
+                   f"WHERE {COL_ID} = ? AND ({COL_REVOCATION_DATE} IS NULL)")
             values = [revocation_date,
                       revocation_reason,
                       certificate_id]
@@ -582 +582 @@
 
         try:
             sql = (f"SELECT * FROM {TAB_CERTIFICATES} "
-                   f"WHERE {COL_PARENT_ID} = ? AND {COL_REVOCATION_DATE} IS NOT NULL AND {COL_REVOCATION_DATE} != ''")
+                   f"WHERE {COL_PARENT_ID} = ? AND {COL_REVOCATION_DATE} IS NOT NULL")
             values = [certificate_id]
             self.cursor.execute(sql, values)
             certificate_rows = self.cursor.fetchall()
@@ -654 +654 @@
         try:
             sql = (f"SELECT * FROM {TAB_CERTIFICATES} "
                    f"WHERE {COL_PARENT_ID} = ? AND {COL_ID} != ? AND "
-                   f"({COL_DELETION_DATE} IS NULL OR {COL_DELETION_DATE} = '')")
+                   f"({COL_DELETION_DATE} IS NULL)")
             values = [certificate_id, certificate_id]
             self.cursor.execute(sql, values)
             certificate_rows = self.cursor.fetchall()
@@ -734 +734 @@
             sql = (
                 f"SELECT * "
                 f"FROM {TAB_CERTIFICATES} a "
-                f"WHERE (a.{COL_DELETION_DATE} IS NULL OR a.{COL_DELETION_DATE} = '') "
+                f"WHERE (a.{COL_DELETION_DATE} IS NULL) "
                 f"AND a.{COL_PARENT_ID} = ? AND a.{COL_ID} != ? "
                 f"AND a.{COL_TYPE_ID} IN ({','.join('?' * len(target_types))}) "