move new enriched column behavior to sa_columns

mathesar/models.py

@@ -96,16 +96,12 @@ def name(self):
 
     @cached_property
     def sa_columns(self):
-        return self._sa_table.columns
+        return self._enriched_column_sa_table.columns
 
     @property
     def sa_column_names(self):
         return self.sa_columns.keys()
 
-    @cached_property
-    def mathesar_columns(self):
-        return self._enriched_column_sa_table.columns
-
     def add_column(self, column_data):
         return columns.create_column(
             self.schema._sa_engine,

mathesar/pagination.py

@@ -23,9 +23,9 @@ def paginate_queryset(self, queryset, request, table_id):
             self.limit = self.default_limit
         self.offset = self.get_offset(request)
         table = queryset.get(id=table_id)
-        self.count = len(table.mathesar_columns)
+        self.count = len(table.sa_columns)
         self.request = request
-        return list(table.mathesar_columns)[self.offset:self.offset + self.limit]
+        return list(table.sa_columns)[self.offset:self.offset + self.limit]
 
 
 class TableLimitOffsetPagination(DefaultLimitOffsetPagination):

mathesar/utils/tables.py

@@ -22,7 +22,7 @@ def get_table_column_types(table):
     types = infer_table_column_types(schema.name, table.name, schema._sa_engine)
     col_types = {
         col.name: t().compile(dialect=schema._sa_engine.dialect)
-        for col, t in zip(table.mathesar_columns, types)
+        for col, t in zip(table.sa_columns, types)
         if not col.is_default
         and not col.primary_key
         and not col.foreign_keys

mathesar/views/api.py

@@ -101,7 +101,7 @@ def list(self, request, table_pk=None):
     def retrieve(self, request, pk=None, table_pk=None):
         table = Table.objects.get(id=table_pk)
         try:
-            column = table.mathesar_columns[int(pk)]
+            column = table.sa_columns[int(pk)]
         except IndexError:
             raise NotFound
         serializer = ColumnSerializer(column)