Merge pull request #155 from crobox/feature/query_executor

Feature/query executor
crobox · Nov 3, 2023 · ea1a48b · ea1a48b
2 parents 4181bcd + dc3e9ec
commit ea1a48b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 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
@@ -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
@@ -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
@@ -13,11 +13,12 @@ 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]]
 
   def insert[V: JsonWriter](table: Table, values: Seq[V])(implicit executionContext: ExecutionContext,
                                                           settings: QuerySettings = QuerySettings()): Future[String]
+
 }