fix(core): update

This commit is contained in:
2022-07-27 08:29:59 +02:00
parent 9bdd9484f1
commit b4ae49b604
6 changed files with 5145 additions and 570 deletions

View File

@ -3,6 +3,6 @@
*/
export const commitinfo = {
name: '@pushrocks/smartclickhouse',
version: '2.0.2',
version: '2.0.3',
description: 'an odm for talking to clickhouse'
}

View File

@ -2,7 +2,7 @@ import * as plugins from './smartclickhouse.plugins.js';
import { TimeDataTable } from './smartclickhouse.classes.timedatatable.js';
export interface IClickhouseConstructorOptions {
host: string;
url: string;
database: string;
password?: string;
}
@ -20,8 +20,20 @@ export class SmartClickHouseDb {
*/
public async start(dropOld = false) {
console.log(`Connecting to default database first.`);
const defaultOptions: {[keyArg: string]: string} = {};
// the protocol, url and host
const parsedUrl = plugins.smarturl.Smarturl.createFromUrl(this.options.url);
parsedUrl.protocol === 'https' ? defaultOptions.protocol = plugins.clickhouse.ClickHouseConnectionProtocol.HTTPS : null;
parsedUrl.protocol === 'http' ? defaultOptions.protocol = plugins.clickhouse.ClickHouseConnectionProtocol.HTTP : null;
defaultOptions.host = parsedUrl.hostname;
defaultOptions.port = parsedUrl.port;
// the database
defaultOptions.database = this.options.database;
// the password
this.options.password ? defaultOptions.password = this.options.password : null;
// lets connect
const defaultClient = new plugins.clickhouse.ClickHouseClient({
...this.options,
...defaultOptions,
database: 'default',
});
console.log(`Create database ${this.options.database}, if it does not exist...`);
@ -32,7 +44,7 @@ export class SmartClickHouseDb {
console.log(`Ensured database. Now connecting to wanted database: ${this.options.database}`);
this.clickhouseClient = new plugins.clickhouse.ClickHouseClient({
...this.options,
...defaultOptions
});
console.log(`trying to ping database...`);
const result = await this.clickhouseClient.ping();

View File

@ -1,8 +1,10 @@
// @pushrocks scope
import * as smartobject from '@pushrocks/smartobject';
import * as smarturl from '@pushrocks/smarturl';
export {
smartobject
smartobject,
smarturl
}
// thirdparty