Fixed empty creature abilities being saved

Author: Galarzaa90

CHANGELOG.rst

@@ -9,6 +9,8 @@ Changelog
 
 - Added ``upgrade_classification`` to item attributes.
 - Fixed empty creature and item sounds being saved.
+- Fixed empty creature abilities being saved.
+- Marked more SQLite columns as ``NOT NULL``.
 
 .. 6.0.2
 

tibiawikisql/models/creature.py

@@ -21,8 +21,8 @@
 
 from tibiawikisql import schema
 from tibiawikisql.models import abc
-from tibiawikisql.utils import (clean_links, int_pattern, parse_boolean, parse_integer, parse_min_max, parse_sounds,
-                                clean_question_mark, strip_code, find_template)
+from tibiawikisql.utils import (clean_links, clean_question_mark, find_template, int_pattern, parse_boolean,
+                                parse_integer, parse_min_max, parse_sounds, strip_code)
 
 if TYPE_CHECKING:
     from mwparserfromhell.nodes import Template
@@ -66,12 +66,15 @@ def parse_abilities(value):
     parsed = mwparserfromhell.parse(value)
     ability_list_template = find_template(value, "Ability List")
     if not ability_list_template:
+        name = strip_code(parsed)
         return [{
-            "name": strip_code(parsed),
+            "name": name,
             "element": "no_template",
-        }]
+        }] if name else []
     abilities = []
     for element in ability_list_template.params:
+        if not element.strip():
+            continue
         ability_template = next(element.value.ifilter_templates(recursive=False), None)
         if not ability_template:
             abilities.append({

tibiawikisql/schema.py

@@ -146,22 +146,22 @@ class Item(Table):
 
 class ItemSound(Table, table_name="item_sound"):
     item_id = Column(ForeignKey(Integer, table="item", column="article_id"), index=True)
-    content = Column(Text)
+    content = Column(Text, nullable=False)
 
 
 class ItemStoreOffer(Table, table_name="item_store_offer"):
     item_id = Column(ForeignKey(Integer, table="item", column="article_id"), index=True)
-    price = Column(Integer)
-    amount = Column(Integer)
-    currency = Column(Text)
+    price = Column(Integer, nullable=False)
+    amount = Column(Integer, nullable=False)
+    currency = Column(Text, nullable=False)
 
 
 class CreatureDrop(Table, table_name="creature_drop"):
     creature_id = Column(ForeignKey(Integer, table="creature", column="article_id"), index=True, nullable=False)
     item_id = Column(ForeignKey(Integer, table="item", column="article_id"), index=True, nullable=False)
     chance = Column(Real)
-    min = Column(Integer)
-    max = Column(Integer)
+    min = Column(Integer, nullable=False)
+    max = Column(Integer, nullable=False)
 
 
 class ItemAttribute(Table, table_name="item_attribute"):
@@ -197,7 +197,7 @@ class House(Table):
     house_id = Column(Integer, index=True)
     title = Column(Text, unique=True, no_case=True)
     name = Column(Text, unique=True, no_case=True)
-    city = Column(Text, index=True)
+    city = Column(Text, index=True, nullable=False)
     street = Column(Text, index=True)
     location = Column(Text, index=True)
     beds = Column(Integer)
@@ -218,8 +218,8 @@ class Imbuement(Table):
     article_id = Column(Integer, primary_key=True)
     title = Column(Text, unique=True, index=True)
     name = Column(Text, unique=True, index=True)
-    tier = Column(Text)
-    type = Column(Text)
+    tier = Column(Text, nullable=False)
+    type = Column(Text, nullable=False)
     effect = Column(Text)
     slots = Column(Text)
     version = Column(Text, index=True)
@@ -231,7 +231,7 @@ class Imbuement(Table):
 class ImbuementMaterial(Table, table_name="imbuement_material"):
     imbuement_id = Column(ForeignKey(Integer, "imbuement", "article_id"), index=True)
     item_id = Column(ForeignKey(Integer, "item", "article_id"), index=True)
-    amount = Column(Integer)
+    amount = Column(Integer, nullable=False)
 
 
 class ItemKey(Table, table_name="item_key"):