NPO-Accounting/conservancy_beancount Changeset - ca94ecafb02d

Changeset - ca94ecafb02d

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Brett Smith - 3 years ago 2021-03-18 20:22:30
brettcsmith@brettcsmith.org

query: Add db_name column.

2 files changed with 9 insertions and 1 deletions:

conservancy_beancount/reports/query.py

setup.py

0 comments (0 inline, 0 general)

conservancy_beancount/reports/query.py

➞

Show inline comments

@@ ... / @@ -221,12 +221,18 @@ ORDER BY email.date_encountered DESC @@
 class DBId(DBColumn):
     """Look up an entity's numeric id from the database"""
     _db_query = "SELECT id FROM donor WHERE ledger_entity_id = ?"
     _dtype = int
 class DBName(DBColumn):
     """Look up an entity's display name from the database"""
     _db_query = "SELECT display_name FROM donor WHERE ledger_entity_id = ?"
     _dtype = str
 class DBPostal(DBColumn):
     """Look up an entity's postal addresses from the database"""
     _db_query = """
 SELECT postal.formatted_address
 FROM donor
 JOIN donor_postal_address_mapping map ON donor.id = map.donor_id
@@ ... / @@ -441,16 +447,18 @@ class _EnvironmentMixin: @@
             if repo_path is None:
                 raise sqlite3.Error("no repository configured to host database")
             db_conn = sqlite3.connect(os.fspath(repo_path / cls.db_path))
         except (OSError, sqlite3.Error):
             columns['db_email'] = DBEmail
             columns['db_id'] = DBId
             columns['db_name'] = DBName
             columns['db_postal'] = DBPostal
         else:
             columns['db_email'] = DBEmail.with_db(db_conn)
             columns['db_id'] = DBId.with_db(db_conn)
             columns['db_name'] = DBName.with_db(db_conn)
             columns['db_postal'] = DBPostal.with_db(db_conn)
         rt_credentials = config.rt_credentials()
         rt_client = config.rt_client(rt_credentials)
         if rt_client is None:
             rt_ticket = RTTicket

setup.py

➞

Show inline comments

@@ ... / @@ -2,13 +2,13 @@ @@
 from setuptools import setup
 setup(
     name='conservancy_beancount',
     description="Plugin, library, and reports for reading Conservancy's books",
-    version='1.19.5',
+    version='1.19.6',
     author='Software Freedom Conservancy',
     author_email='info@sfconservancy.org',
     license='GNU AGPLv3+',
     install_requires=[
         'babel>=2.6',  # Debian:python3-babel

0 comments (0 inline, 0 general)