push.rocks/smartclickhouse
3
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-07-28 16:53:07 +02:00
parent fbf177b482
commit 479e0725e6
8 changed files with 190 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ts/smartclickhouse.classes.smartclickhouse.ts
View File

@@ -1,16 +1,17 @@
import * as plugins from './smartclickhouse.plugins.js';
import { TimeDataTable } from './smartclickhouse.classes.timedatatable.js';
import { ClickhouseHttpClient } from './smartclickhouse.classes.httpclient.js';
export interface IClickhouseConstructorOptions {
url: string;
database: string;
user?: string;
password?: string;
}
export class SmartClickHouseDb {
public options: IClickhouseConstructorOptions;
public defaultClient: plugins.clickhouse.ClickHouseClient;
public clickhouseClient: plugins.clickhouse.ClickHouseClient;
public clickhouseClient: ClickhouseHttpClient;
constructor(optionsArg: IClickhouseConstructorOptions) {
this.options = optionsArg;
@@ -21,43 +22,24 @@ 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
this.defaultClient = new plugins.clickhouse.ClickHouseClient({
...defaultOptions,
database: 'default',
});
this.clickhouseClient = await ClickhouseHttpClient.createAndStart(this.options);
await this.pingDatabaseUntilAvailable();
console.log(`Create database ${this.options.database}, if it does not exist...`);
await this.createDatabase(dropOld);
console.log(`Ensured database. Now connecting to wanted database: ${this.options.database}`);
this.clickhouseClient = new plugins.clickhouse.ClickHouseClient({
...defaultOptions
});
}
public async createDatabase(dropOld: boolean = false) {
if (dropOld) {
await this.defaultClient.queryPromise(`DROP DATABASE IF EXISTS ${this.options.database}`);
await this.clickhouseClient.queryPromise(`DROP DATABASE IF EXISTS ${this.options.database}`);
}
await this.defaultClient.queryPromise(`CREATE DATABASE IF NOT EXISTS ${this.options.database}`);
await this.clickhouseClient.queryPromise(`CREATE DATABASE IF NOT EXISTS ${this.options.database}`);
}
public async pingDatabaseUntilAvailable() {
let available = false;
while(!available) {
available = await this.defaultClient.ping().catch(err => {
available = await this.clickhouseClient.ping().catch(err => {
return false;
});
if (!available) {