Feat/database view (#1765)

* chore: rename flowy-database to flowy-sqlite

* refactor: rename flowy-grid to flowy-database

* refactor: rename grid to database

* refactor: rename GridEvent to DatabaseEvent

* refactor: rename grid_id to database_id

* refactor: rename dart code
This commit is contained in:
Nathan.fooo
2023-01-31 08:28:31 +08:00
committed by GitHub
parent 5de3912fe3
commit 5b07656295
400 changed files with 2447 additions and 2435 deletions

View File

@ -15,7 +15,7 @@ lib-ot = { path = "../../../shared-lib/lib-ot" }
lib-infra = { path = "../../../shared-lib/lib-infra" }
flowy-document = { path = "../flowy-document" }
flowy-database = { path = "../flowy-database", optional = true }
flowy-sqlite = { path = "../flowy-sqlite", optional = true }
flowy-error = { path = "../flowy-error", features = ["adaptor_database", "adaptor_dispatch"]}
flowy-notification = { path = "../flowy-notification" }
lib-dispatch = { path = "../lib-dispatch" }
@ -51,7 +51,7 @@ flowy-codegen = { path = "../flowy-codegen"}
default = []
sync = []
cloud_sync = ["sync"]
rev-sqlite = ["flowy-database", "flowy-folder/rev-sqlite"]
rev-sqlite = ["flowy-sqlite", "flowy-folder/rev-sqlite"]
flowy_unit_test = ["lib-ot/flowy_unit_test", "flowy-revision/flowy_unit_test"]
dart = ["flowy-codegen/dart", "flowy-notification/dart"]
ts = ["flowy-codegen/ts", "flowy-notification/ts"]

View File

@ -9,8 +9,8 @@ use crate::{
manager::FolderManager,
services::{app::event_handler::*, trash::event_handler::*, view::event_handler::*, workspace::event_handler::*},
};
use flowy_database::{ConnectionPool, DBConnection};
use flowy_derive::{Flowy_Event, ProtoBuf_Enum};
use flowy_sqlite::{ConnectionPool, DBConnection};
use folder_model::{AppRevision, TrashRevision, ViewRevision, WorkspaceRevision};
use lib_dispatch::prelude::*;
use lib_infra::future::FutureResult;

View File

@ -6,7 +6,7 @@ pub mod services;
mod macros;
#[macro_use]
extern crate flowy_database;
extern crate flowy_sqlite;
pub mod manager;
mod notification;

View File

@ -3,12 +3,12 @@ use bytes::Bytes;
use flowy_client_sync::client_folder::{FolderChangeset, FolderOperations, FolderPad};
use flowy_client_sync::make_operations_from_revisions;
use flowy_client_sync::util::recover_operation_from_revisions;
use flowy_database::ConnectionPool;
use flowy_error::{FlowyError, FlowyResult};
use flowy_revision::{
RevisionCloudService, RevisionManager, RevisionMergeable, RevisionObjectDeserializer, RevisionObjectSerializer,
RevisionWebSocket,
};
use flowy_sqlite::ConnectionPool;
use lib_infra::future::FutureResult;
use lib_ot::core::EmptyAttributes;
use parking_lot::RwLock;

View File

@ -6,9 +6,9 @@ use crate::{
use bytes::Bytes;
use flowy_client_sync::client_folder::FolderPad;
use flowy_client_sync::client_folder::{make_folder_rev_json_str, FolderOperationsBuilder};
use flowy_database::kv::KV;
use flowy_error::{FlowyError, FlowyResult};
use flowy_revision::reset::{RevisionResettable, RevisionStructReset};
use flowy_sqlite::kv::KV;
use folder_model::{AppRevision, FolderRevision, ViewRevision, WorkspaceRevision};
use revision_model::Revision;

View File

@ -10,9 +10,9 @@ use crate::{
services::{folder_editor::FolderEditor, persistence::migration::FolderMigration},
};
use flowy_client_sync::client_folder::{FolderOperationsBuilder, FolderPad};
use flowy_database::ConnectionPool;
use flowy_error::{FlowyError, FlowyResult};
use flowy_revision_persistence::{RevisionDiskCache, RevisionState, SyncRecord};
use flowy_sqlite::ConnectionPool;
use folder_model::{AppRevision, TrashRevision, ViewRevision, WorkspaceRevision};
use revision_model::Revision;
use std::sync::Arc;

View File

@ -1,13 +1,13 @@
use bytes::Bytes;
use diesel::{sql_types::Integer, update, SqliteConnection};
use flowy_database::{
use flowy_error::{internal_error, FlowyError, FlowyResult};
use flowy_revision_persistence::{RevisionChangeset, RevisionDiskCache, RevisionState, SyncRecord};
use flowy_sqlite::{
impl_sql_integer_expression, insert_or_ignore_into,
prelude::*,
schema::{rev_table, rev_table::dsl},
ConnectionPool,
};
use flowy_error::{internal_error, FlowyError, FlowyResult};
use flowy_revision_persistence::{RevisionChangeset, RevisionDiskCache, RevisionState, SyncRecord};
use lib_infra::util::md5;
use revision_model::{Revision, RevisionRange};
use std::sync::Arc;

View File

@ -1,12 +1,12 @@
#![allow(clippy::unused_unit)]
use bytes::Bytes;
use flowy_database::{
use flowy_error::{internal_error, FlowyResult};
use flowy_revision::{RevisionSnapshot, RevisionSnapshotDiskCache};
use flowy_sqlite::{
prelude::*,
schema::{folder_rev_snapshot, folder_rev_snapshot::dsl},
ConnectionPool,
};
use flowy_error::{internal_error, FlowyResult};
use flowy_revision::{RevisionSnapshot, RevisionSnapshotDiskCache};
use lib_infra::util::timestamp;
use std::sync::Arc;

View File

@ -3,7 +3,7 @@ use crate::entities::{
trash::{TrashPB, TrashType},
};
use crate::{errors::FlowyError, services::persistence::version_1::workspace_sql::WorkspaceTable};
use flowy_database::{
use flowy_sqlite::{
prelude::*,
schema::{app_table, app_table::dsl},
SqliteConnection,

View File

@ -1,6 +1,6 @@
use crate::errors::FlowyError;
use diesel::sql_types::Integer;
use flowy_database::{
use flowy_sqlite::{
prelude::*,
schema::{trash_table, trash_table::dsl},
SqliteConnection,

View File

@ -6,8 +6,8 @@ use crate::services::persistence::{
},
FolderPersistenceTransaction, TrashTableSql,
};
use flowy_database::DBConnection;
use flowy_error::FlowyResult;
use flowy_sqlite::DBConnection;
use folder_model::{AppRevision, TrashRevision, ViewRevision, WorkspaceRevision};
/// V1Transaction is deprecated since version 0.0.2 version

View File

@ -7,7 +7,7 @@ use crate::{
services::persistence::version_1::app_sql::AppTable,
};
use diesel::sql_types::Integer;
use flowy_database::{
use flowy_sqlite::{
prelude::*,
schema::{view_table, view_table::dsl},
SqliteConnection,

View File

@ -1,6 +1,6 @@
use crate::{entities::workspace::UpdateWorkspaceParams, errors::FlowyError};
use diesel::SqliteConnection;
use flowy_database::{
use flowy_sqlite::{
prelude::*,
schema::{workspace_table, workspace_table::dsl},
};

View File

@ -15,7 +15,7 @@ use crate::{
},
};
use bytes::Bytes;
use flowy_database::kv::KV;
use flowy_sqlite::kv::KV;
use folder_model::{gen_view_id, ViewRevision};
use futures::{FutureExt, StreamExt};
use std::{collections::HashSet, sync::Arc};

View File

@ -2,9 +2,9 @@ use crate::services::FOLDER_SYNC_INTERVAL_IN_MILLIS;
use bytes::Bytes;
use flowy_client_sync::client_folder::{FolderOperations, FolderPad};
use flowy_client_sync::make_operations_from_revisions;
use flowy_database::ConnectionPool;
use flowy_error::{FlowyError, FlowyResult};
use flowy_revision::*;
use flowy_sqlite::ConnectionPool;
use lib_infra::future::{BoxResultFuture, FutureResult};
use lib_ot::core::OperationTransform;
use parking_lot::RwLock;

View File

@ -9,7 +9,7 @@ use crate::{
read_local_workspace_apps, TrashController,
},
};
use flowy_database::kv::KV;
use flowy_sqlite::kv::KV;
use folder_model::{AppRevision, WorkspaceRevision};
use std::sync::Arc;