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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
package-lock.json generated
View File

@ -10,7 +10,7 @@
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@depyronick/clickhouse-client": "^1.0.12", "@depyronick/clickhouse-client": "^1.0.12",
"@pushrocks/smartobject": "^1.0.8" "@pushrocks/smartobject": "^1.0.9"
}, },
"devDependencies": { "devDependencies": {
"@gitzone/tsbuild": "^2.1.25", "@gitzone/tsbuild": "^2.1.25",
@ -2635,9 +2635,9 @@
} }
}, },
"node_modules/@pushrocks/smartobject": { "node_modules/@pushrocks/smartobject": {
"version": "1.0.8", "version": "1.0.9",
"resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartobject/-/smartobject-1.0.8.tgz", "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartobject/-/smartobject-1.0.9.tgz",
"integrity": "sha512-sqrmbPkCZe4+OTqFGYEUBgwG9J/gMVdjz6Tuy8B7v5RaRvUobcjBk7FBa0ahMMPmuKEbddC5xa8+Jqtjb4iJAA==", "integrity": "sha512-74IlcVWhhEOsG7X65H4DmYP1o8HejZMWj5uATCk99A+XjZMi8UJu8H7EsgT++JJKkwLz2BKc9323BfNk1B79WA==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"fast-deep-equal": "^3.1.3", "fast-deep-equal": "^3.1.3",
@ -17723,9 +17723,9 @@
} }
}, },
"@pushrocks/smartobject": { "@pushrocks/smartobject": {
"version": "1.0.8", "version": "1.0.9",
"resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartobject/-/smartobject-1.0.8.tgz", "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartobject/-/smartobject-1.0.9.tgz",
"integrity": "sha512-sqrmbPkCZe4+OTqFGYEUBgwG9J/gMVdjz6Tuy8B7v5RaRvUobcjBk7FBa0ahMMPmuKEbddC5xa8+Jqtjb4iJAA==", "integrity": "sha512-74IlcVWhhEOsG7X65H4DmYP1o8HejZMWj5uATCk99A+XjZMi8UJu8H7EsgT++JJKkwLz2BKc9323BfNk1B79WA==",
"requires": { "requires": {
"fast-deep-equal": "^3.1.3", "fast-deep-equal": "^3.1.3",
"minimatch": "^5.0.1" "minimatch": "^5.0.1"

2
package.json
View File

@ -24,7 +24,7 @@
}, },
"dependencies": { "dependencies": {
"@depyronick/clickhouse-client": "^1.0.12", "@depyronick/clickhouse-client": "^1.0.12",
"@pushrocks/smartobject": "^1.0.8" "@pushrocks/smartobject": "^1.0.9"
}, },
"browserslist": [ "browserslist": [
"last 1 chrome versions" "last 1 chrome versions"

3
test/test.nonci.ts
View File

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

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

@ -1,7 +1,7 @@
import * as plugins from './smartclickhouse.plugins'; import * as plugins from './smartclickhouse.plugins';
import { SmartClickHouseDb } from './smartclickhouse.classes.smartclickhouse'; 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 { export interface IColumnInfo {
database: string; database: string;
table: string; table: string;
@ -82,14 +82,25 @@ export class TimeDataTable {
let storageJson: { [key: string]: any } = {}; let storageJson: { [key: string]: any } = {};
// helper stuff // helper stuff
const getClickhouseTypeForValue = (valueArg: any): TClickhouseColumnDataType => {
const typeConversion: {[key: string]: TClickhouseColumnDataType} = { const typeConversion: {[key: string]: TClickhouseColumnDataType} = {
string: 'String', string: 'String',
number: 'Float64', number: 'Float64',
undefined: null,
null: null
}; };
const getClickhouseTypeForValue = (valueArg: any) => { 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]; 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; let columnFound = false;
for (const column of this.columns) { for (const column of this.columns) {
if (pathArg === column.name) { if (pathArg === column.name) {
@ -98,9 +109,22 @@ export class TimeDataTable {
} }
} }
if (!columnFound) { if (!columnFound) {
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(` await this.smartClickHouseDbRef.clickhouseClient.queryPromise(`
ALTER TABLE ${this.tableName} ADD COLUMN ${pathArg} ${typeArg} FIRST ${alterString}
`); `);
} catch(err) {
console.log(alterString);
for (const column of this.columns) {
console.log(column.name);
}
}
await this.updateColumns(); await this.updateColumns();
} }
}; };
@ -117,6 +141,9 @@ export class TimeDataTable {
} }
// lets deal with the rest // lets deal with the rest
const clickhouseType = getClickhouseTypeForValue(value); const clickhouseType = getClickhouseTypeForValue(value);
if (!clickhouseType) {
continue;
}
await checkPath(key, clickhouseType); await checkPath(key, clickhouseType);
storageJson[key] = value; storageJson[key] = value;
} }