adminforth 1.2.29 → 1.2.30

package/dataConnectors/clickhouse.ts

@@ -257,53 +257,42 @@ class ClickhouseConnector extends AdminForthBaseConnector implements IAdminForth
       const tableName = resource.table;
       const result = {};
       await Promise.all(columns.map(async (col) => {
-        // const stmt = await this.db.prepare(`SELECT MIN(${col.name}) as min, MAX(${col.name}) as max FROM ${tableName}`);
-        // const { min, max } = stmt.get();
-        // result[col.name] = {
-        //   min, max,
-        // };
+        const stmt = await this.client.query({
+          query: `SELECT MIN(${col.name}) as min, MAX(${col.name}) as max FROM ${tableName}`,
+          format: 'JSONEachRow',
+        });
+        const rows = await stmt.json();
+        result[col.name] = {
+          min: rows[0].min,
+          max: rows[0].max,
+        };
+
       }))
       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,
         columns: columns,
         values: [Object.values(record)],
       });
-
-      console.log('🪲 Clickhouse Query done');
-      
     }
 
     async updateRecord({ resource, recordId, newValues }: { resource: AdminForthResource, recordId: any, newValues: any }) {
-      const columnsWithPlaceholders = Object.keys(newValues).map((col) => `${col} = ?`);
+      const columnsWithPlaceholders = Object.keys(newValues).map((col) => {
+        return `${col} = {${col}:${resource.dataSourceColumns.find((c) => c.name == col)._underlineType}}`
+      });
       const values = [...Object.values(newValues), recordId];
 
-      // const q = this.db.prepare(
-      //     `UPDATE ${resource.table} SET ${columnsWithPlaceholders} WHERE ${this.getPrimaryKey(resource)} = ?`
-      // )
-      // await q.run(values);
+      await this.client.command(
+        { 
+          query: `ALTER TABLE ${this.dbName}.${resource.table} UPDATE ${columnsWithPlaceholders.join(', ')} WHERE ${this.getPrimaryKey(resource)} = {recordId:${resource.dataSourceColumns.find((c) => c.primaryKey)._underlineType}}`, 
+          query_params: { ...newValues, recordId },
+      }
+      );
     }
 
     async deleteRecord({ resource, recordId }: { resource: AdminForthResource, recordId: any }) {

package/dist/dataConnectors/clickhouse.js

@@ -248,11 +248,15 @@ class ClickhouseConnector extends AdminForthBaseConnector {
             const tableName = resource.table;
             const result = {};
             yield Promise.all(columns.map((col) => __awaiter(this, void 0, void 0, function* () {
-                // const stmt = await this.db.prepare(`SELECT MIN(${col.name}) as min, MAX(${col.name}) as max FROM ${tableName}`);
-                // const { min, max } = stmt.get();
-                // result[col.name] = {
-                //   min, max,
-                // };
+                const stmt = yield this.client.query({
+                    query: `SELECT MIN(${col.name}) as min, MAX(${col.name}) as max FROM ${tableName}`,
+                    format: 'JSONEachRow',
+                });
+                const rows = yield stmt.json();
+                result[col.name] = {
+                    min: rows[0].min,
+                    max: rows[0].max,
+                };
             })));
             return result;
         });
@@ -261,36 +265,24 @@ 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,
                 columns: columns,
                 values: [Object.values(record)],
             });
-            console.log('🪲 Clickhouse Query done');
         });
     }
     updateRecord(_a) {
         return __awaiter(this, arguments, void 0, function* ({ resource, recordId, newValues }) {
-            const columnsWithPlaceholders = Object.keys(newValues).map((col) => `${col} = ?`);
+            const columnsWithPlaceholders = Object.keys(newValues).map((col) => {
+                return `${col} = {${col}:${resource.dataSourceColumns.find((c) => c.name == col)._underlineType}}`;
+            });
             const values = [...Object.values(newValues), recordId];
-            // const q = this.db.prepare(
-            //     `UPDATE ${resource.table} SET ${columnsWithPlaceholders} WHERE ${this.getPrimaryKey(resource)} = ?`
-            // )
-            // await q.run(values);
+            yield this.client.command({
+                query: `ALTER TABLE ${this.dbName}.${resource.table} UPDATE ${columnsWithPlaceholders.join(', ')} WHERE ${this.getPrimaryKey(resource)} = {recordId:${resource.dataSourceColumns.find((c) => c.primaryKey)._underlineType}}`,
+                query_params: Object.assign(Object.assign({}, newValues), { recordId }),
+            });
         });
     }
     deleteRecord(_a) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "1.2.29",
+  "version": "1.2.30",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",