@opengis/fastify-table 1.3.43 → 1.3.44
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
|
@@ -189,7 +189,7 @@ export default async function dataAPI(req, reply, called) {
|
|
|
189
189
|
count(*)::int as total,
|
|
190
190
|
count(*) FILTER(WHERE ${filterWhere.join(' and ') || 'true'})::int as filtered
|
|
191
191
|
${aggregates.length ? `,${aggregates.map((el) => `${aggColumns[el.name]}(${el.name}) FILTER(WHERE ${filterWhere.join(' and ') || 'true'}) as ${el.name}`).join(',')}` : ''}
|
|
192
|
-
from (select * ${sql?.filter(el => el.inline).map(el => `,(${el.sql})`).join('') || ''} from ${table} t ${sqlTable})
|
|
192
|
+
from (select * ${sql?.filter(el => el.inline).map(el => `,(${el.sql})`).join('') || ''} from ${table} t ${sqlTable})q
|
|
193
193
|
where ${[loadTable?.query, tokenData?.query, accessQuery, contextQuery].filter(el => el).filter((el) => checkQuery(el)).join(' and ') || 'true'} `
|
|
194
194
|
.replace(/{{uid}}/g, uid);
|
|
195
195
|
|
|
@@ -321,6 +321,10 @@ export default async function dataAPI(req, reply, called) {
|
|
|
321
321
|
filters: filters?.map?.(el => ({ ...el, sql: undefined })),
|
|
322
322
|
};
|
|
323
323
|
|
|
324
|
+
if (!res.columns?.length && dbColumns?.length) {
|
|
325
|
+
Object.assign(res, { columns: dbColumns.map(({ name, title, dataTypeID }) => ({ name, title, type: pg.pgType[dataTypeID] })) });
|
|
326
|
+
}
|
|
327
|
+
|
|
324
328
|
// console.log({ add: loadTable.table, form: loadTable.form });
|
|
325
329
|
if (uid && actions.includes('add')) {
|
|
326
330
|
const addTokens = setToken({
|