@opengis/fastify-table 1.1.29 → 1.1.31

package/Changelog.md

@@ -1,5 +1,9 @@
 # fastify-table
 
+## 1.1.31 - 11.10.2024
+
+- move notification api to admin
+
 ## 1.1.29 - 09.10.2024
 
 - add after crud hook

package/crud/controllers/insert.js

@@ -40,7 +40,7 @@ export default async function insert(req) {
     table: add || table, data: req.body, uid,
   });
 
-  // table_properties
+  // admin.custom_column
   await applyHook('afterInsert', { req, res });
   // form DataTable
   const extraKeys = Object.keys(formData)?.filter((key) => formData?.[key]?.type === 'DataTable' && formData?.[key]?.table && formData?.[key]?.parent_id && req.body[key].length);

package/crud/controllers/update.js

@@ -38,7 +38,7 @@ export default async function update(req) {
     table: tokenData?.table || table, id: tokenData?.id || id, data: req.body, uid,
   });
 
-  // table_properties
+  // admin.custom_column
   await applyHook('afterUpdate', { req, res });
 
   // form DataTable

package/index.js

@@ -49,29 +49,9 @@ async function plugin(fastify, opt) {
     return filepath;
   });
 
-  fastify.addHook('onListen', async () => {
-    const { client } = pgClients;
-    if (client?.pk?.['crm.cls']) {
-      const clsDir = path.join(process.cwd(), 'server/templates/cls');
-      const files = existsSync(clsDir) ? readdirSync(clsDir) : [];
-      if (files.length) {
-        const res = await Promise.all(files.map(async (filename) => {
-          const filepath = path.join(clsDir, filename);
-          const data = JSON.parse(readFileSync(filepath));
-          return { name: path.parse(filename).name, data };
-        }));
-        await client.query('truncate table crm.cls');
-        const { rows } = await client.query(`insert into crm.cls(name, type) 
-        select value->>'name', 'json' from json_array_elements($1) returning cls_id as id, name`, [JSON.stringify(res).replace(/'/g, "''")]);
-        rows.forEach((row) => Object.assign(row, { data: res.find((cls) => row.name === cls.name)?.data }));
-        const sql = `insert into crm.cls(code, name, parent)
-        select json_array_elements(value->'data')->>'id', json_array_elements(value->'data')->>'text', value->>'name' from json_array_elements($1)`;
-        await client.query(sql, [JSON.stringify(rows).replace(/'/g, "''")]);
-      }
-    }
-    // execute core migrations
-    await execMigrations();
-  });
+  // core migrations
+  await execMigrations();
+
   if (!fastify.funcs) {
     fastify.addHook('onRequest', async (req) => {
       req.funcs = fastify;

package/notification/index.js

@@ -1,43 +1,12 @@
 // api
-import readNotifications from './controllers/readNotifications.js'; // mark as read
-import userNotifications from './controllers/userNotifications.js'; // check all, backend pagination
 import testEmail from './controllers/testEmail.js';
 // funcs
 import addNotification from './funcs/addNotification.js'; // add to db
 import notification from './funcs/sendNotification.js'; // send notification
 
-import onWidgetSet from './hook/onWidgetSet.js'; // send notification on comment
-import { addHook } from '../utils.js';
-
-const tableSchema = {
-  params: {
-    id: { type: 'string' },
-  },
-  querystring: {
-    nocache: { type: 'string', pattern: '^(\\d+)$' },
-  },
-};
-
 async function plugin(fastify, config = {}) {
   const prefix = config.prefix || '/api';
-  fastify.route({
-    method: 'GET',
-    url: `${prefix}/notification`,
-    config: {
-      policy: ['user'],
-    },
-    schema: tableSchema,
-    handler: userNotifications,
-  });
-  fastify.route({
-    method: 'GET',
-    url: `${prefix}/notification-read/:id?`,
-    config: {
-      policy: ['user'],
-    },
-    schema: tableSchema,
-    handler: readNotifications,
-  });
+
   fastify.route({
     method: 'GET',
     url: `${prefix}/test-email`,
@@ -49,7 +18,6 @@ async function plugin(fastify, config = {}) {
 
   fastify.decorate('addNotification', addNotification);
   fastify.decorate('notification', notification);
-  addHook('onWidgetSet', onWidgetSet);
 }
 
 export default plugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.1.29",
+  "version": "1.1.31",
   "type": "module",
   "description": "core-plugins",
   "main": "index.js",

package/server/migrations/crm.sql

@@ -113,29 +113,6 @@ ALTER TABLE crm.checklists ADD COLUMN IF NOT EXISTS editor_id text;
 ALTER TABLE crm.checklists ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
 ALTER TABLE crm.checklists ADD CONSTRAINT crm_checklists_pkey PRIMARY KEY (checklist_id);
 
--- crm.cls
--- DROP TABLE IF EXISTS crm.cls;
-CREATE TABLE IF NOT EXISTS crm.cls();
-ALTER TABLE crm.cls DROP CONSTRAINT IF EXISTS crm_cls_pkey;
-ALTER TABLE crm.cls DROP CONSTRAINT IF EXISTS crm_cls_unique;
-ALTER TABLE crm.cls ADD COLUMN IF NOT EXISTS cls_id text NOT NULL DEFAULT next_id();
-
-ALTER TABLE crm.cls ADD COLUMN IF NOT EXISTS name text;
-ALTER TABLE crm.cls ADD COLUMN IF NOT EXISTS data text;
-ALTER TABLE crm.cls ADD COLUMN IF NOT EXISTS type text;
-ALTER TABLE crm.cls ADD COLUMN IF NOT EXISTS parent text;
-ALTER TABLE crm.cls ADD COLUMN IF NOT EXISTS code text;
-ALTER TABLE crm.cls ADD COLUMN IF NOT EXISTS color text;
-ALTER TABLE crm.cls ADD COLUMN IF NOT EXISTS icon text;
-
-ALTER TABLE crm.cls ADD COLUMN IF NOT EXISTS uid text;
-ALTER TABLE crm.cls ADD COLUMN IF NOT EXISTS files json;
-ALTER TABLE crm.cls ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT (now())::timestamp without time zone;
-ALTER TABLE crm.cls ADD COLUMN IF NOT EXISTS editor_id text;
-ALTER TABLE crm.cls ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
-ALTER TABLE crm.cls ADD CONSTRAINT crm_cls_pkey PRIMARY KEY (cls_id);
-ALTER TABLE crm.cls ADD CONSTRAINT crm_cls_unique UNIQUE (code, parent);
-
 -- DROP TABLE crm.properties;
 CREATE TABLE IF NOT EXISTS crm.properties();
 ALTER TABLE crm.properties DROP CONSTRAINT IF EXISTS crm_properties_pkey;

package/server/migrations/properties.sql

@@ -1,7 +1,10 @@
 create schema if not exists admin;
 create schema if not exists setting;
 
--- DROP TABLE admin.properties;
+-- drop old
+DROP TABLE IF EXISTS setting.extra_data;
+DROP TABLE IF EXISTS admin.table_properties;
+
 CREATE TABLE IF NOT EXISTS admin.properties();
 ALTER TABLE admin.properties DROP CONSTRAINT IF EXISTS admin_properties_property_id_pkey;
 ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS property_id text NOT NULL DEFAULT next_id();
@@ -31,7 +34,6 @@ ALTER TABLE admin.properties ADD CONSTRAINT admin_properties_property_id_pkey PR
 
 COMMENT ON TABLE admin.properties IS 'Налаштування';
 
--- DROP TABLE admin.user_properties;
 CREATE TABLE IF NOT EXISTS admin.user_properties();
 ALTER TABLE admin.user_properties DROP CONSTRAINT IF EXISTS admin_user_properties_property_id_pkey;
 alter table admin.user_properties drop constraint if exists user_properties_key_uid_unique;
@@ -40,13 +42,20 @@ ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS property_id text NOT
 ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS property_key text;
 COMMENT ON COLUMN admin.user_properties.property_key IS 'Ключ';
 ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS property_json json;
-COMMENT ON COLUMN admin.user_properties.property_json IS 'Значення налаштування';
+COMMENT ON COLUMN admin.user_properties.property_json IS 'Налаштування json';
+ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS property_text text;
+COMMENT ON COLUMN admin.user_properties.property_text IS 'Налаштування text';
 
 ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS property_entity text;
 COMMENT ON COLUMN admin.user_properties.property_entity IS 'Сутність';
 ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS property_title text;
 COMMENT ON COLUMN admin.user_properties.property_title IS 'Назва';
 
+ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS private boolean;
+ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS private SET NOT NULL;
+ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS private boolean default SET default true;
+COMMENT ON COLUMN admin.user_properties.private IS 'Доступ лише для користувача, який додав дане налаштування';
+
 ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS uid text NOT NULL DEFAULT '1'::text;
 ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS editor_id text;
 ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
@@ -58,71 +67,74 @@ ALTER TABLE admin.user_properties ADD CONSTRAINT user_properties_key_uid_unique
 
 COMMENT ON TABLE admin.user_properties IS 'Налаштування користувача';
 
--- DROP TABLE admin.table_properties;
-CREATE TABLE IF NOT EXISTS admin.table_properties();
-ALTER TABLE admin.table_properties DROP CONSTRAINT IF EXISTS admin_table_properties_property_id_pkey cascade;
-alter table admin.table_properties drop constraint if exists table_properties_key_type_entity_uid_unique;
-ALTER TABLE admin.table_properties ADD COLUMN IF NOT EXISTS property_id text NOT NULL DEFAULT next_id();
-
-ALTER TABLE admin.table_properties ADD COLUMN IF NOT EXISTS property_key text;
-ALTER TABLE admin.table_properties ADD COLUMN IF NOT EXISTS property_type text;
-ALTER TABLE admin.table_properties ADD COLUMN IF NOT EXISTS property_entity text;
-ALTER TABLE admin.table_properties ADD COLUMN IF NOT EXISTS property_title text;
-ALTER TABLE admin.table_properties ADD COLUMN IF NOT EXISTS property_format text;
-ALTER TABLE admin.table_properties ADD COLUMN IF NOT EXISTS property_data text;
-
-ALTER TABLE admin.table_properties ADD COLUMN IF NOT EXISTS uid text NOT NULL DEFAULT '1'::text;
-ALTER TABLE admin.table_properties ADD COLUMN IF NOT EXISTS editor_id text;
-ALTER TABLE admin.table_properties ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
-ALTER TABLE admin.table_properties ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT now();
-ALTER TABLE admin.table_properties ADD COLUMN IF NOT EXISTS files json;
-
-ALTER TABLE admin.table_properties ADD CONSTRAINT admin_table_properties_property_id_pkey PRIMARY KEY(property_id);
-ALTER TABLE admin.table_properties ADD CONSTRAINT table_properties_key_type_entity_uid_unique UNIQUE (property_key,property_type,property_entity,uid);
-
-COMMENT ON TABLE admin.table_properties IS 'Налаштування таблиць користувача';
-COMMENT ON COLUMN admin.table_properties.property_key IS 'Ключ';
-COMMENT ON COLUMN admin.table_properties.property_type IS 'Тип (колонка/фільтр)';
-COMMENT ON COLUMN admin.table_properties.property_entity IS 'Сутність';
-COMMENT ON COLUMN admin.table_properties.property_title IS 'Назва';
-COMMENT ON COLUMN admin.table_properties.property_format IS 'Формат';
-COMMENT ON COLUMN admin.table_properties.property_data IS 'Класифікатор';
-
-CREATE TABLE if not exists setting.extra_data();
-ALTER TABLE setting.extra_data DROP CONSTRAINT IF EXISTS setting_extra_data_pkey;
-ALTER TABLE setting.extra_data DROP CONSTRAINT IF EXISTS setting_extra_data_property_id_fkey;
-ALTER TABLE setting.extra_data DROP CONSTRAINT IF EXISTS setting_extra_data_property_key_object_id_entity_unique;
-ALTER TABLE setting.extra_data ADD COLUMN IF NOT EXISTS extra_data_id text;
-ALTER TABLE setting.extra_data ALTER COLUMN extra_data_id SET NOT NULL;
-ALTER TABLE setting.extra_data ALTER COLUMN extra_data_id SET DEFAULT next_id();
-
-ALTER TABLE setting.extra_data ADD COLUMN IF NOT EXISTS property_id text;
-ALTER TABLE setting.extra_data ADD COLUMN IF NOT EXISTS property_key text;
-ALTER TABLE setting.extra_data ADD COLUMN IF NOT EXISTS property_entity text;
-ALTER TABLE setting.extra_data ADD COLUMN IF NOT EXISTS object_id text;
-ALTER TABLE setting.extra_data ADD COLUMN IF NOT EXISTS value_text text;
-ALTER TABLE setting.extra_data ADD COLUMN IF NOT EXISTS value_date timestamp without time zone;
-ALTER TABLE setting.extra_data ADD COLUMN IF NOT EXISTS uid text;
-ALTER TABLE setting.extra_data ALTER COLUMN uid SET DEFAULT '1'::text;
-ALTER TABLE setting.extra_data ADD COLUMN IF NOT EXISTS cdate timestamp without time zone;
-ALTER TABLE setting.extra_data ALTER COLUMN cdate SET DEFAULT date_trunc('seconds'::text, now());
-ALTER TABLE setting.extra_data ADD COLUMN IF NOT EXISTS editor_id text;
-ALTER TABLE setting.extra_data ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
-ALTER TABLE setting.extra_data ADD COLUMN IF NOT EXISTS files json;
-ALTER TABLE setting.extra_data ADD CONSTRAINT setting_extra_data_pkey PRIMARY KEY (extra_data_id);
-ALTER TABLE setting.extra_data ADD CONSTRAINT setting_extra_data_property_id_fkey FOREIGN KEY (property_id) REFERENCES admin.table_properties (property_id) MATCH SIMPLE;
-ALTER TABLE setting.extra_data ADD CONSTRAINT setting_extra_data_property_key_object_id_entity_unique UNIQUE (property_key, object_id, property_entity);
-
-COMMENT ON TABLE setting.extra_data IS 'Значення користувацьких полів';
-COMMENT ON COLUMN setting.extra_data.property_id IS 'ID поля користувача';
-COMMENT ON COLUMN setting.extra_data.property_key IS 'Назва колонки';
-COMMENT ON COLUMN setting.extra_data.property_entity IS 'Таблиця';
-COMMENT ON COLUMN setting.extra_data.object_id IS 'Ідентифікатор об''єкту';
-COMMENT ON COLUMN setting.extra_data.value_text IS 'Значення';
-COMMENT ON COLUMN setting.extra_data.value_date IS 'Дата';
-COMMENT ON COLUMN setting.extra_data.uid IS 'ID користувача';
-
-CREATE INDEX IF NOT EXISTS setting_extra_data_cdate_btree_idx ON setting.extra_data USING btree (cdate);
-CREATE INDEX IF NOT EXISTS setting_extra_data_property_id_btree_idx ON setting.extra_data USING btree (property_id COLLATE pg_catalog."default");
-CREATE INDEX IF NOT EXISTS setting_extra_data_property_entity_btree_idx ON setting.extra_data USING btree (property_entity COLLATE pg_catalog."default");
-CREATE INDEX IF NOT EXISTS setting_extra_data_object_id_btree_idx ON setting.extra_data USING btree (object_id COLLATE pg_catalog."default");
+drop table if exists admin.custom_column cascade;
+
+CREATE TABLE IF NOT EXISTS admin.custom_column();
+ALTER TABLE admin.custom_column DROP CONSTRAINT IF EXISTS admin_custom_column_column_id_pkey cascade;
+alter table admin.custom_column drop constraint if exists admin_custom_column_key_entity_uid_unique;
+ALTER TABLE admin.custom_column ADD COLUMN IF NOT EXISTS column_id text NOT NULL DEFAULT next_id();
+
+ALTER TABLE admin.custom_column ADD COLUMN IF NOT EXISTS name text;
+ALTER TABLE admin.custom_column ADD COLUMN IF NOT EXISTS entity text;
+ALTER TABLE admin.custom_column ADD COLUMN IF NOT EXISTS title text;
+ALTER TABLE admin.custom_column ADD COLUMN IF NOT EXISTS format text;
+ALTER TABLE admin.custom_column ADD COLUMN IF NOT EXISTS data text;
+ALTER TABLE admin.custom_column ADD COLUMN IF NOT EXISTS filter boolean;
+ALTER TABLE admin.custom_column ADD COLUMN IF NOT EXISTS _table boolean;
+
+ALTER TABLE admin.custom_column ADD COLUMN IF NOT EXISTS uid text NOT NULL DEFAULT '1'::text;
+ALTER TABLE admin.custom_column ADD COLUMN IF NOT EXISTS editor_id text;
+ALTER TABLE admin.custom_column ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
+ALTER TABLE admin.custom_column ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT now();
+ALTER TABLE admin.custom_column ADD COLUMN IF NOT EXISTS files json;
+
+ALTER TABLE admin.custom_column ADD CONSTRAINT admin_custom_column_column_id_pkey PRIMARY KEY(column_id);
+ALTER TABLE admin.custom_column ADD CONSTRAINT admin_custom_column_name_entity_uid_unique UNIQUE (name,entity,uid);
+
+COMMENT ON TABLE admin.custom_column IS 'Налаштування таблиць користувача';
+COMMENT ON COLUMN admin.custom_column.name IS 'Ключ';
+COMMENT ON COLUMN admin.custom_column.entity IS 'Таблиця';
+COMMENT ON COLUMN admin.custom_column.title IS 'Підпис';
+COMMENT ON COLUMN admin.custom_column.format IS 'Формат';
+COMMENT ON COLUMN admin.custom_column.data IS 'Класифікатор';
+COMMENT ON COLUMN admin.custom_column.filter IS 'Виводити у фільтрах';
+COMMENT ON COLUMN admin.custom_column._table IS 'Відображати у таблиці';
+
+CREATE TABLE if not exists crm.extra_data();
+ALTER TABLE crm.extra_data DROP CONSTRAINT IF EXISTS crm_extra_data_pkey;
+ALTER TABLE crm.extra_data DROP CONSTRAINT IF EXISTS crm_extra_data_property_id_fkey;
+ALTER TABLE crm.extra_data DROP CONSTRAINT IF EXISTS crm_extra_data_property_key_object_id_entity_unique;
+ALTER TABLE crm.extra_data ADD COLUMN IF NOT EXISTS extra_data_id text;
+ALTER TABLE crm.extra_data ALTER COLUMN extra_data_id SET NOT NULL;
+ALTER TABLE crm.extra_data ALTER COLUMN extra_data_id SET DEFAULT next_id();
+
+ALTER TABLE crm.extra_data ADD COLUMN IF NOT EXISTS property_id text;
+ALTER TABLE crm.extra_data ADD COLUMN IF NOT EXISTS property_key text;
+ALTER TABLE crm.extra_data ADD COLUMN IF NOT EXISTS property_entity text;
+ALTER TABLE crm.extra_data ADD COLUMN IF NOT EXISTS object_id text;
+ALTER TABLE crm.extra_data ADD COLUMN IF NOT EXISTS value_text text;
+ALTER TABLE crm.extra_data ADD COLUMN IF NOT EXISTS value_date timestamp without time zone;
+ALTER TABLE crm.extra_data ADD COLUMN IF NOT EXISTS uid text;
+ALTER TABLE crm.extra_data ALTER COLUMN uid SET DEFAULT '1'::text;
+ALTER TABLE crm.extra_data ADD COLUMN IF NOT EXISTS cdate timestamp without time zone;
+ALTER TABLE crm.extra_data ALTER COLUMN cdate SET DEFAULT date_trunc('seconds'::text, now());
+ALTER TABLE crm.extra_data ADD COLUMN IF NOT EXISTS editor_id text;
+ALTER TABLE crm.extra_data ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
+ALTER TABLE crm.extra_data ADD COLUMN IF NOT EXISTS files json;
+ALTER TABLE crm.extra_data ADD CONSTRAINT crm_extra_data_pkey PRIMARY KEY (extra_data_id);
+ALTER TABLE crm.extra_data ADD CONSTRAINT crm_extra_data_property_id_fkey FOREIGN KEY (property_id) REFERENCES admin.custom_column (column_id) MATCH SIMPLE;
+ALTER TABLE crm.extra_data ADD CONSTRAINT crm_extra_data_property_key_object_id_entity_unique UNIQUE (property_key, object_id, property_entity);
+
+COMMENT ON TABLE crm.extra_data IS 'Значення користувацьких полів';
+COMMENT ON COLUMN crm.extra_data.property_id IS 'ID поля користувача';
+COMMENT ON COLUMN crm.extra_data.property_key IS 'Назва колонки';
+COMMENT ON COLUMN crm.extra_data.property_entity IS 'Таблиця';
+COMMENT ON COLUMN crm.extra_data.object_id IS 'Ідентифікатор об''єкту';
+COMMENT ON COLUMN crm.extra_data.value_text IS 'Значення';
+COMMENT ON COLUMN crm.extra_data.value_date IS 'Дата';
+COMMENT ON COLUMN crm.extra_data.uid IS 'ID користувача';
+
+CREATE INDEX IF NOT EXISTS crm_extra_data_cdate_btree_idx ON crm.extra_data USING btree (cdate);
+CREATE INDEX IF NOT EXISTS crm_extra_data_property_id_btree_idx ON crm.extra_data USING btree (property_id COLLATE pg_catalog."default");
+CREATE INDEX IF NOT EXISTS crm_extra_data_property_entity_btree_idx ON crm.extra_data USING btree (property_entity COLLATE pg_catalog."default");
+CREATE INDEX IF NOT EXISTS crm_extra_data_object_id_btree_idx ON crm.extra_data USING btree (object_id COLLATE pg_catalog."default");

package/server/migrations/roles.sql

@@ -1,4 +1,6 @@
 create schema if not exists admin;
+create schema if not exists public;
+CREATE EXTENSION if not exists pg_trgm SCHEMA public VERSION "1.5";
 
 -- Role (Group)
 -- drop table if exists admin.roles;

package/test/api/notification.test.js

@@ -25,32 +25,6 @@ test('api && funcs notification', async (t) => {
   if (!notificationIds?.length) {
     assert.ok(0, 'insert notification error');
   }
-  await t.test('GET /notification', async () => {
-    const res = await app.inject({
-      method: 'GET',
-      url: '/api/notification',
-    });
-    const rep = res.json();
-    assert.ok(rep.total > 0);
-  });
-  await t.test('GET /notification-read/:id', async () => {
-    const res = await app.inject({
-      method: 'GET',
-      url: `/api/notification-read/${notificationIds[0]}`,
-    });
-    const rep = res.json();
-    assert.ok(!rep.message?.startsWith(0), res.body);
-    assert.ok(rep.message?.includes('unread notifications marked'), res.body);
-  });
-  await t.test('GET /notification-read', async () => {
-    const res = await app.inject({
-      method: 'GET',
-      url: '/api/notification-read',
-    });
-    const rep = res.json();
-    assert.ok(!rep.message?.startsWith(0), res.body);
-    assert.ok(rep.message?.includes('unread notifications marked'), res.body);
-  });
 
   const { sql } = await getSelect('core.user_mentioned');
   const { name } = await pg.query(`with data (id,name,email) as (${sql})