From 85ab9015e2ceb07ff8c9879e85b3b2d3d90b900f Mon Sep 17 00:00:00 2001
From: Leonard Wolters <leonard@crobox.com>
Date: Mon, 13 Nov 2023 14:16:09 +0100
Subject: [PATCH] WIP: Refactoring QueryExecutor

---
 .../com/crobox/clickhouse/DslITSpec.scala     |  6 +++---
 .../com/crobox/clickhouse/dsl/package.scala   | 19 -------------------
 2 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/dsl/src/it/scala/com/crobox/clickhouse/DslITSpec.scala b/dsl/src/it/scala/com/crobox/clickhouse/DslITSpec.scala
index 58c25147..2fa5b331 100644
--- a/dsl/src/it/scala/com/crobox/clickhouse/DslITSpec.scala
+++ b/dsl/src/it/scala/com/crobox/clickhouse/DslITSpec.scala
@@ -59,9 +59,9 @@ trait DslITSpec extends ClickhouseClientSpec with ClickhouseSpec with TestSchema
     } yield {}
     whenReady(tables) { _ =>
       val inserts = for {
-        _ <- table1Entries.into(OneTestTable)
-        _ <- table2Entries.into(TwoTestTable)
-        _ <- table3Entries.into(ThreeTestTable)
+        _ <- queryExecutor.insert(OneTestTable, table1Entries)
+        _ <- queryExecutor.insert(TwoTestTable, table2Entries)
+        _ <- queryExecutor.insert(ThreeTestTable, table3Entries)
       } yield {}
       inserts.futureValue
     }
diff --git a/dsl/src/main/scala/com/crobox/clickhouse/dsl/package.scala b/dsl/src/main/scala/com/crobox/clickhouse/dsl/package.scala
index 1ec71879..67bcf23b 100644
--- a/dsl/src/main/scala/com/crobox/clickhouse/dsl/package.scala
+++ b/dsl/src/main/scala/com/crobox/clickhouse/dsl/package.scala
@@ -1,11 +1,8 @@
 package com.crobox.clickhouse
 
 import com.crobox.clickhouse.dsl.column.ClickhouseColumnFunctions
-import com.crobox.clickhouse.dsl.execution.{QueryExecutor, QueryResult}
 import com.crobox.clickhouse.dsl.marshalling.{QueryValue, QueryValueFormats}
-import spray.json.{JsonReader, JsonWriter}
 
-import scala.concurrent.{ExecutionContext, Future}
 import scala.util.Try
 
 package object dsl extends ClickhouseColumnFunctions with QueryFactory with QueryValueFormats {
@@ -14,22 +11,6 @@ package object dsl extends ClickhouseColumnFunctions with QueryFactory with Quer
   trait Contra[-A]
   type Union[A, B] = Contra[A] <:< Contra[B]
 
-  implicit class QueryExecution(query: Query) {
-
-    def execute[V: JsonReader](
-        implicit executionContext: ExecutionContext,
-        queryExecutor: QueryExecutor
-    ): Future[QueryResult[V]] = queryExecutor.execute(query)
-  }
-
-  implicit class ValueInsertion[V: JsonWriter](values: Seq[V]) {
-
-    def into(table: Table)(
-        implicit executionContext: ExecutionContext,
-        queryExecutor: QueryExecutor
-    ): Future[String] = queryExecutor.insert(table, values)
-  }
-
   /**
    * Exposes the OperationalQuery.+ operator on Try[OperationalQuery]
    */