1.0.11

package-lock.json

@@ -1,16 +1,16 @@
 {
   "name": "@pushrocks/smartclickhouse",
-  "version": "1.0.7",
+  "version": "1.0.11",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@pushrocks/smartclickhouse",
-      "version": "1.0.7",
+      "version": "1.0.11",
       "license": "MIT",
       "dependencies": {
         "@depyronick/clickhouse-client": "^1.0.12",
-        "@pushrocks/smartobject": "^1.0.8"
+        "@pushrocks/smartobject": "^1.0.10"
       },
       "devDependencies": {
         "@gitzone/tsbuild": "^2.1.25",
@@ -2635,9 +2635,9 @@
       }
     },
     "node_modules/@pushrocks/smartobject": {
-      "version": "1.0.8",
+      "version": "1.0.10",
-      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartobject/-/smartobject-1.0.8.tgz",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartobject/-/smartobject-1.0.10.tgz",
-      "integrity": "sha512-sqrmbPkCZe4+OTqFGYEUBgwG9J/gMVdjz6Tuy8B7v5RaRvUobcjBk7FBa0ahMMPmuKEbddC5xa8+Jqtjb4iJAA==",
+      "integrity": "sha512-Tfhvy/XoYQ0e4Sl/ztvqJh+lxR9+zixHlnMPstYW05ZbRTZzC6lf1EZLcsmjiALkz6IDFNEwrMrwODlJIpjj+A==",
       "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
@@ -17723,9 +17723,9 @@
       }
     },
     "@pushrocks/smartobject": {
-      "version": "1.0.8",
+      "version": "1.0.10",
-      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartobject/-/smartobject-1.0.8.tgz",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartobject/-/smartobject-1.0.10.tgz",
-      "integrity": "sha512-sqrmbPkCZe4+OTqFGYEUBgwG9J/gMVdjz6Tuy8B7v5RaRvUobcjBk7FBa0ahMMPmuKEbddC5xa8+Jqtjb4iJAA==",
+      "integrity": "sha512-Tfhvy/XoYQ0e4Sl/ztvqJh+lxR9+zixHlnMPstYW05ZbRTZzC6lf1EZLcsmjiALkz6IDFNEwrMrwODlJIpjj+A==",
       "requires": {
         "fast-deep-equal": "^3.1.3",
         "minimatch": "^5.0.1"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartclickhouse",
-  "version": "1.0.7",
+  "version": "1.0.11",
   "private": false,
   "description": "an odm for talking to clickhouse",
   "main": "dist_ts/index.js",
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@depyronick/clickhouse-client": "^1.0.12",
-    "@pushrocks/smartobject": "^1.0.8"
+    "@pushrocks/smartobject": "^1.0.10"
   },
   "browserslist": [
     "last 1 chrome versions"

test/test.nonci.ts

@@ -23,7 +23,8 @@ tap.test('should create a timedatatable', async () => {
       message: `hello this is a message ${i}`,
       wow: 'hey',
       deep: {
-        so: 'hello'
+        so: 'hello',
+        myArray: ['array1', 'array2']
       }
     });
     i++;

ts/smartclickhouse.classes.timedatatable.ts

@@ -1,7 +1,7 @@
 import * as plugins from './smartclickhouse.plugins';
 import { SmartClickHouseDb } from './smartclickhouse.classes.smartclickhouse';
 
-export type TClickhouseColumnDataType = 'String' | "DateTime64(3, 'Europe/Berlin')" | 'Float64';
+export type TClickhouseColumnDataType = 'String' | "DateTime64(3, 'Europe/Berlin')" | 'Float64' | 'Array(String)' | 'Array(Float64)';
 export interface IColumnInfo {
   database: string;
   table: string;
@@ -32,10 +32,17 @@ export class TimeDataTable {
 
     // create table in clickhouse
     await smartClickHouseDbRefArg.clickhouseClient
-      .queryPromise(`CREATE TABLE IF NOT EXISTS ${newTable.tableName} (
+      .queryPromise(`
-      timestamp DateTime64(3, 'Europe/Berlin'),
+        CREATE TABLE IF NOT EXISTS ${newTable.tableName} (
-      message String
+          timestamp DateTime64(3, 'Europe/Berlin'),
-    ) ENGINE=MergeTree() ORDER BY timestamp`);
+          message String
+        ) ENGINE=MergeTree() ORDER BY timestamp`);
+    
+    // lets adjust the TTL
+    await smartClickHouseDbRefArg.clickhouseClient
+      .queryPromise(`
+        ALTER TABLE ${newTable.tableName} MODIFY TTL toDateTime(timestamp) + INTERVAL 2 DAY
+      `);
 
     await newTable.updateColumns();
     console.log(`=======================`)
@@ -60,7 +67,6 @@ export class TimeDataTable {
   }
 
   public columns: IColumnInfo[] = [];
-  public seenPaths: { pathName: string; type: TClickhouseColumnDataType }[] = [];
 
   /**
    * updates the columns
@@ -82,14 +88,25 @@ export class TimeDataTable {
     let storageJson: { [key: string]: any } = {};
     
     // helper stuff
-    const typeConversion: {[key: string]: TClickhouseColumnDataType} = {
+    
-      string: 'String',
+    const getClickhouseTypeForValue = (valueArg: any): TClickhouseColumnDataType => {
-      number: 'Float64',
+      const typeConversion: {[key: string]: TClickhouseColumnDataType} = {
-    };
+        string: 'String',
-    const getClickhouseTypeForValue = (valueArg: any) => {
+        number: 'Float64',
+        undefined: null,
+        null: null
+      };
+      if (valueArg instanceof Array) {
+        const arrayType = typeConversion[(typeof valueArg[0]) as string];
+        if (!arrayType) {
+          return null;
+        } else {
+          return `Array(${arrayType})` as TClickhouseColumnDataType;
+        }
+      }
       return typeConversion[(typeof valueArg) as string];
     }
-    const checkPath = async (pathArg: string, typeArg: TClickhouseColumnDataType) => {
+    const checkPath = async (pathArg: string, typeArg: TClickhouseColumnDataType, prechecked = false) => {
       let columnFound = false;
       for (const column of this.columns) {
         if (pathArg === column.name) {
@@ -98,9 +115,22 @@ export class TimeDataTable {
         }
       }
       if (!columnFound) {
-        await this.smartClickHouseDbRef.clickhouseClient.queryPromise(`
+        if (!prechecked) {
-          ALTER TABLE ${this.tableName} ADD COLUMN ${pathArg} ${typeArg} FIRST
+          await this.updateColumns();
+          await checkPath(pathArg, typeArg, true);
+          return;
+        }
+        const alterString = `ALTER TABLE ${this.tableName} ADD COLUMN ${pathArg} ${typeArg} FIRST`
+        try {
+          await this.smartClickHouseDbRef.clickhouseClient.queryPromise(`
+          ${alterString}
         `);
+        } catch(err) {
+          console.log(alterString);
+          for (const column of this.columns) {
+            console.log(column.name);
+          }
+        }
         await this.updateColumns();
       }
     };
@@ -117,6 +147,9 @@ export class TimeDataTable {
       }
       // lets deal with the rest
       const clickhouseType = getClickhouseTypeForValue(value);
+      if (!clickhouseType) {
+        continue;
+      }
       await checkPath(key, clickhouseType);
       storageJson[key] = value;
     }