refactor: update surrealdb client usage to support 'any' engine type
This commit is contained in:
@@ -1,15 +1,17 @@
|
||||
use crate::{Env, surrealdb_init_mem, surrealdb_init_ws};
|
||||
use crate::{load_env, surrealdb_init_mem, surrealdb_init_ws, Env};
|
||||
use axum::{Router, serve};
|
||||
use imphnen_entities::{SurrealMemClient, SurrealWsClient};
|
||||
use log::{debug, error, info};
|
||||
use std::{future::Future, net::SocketAddr};
|
||||
use tokio::net::TcpListener;
|
||||
|
||||
|
||||
pub async fn axum_init<F, Fut>(router_fn: F)
|
||||
where
|
||||
F: FnOnce(SurrealWsClient, SurrealMemClient) -> Fut,
|
||||
Fut: Future<Output = Router>,
|
||||
{
|
||||
load_env();
|
||||
let env = Env::new();
|
||||
info!("Environment loaded with port: {}", env.port);
|
||||
|
||||
|
||||
@@ -1,17 +1,20 @@
|
||||
use super::Env;
|
||||
use crate::{SurrealMemClient, SurrealWsClient};
|
||||
use crate::SurrealMemClient;
|
||||
use surrealdb::engine::local::Mem;
|
||||
use surrealdb::engine::remote::ws::{Client, Ws};
|
||||
use surrealdb::engine::any;
|
||||
use surrealdb::opt::auth::Root;
|
||||
use surrealdb::{Result, Surreal};
|
||||
use crate::enviroment::load_env;
|
||||
|
||||
pub mod resource;
|
||||
pub use resource::*;
|
||||
|
||||
pub async fn surrealdb_init_ws() -> Result<SurrealWsClient> {
|
||||
pub async fn surrealdb_init_ws() -> Result<Surreal<any::Any>> {
|
||||
load_env();
|
||||
let env = Env::new();
|
||||
let db = Surreal::<Client>::init();
|
||||
db.connect::<Ws>(env.surrealdb_url.clone()).await?;
|
||||
let db = any::connect(&env.surrealdb_url).await?;
|
||||
|
||||
|
||||
db.signin(Root {
|
||||
username: &env.surrealdb_username,
|
||||
password: &env.surrealdb_password,
|
||||
|
||||
Reference in New Issue
Block a user