|
|
@@ -318,8 +318,8 @@ function createPgStore({ connectionString, ssl = true, max = 5, schema = 'public
|
|
|
async function queryPlatformRows({ from, to } = {}) {
|
|
|
const where = [];
|
|
|
const params = [];
|
|
|
- if (from) { params.push(String(from)); where.push(`date >= ${params.length}`); }
|
|
|
- if (to) { params.push(String(to)); where.push(`date <= ${params.length}`); }
|
|
|
+ if (from) { params.push(String(from)); where.push(`date >= $${params.length}`); }
|
|
|
+ if (to) { params.push(String(to)); where.push(`date <= $${params.length}`); }
|
|
|
const sql = `SELECT * FROM ops_platform_row ${where.length ? 'WHERE ' + where.join(' AND ') : ''} ORDER BY date ASC, shop_id ASC`;
|
|
|
const r = await getPool().query(sql, params);
|
|
|
return r.rows.map((row) => ({
|
|
|
@@ -340,9 +340,9 @@ function createPgStore({ connectionString, ssl = true, max = 5, schema = 'public
|
|
|
poolRef.query('SELECT COUNT(*)::int AS c FROM ops_row'),
|
|
|
poolRef.query('SELECT COUNT(*)::int AS c FROM ops_platform_row'),
|
|
|
poolRef.query(`SELECT MIN(d) AS f, MAX(d) AS t FROM (
|
|
|
- SELECT date AS d FROM ops_row UNION SELECT date AS d FROM ops_platform_row)`),
|
|
|
+ SELECT date AS d FROM ops_row UNION SELECT date AS d FROM ops_platform_row) AS t`),
|
|
|
poolRef.query(`SELECT COUNT(*)::int AS c FROM (
|
|
|
- SELECT date, shop_key FROM ops_row UNION SELECT date, shop_id FROM ops_platform_row)`),
|
|
|
+ SELECT date, shop_key FROM ops_row UNION SELECT date, shop_id FROM ops_platform_row) AS t`),
|
|
|
poolRef.query(`SELECT school, COUNT(DISTINCT shop)::int AS c FROM (
|
|
|
SELECT school, shop_id AS shop FROM ops_platform_row WHERE school <> ''
|
|
|
UNION SELECT school, shop_key AS shop FROM ops_row WHERE school <> ''
|