adminforth 1.2.28 → 1.2.29

package/dataConnectors/baseConnector.ts

@@ -10,16 +10,25 @@ export default class AdminForthBaseConnector implements IAdminForthDataSourceCon
     }
   }
 
-  getRecordByPrimaryKeyWithOriginalTypes(resource: AdminForthResource, id: string): Promise<any> {
-    throw new Error('Method not implemented.');
+  async getRecordByPrimaryKeyWithOriginalTypes(resource: AdminForthResource, id: string): Promise<any> {
+    const data = await this.getDataWithOriginalTypes({ 
+      resource, 
+      limit: 1, 
+      offset: 0,
+      sort: [], 
+      filters: [{ field: this.getPrimaryKey(resource), operator: AdminForthFilterOperators.EQ, value: id }],
+      getTotals: false
+    });
+    return data.data.length > 0 ? data.data[0] : null;
   }
 
-  getDataWithOriginalTypes({ resource, limit, offset, sort, filters }: { 
+  getDataWithOriginalTypes({ resource, limit, offset, sort, filters, getTotals }: { 
     resource: AdminForthResource, 
     limit: number, 
     offset: number, 
     sort: { field: string, direction: AdminForthSortDirections }[], 
-    filters: { field: string, operator: AdminForthFilterOperators, value: any }[] 
+    filters: { field: string, operator: AdminForthFilterOperators, value: any }[],
+    getTotals?: boolean
   }): Promise<{ data: any[], total: number }> {
     throw new Error('Method not implemented.');
   }
@@ -68,7 +77,7 @@ export default class AdminForthBaseConnector implements IAdminForthDataSourceCon
     limit: number, 
     offset: number, 
     sort: { field: string, direction: AdminForthSortDirections }[], 
-    filters: { field: string, operator: AdminForthFilterOperators, value: any }[] 
+    filters: { field: string, operator: AdminForthFilterOperators, value: any }[]
   }): Promise<{ data: any[], total: number }> {
     if (filters) {
       filters.map((f) => {
@@ -80,7 +89,7 @@ export default class AdminForthBaseConnector implements IAdminForthDataSourceCon
       });
     }
 
-    const d = await this.getDataWithOriginalTypes({ resource, limit, offset, sort, filters });
+    const d = await this.getDataWithOriginalTypes({ resource, limit, offset, sort, filters, getTotals: true });
     // call getFieldValue for each field
     d.data.map((record) => {
       for (const col of resource.dataSourceColumns) {

package/dataConnectors/clickhouse.ts

@@ -2,7 +2,9 @@ import betterSqlite3 from 'better-sqlite3';
 import { AdminForthDataTypes, AdminForthFilterOperators, AdminForthSortDirections, IAdminForthDataSourceConnector, AdminForthResource, AdminForthResourceColumn } from '../types/AdminForthConfig.js';
 import AdminForthBaseConnector from './baseConnector.js';
 import dayjs from 'dayjs';
-import { createClient } from '@clickhouse/client' // or '@clickhouse/client-web'
+import { createClient, ClickHouseLogLevel } from '@clickhouse/client' // or '@clickhouse/client-web'
+import { isObject } from 'util';
+import { date } from 'zod';
 
 
 
@@ -21,6 +23,18 @@ class ClickhouseConnector extends AdminForthBaseConnector implements IAdminForth
       // create connection here
       this.client = createClient({ 
         url: url.replace('clickhouse://', 'http://'),
+        clickhouse_settings: {
+          // Allows to insert serialized JS Dates (such as '2023-12-06T10:54:48.000Z')
+          date_time_input_format: 'best_effort',
+
+          // Recommended for cluster usage to avoid situations where a query processing error occurred after the response code, 
+          // and HTTP headers were already sent to the client.
+          // See https://clickhouse.com/docs/en/interfaces/http/#response-buffering
+          wait_end_of_query: 1,
+        },
+        // log:{
+        //   level: ClickHouseLogLevel.TRACE,
+        // }
       });
     }
 
@@ -83,7 +97,8 @@ class ClickhouseConnector extends AdminForthBaseConnector implements IAdminForth
         } else if (field._underlineType.startsWith('DateTime') 
             || field._underlineType.startsWith('String') 
             || field._underlineType.startsWith('FixedString')) {
-          return dayjs(value).toISOString();
+          const v = dayjs(value).toISOString();
+          return v;
         } else {
           throw new Error(`AdminForth does not support row type: ${field._underlineType} for timestamps, use VARCHAR (with iso strings) or TIMESTAMP/INT (with unix timestamps). Issue in field "${field.name}"`);
         }
@@ -104,21 +119,6 @@ class ClickhouseConnector extends AdminForthBaseConnector implements IAdminForth
       return value;
     }
 
-    async getRecordByPrimaryKeyWithOriginalTypes(resource: AdminForthResource, key: any): Promise<any> {
-        const columns = resource.dataSourceColumns.map((col) => col.name).join(', ');
-        const tableName = resource.table;
-        const stmt = await this.client.query({
-          query: `SELECT ${columns} FROM ${tableName} WHERE ${this.getPrimaryKey(resource)} = ?`,
-          format: 'JSONEachRow',
-          query_params: [key],
-        });
-        const row = await stmt.json();
-        if (!row.length) {
-          return null;
-        }
-        return row[0];
-    }
-
     setFieldValue(field: AdminForthResourceColumn, value: any): any {
       if (field.type == AdminForthDataTypes.DATETIME) {
         if (!value) {
@@ -131,7 +131,8 @@ class ClickhouseConnector extends AdminForthBaseConnector implements IAdminForth
           || field._underlineType.startsWith('String') 
           || field._underlineType.startsWith('FixedString')) {
           // value is iso string now, convert to unix timestamp
-          return dayjs(value).toISOString();
+          const iso = dayjs(value).toISOString();
+          return iso;
         }
       } else if (field.type == AdminForthDataTypes.BOOLEAN) {
         return value ? 1 : 0;
@@ -166,18 +167,20 @@ class ClickhouseConnector extends AdminForthBaseConnector implements IAdminForth
     };
     
 
-    async getDataWithOriginalTypes({ resource, limit, offset, sort, filters }: { 
+    async getDataWithOriginalTypes({ resource, limit, offset, sort, filters, getTotals }: { 
         resource: AdminForthResource, 
         limit: number, 
         offset: number, 
         sort: { field: string, direction: AdminForthSortDirections }[], 
-        filters: { field: string, operator: AdminForthFilterOperators, value: any }[] 
+        filters: { field: string, operator: AdminForthFilterOperators, value: any }[],
+        getTotals?: boolean, 
     }): Promise<{ data: any[], total: number }> {
       const columns = resource.dataSourceColumns.map((col) => col.name).join(', ');
       const tableName = resource.table;
 
       const where = filters.length ? `WHERE ${filters.map((f, i) => {
-        let placeholder = `{f${i}}`;
+        const column = resource.dataSourceColumns.find((col) => col.name == f.field);
+        let placeholder = `{f${i}:${column._underlineType}}`;
         let field = f.field;
         let operator = this.OperatorsMap[f.operator];
         if (f.operator == AdminForthFilterOperators.IN || f.operator == AdminForthFilterOperators.NIN) {
@@ -208,7 +211,6 @@ class ClickhouseConnector extends AdminForthBaseConnector implements IAdminForth
       
 
       const q = `SELECT ${columns} FROM ${tableName} ${where} ${orderBy} LIMIT {limit:Int} OFFSET {offset:Int}`;
-      
       const d = {
         ...params,
         limit,
@@ -227,15 +229,17 @@ class ClickhouseConnector extends AdminForthBaseConnector implements IAdminForth
       }
       const rows = await stmt.json();
 
-
-      const countQ = await this.client.query({
-        query: `SELECT COUNT(*) FROM ${tableName} ${where}`,
-        format: 'JSONEachRow',
-        query_params: d,
-      });
-      const total = (
-        await countQ.json()
-      )['COUNT(*)'];
+      let total = 0;
+      if (getTotals) {
+        const countQ = await this.client.query({
+          query: `SELECT COUNT(*) FROM ${tableName} ${where}`,
+          format: 'JSONEachRow',
+          query_params: d,
+        });
+        const countResp = await countQ.json()
+        console.log('🪲 Clickhouse Query count', countResp);
+        total = countResp[0]['COUNT()'];
+      }
 
       return {
         data: rows.map((row) => {
@@ -261,17 +265,34 @@ class ClickhouseConnector extends AdminForthBaseConnector implements IAdminForth
       }))
       return result;
     }
-
     async createRecordOriginalValues({ resource, record }: { resource: AdminForthResource, record: any }) {
       const tableName = resource.table;
       const columns = Object.keys(record);
+      
+      // const q = `INSERT INTO ${tableName} (${columns.join(', ')}) VALUES (${columns.map((colName) => {
+      //   const colType = resource.dataSourceColumns.find((col) => col.name == colName)._underlineType;
+      //   if (colType.startsWith('Int') || colType.startsWith('UInt') || colType.startsWith('Float')) {
+      //     return record[colName];
+      //   } else {
+      //     return "'"+record[colName]+"'"
+      //   }
+      // }).join(', ')  })`;
+      // console.log('🪲 Clickhouse Query', q) ;
+      // await this.client.command({
+      //   query: q,
+
+      // });
+
+      console.log('🪲 Clickhouse Insert', record);
+
       await this.client.insert({
+        database: this.dbName,
         table: tableName,
-        values: columns.map((colName) => {
-          return {[colName]: record[colName]};
-        }),
-        format: 'JSONEachRow',
-      })
+        columns: columns,
+        values: [Object.values(record)],
+      });
+
+      console.log('🪲 Clickhouse Query done');
       
     }
 
@@ -286,8 +307,15 @@ class ClickhouseConnector extends AdminForthBaseConnector implements IAdminForth
     }
 
     async deleteRecord({ resource, recordId }: { resource: AdminForthResource, recordId: any }) {
-      // const q = this.db.prepare(`DELETE FROM ${resource.table} WHERE ${this.getPrimaryKey(resource)} = ?`);
-      // await q.run(recordId);
+      const pkColumn = resource.dataSourceColumns.find((col) => col.primaryKey);
+      await this.client.command(
+        { 
+          query: `ALTER TABLE ${this.dbName}.${resource.table} DELETE WHERE ${
+            pkColumn.name
+          } = {recordId:${pkColumn._underlineType}}`, 
+          query_params: { recordId },
+      }
+      );
     }
 
     close() {

package/dataConnectors/mongo.ts

@@ -83,28 +83,9 @@ class MongoConnector extends AdminForthBaseConnector implements IAdminForthDataS
         }
 
         return value;
-      }
-    
-    async getRecordByPrimaryKeyWithOriginalTypes(resource, key) {
-        const tableName = resource.table;
-        const collection = this.db.db().collection(tableName);
-        const row = await collection.findOne({ [this.getPrimaryKey(resource)]: key });
-        if (!row) {
-            return null;
-        }
-        const newRow = {};
-        for (const [key_1, value] of Object.entries(row)) {
-            const dbKey = resource.dataSourceColumns.find((col) => col.name == key_1);
-            if (!dbKey) {
-                continue; // should I continue or throw an error?
-                throw new Error(`Resource '${resource.table}' has no column '${key_1}' defined`);
-            }
-            newRow[key_1] = value;
-        }
-        console.log('newRow', newRow);
-        return newRow;
     }
 
+
     setFieldValue(field, value) {
         if (field.type == AdminForthDataTypes.DATETIME) {
           if (!value) {
@@ -123,7 +104,7 @@ class MongoConnector extends AdminForthBaseConnector implements IAdminForthDataS
         return value;
       }
     
-    async getDataWithOriginalTypes({ resource, limit, offset, sort, filters }) {
+    async getDataWithOriginalTypes({ resource, limit, offset, sort, filters, getTotals }) {
         // const columns = resource.dataSourceColumns.filter(c=> !c.virtual).map((col) => col.name).join(', ');
         const tableName = resource.table;
 
@@ -132,7 +113,10 @@ class MongoConnector extends AdminForthBaseConnector implements IAdminForthDataS
         for (const filter of filters) {
             query[filter.field] = this.OperatorsMap[filter.operator](filter.value);
         }
-        const total = await collection.countDocuments(query);
+        let total = 0;
+        if (getTotals) {
+            total = await collection.countDocuments(query);
+        }
         const result = await collection.find(query)
             .sort(sort)
             .skip(offset)

package/dataConnectors/postgres.ts

@@ -164,24 +164,9 @@ class PostgresConnector extends AdminForthBaseConnector implements IAdminForthDa
         }
 
         return value;
-      }
-
-
-    async getRecordByPrimaryKeyWithOriginalTypes(resource, key) {
-        const tableName = resource.table;
-        const columns = resource.dataSourceColumns.map((col) => `"${col.name}"`).join(', ');
-        const stmt = await this.db.query(`SELECT ${columns} FROM ${tableName} WHERE ${this.getPrimaryKey(resource)} = $1`, [key]);
-        const row = stmt.rows[0];
-        if (!row) {
-            return null;
-        }
-        const newRow = {};
-        for (const [key_1, value] of Object.entries(row)) {
-            newRow[key_1] = value;
-        }
-        return newRow;
     }
 
+
     setFieldValue(field, value) {
         if (field.type == AdminForthDataTypes.DATETIME) {
           if (!value) {
@@ -198,7 +183,7 @@ class PostgresConnector extends AdminForthBaseConnector implements IAdminForthDa
         return value;
       }
     
-    async getDataWithOriginalTypes({ resource, limit, offset, sort, filters }) {
+    async getDataWithOriginalTypes({ resource, limit, offset, sort, filters, getTotals }) {
       const columns = resource.dataSourceColumns.map((col) => `"${col.name}"`).join(', ');
       const tableName = resource.table;
       
@@ -246,8 +231,10 @@ class PostgresConnector extends AdminForthBaseConnector implements IAdminForthDa
       }
       const stmt = await this.db.query(selectQuery, d);
       const rows = stmt.rows;
-      
-      const total = (await this.db.query(`SELECT COUNT(*) FROM ${tableName} ${where}`, filterValues)).rows[0].count;
+      let total = 0;
+      if (getTotals) {
+        total = (await this.db.query(`SELECT COUNT(*) FROM ${tableName} ${where}`, filterValues)).rows[0].count;
+      }
       return {
         data: rows.map((row) => {
           const newRow = {};

package/dataConnectors/sqlite.ts

@@ -91,21 +91,6 @@ class SQLiteConnector extends AdminForthBaseConnector implements IAdminForthData
       return value;
     }
 
-    async getRecordByPrimaryKeyWithOriginalTypes(resource: AdminForthResource, key: any): Promise<any> {
-        const columns = resource.dataSourceColumns.map((col) => col.name).join(', ');
-        const tableName = resource.table;
-        const stmt = this.db.prepare(`SELECT ${columns} FROM ${tableName} WHERE ${this.getPrimaryKey(resource)} = ?`);
-        const row = stmt.get(key);
-        if (!row) {
-            return null;
-        }
-        const newRow = {};
-        for (const [key, value] of Object.entries(row)) {
-            newRow[key] = value;
-        }
-        return newRow;
-    }
-
     setFieldValue(field: AdminForthResourceColumn, value: any): any {
       if (field.type == AdminForthDataTypes.DATETIME) {
         if (!value) {
@@ -151,13 +136,7 @@ class SQLiteConnector extends AdminForthBaseConnector implements IAdminForthData
     };
     
 
-    async getDataWithOriginalTypes({ resource, limit, offset, sort, filters }: { 
-        resource: AdminForthResource, 
-        limit: number, 
-        offset: number, 
-        sort: { field: string, direction: AdminForthSortDirections }[], 
-        filters: { field: string, operator: AdminForthFilterOperators, value: any }[] 
-    }): Promise<{ data: any[], total: number }> {
+    async getDataWithOriginalTypes({ resource, limit, offset, sort, filters, getTotals }): Promise<{ data: any[], total: number }> {
       const columns = resource.dataSourceColumns.map((col) => col.name).join(', ');
       const tableName = resource.table;
 
@@ -203,9 +182,11 @@ class SQLiteConnector extends AdminForthBaseConnector implements IAdminForthData
       }
       const rows = await stmt.all(d);
 
-      const total = (
-        await this.db.prepare(`SELECT COUNT(*) FROM ${tableName} ${where}`).get([...filterValues])
-      )['COUNT(*)'];
+      let total = 0;
+      if (getTotals) {
+        const totalStmt = this.db.prepare(`SELECT COUNT(*) FROM ${tableName} ${where}`);
+        total = totalStmt.get([...filterValues])['COUNT(*)'];
+      }
 
       return {
         data: rows.map((row) => {

package/dist/dataConnectors/baseConnector.js

@@ -17,9 +17,19 @@ export default class AdminForthBaseConnector {
         }
     }
     getRecordByPrimaryKeyWithOriginalTypes(resource, id) {
-        throw new Error('Method not implemented.');
+        return __awaiter(this, void 0, void 0, function* () {
+            const data = yield this.getDataWithOriginalTypes({
+                resource,
+                limit: 1,
+                offset: 0,
+                sort: [],
+                filters: [{ field: this.getPrimaryKey(resource), operator: AdminForthFilterOperators.EQ, value: id }],
+                getTotals: false
+            });
+            return data.data.length > 0 ? data.data[0] : null;
+        });
     }
-    getDataWithOriginalTypes({ resource, limit, offset, sort, filters }) {
+    getDataWithOriginalTypes({ resource, limit, offset, sort, filters, getTotals }) {
         throw new Error('Method not implemented.');
     }
     discoverFields(resource) {
@@ -64,7 +74,7 @@ export default class AdminForthBaseConnector {
                     }
                 });
             }
-            const d = yield this.getDataWithOriginalTypes({ resource, limit, offset, sort, filters });
+            const d = yield this.getDataWithOriginalTypes({ resource, limit, offset, sort, filters, getTotals: true });
             // call getFieldValue for each field
             d.data.map((record) => {
                 for (const col of resource.dataSourceColumns) {

package/dist/dataConnectors/clickhouse.js

@@ -38,6 +38,17 @@ class ClickhouseConnector extends AdminForthBaseConnector {
         // create connection here
         this.client = createClient({
             url: url.replace('clickhouse://', 'http://'),
+            clickhouse_settings: {
+                // Allows to insert serialized JS Dates (such as '2023-12-06T10:54:48.000Z')
+                date_time_input_format: 'best_effort',
+                // Recommended for cluster usage to avoid situations where a query processing error occurred after the response code, 
+                // and HTTP headers were already sent to the client.
+                // See https://clickhouse.com/docs/en/interfaces/http/#response-buffering
+                wait_end_of_query: 1,
+            },
+            // log:{
+            //   level: ClickHouseLogLevel.TRACE,
+            // }
         });
     }
     discoverFields(resource) {
@@ -108,7 +119,8 @@ class ClickhouseConnector extends AdminForthBaseConnector {
             else if (field._underlineType.startsWith('DateTime')
                 || field._underlineType.startsWith('String')
                 || field._underlineType.startsWith('FixedString')) {
-                return dayjs(value).toISOString();
+                const v = dayjs(value).toISOString();
+                return v;
             }
             else {
                 throw new Error(`AdminForth does not support row type: ${field._underlineType} for timestamps, use VARCHAR (with iso strings) or TIMESTAMP/INT (with unix timestamps). Issue in field "${field.name}"`);
@@ -133,22 +145,6 @@ class ClickhouseConnector extends AdminForthBaseConnector {
         }
         return value;
     }
-    getRecordByPrimaryKeyWithOriginalTypes(resource, key) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const columns = resource.dataSourceColumns.map((col) => col.name).join(', ');
-            const tableName = resource.table;
-            const stmt = yield this.client.query({
-                query: `SELECT ${columns} FROM ${tableName} WHERE ${this.getPrimaryKey(resource)} = ?`,
-                format: 'JSONEachRow',
-                query_params: [key],
-            });
-            const row = yield stmt.json();
-            if (!row.length) {
-                return null;
-            }
-            return row[0];
-        });
-    }
     setFieldValue(field, value) {
         if (field.type == AdminForthDataTypes.DATETIME) {
             if (!value) {
@@ -162,7 +158,8 @@ class ClickhouseConnector extends AdminForthBaseConnector {
                 || field._underlineType.startsWith('String')
                 || field._underlineType.startsWith('FixedString')) {
                 // value is iso string now, convert to unix timestamp
-                return dayjs(value).toISOString();
+                const iso = dayjs(value).toISOString();
+                return iso;
             }
         }
         else if (field.type == AdminForthDataTypes.BOOLEAN) {
@@ -180,11 +177,12 @@ class ClickhouseConnector extends AdminForthBaseConnector {
         return value;
     }
     getDataWithOriginalTypes(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ resource, limit, offset, sort, filters }) {
+        return __awaiter(this, arguments, void 0, function* ({ resource, limit, offset, sort, filters, getTotals }) {
             const columns = resource.dataSourceColumns.map((col) => col.name).join(', ');
             const tableName = resource.table;
             const where = filters.length ? `WHERE ${filters.map((f, i) => {
-                let placeholder = `{f${i}}`;
+                const column = resource.dataSourceColumns.find((col) => col.name == f.field);
+                let placeholder = `{f${i}:${column._underlineType}}`;
                 let field = f.field;
                 let operator = this.OperatorsMap[f.operator];
                 if (f.operator == AdminForthFilterOperators.IN || f.operator == AdminForthFilterOperators.NIN) {
@@ -222,12 +220,17 @@ class ClickhouseConnector extends AdminForthBaseConnector {
                 console.log('🪲 Clickhouse Query', q, 'params:', d);
             }
             const rows = yield stmt.json();
-            const countQ = yield this.client.query({
-                query: `SELECT COUNT(*) FROM ${tableName} ${where}`,
-                format: 'JSONEachRow',
-                query_params: d,
-            });
-            const total = (yield countQ.json())['COUNT(*)'];
+            let total = 0;
+            if (getTotals) {
+                const countQ = yield this.client.query({
+                    query: `SELECT COUNT(*) FROM ${tableName} ${where}`,
+                    format: 'JSONEachRow',
+                    query_params: d,
+                });
+                const countResp = yield countQ.json();
+                console.log('🪲 Clickhouse Query count', countResp);
+                total = countResp[0]['COUNT()'];
+            }
             return {
                 data: rows.map((row) => {
                     const newRow = {};
@@ -258,13 +261,26 @@ class ClickhouseConnector extends AdminForthBaseConnector {
         return __awaiter(this, arguments, void 0, function* ({ resource, record }) {
             const tableName = resource.table;
             const columns = Object.keys(record);
+            // const q = `INSERT INTO ${tableName} (${columns.join(', ')}) VALUES (${columns.map((colName) => {
+            //   const colType = resource.dataSourceColumns.find((col) => col.name == colName)._underlineType;
+            //   if (colType.startsWith('Int') || colType.startsWith('UInt') || colType.startsWith('Float')) {
+            //     return record[colName];
+            //   } else {
+            //     return "'"+record[colName]+"'"
+            //   }
+            // }).join(', ')  })`;
+            // console.log('🪲 Clickhouse Query', q) ;
+            // await this.client.command({
+            //   query: q,
+            // });
+            console.log('🪲 Clickhouse Insert', record);
             yield this.client.insert({
+                database: this.dbName,
                 table: tableName,
-                values: columns.map((colName) => {
-                    return { [colName]: record[colName] };
-                }),
-                format: 'JSONEachRow',
+                columns: columns,
+                values: [Object.values(record)],
             });
+            console.log('🪲 Clickhouse Query done');
         });
     }
     updateRecord(_a) {
@@ -279,8 +295,11 @@ class ClickhouseConnector extends AdminForthBaseConnector {
     }
     deleteRecord(_a) {
         return __awaiter(this, arguments, void 0, function* ({ resource, recordId }) {
-            // const q = this.db.prepare(`DELETE FROM ${resource.table} WHERE ${this.getPrimaryKey(resource)} = ?`);
-            // await q.run(recordId);
+            const pkColumn = resource.dataSourceColumns.find((col) => col.primaryKey);
+            yield this.client.command({
+                query: `ALTER TABLE ${this.dbName}.${resource.table} DELETE WHERE ${pkColumn.name} = {recordId:${pkColumn._underlineType}}`,
+                query_params: { recordId },
+            });
         });
     }
     close() {

package/dist/dataConnectors/mongo.js

@@ -86,27 +86,6 @@ class MongoConnector extends AdminForthBaseConnector {
         }
         return value;
     }
-    getRecordByPrimaryKeyWithOriginalTypes(resource, key) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const tableName = resource.table;
-            const collection = this.db.db().collection(tableName);
-            const row = yield collection.findOne({ [this.getPrimaryKey(resource)]: key });
-            if (!row) {
-                return null;
-            }
-            const newRow = {};
-            for (const [key_1, value] of Object.entries(row)) {
-                const dbKey = resource.dataSourceColumns.find((col) => col.name == key_1);
-                if (!dbKey) {
-                    continue; // should I continue or throw an error?
-                    throw new Error(`Resource '${resource.table}' has no column '${key_1}' defined`);
-                }
-                newRow[key_1] = value;
-            }
-            console.log('newRow', newRow);
-            return newRow;
-        });
-    }
     setFieldValue(field, value) {
         if (field.type == AdminForthDataTypes.DATETIME) {
             if (!value) {
@@ -127,7 +106,7 @@ class MongoConnector extends AdminForthBaseConnector {
         return value;
     }
     getDataWithOriginalTypes(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ resource, limit, offset, sort, filters }) {
+        return __awaiter(this, arguments, void 0, function* ({ resource, limit, offset, sort, filters, getTotals }) {
             // const columns = resource.dataSourceColumns.filter(c=> !c.virtual).map((col) => col.name).join(', ');
             const tableName = resource.table;
             const collection = this.db.db().collection(tableName);
@@ -135,7 +114,10 @@ class MongoConnector extends AdminForthBaseConnector {
             for (const filter of filters) {
                 query[filter.field] = this.OperatorsMap[filter.operator](filter.value);
             }
-            const total = yield collection.countDocuments(query);
+            let total = 0;
+            if (getTotals) {
+                total = yield collection.countDocuments(query);
+            }
             const result = yield collection.find(query)
                 .sort(sort)
                 .skip(offset)

package/dist/dataConnectors/postgres.js

@@ -167,22 +167,6 @@ class PostgresConnector extends AdminForthBaseConnector {
         }
         return value;
     }
-    getRecordByPrimaryKeyWithOriginalTypes(resource, key) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const tableName = resource.table;
-            const columns = resource.dataSourceColumns.map((col) => `"${col.name}"`).join(', ');
-            const stmt = yield this.db.query(`SELECT ${columns} FROM ${tableName} WHERE ${this.getPrimaryKey(resource)} = $1`, [key]);
-            const row = stmt.rows[0];
-            if (!row) {
-                return null;
-            }
-            const newRow = {};
-            for (const [key_1, value] of Object.entries(row)) {
-                newRow[key_1] = value;
-            }
-            return newRow;
-        });
-    }
     setFieldValue(field, value) {
         if (field.type == AdminForthDataTypes.DATETIME) {
             if (!value) {
@@ -201,7 +185,7 @@ class PostgresConnector extends AdminForthBaseConnector {
         return value;
     }
     getDataWithOriginalTypes(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ resource, limit, offset, sort, filters }) {
+        return __awaiter(this, arguments, void 0, function* ({ resource, limit, offset, sort, filters, getTotals }) {
             const columns = resource.dataSourceColumns.map((col) => `"${col.name}"`).join(', ');
             const tableName = resource.table;
             let totalCounter = 1;
@@ -248,7 +232,10 @@ class PostgresConnector extends AdminForthBaseConnector {
             }
             const stmt = yield this.db.query(selectQuery, d);
             const rows = stmt.rows;
-            const total = (yield this.db.query(`SELECT COUNT(*) FROM ${tableName} ${where}`, filterValues)).rows[0].count;
+            let total = 0;
+            if (getTotals) {
+                total = (yield this.db.query(`SELECT COUNT(*) FROM ${tableName} ${where}`, filterValues)).rows[0].count;
+            }
             return {
                 data: rows.map((row) => {
                     const newRow = {};

package/dist/dataConnectors/sqlite.js

@@ -121,22 +121,6 @@ class SQLiteConnector extends AdminForthBaseConnector {
         }
         return value;
     }
-    getRecordByPrimaryKeyWithOriginalTypes(resource, key) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const columns = resource.dataSourceColumns.map((col) => col.name).join(', ');
-            const tableName = resource.table;
-            const stmt = this.db.prepare(`SELECT ${columns} FROM ${tableName} WHERE ${this.getPrimaryKey(resource)} = ?`);
-            const row = stmt.get(key);
-            if (!row) {
-                return null;
-            }
-            const newRow = {};
-            for (const [key, value] of Object.entries(row)) {
-                newRow[key] = value;
-            }
-            return newRow;
-        });
-    }
     setFieldValue(field, value) {
         if (field.type == AdminForthDataTypes.DATETIME) {
             if (!value) {
@@ -166,7 +150,7 @@ class SQLiteConnector extends AdminForthBaseConnector {
         return value;
     }
     getDataWithOriginalTypes(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ resource, limit, offset, sort, filters }) {
+        return __awaiter(this, arguments, void 0, function* ({ resource, limit, offset, sort, filters, getTotals }) {
             const columns = resource.dataSourceColumns.map((col) => col.name).join(', ');
             const tableName = resource.table;
             const where = filters.length ? `WHERE ${filters.map((f, i) => {
@@ -205,7 +189,11 @@ class SQLiteConnector extends AdminForthBaseConnector {
                 console.log('🪲 SQLITE Query', q, 'params:', d);
             }
             const rows = yield stmt.all(d);
-            const total = (yield this.db.prepare(`SELECT COUNT(*) FROM ${tableName} ${where}`).get([...filterValues]))['COUNT(*)'];
+            let total = 0;
+            if (getTotals) {
+                const totalStmt = this.db.prepare(`SELECT COUNT(*) FROM ${tableName} ${where}`);
+                total = totalStmt.get([...filterValues])['COUNT(*)'];
+            }
             return {
                 data: rows.map((row) => {
                     const newRow = {};

package/dist/spa/spa/src/components/ResourceForm.vue

@@ -232,8 +232,12 @@ const columnError = (column) => {
 
 
 const setCurrentValue = (key, value) => {
-  currentValues.value[key] = value;
-
+  const col = props.resource.columns.find((column) => column.name === key);
+  if (['integer', 'float'].includes(col.type) && (value || value === 0)) {
+    currentValues.value[key] = +value;
+  } else {
+    currentValues.value[key] = value;
+  }
   emit('update:record', currentValues.value);
 };
 
@@ -242,8 +246,7 @@ onMounted(() => {
     currentValues.value[key] = props.record[key];
   });
   initFlowbite();
-
-  
+  emit('update:isValid', isValid.value);
 });
 
 const columnOptions = computedAsync(async () => { 
@@ -267,7 +270,6 @@ const columnOptions = computedAsync(async () => {
 
 }, {});
 
-const coreStore = useCoreStore();
 
 const editableColumns = computed(() => {
   const mode = props.record ? 'edit' : 'create';

package/dist/spa/spa/src/views/CreateView.vue

@@ -119,6 +119,7 @@ onMounted(async () => {
 });
 
 async function saveRecord() {
+  console.log('saveRecord isValid', isValid.value);
   if (!isValid.value) {
     validating.value = true;
     return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "1.2.28",
+  "version": "1.2.29",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -15,6 +15,7 @@
   "license": "ISC",
   "type": "module",
   "dependencies": {
+    "@clickhouse/client": "^1.4.0",
     "better-sqlite3": "^10.0.0",
     "crypto": "^1.0.1",
     "dayjs": "^1.11.11",
@@ -25,8 +26,7 @@
     "mongodb": "6.6",
     "node-fetch": "^3.3.2",
     "pg": "^8.11.5",
-    "uuid": "^9.0.1",
-    "@clickhouse/client": "^1.4.0"
+    "uuid": "^9.0.1"
   },
   "devDependencies": {
     "@types/node": "^20.14.2",

package/spa/src/components/ResourceForm.vue

@@ -232,8 +232,12 @@ const columnError = (column) => {
 
 
 const setCurrentValue = (key, value) => {
-  currentValues.value[key] = value;
-
+  const col = props.resource.columns.find((column) => column.name === key);
+  if (['integer', 'float'].includes(col.type) && (value || value === 0)) {
+    currentValues.value[key] = +value;
+  } else {
+    currentValues.value[key] = value;
+  }
   emit('update:record', currentValues.value);
 };
 
@@ -242,8 +246,7 @@ onMounted(() => {
     currentValues.value[key] = props.record[key];
   });
   initFlowbite();
-
-  
+  emit('update:isValid', isValid.value);
 });
 
 const columnOptions = computedAsync(async () => { 
@@ -267,7 +270,6 @@ const columnOptions = computedAsync(async () => {
 
 }, {});
 
-const coreStore = useCoreStore();
 
 const editableColumns = computed(() => {
   const mode = props.record ? 'edit' : 'create';

package/spa/src/views/CreateView.vue

@@ -119,6 +119,7 @@ onMounted(async () => {
 });
 
 async function saveRecord() {
+  console.log('saveRecord isValid', isValid.value);
   if (!isValid.value) {
     validating.value = true;
     return;

package/types/AdminForthConfig.ts

@@ -93,7 +93,10 @@ export interface IExpressHttpServer extends IHttpServer {
 export interface IAdminForthDataSourceConnector {
   
   /**
-   * Function which will be called to fetch record from database.
+   * Optional.
+   * You an redefine this function to define how one record should be fetched from database.
+   * You you will not redefine it, AdminForth will use {@link IAdminForthDataSourceConnector.getData} with limit 1 and offset 0 and
+   * filter by primary key. 
    */
   getRecordByPrimaryKeyWithOriginalTypes(resource: AdminForthResource, recordId: string): Promise<any>;
 
@@ -142,12 +145,13 @@ export interface IAdminForthDataSourceConnector {
    * 
    * Fields are returned from db "as is" then {@link AdminForthBaseConnector.getData} will transform each field using {@link IAdminForthDataSourceConnector.getFieldValue}
    */
-  getDataWithOriginalTypes({ resource, limit, offset, sort, filters }: {
+  getDataWithOriginalTypes({ resource, limit, offset, sort, filters, getTotals }: {
     resource: AdminForthResource,
     limit: number,
     offset: number,
     sort: { field: string, direction: AdminForthSortDirections }[], 
-    filters: { field: string, operator: AdminForthFilterOperators, value: any }[] 
+    filters: { field: string, operator: AdminForthFilterOperators, value: any }[],
+    getTotals?: boolean
   }): Promise<{data: Array<any>, total: number}>;