@opengis/fastify-table 1.2.67 → 1.2.69

package/server/plugins/crud/funcs/setToken.js

@@ -1,44 +1,44 @@
-import { createHash, randomUUID } from 'crypto';
-
-import config from '../../../../config.js';
-
-import getRedis from '../../redis/funcs/getRedis.js';
-
-const rclient = getRedis({ db: 0 });
-
-// import { config, getRedis } from '../../../../utils.js';
-
-const generateCodes = (ids, userToken) => {
-  const token = userToken || randomUUID();
-  const notNullIds = ids.filter((el) => el);
-  const obj = {};
-  const codes = notNullIds.reduce((acc, id) => {
-    const newToken = createHash('sha1').update(token + id).digest('base64url').replace(/-/g, '');
-    acc[newToken] = id; obj[id] = newToken;
-    return acc;
-  }, {});
-  return { codes, obj };
-};
-
-function setToken({
-  ids: idsOrigin, uid, array,
-}) {
-  //  const rclient5 = getRedis({ db: 0, funcs });
-
-  if (!uid) return { user: 'empty' };
-  if (!Object.keys(idsOrigin).length) return { ids: 'empty' };
-
-  const ids = idsOrigin.map((el) => (typeof el === 'object' ? JSON.stringify(el) : el));
-
-  // TODO generate salt
-  const { codes, obj } = generateCodes(ids, uid);
-
-  if (!Object.keys(codes).length) return { ids: 'empty' };
-
-  rclient.hmset(`${config.pg.database}:token:edit:${uid}`, codes);
-  // console.log(`${config.pg.database}:token:edit:${uid}`, idsOrigin, Object.values(obj));
-  // TODO дополнительно писать в hset token -> uid
-  return array ? Object.values(obj) : obj;
-}
-
-export default setToken;
+import { createHash, randomUUID } from 'crypto';
+
+import config from '../../../../config.js';
+
+import getRedis from '../../redis/funcs/getRedis.js';
+
+const rclient = getRedis({ db: 0 });
+
+// import { config, getRedis } from '../../../../utils.js';
+
+const generateCodes = (ids, userToken) => {
+  const token = userToken || randomUUID();
+  const notNullIds = ids.filter((el) => el);
+  const obj = {};
+  const codes = notNullIds.reduce((acc, id) => {
+    const newToken = createHash('sha1').update(token + id).digest('base64url').replace(/-/g, '');
+    acc[newToken] = id; obj[id] = newToken;
+    return acc;
+  }, {});
+  return { codes, obj };
+};
+
+function setToken({
+  ids: idsOrigin, uid, array,
+}) {
+  //  const rclient5 = getRedis({ db: 0, funcs });
+
+  if (!uid) return { user: 'empty' };
+  if (!Object.keys(idsOrigin).length) return { ids: 'empty' };
+
+  const ids = idsOrigin.map((el) => (typeof el === 'object' ? JSON.stringify(el) : el));
+
+  // TODO generate salt
+  const { codes, obj } = generateCodes(ids, uid);
+
+  if (!Object.keys(codes).length) return { ids: 'empty' };
+
+  rclient.hmset(`${config.pg.database}:token:edit:${uid}`, codes);
+  // console.log(`${config.pg.database}:token:edit:${uid}`, idsOrigin, Object.values(obj));
+  // TODO дополнительно писать в hset token -> uid
+  return array ? Object.values(obj) : obj;
+}
+
+export default setToken;

package/server/plugins/crud/funcs/utils/getFolder.js

@@ -1,11 +1,11 @@
-import path from 'node:path';
-
-import config from '../../../../../config.js';
-
-export default function getFolder(req, type = 'server') {
-  if (!['server', 'local'].includes(type)) throw new Error('params type is invalid');
-  const types = { local: req.root || config.root, server: req.mapServerRoot || config.mapServerRoot };
-  const dbname = req.pg?.options?.database || req.pg?.database || config.pg?.database; // request / config params / default config params
-  const filepath = path.posix.join(types[type] || `/data/local/${dbname || ''}`, req.folder || config.folder || '');
-  return filepath;
-}
+import path from 'node:path';
+
+import config from '../../../../../config.js';
+
+export default function getFolder(req, type = 'server') {
+  if (!['server', 'local'].includes(type)) throw new Error('params type is invalid');
+  const types = { local: req.root || config.root, server: req.mapServerRoot || config.mapServerRoot };
+  const dbname = req.pg?.options?.database || req.pg?.database || config.pg?.database; // request / config params / default config params
+  const filepath = path.posix.join(types[type] || `/data/local/${dbname || ''}`, req.folder || config.folder || '');
+  return filepath;
+}

package/server/plugins/crud/funcs/validateData.js

@@ -34,7 +34,7 @@ function checkBody({ body = {}, arr = [], idx }) {
         const input = arr.find(el => el.key === key) || {};
 
         if (input.colModel?.length && input.type?.toLowerCase() === 'datatable') {
-            const result = body[key].reduce((acc, item, i) => {
+            const result = body[key]?.reduce?.((acc, item, i) => {
                 const check = checkBody({ body: item, arr: input.colModel, idx: i });
                 acc.push(check);
                 return acc;
@@ -48,10 +48,10 @@ function checkBody({ body = {}, arr = [], idx }) {
         return acc1;
     }, []);
 
-    const invalidField = res.find(el => el.error);
+    const invalidField = res.find(el => el?.error);
 
     if (invalidField) {
-        console.warn('invalid field: ', invalidField.key, invalidField.error);
+        console.warn('invalid field: ', invalidField?.key, invalidField?.error);
         return invalidField;
     }
 

package/server/plugins/crud/index.js

@@ -1,23 +1,23 @@
-// import getOpt from './funcs/getOpt.js';
-// import setOpt from './funcs/setOpt.js';
-
-// import isFileExists from './funcs/isFileExists.js';
-
-// import dataUpdate from './funcs/dataUpdate.js';
-// import dataInsert from './funcs/dataInsert.js';
-
-// import getAccessFunc from './funcs/getAccess.js';
-
-async function plugin(fastify) {
-  // fastify.decorate('setOpt', setOpt);
-  // fastify.decorate('getOpt', getOpt);
-
-  // fastify.decorate('dataUpdate', dataUpdate);
-  // fastify.decorate('dataInsert', dataInsert);
-
-  // fastify.decorate('getAccess', getAccessFunc);
-
-  // fastify.decorate('isFileExists', isFileExists);
-}
-
-export default plugin;
+// import getOpt from './funcs/getOpt.js';
+// import setOpt from './funcs/setOpt.js';
+
+// import isFileExists from './funcs/isFileExists.js';
+
+// import dataUpdate from './funcs/dataUpdate.js';
+// import dataInsert from './funcs/dataInsert.js';
+
+// import getAccessFunc from './funcs/getAccess.js';
+
+async function plugin(fastify) {
+  // fastify.decorate('setOpt', setOpt);
+  // fastify.decorate('getOpt', getOpt);
+
+  // fastify.decorate('dataUpdate', dataUpdate);
+  // fastify.decorate('dataInsert', dataInsert);
+
+  // fastify.decorate('getAccess', getAccessFunc);
+
+  // fastify.decorate('isFileExists', isFileExists);
+}
+
+export default plugin;

package/server/plugins/hook/index.js

@@ -1,8 +1,8 @@
-import addHook from './funcs/addHook.js';
-import applyHook from './funcs/applyHook.js';
-
-async function plugin(fastify) {
-//   fastify.decorate('addHook', addHook);
-//   fastify.decorate('applyHook', applyHook);
-}
-export default plugin;
+import addHook from './funcs/addHook.js';
+import applyHook from './funcs/applyHook.js';
+
+async function plugin(fastify) {
+//   fastify.decorate('addHook', addHook);
+//   fastify.decorate('applyHook', applyHook);
+}
+export default plugin;

package/server/plugins/logger/errorStatus.js

@@ -1,19 +1,19 @@
-import applyHookSync from '../hook/funcs/applyHookSync.js';
-
-function errorStatus(error) {
-  const hook = applyHookSync('errorStatus', error);
-  if (hook) return hook;
-
-  if (error.routine === 'exec_stmt_raise' && error.file === 'pl_exec.c') {
-    return 601;
-  }
-  if (error.routine === 'ExecConstraints') {
-    return 602;
-  }
-  if (error.type === 'DatabaseError') {
-    return 600;
-  }
-
-  return 500;
-}
-export default errorStatus;
+import applyHookSync from '../hook/funcs/applyHookSync.js';
+
+function errorStatus(error) {
+  const hook = applyHookSync('errorStatus', error);
+  if (hook) return hook;
+
+  if (error.routine === 'exec_stmt_raise' && error.file === 'pl_exec.c') {
+    return 601;
+  }
+  if (error.routine === 'ExecConstraints') {
+    return 602;
+  }
+  if (error.type === 'DatabaseError') {
+    return 600;
+  }
+
+  return 500;
+}
+export default errorStatus;

package/server/plugins/logger/index.js

@@ -1,26 +1,26 @@
-import errorMessage from './errorMessage.js';
-import logger from './getLogger.js';
-import pgClients from '../pg/pgClients.js';
-
-async function plugin(fastify) {
-  fastify.setErrorHandler(async (error, request, reply) => {
-    // validation not error
-    if (error.validation) {
-      request.log.warn(request, { code: error?.code, status: 422, error: error.toString() });
-      return reply.status(422).send(error.toString());
-    }
-
-    // logger
-    request.log.error(error, request);
-    console.error({ msg: error.message, where: error.where, stack: error.stack });
-
-    // errorMessage
-    const msg = errorMessage(error);
-
-    return reply.status(error.statusCode || 500).send(msg);
-  });
-  fastify.addHook('onListen', async () => {
-    logger.file('init', { db: pgClients.client?.options?.database });
-  });
-}
-export default plugin;
+import errorMessage from './errorMessage.js';
+import logger from './getLogger.js';
+import pgClients from '../pg/pgClients.js';
+
+async function plugin(fastify) {
+  fastify.setErrorHandler(async (error, request, reply) => {
+    // validation not error
+    if (error.validation) {
+      request.log.warn(request, { code: error?.code, status: 422, error: error.toString() });
+      return reply.status(422).send(error.toString());
+    }
+
+    // logger
+    request.log.error(error, request);
+    console.error({ msg: error.message, where: error.where, stack: error.stack });
+
+    // errorMessage
+    const msg = errorMessage(error);
+
+    return reply.status(error.statusCode || 500).send(msg);
+  });
+  fastify.addHook('onListen', async () => {
+    logger.file('init', { db: pgClients.client?.options?.database });
+  });
+}
+export default plugin;

package/server/plugins/migration/index.js

@@ -1,7 +1,7 @@
-import execMigrations from './funcs/exec.migrations.js';
-
-async function plugin(fastify) {
-//   fastify.decorate('execMigrations', execMigrations);
-}
-
-export default plugin;
+import execMigrations from './funcs/exec.migrations.js';
+
+async function plugin(fastify) {
+//   fastify.decorate('execMigrations', execMigrations);
+}
+
+export default plugin;

package/server/plugins/pg/funcs/autoIndex.js

@@ -16,8 +16,8 @@ async function autoIndex({
 
   if (!filter?.length || !table) return null;
 
-  const attrs = filter.map((el) => (el.name || el).replace(/'/g, '')).sort();
-  const types = filter.map((el) => (el.name ? el : { name: el }))
+  const attrs = filter.map((el) => (el.name || el).replace(/'/g, '')).filter(el => el?.indexOf('(') === -1).sort();
+  const types = filter.filter(el => (el?.name || el)?.indexOf?.('(') === -1).map((el) => (el.name ? el : { name: el }))
     .reduce((p, el) => ({ ...p, [el.name]: el.type || '-' }), {});
 
   const redisKey = `autoindex1:${table}:${attrs.join(';')}`;

package/server/plugins/policy/sqlInjection.js

@@ -1,33 +1,33 @@
-const sqlInjection = [
-  '()',
-  '^',
-  '*',
-  'like ',
-  '@variable',
-  '@@variable',
-  'group by ',
-  'union ',
-  'select ',
-  'having ',
-  'as injectx',
-  'where ',
-  'rlike ',
-  'if(',
-  'sleep(',
-  'waitfor delay',
-  'benchmark(',
-  'pg_sleep(',
-  "'\\\"",
-  'randomblob(',
-  'order by ',
-  'union all ',
-  '+or',
-  'or ',
-  'and ',
-  "'' ",
-  '"""  ',
-  '<script',
-  'javascript:',
-];
-
-export default sqlInjection;
+const sqlInjection = [
+  '()',
+  '^',
+  '*',
+  'like ',
+  '@variable',
+  '@@variable',
+  'group by ',
+  'union ',
+  'select ',
+  'having ',
+  'as injectx',
+  'where ',
+  'rlike ',
+  'if(',
+  'sleep(',
+  'waitfor delay',
+  'benchmark(',
+  'pg_sleep(',
+  "'\\\"",
+  'randomblob(',
+  'order by ',
+  'union all ',
+  '+or',
+  'or ',
+  'and ',
+  "'' ",
+  '"""  ',
+  '<script',
+  'javascript:',
+];
+
+export default sqlInjection;

package/server/plugins/redis/client.js

@@ -1,8 +1,8 @@
-import redisClients from './funcs/redisClients.js';
-import getRedis from './funcs/getRedis.js';
-
-if (!redisClients[0]) {
-  getRedis({ db: 0 });
-}
-
-export default redisClients[0];
+import redisClients from './funcs/redisClients.js';
+import getRedis from './funcs/getRedis.js';
+
+if (!redisClients[0]) {
+  getRedis({ db: 0 });
+}
+
+export default redisClients[0];

package/server/plugins/redis/funcs/redisClients.js

@@ -1,3 +1,3 @@
-const redisClients = {};
-
-export default redisClients;
+const redisClients = {};
+
+export default redisClients;

package/server/plugins/redis/index.js

@@ -1,17 +1,17 @@
-// import redis from './client.js';
-import redisClients from './funcs/redisClients.js';
-
-function close(fastify) {
-  // redis.quit();
-  Object.keys(redisClients).forEach((key) => redisClients[key].quit());
-}
-
-async function plugin(fastify) {
-  // const client = getRedis({ db: 0 });
-  // client.getJSON = client.get;
-  // fastify.decorate('rclient', client);
-  // fastify.decorate('getRedis', getRedis);
-  fastify.addHook('onClose', close);
-}
-
-export default plugin;
+// import redis from './client.js';
+import redisClients from './funcs/redisClients.js';
+
+function close(fastify) {
+  // redis.quit();
+  Object.keys(redisClients).forEach((key) => redisClients[key].quit());
+}
+
+async function plugin(fastify) {
+  // const client = getRedis({ db: 0 });
+  // client.getJSON = client.get;
+  // fastify.decorate('rclient', client);
+  // fastify.decorate('getRedis', getRedis);
+  fastify.addHook('onClose', close);
+}
+
+export default plugin;

package/server/plugins/table/funcs/getData.js

@@ -1,8 +1,8 @@
 import routeData from '../../../routes/table/controllers/data.js';
 
-export default async function getData({ id, table, pg, filter, limit, page, search, user }) {
+export default async function getData({ id, table, pg, filter, limit, page, search, user, sql }, reply, called) {
   const params = { table, id };
-  const query = { filter, limit, page, search };
-  const result = await routeData({ pg, params, query, user });
+  const query = { filter, limit, page, search, sql };
+  const result = await routeData({ pg, params, query, user, sql }, reply, called);
   return result;
 }

package/server/plugins/table/funcs/getFilterSQL/index.js

@@ -7,24 +7,20 @@ import getTableSql from './util/getTableSql.js';
 import getFilterQuery from './util/getFilterQuery.js';
 import getOptimizedQuery from './util/getOptimizedQuery.js';
 
+const checkInline = {};
 const defaultTable = 'crm.extra_data';
 
-function getExtraQuery(mainColumns, extraColumns, schema, table, pk, mode = 'property') {
-  const extraKeys = mode === 'column'
-    ? Object.keys(schema || {}).filter(key => !mainColumns.map(el => el?.name).includes(key) && extraColumns.map(el => el?.name).includes(key))
-    : Object.keys(schema || {}).filter(key => !mainColumns.map(el => el?.name).includes(key));
+function getExtraQuery(mainColumns, schema, table, pk) {
+  const extraKeys = Object.keys(schema || {}).filter(key => !mainColumns.map(el => el?.name).includes(key));
 
-  if (mode === 'column') {
-    return { q: `left join lateral (select ${extraKeys.map(key => `"${key}"`).join(',')} from ${table} where ${pk}=t.${pk} limit 1) extra on 1=1`, extraKeys };
-  }
   return {
-    q: extraKeys.map((el, idx) => `left join lateral (select value_text as "${el.replace(/'/g, "''")}" from ${table} where property_key='${el.replace(/'/g, "''")}' and object_id=t.${pk} limit 1) extra${idx} on 1=1`).join(' '),
+    q: extraKeys.map((el) => `,(select value_text as "${el.replace(/'/g, "''")}" from ${table} where property_key='${el.replace(/'/g, "''")}' and object_id=t.${pk} limit 1)`).join(' '),
     extraKeys,
   };
 }
 
 export default async function getFilterSQL({
-  table, filter, pg = pgClients.client, search, filterList, query, custom, state,
+  table, filter, pg = pgClients.client, search, filterList, query, custom, state, uid,
 }) {
   if (!table) return { error: 'param table is required', status: 400 };
 
@@ -40,32 +36,45 @@ export default async function getFilterSQL({
     || defaultTable
     : undefined;
 
-  const { fields: fieldsExtra = [] } = pg.pk?.[extraDataTable] ? await pg.query(`select * from ${extraDataTable} limit 0`) : {};
-  const mode = fieldsExtra.find((col) => col?.name === pg.pk?.[body?.table || table]) ? 'column' : 'property';
-
-  const { fields: fieldsModel = [] } = body?.table && pg.pk[body?.table] ? await pg.query(`select * from ${body.table} limit 0`) : {};
-  const { q: extraSqlList, extraKeys } = pg.pk?.[extraDataTable] && pg.pk?.[body?.table]
-    ? getExtraQuery(fieldsModel, fieldsExtra, loadTemplate?.schema, extraDataTable, pg.pk[body?.table || table], mode)
+  const { fields: fieldsModel = [] } = body?.table && pg.pk[body.table] ? await pg.query(`select * from ${body.table} limit 0`) : {};
+  const { q: extraSqlColumns, extraKeys } = pg.pk?.[extraDataTable] && pg.pk?.[body.table || table]
+    ? getExtraQuery(fieldsModel, loadTemplate?.schema, extraDataTable, pg.pk[body.table || table])
     : {};
 
   // console.log('extra getFilterSQL', extraDataTable, pg.pk?.[extraDataTable]);
 
-  const sqlList = body?.sql?.length
-    ? body?.sql?.filter((el) => !el.disabled && el?.sql?.replace)
-      .map((el, i) => {
-        Object.assign(el, { name: el.name || `t${i + 1}` });
-        return ` left join lateral (${el.filter ? el.sql.replace(/limit 1/ig, '') : el.sql}) as ${el.name} on 1=1 `;
-      }).join(' ')
-    : '';
-  const fieldQuery = `select * from ${body?.table || table} t ${sqlList || ''} ${extraSqlList || ''} limit 0`;
-  const { fields = [] } = !extra || mode === 'column' ? await pg.query(fieldQuery) : { fields: extraKeys.map(el => ({ name: el.name, dataTypeID: 25 })) };
+  // check sql inline fields count
+  if (!checkInline[body.table] && body.sql?.length && body.table) {
+    const filterSql = body.sql.filter(el => el.inline ?? true);
+    const d = await Promise.all(filterSql.map(el => pg.query(`select  q.* from(select * from ${body.table})t left join lateral(${el.sql})q on 1=1 limit 0`).then(el => el.fields)))
+    d.forEach((el, i) => {
+      filterSql[i].inline = el.length == 1 ? true : false;
+      filterSql[i].fields = el.map(f => f.name);
+    });
+    checkInline[table] = body.sql;
+  } else if (checkInline[table]) {
+    body.sql = checkInline[table]
+  }
+
+  const sqlTable = body?.sql?.length
+    ? body.sql
+      .filter((el) => !el?.disabled && !el.inline && el?.sql?.replace && (!el.sql.includes('{{uid}}') || uid))
+      .map((el, i) => ` left join lateral (${el.sql.replace('{{uid}}', uid)}) ${el.name || `t${i}`} on 1=1 `)
+      .join('')
+    : null;
+  const sqlInline = body.sql?.filter?.(el => el.inline).map(el => `,(${el.sql})`).join('');
+
+  const fieldQuery = `select * ${extraSqlColumns || ''} ${sqlInline || ''} from ${body?.table || table} t ${sqlTable || ''} limit 0`;
+  const { fields = [] } = !extra ? await pg.query(fieldQuery) : { fields: extraKeys.map(el => ({ name: el.name, dataTypeID: 25 })) };
   const autoSearchColumn = fields?.filter((el) => pg.pgType?.[el.dataTypeID] === 'text')?.map((el) => el.name).join(',');
   const searchColumn = body?.search_column || body?.meta?.search || autoSearchColumn;
   const fieldsList = (fieldsModel || fields)?.map((el) => el.name);
+
   try {
     const tableSQL = await getTableSql({
       pg, body, table, fields,
     });
+
     const sval = `ilike '%${decodeURIComponent(search?.replace(/%/g, '%25')).replace(/'/g, "''").replace(/%/g, '\\%')}%'`;
     const searchQuery = search && searchColumn
       ? ` (${searchColumn.split(',')?.map((name) => {
@@ -73,33 +82,40 @@ export default async function getFilterSQL({
         return pk && !fieldsList.includes(name) ? `${pk} in (select ${pk} from (${fieldQuery.replace(/limit 0/g, '')} where ${name} ${sval} )q where 1=1)` : `${name} ${sval}`;
       }).join(' or ')} )` : '';
 
-    body?.filterSql?.forEach?.((el) => Object.assign(el, { filtersql: 1 }));
-
-    const filterList1 = await Promise.all((filterList || (body?.filter_list || []).concat(body?.filterInline || []).concat(body?.filterCustom || []).concat(body?.filterState || []).concat(body?.filterList || [])
-      .concat(body?.filters || [])).concat(body?.filterSql || []) /* .concat(extraFilters || []).concat(customFilters || []) */
-
-      ?.map(async (el) => {
-        if (el.name && extraKeys?.includes?.(el.name)) {
-          Object.assign(el, { extra: { table: extraDataTable, mode } });
-        }
-        if (!el?.data) return el;
-        const cls = await getTemplate(['cls', 'select'], el.data);
-        if (Array.isArray(cls) && cls?.length) {
-          Object.assign(el, { options: cls });
-        }
-        else if (typeof (cls?.sql || cls) === 'string') {
-          Object.assign(el, { sql: cls?.sql || cls });
-        }
-        return el;
-      }));
+    const filterList1 = await Promise.all((filterList || (body?.filter_list || [])
+      .concat(body?.filterInline || [])
+      .concat(body?.filterCustom || [])
+      .concat(body?.filterState || [])
+      .concat(body?.filterList || [])
+      .concat(body?.filters || [])
+    )?.filter(el => el.id || el.name)?.map(async (el) => {
+      el.name = el.name || el.id;
+
+      if (el.name && extraKeys?.includes?.(el.name)) {
+        Object.assign(el, { extra: { table: extraDataTable } });
+      }
+      if (!el?.data) return el;
+      const cls = await getTemplate(['cls', 'select'], el.data);
+
+      if (Array.isArray(cls) && cls?.length) {
+        Object.assign(el, { cls: el.data, options: cls, select: `select code, name from admin.cls where parent='${el.data}'` });
+      }
+      else if (typeof (cls?.sql || cls) === 'string') {
+        Object.assign(el, { select: cls?.sql || cls });
+      }
+      return el;
+    }));
+
+    const modelQuery = body?.model || body?.table || table;
 
     const filters = getFilterQuery({
       pg,
       filter,
-      table: body?.table || table,
+      table: modelQuery,
       tableSQL,
       fields,
       filterList: filterList1,
+      uid,
     });
 
     // filter
@@ -110,16 +126,18 @@ export default async function getFilterSQL({
     const q = [body?.query, query, searchQuery, filterQuery, stateQuery, customQuery].filter((el) => el).join(' and ');
 
     // table
-    const modelQuery = body?.model || body?.table || table;
-    const optimizedSQL = `select * from ${getOptimizedQuery({ body, extraSqlList, table, q })} `;
-    const tableCount = getOptimizedQuery({ body, extraSqlList, table, q }, true);
-    // console.log(optimizedSQL);
+
+    const obj = { table: modelQuery, orderby: body?.order || body?.orderby, sqlTable, sqlInline, extraSqlColumns, q };
+    const optimizedSQL = `select * from ${getOptimizedQuery(obj)} `;
+    const tableCount = getOptimizedQuery(obj, true);
+
     return {
       filterList,
-
+      filters,
       q,
       optimizedSQL,
-      extraSqlList,
+      sqlTable,
+      extraSqlColumns,
       extraKeys,
       tableCount,
       table: modelQuery,