Update to Psycopg 3

Closes #10901

cookiecutter-module/{{ cookiecutter.module_name }}/tox.ini

@@ -16,7 +16,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account/company.py

@@ -117,10 +117,13 @@ class Company(metaclass=PoolMeta):
         # Need to cast numeric for sqlite
         cast_ = MoveLine.debit.sql_cast
         amount = cast_(Sum(Coalesce(line.debit, 0) - Coalesce(line.credit, 0)))
-        if operator in {'in', 'not in'}:
+
-            value = [cast_(Literal(Decimal(v or 0))) for v in value]
+        if backend.name == 'sqlite':
-        else:
+            if operator in {'in', 'not in'}:
-            value = cast_(Literal(Decimal(value or 0)))
+                value = [cast_(Literal(Decimal(v or 0))) for v in value]
+            else:
+                value = cast_(Literal(Decimal(value or 0)))
+
         query = (line
             .join(account, condition=account.id == line.account)
             .join(account_type, condition=account.type == account_type.id)

modules/account/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_asset/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_be/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_budget/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_cash_rounding/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_consolidation/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_credit_limit/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_de_skr03/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_deposit/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_dunning/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_dunning_email/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_dunning_fee/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_dunning_letter/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_es/reporting_tax.py

@@ -196,7 +196,9 @@ class AEATPartyReport(AEATReport):
 
             from_ = convert_from(None, tables)
             cursor.execute(*from_.select(
-                    expression, where=where, group_by=(expression,))
+                    expression.as_('aeat'),
+                    where=where,
+                    group_by=[expression.as_('aeat')])
                 .select(Count()))
             row = cursor.fetchone()
             if row:
@@ -880,7 +882,7 @@ class ESVATBook(ModelSQL, ModelView):
                     invoice.party,
                     invoice.invoice_date,
                     invoice.party_tax_identifier,
-                    Coalesce(tax.es_reported_with, tax.id),
+                    Coalesce(tax.es_reported_with, tax.id).as_('tax'),
                     ]))
         return query
 

modules/account_es/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_es_sii/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_eu/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_export/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_export_winbooks/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_fr/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_fr_chorus/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_invoice/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_invoice_correction/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_invoice_defer/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_invoice_history/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_invoice_line_standalone/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_invoice_secondary_unit/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_invoice_stock/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_invoice_watermark/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_move_line_grouping/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_payment/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_payment_braintree/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_payment_clearing/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_payment_sepa/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_payment_sepa_cfonb/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_payment_stripe/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_product/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_receivable_rule/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_rule/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_statement/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_statement_aeb43/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_statement_coda/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_statement_mt940/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_statement_ofx/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_statement_rule/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_statement_sepa/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_stock_anglo_saxon/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_stock_continental/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_stock_eu/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_stock_landed_cost/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_stock_landed_cost_weight/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_stock_shipment_cost/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_stock_shipment_cost_weight/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_syscohada/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_tax_cash/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_tax_non_deductible/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/account_tax_rule_country/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/analytic_account/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/analytic_budget/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/analytic_invoice/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/analytic_purchase/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/analytic_sale/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/attendance/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/authentication_saml/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/authentication_sms/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/bank/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/carrier/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/carrier_carriage/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/carrier_percentage/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/carrier_subdivision/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/carrier_weight/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/commission/commission_reporting.py

@@ -177,7 +177,7 @@ class AgentTimeseries(Agent):
     @classmethod
     def _group_by(cls, tables, withs):
         return super()._group_by(tables, withs) + [
-            cls._column_date(tables, withs)]
+            cls._column_date(tables, withs).as_('date')]
 
 
 class Context(ModelView):

modules/commission/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/commission_waiting/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/company/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/company_work_time/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/country/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/currency/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/currency_ro/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/currency_rs/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/customs/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/dashboard/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/document_incoming/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/document_incoming_invoice/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/document_incoming_ocr/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/document_incoming_ocr_typless/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/edocument_peppol/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/edocument_peppol_peppyrus/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/edocument_ubl/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/edocument_uncefact/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/edocument_unece/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/google_maps/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/inbound_email/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/incoterm/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/ldap_authentication/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/marketing/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}

modules/marketing_automation/marketing_automation_reporting.py

@@ -127,7 +127,7 @@ class Scenario(Abstract):
     @classmethod
     def _group_by(cls, tables, withs):
         record = tables['record']
-        return [record.scenario, cls._column_date(tables, withs)]
+        return [record.scenario, cls._column_date(tables, withs).as_('date')]
 
     @classmethod
     def _where(cls, tables, withs):
@@ -239,7 +239,9 @@ class Activity(Abstract):
     @classmethod
     def _group_by(cls, tables, withs):
         record_activity = tables['record_activity']
-        return [record_activity.activity, cls._column_date(tables, withs)]
+        return [
+            record_activity.activity,
+            cls._column_date(tables, withs).as_('date')]
 
     @classmethod
     def _where(cls, tables, withs):

modules/marketing_automation/tox.ini

@@ -12,7 +12,7 @@ commands_post =
 deps =
     coverage
     unittest-xml-reporting
-    postgresql: psycopg2 >= 2.7.0
+    postgresql: psycopg[pool] >= 3
 passenv = *
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}