Update to Psycopg 3

Closes #10901
This commit is contained in:
Nicolas Évrard
2026-03-22 19:53:32 +01:00
parent 7fb5a4a3de
commit 299dd6b1c9
243 changed files with 555 additions and 540 deletions
@@ -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://}
+3
View File
@@ -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 backend.name == 'sqlite':
if operator in {'in', 'not in'}:
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)
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+4 -2
View File
@@ -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
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
@@ -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://}
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
@@ -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://}
+1 -1
View File
@@ -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://}
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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):
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
+1 -1
View File
@@ -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://}
@@ -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):
+1 -1
View File
@@ -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://}

Some files were not shown because too many files have changed in this diff Show More