refactor: move Database to client crate behind testing feature (#4059)

* refactor: move Database to client crate behind testing feature

Signed-off-by: tison <wander4096@gmail.com>

* partial move

Signed-off-by: tison <wander4096@gmail.com>

* catch up more

Signed-off-by: tison <wander4096@gmail.com>

* fix imports

Signed-off-by: tison <wander4096@gmail.com>

* finish

Signed-off-by: tison <wander4096@gmail.com>

* tidy

Signed-off-by: tison <wander4096@gmail.com>

---------

Signed-off-by: tison <wander4096@gmail.com>
This commit is contained in:
tison
2024-05-28 11:21:43 +08:00
committed by GitHub
parent 097f62f459
commit 9dd6e033a7
17 changed files with 167 additions and 114 deletions

View File

@@ -10,7 +10,7 @@ workspace = true
[dependencies]
async-trait = "0.1"
clap.workspace = true
client.workspace = true
client = { workspace = true, features = ["testing"] }
common-error.workspace = true
common-query.workspace = true
common-recordbatch.workspace = true
@@ -19,7 +19,5 @@ serde.workspace = true
serde_json.workspace = true
sqlness = { version = "0.5" }
tempfile.workspace = true
# TODO depend `Database` client
tests-integration.workspace = true
tinytemplate = "1.2"
tokio.workspace = true

View File

@@ -24,13 +24,14 @@ use std::time::Duration;
use async_trait::async_trait;
use client::error::ServerSnafu;
use client::{Client, Error as ClientError, DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME};
use client::{
Client, Database as DB, Error as ClientError, DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME,
};
use common_error::ext::ErrorExt;
use common_query::{Output, OutputData};
use common_recordbatch::RecordBatches;
use serde::Serialize;
use sqlness::{Database, EnvController, QueryContext};
use tests_integration::database::Database as DB;
use tinytemplate::TinyTemplate;
use tokio::sync::Mutex as TokioMutex;