sources.beancount: Correct type for links and tags columns

beanquery/query_execute_test.py

@@ -1086,6 +1086,34 @@ def test_aggregated_group_by_invisible_order_by_aggregate_invisible(self):
                 (2,),
                 ])
 
+    def test_aggregated_group_by_links(self):
+        self.check_query(
+            """
+            2010-02-21 * "doctor" "appointment" ^2010-reimbursement-doc1
+              Assets:Bank:Checking               -1000.00 USD
+              Assets:AccountsReceivable:Pending   1000.00 USD
+
+            2010-02-22 * "insurance" "partial reimbursement" ^2010-reimbursement-doc1
+              Assets:Bank:Checking                100.00 USD
+              Assets:AccountsReceivable:Pending  -100.00 USD
+            """,
+            """
+            SELECT FIRST(date) as date, FIRST(payee) AS payee, FIRST(narration) AS narration, links, SUM(position) AS balance
+            WHERE account ~ 'Assets:AccountsReceivable:Pending'
+            GROUP BY links
+            ORDER BY balance DESC
+            """,
+            [
+                ('date', datetime.date),
+                ('payee', str),
+                ('narration', str),
+                ('links', frozenset),
+                ('balance', inventory.Inventory),
+            ],
+            [
+                (datetime.date(2010, 2, 21), 'doctor', 'appointment', {'2010-reimbursement-doc1'}, I('900.00 USD')),
+            ])
+
     def test_aggregated_group_by_with_having(self):
         self.check_query(
             """

beanquery/query_render.py

@@ -147,6 +147,10 @@ def format(self, value):
         return self.sep.join(str(x) for x in sorted(value))
 
 
+class FrozensetRenderer(SetRenderer):
+    dtype = frozenset
+
+
 class DateRenderer(ColumnRenderer):
     dtype = datetime.date
 

beanquery/query_render_test.py

@@ -100,6 +100,13 @@ def test_set_str(self):
             'bb  ccc',
         ])
 
+    def test_frozenset_str(self):
+        self.assertEqual(self.render(frozenset, [frozenset({}), frozenset({'aaaa'}), frozenset({'bb', 'ccc'})]), [
+            '       ',
+            'aaaa   ',
+            'bb  ccc',
+        ])
+
     def test_date(self):
         self.assertEqual(self.render(datetime.date, [datetime.date(2014, 10, 3)]), [
             '2014-10-03'

beanquery/sources/beancount.py

@@ -357,12 +357,12 @@ def description(entry):
             return None
         return ' | '.join(filter(None, [entry.payee, entry.narration]))
 
-    @columns.register(set)
+    @columns.register(frozenset)
     def tags(entry):
         """The set of tags of the transaction."""
         return getattr(entry, 'tags', None)
 
-    @columns.register(set)
+    @columns.register(frozenset)
     def links(entry):
         """The set of links of the transaction."""
         return getattr(entry, 'links', None)
@@ -493,12 +493,12 @@ def description(context):
         """A combination of the payee + narration for the transaction of this posting."""
         return ' | '.join(filter(None, [context.entry.payee, context.entry.narration]))
 
-    @columns.register(set)
+    @columns.register(frozenset)
     def tags(context):
         """The set of tags of the parent transaction for this posting."""
         return context.entry.tags
 
-    @columns.register(set)
+    @columns.register(frozenset)
     def links(context):
         """The set of links of the parent transaction for this posting."""
         return context.entry.links