moved more attributes into ColumnMeta

Author: dantownsend

piccolo/columns/base.py

@@ -28,6 +28,12 @@
 
 @dataclass
 class ColumnMeta:
+    # General attributes:
+    null: bool = True
+    primary: bool = False
+    key: bool = False
+    unique: bool = False
+
     # Set by the Table Metaclass:
     _name: t.Optional[str] = None
     _table: t.Optional[Table] = None
@@ -95,11 +101,9 @@ def __init__(
         key: bool = False,
         unique: bool = False,
     ) -> None:
-        self.null = null
-        self.primary = primary
-        self.key = key
-        self.unique = unique
-        self._meta = ColumnMeta()
+        self._meta = ColumnMeta(
+            null=null, primary=primary, key=key, unique=unique
+        )
 
     def is_in(self, values: Iterable) -> Where:
         return Where(column=self, values=values, operator=In)
@@ -159,11 +163,11 @@ def querystring(self) -> QueryString:
             self, "column_type", self.__class__.__name__.upper()
         )
         query = f"{self._meta.name} {column_type}"
-        if self.primary:
+        if self._meta.primary:
             query += " PRIMARY"
-        if self.key:
+        if self._meta.key:
             query += " KEY"
-        if self.unique:
+        if self._meta.unique:
             query += " UNIQUE"
 
         foreign_key_meta = getattr(self, "foreign_key_meta", None)

piccolo/table.py

@@ -90,9 +90,7 @@ def __str__(cls):
                     f"{col._meta.name} = ForeignKey({col._foreign_key_meta.references.__name__})"
                 )
             else:
-                columns.append(
-                    f"{col._meta.name} = {col.__class__.__name__}()"
-                )
+                columns.append(f"{col._meta.name} = {col.__class__.__name__}()")
         columns_string = spacer.join(columns)
         return f"class {cls.__name__}(Table):\n" f"    {columns_string}\n"
 
@@ -119,10 +117,8 @@ def __init__(self, **kwargs):
                     is_callable = hasattr(column.default, "__call__")
                     value = column.default() if is_callable else column.default
                 else:
-                    if not column.null:
-                        raise ValueError(
-                            f"{column._meta.name} wasn't provided"
-                        )
+                    if not column._meta.null:
+                        raise ValueError(f"{column._meta.name} wasn't provided")
             self[column._meta.name] = value
 
         unrecognized = kwargs.keys()
@@ -171,9 +167,7 @@ def get_related(self, column_name: str) -> Objects:
         foreign_key = cls.get_column_by_name(column_name)
 
         if isinstance(foreign_key, ForeignKey):
-            references: t.Type[
-                Table
-            ] = foreign_key._foreign_key_meta.references
+            references: t.Type[Table] = foreign_key._foreign_key_meta.references
 
             return (
                 references.objects()