Merge fixes

Author: eito-fis

db/columns.py

@@ -88,9 +88,9 @@ def table_(self):
         Returns the current table the column is associated with if it exists, otherwise
         returns the table the column was originally created from.
         """
-        if hasattr(self, "table"):
+        if hasattr(self, "table") and self.table is not None:
             return self.table
-        elif hasattr(self, "original_table"):
+        elif hasattr(self, "original_table") and self.original_table is not None:
             return self.original_table
         return None
 
@@ -146,6 +146,8 @@ def column_index(self):
 
     @property
     def default_value(self):
+        print(self.table_)
+        print(self.original_table)
         if self.table_ is not None:
             table_oid = tables.get_oid_from_table(
                 self.table_.name, self.table_.schema, self.engine

mathesar/serializers.py

@@ -93,7 +93,7 @@ class Meta:
         model = Table
         fields = ['id', 'name', 'schema', 'created_at', 'updated_at',
                   'columns', 'records_url', 'constraints_url', 'columns_url',
-                  'data_files', 'has_dependencies']
+                  'data_files', 'has_dependencies', 'import_verified']
 
     def get_records_url(self, obj):
         if isinstance(obj, Table):