re-enable ColumnProxyContainer with some simple tests

TODO: add some more dict-like functionality to replace the original dict

sew/_core.py

@@ -9,7 +9,7 @@
 import re
 
 from .formatSpec import FormatSpecifier
-from .column import ColumnProxy
+from .column import ColumnProxy, ColumnProxyContainer
 
 #%% Basic container, the most barebones
 class SqliteContainer:

sew/column.py

@@ -33,33 +33,37 @@ def __repr__(self):
     def __str__(self):
         return "%s %s" % (self._name, self._typehint)
 
-    def _requireType(self, x):
-        if not isinstance(x, self.typehint):
-            raise TypeError("Compared value must be of type %s" % str(self.typehint))
+    def _requireColumnProxy(self, x):
+        if not isinstance(x, self.__class__):
+            raise TypeError("Comparisons are only allowed between ColumnProxy objects.")
+
+    # def _requireType(self, x):
+    #     if not isinstance(x, self.typehint):
+    #         raise TypeError("Compared value must be of type %s" % str(self.typehint))
 
     def __lt__(self, x):
-        self._requireType(x)
-        return "%s < %s" % (self._name, str(x))
+        self._requireColumnProxy(x)
+        return "%s < %s" % (self._name, x.name)
 
     def __le__(self, x):
-        self._requireType(x)
-        return "%s <= %s" % (self._name, str(x))
+        self._requireColumnProxy(x)
+        return "%s <= %s" % (self._name, x.name)
 
     def __gt__(self, x):
-        self._requireType(x)
-        return "%s > %s" % (self._name, str(x))
+        self._requireColumnProxy(x)
+        return "%s > %s" % (self._name, x.name)
 
     def __ge__(self, x):
-        self._requireType(x)
-        return "%s >= %s" % (self._name, str(x))
+        self._requireColumnProxy(x)
+        return "%s >= %s" % (self._name, x.name)
 
     def __eq__(self, x):
-        self._requireType(x)
-        return "%s = %s" % (self._name, str(x))
+        self._requireColumnProxy(x)
+        return "%s = %s" % (self._name, x.name)
 
     def __ne__(self, x):
-        self._requireType(x)
-        return "%s != %s" % (self._name, str(x))
+        self._requireColumnProxy(x)
+        return "%s != %s" % (self._name, x.name)
 
 #%%
 class ColumnProxyContainer:
@@ -71,7 +75,12 @@ class ColumnProxyContainer:
     mytable.cols.mycolname
     """
     def __init__(self, columnProxies: list[ColumnProxy]):
+        lastTablename = None
         for col in columnProxies:
+            if lastTablename is not None and lastTablename != col.tablename:
+                raise ValueError("ColumnProxyContainer can only contain columns from the same table.")
+            lastTablename = col.tablename
+            # Here is where we set the attribute directly
             setattr(self, col.name, col)
 
 

tests/columns.py

@@ -11,4 +11,24 @@ def test_columnProxy_properties(self):
         self.assertEqual(proxy.name, "col1")
         self.assertEqual(proxy.typehint, "int")
         self.assertEqual(proxy.tablename, "mytbl")
-
+        self.assertEqual(str(proxy), "col1 int")
+
+
+    def test_columnProxyContainer(self):
+        # Just add some and reference
+        proxy = sew.ColumnProxy("col1", "int", "mytbl")
+        proxy2 = sew.ColumnProxy("col2", "int", "mytbl")
+        proxy3 = sew.ColumnProxy("col3", "int", "mytbl")
+        proxylist = [proxy, proxy2, proxy3]
+        container = sew.ColumnProxyContainer(proxylist)
+
+        self.assertEqual(container.col1, proxy)
+        self.assertEqual(container.col2, proxy2)
+        self.assertEqual(container.col3, proxy3)
+
+        # Check that they should all belong to same table
+        proxylist.append(
+            sew.ColumnProxy("col4", "int", "mytbl2")
+        )
+        with self.assertRaises(ValueError):
+            sew.ColumnProxyContainer(proxylist)