2.0.2

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartclickhouse",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "private": false,
   "description": "an odm for talking to clickhouse",
   "main": "dist_ts/index.js",
@@ -15,16 +15,16 @@
     "createClickhouse": "docker run --name some-clickhouse-server --ulimit nofile=262144:262144 -p 8123:8123 -p 9000:9000  --volume=$PWD/.nogit/testdatabase:/var/lib/clickhouse yandex/clickhouse-server"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.48",
-    "@gitzone/tsbundle": "^1.0.91",
-    "@gitzone/tstest": "^1.0.67",
-    "@pushrocks/tapbundle": "^5.0.2",
-    "@types/node": "^17.0.21",
+    "@gitzone/tsbuild": "^2.1.61",
+    "@gitzone/tsbundle": "^2.0.3",
+    "@gitzone/tstest": "^1.0.71",
+    "@pushrocks/tapbundle": "^5.0.3",
+    "@types/node": "^17.0.33",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.15.0"
   },
   "dependencies": {
-    "@depyronick/clickhouse-client": "^1.0.12",
+    "@depyronick/clickhouse-client": "^1.0.13",
     "@pushrocks/smartobject": "^1.0.10"
   },
   "browserslist": [

ts/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@pushrocks/smartclickhouse',
+  version: '2.0.2',
+  description: 'an odm for talking to clickhouse'
+}

ts/smartclickhouse.classes.timedatatable.ts

@@ -26,14 +26,22 @@ export interface IColumnInfo {
   datetime_precision: '3';
 }
 
+export interface ITimeDataTableOptions {
+  tableName: string;
+  retainDataForDays: number;
+}
+
 export class TimeDataTable {
   public static async getTable(smartClickHouseDbRefArg: SmartClickHouseDb, tableNameArg: string) {
-    const newTable = new TimeDataTable(smartClickHouseDbRefArg, tableNameArg);
+    const newTable = new TimeDataTable(smartClickHouseDbRefArg, {
+      tableName: tableNameArg,
+      retainDataForDays: 30
+    });
 
     // create table in clickhouse
     await smartClickHouseDbRefArg.clickhouseClient
       .queryPromise(`
-        CREATE TABLE IF NOT EXISTS ${newTable.tableName} (
+        CREATE TABLE IF NOT EXISTS ${newTable.options.tableName} (
           timestamp DateTime64(3, 'Europe/Berlin'),
           message String
         ) ENGINE=MergeTree() ORDER BY timestamp`);
@@ -41,13 +49,13 @@ export class TimeDataTable {
     // lets adjust the TTL
     await smartClickHouseDbRefArg.clickhouseClient
       .queryPromise(`
-        ALTER TABLE ${newTable.tableName} MODIFY TTL toDateTime(timestamp) + INTERVAL 1 MONTH
+        ALTER TABLE ${newTable.options.tableName} MODIFY TTL toDateTime(timestamp) + INTERVAL ${newTable.options.retainDataForDays} DAY
       `);
 
     await newTable.updateColumns();
     console.log(`=======================`)
     console.log(
-      `table with name "${newTable.tableName}" in databse ${newTable.smartClickHouseDbRef.options.database} has the following columns:`
+      `table with name "${newTable.options.tableName}" in databse ${newTable.smartClickHouseDbRef.options.database} has the following columns:`
     );
     for (const column of newTable.columns) {
       console.log(`>> ${column.name}: ${column.type}`);
@@ -59,11 +67,11 @@ export class TimeDataTable {
 
   // INSTANCE
   public smartClickHouseDbRef: SmartClickHouseDb;
-  public tableName: string;
+  public options: ITimeDataTableOptions;
 
-  constructor(smartClickHouseDbRefArg: SmartClickHouseDb, tableNameArg: string) {
+  constructor(smartClickHouseDbRefArg: SmartClickHouseDb, optionsArg: ITimeDataTableOptions) {
     this.smartClickHouseDbRef = smartClickHouseDbRefArg;
-    this.tableName = tableNameArg;
+    this.options = optionsArg;
   }
 
   public columns: IColumnInfo[] = [];
@@ -75,7 +83,7 @@ export class TimeDataTable {
     this.columns = await this.smartClickHouseDbRef.clickhouseClient.queryPromise(`
       SELECT * FROM system.columns
       WHERE database LIKE '${this.smartClickHouseDbRef.options.database}'
-      AND table LIKE '${this.tableName}'
+      AND table LIKE '${this.options.tableName}'
     `);
     return this.columns;
   }
@@ -120,7 +128,7 @@ export class TimeDataTable {
           await checkPath(pathArg, typeArg, true);
           return;
         }
-        const alterString = `ALTER TABLE ${this.tableName} ADD COLUMN ${pathArg} ${typeArg} FIRST`
+        const alterString = `ALTER TABLE ${this.options.tableName} ADD COLUMN ${pathArg} ${typeArg} FIRST`
         try {
           await this.smartClickHouseDbRef.clickhouseClient.queryPromise(`
           ${alterString}
@@ -154,7 +162,7 @@ export class TimeDataTable {
       storageJson[key] = value;
     }
 
-    const result = await this.smartClickHouseDbRef.clickhouseClient.insertPromise(this.tableName, [
+    const result = await this.smartClickHouseDbRef.clickhouseClient.insertPromise(this.options.tableName, [
       storageJson,
     ]);
     return result;