From 812eb56600638fcabb7251efaf694be6ebce547c Mon Sep 17 00:00:00 2001 From: Leonard Wolters Date: Thu, 2 Nov 2023 15:23:23 +0100 Subject: [PATCH 1/2] Small improvements --- .../dsl/execution/ClickhouseQueryExecutor.scala | 9 +++++++-- .../crobox/clickhouse/dsl/execution/QueryExecutor.scala | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dsl/src/main/scala/com/crobox/clickhouse/dsl/execution/ClickhouseQueryExecutor.scala b/dsl/src/main/scala/com/crobox/clickhouse/dsl/execution/ClickhouseQueryExecutor.scala index 9e42ebcc..473290b3 100644 --- a/dsl/src/main/scala/com/crobox/clickhouse/dsl/execution/ClickhouseQueryExecutor.scala +++ b/dsl/src/main/scala/com/crobox/clickhouse/dsl/execution/ClickhouseQueryExecutor.scala @@ -23,7 +23,12 @@ trait ClickhouseQueryExecutor extends QueryExecutor { queryResult.map(_.parseJson.convertTo[QueryResult[V]]) } -// def executeWithProgress[V: JsonReader]( +// override def execute[V: JsonReader]( +// sql: String +// )(implicit executionContext: ExecutionContext, settings: QuerySettings = QuerySettings()): Future[QueryResult[V]] = +// client.query(sql).map(_.parseJson.convertTo[QueryResult[V]]) + + // def executeWithProgress[V: JsonReader]( // query: Query // )(implicit executionContext: ExecutionContext, // settings: QuerySettings = QuerySettings()): Source[QueryProgress, Future[QueryResult[V]]] = { @@ -46,7 +51,7 @@ trait ClickhouseQueryExecutor extends QueryExecutor { object ClickhouseQueryExecutor { - def default(clickhouseClient: ClickhouseClient): ClickhouseQueryExecutor = + def default(clickhouseClient: ClickhouseClient): QueryExecutor = new DefaultClickhouseQueryExecutor(clickhouseClient) } diff --git a/dsl/src/main/scala/com/crobox/clickhouse/dsl/execution/QueryExecutor.scala b/dsl/src/main/scala/com/crobox/clickhouse/dsl/execution/QueryExecutor.scala index 88166fea..54b00875 100644 --- a/dsl/src/main/scala/com/crobox/clickhouse/dsl/execution/QueryExecutor.scala +++ b/dsl/src/main/scala/com/crobox/clickhouse/dsl/execution/QueryExecutor.scala @@ -20,4 +20,5 @@ trait QueryExecutor { self: TokenizerModule => def insert[V: JsonWriter](table: Table, values: Seq[V])(implicit executionContext: ExecutionContext, settings: QuerySettings = QuerySettings()): Future[String] + } From dc3e9ecc6b430c28b6efbc05358740f62f4465d0 Mon Sep 17 00:00:00 2001 From: Leonard Wolters Date: Thu, 2 Nov 2023 15:23:54 +0100 Subject: [PATCH 2/2] Small improvements --- .../clickhouse/dsl/execution/ClickhouseQueryExecutor.scala | 2 +- .../com/crobox/clickhouse/dsl/execution/QueryExecutor.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dsl/src/main/scala/com/crobox/clickhouse/dsl/execution/ClickhouseQueryExecutor.scala b/dsl/src/main/scala/com/crobox/clickhouse/dsl/execution/ClickhouseQueryExecutor.scala index 473290b3..e9d37059 100644 --- a/dsl/src/main/scala/com/crobox/clickhouse/dsl/execution/ClickhouseQueryExecutor.scala +++ b/dsl/src/main/scala/com/crobox/clickhouse/dsl/execution/ClickhouseQueryExecutor.scala @@ -13,7 +13,7 @@ trait ClickhouseQueryExecutor extends QueryExecutor { self: TokenizerModule => implicit val client: ClickhouseClient - override val serverVersion: clickhouse.ClickhouseServerVersion = client.serverVersion + override lazy val serverVersion: clickhouse.ClickhouseServerVersion = client.serverVersion override def execute[V: JsonReader]( query: Query diff --git a/dsl/src/main/scala/com/crobox/clickhouse/dsl/execution/QueryExecutor.scala b/dsl/src/main/scala/com/crobox/clickhouse/dsl/execution/QueryExecutor.scala index 54b00875..f2230ed3 100644 --- a/dsl/src/main/scala/com/crobox/clickhouse/dsl/execution/QueryExecutor.scala +++ b/dsl/src/main/scala/com/crobox/clickhouse/dsl/execution/QueryExecutor.scala @@ -13,7 +13,7 @@ import scala.concurrent.{ExecutionContext, Future} */ trait QueryExecutor { self: TokenizerModule => - val serverVersion: ClickhouseServerVersion + def serverVersion: ClickhouseServerVersion def execute[V: JsonReader](query: Query)(implicit executionContext: ExecutionContext, settings: QuerySettings = QuerySettings()): Future[QueryResult[V]]