push.rocks/smartclickhouse
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(core): update

Browse Source
This commit is contained in:
Philipp Kunz
2022-03-08 15:12:51 +01:00
parent ff78573d16
commit 2f976ac5ce
4 changed files with 46 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
ts/smartclickhouse.classes.timedatatable.ts
View File

@ -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;
@ -82,14 +82,25 @@ export class TimeDataTable {
let storageJson: { [key: string]: any } = {};
// helper stuff
const typeConversion: {[key: string]: TClickhouseColumnDataType} = {
string: 'String',
number: 'Float64',
};
const getClickhouseTypeForValue = (valueArg: any) => {
const getClickhouseTypeForValue = (valueArg: any): TClickhouseColumnDataType => {
const typeConversion: {[key: string]: TClickhouseColumnDataType} = {
string: 'String',
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 +109,22 @@ export class TimeDataTable {
}
}
if (!columnFound) {
await this.smartClickHouseDbRef.clickhouseClient.queryPromise(`
ALTER TABLE ${this.tableName} ADD COLUMN ${pathArg} ${typeArg} FIRST
if (!prechecked) {
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 +141,9 @@ export class TimeDataTable {
}
// lets deal with the rest
const clickhouseType = getClickhouseTypeForValue(value);
if (!clickhouseType) {
continue;
}
await checkPath(key, clickhouseType);
storageJson[key] = value;
}