@opengis/fastify-table 1.2.71 → 1.2.72
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -78,7 +78,7 @@ export default async function dataAPI(req, reply, called) {
|
|
|
78
78
|
const cardSqlFiltered = hookData?.id || params.id ? (cardSql?.filter?.((el) => !el?.disabled && el?.name && el?.sql?.replace) || []) : [];
|
|
79
79
|
const cardSqlTable = cardSqlFiltered.length ? cardSqlFiltered.map((el, i) => ` left join lateral (${el.sql.replace('{{uid}}', uid)}) ct${i} on 1=1 `).join('\n') || '' : '';
|
|
80
80
|
|
|
81
|
-
const sqlInline = loadTable.sql?.filter?.(el => el.inline).map(el => `,(${el.sql})`).join('');
|
|
81
|
+
const sqlInline = loadTable.sql?.filter?.(el => el.inline).map(el => `,(${el.sql})`).join('') || '';
|
|
82
82
|
const { fields = [] } = pg.queryCache ? await pg.queryCache(`select * ${sqlInline} from ${table} t ${sqlTable} ${cardSqlTable} limit 0`) : {};
|
|
83
83
|
const dbColumnsTable = fields.map(el => el.name);
|
|
84
84
|
const cols = columns.filter((el) => el.name !== 'geom' && dbColumnsTable.includes(el.name)).map((el) => el.name || el).join(',');
|
|
@@ -138,8 +138,8 @@ export default async function dataAPI(req, reply, called) {
|
|
|
138
138
|
${metaCols}
|
|
139
139
|
|
|
140
140
|
${dbColumns.find((el) => el.name === 'geom' && pg.pgType?.[el.dataTypeID] === 'geometry') ? ',st_asgeojson(geom)::json as geom' : ''}
|
|
141
|
-
from (select * ${sql?.filter(el => el.inline).map(el => `,(${el.sql})`).join('') || ''} from ${table} t
|
|
142
|
-
|
|
141
|
+
from (select * ${sql?.filter(el => el.inline).map(el => `,(${el.sql})`).join('') || ''} from ${table} t ${sqlTable} ) t
|
|
142
|
+
|
|
143
143
|
${params.id ? cardSqlTable : ''}
|
|
144
144
|
where ${where.join(' and ') || 'true'}
|
|
145
145
|
${order} ${offset} limit ${limit}`
|