|
@@ -28,12 +28,12 @@ def get_where(product, unit, organic=None, limit='90 days'):
|
|
SQL('='),
|
|
SQL('='),
|
|
Literal(organic),
|
|
Literal(organic),
|
|
]))
|
|
]))
|
|
- where.append(
|
|
|
|
- SQL("{ts} at time zone 'utc' BETWEEN now() - {interval} AND now()").format(
|
|
|
|
- ts=Identifier('ts'),
|
|
|
|
- interval=SQL("{literal}::interval").format(literal=Literal(limit))
|
|
|
|
- )
|
|
|
|
- )
|
|
|
|
|
|
+ #where.append(
|
|
|
|
+ # SQL("{ts} at time zone 'utc' BETWEEN now() - {interval} AND now()").format(
|
|
|
|
+ # ts=Identifier('ts'),
|
|
|
|
+ # interval=SQL("{literal}::interval").format(literal=Literal(limit))
|
|
|
|
+ # )
|
|
|
|
+ #)
|
|
where.append(
|
|
where.append(
|
|
SQL("(SELECT id FROM units WHERE name = {unit}) = conv._to").format(
|
|
SQL("(SELECT id FROM units WHERE name = {unit}) = conv._to").format(
|
|
unit=Literal(unit),
|
|
unit=Literal(unit),
|