Browse Source

refactor: sqlite schema

appflowy 2 years ago
parent
commit
bf5247066d
18 changed files with 11 additions and 26 deletions
  1. 0 0
      frontend/rust-lib/flowy-database/migrations/2021-07-09-063045_user/down.sql
  2. 0 0
      frontend/rust-lib/flowy-database/migrations/2021-07-09-063045_user/up.sql
  3. 0 0
      frontend/rust-lib/flowy-database/migrations/2021-07-14-022241_user-add-col/down.sql
  4. 0 0
      frontend/rust-lib/flowy-database/migrations/2021-07-14-022241_user-add-col/up.sql
  5. 0 2
      frontend/rust-lib/flowy-database/migrations/2021-07-22-234458_flowy-editor/down.sql
  6. 0 7
      frontend/rust-lib/flowy-database/migrations/2021-07-22-234458_flowy-editor/up.sql
  7. 0 0
      frontend/rust-lib/flowy-database/migrations/2021-09-22-074638_revision/down.sql
  8. 0 0
      frontend/rust-lib/flowy-database/migrations/2021-09-22-074638_revision/up.sql
  9. 0 2
      frontend/rust-lib/flowy-database/migrations/2022-03-04-101530_flowy-grid/down.sql
  10. 0 5
      frontend/rust-lib/flowy-database/migrations/2022-03-04-101530_flowy-grid/up.sql
  11. 1 0
      frontend/rust-lib/flowy-database/migrations/2022-03-11-025536_grid/down.sql
  12. 4 0
      frontend/rust-lib/flowy-database/migrations/2022-03-11-025536_grid/up.sql
  13. 0 0
      frontend/rust-lib/flowy-database/migrations/2022-04-05-015536_grid-block-index/down.sql
  14. 0 0
      frontend/rust-lib/flowy-database/migrations/2022-04-05-015536_grid-block-index/up.sql
  15. 1 0
      frontend/rust-lib/flowy-database/migrations/2022-06-11-090029_view-add-col/down.sql
  16. 2 0
      frontend/rust-lib/flowy-database/migrations/2022-06-11-090029_view-add-col/up.sql
  17. 1 9
      frontend/rust-lib/flowy-database/src/schema.rs
  18. 2 1
      frontend/rust-lib/flowy-folder/src/services/persistence/version_1/view_sql.rs

+ 0 - 0
frontend/rust-lib/flowy-database/migrations/2021-07-09-063045_flowy-user/down.sql → frontend/rust-lib/flowy-database/migrations/2021-07-09-063045_user/down.sql


+ 0 - 0
frontend/rust-lib/flowy-database/migrations/2021-07-09-063045_flowy-user/up.sql → frontend/rust-lib/flowy-database/migrations/2021-07-09-063045_user/up.sql


+ 0 - 0
frontend/rust-lib/flowy-database/migrations/2021-07-14-022241_flowy-user/down.sql → frontend/rust-lib/flowy-database/migrations/2021-07-14-022241_user-add-col/down.sql


+ 0 - 0
frontend/rust-lib/flowy-database/migrations/2021-07-14-022241_flowy-user/up.sql → frontend/rust-lib/flowy-database/migrations/2021-07-14-022241_user-add-col/up.sql


+ 0 - 2
frontend/rust-lib/flowy-database/migrations/2021-07-22-234458_flowy-editor/down.sql

@@ -1,2 +0,0 @@
--- This file should undo anything in `up.sql`
-DROP TABLE doc_table;

+ 0 - 7
frontend/rust-lib/flowy-database/migrations/2021-07-22-234458_flowy-editor/up.sql

@@ -1,7 +0,0 @@
--- Your SQL goes here
-CREATE TABLE doc_table (
-    id TEXT NOT NULL PRIMARY KEY,
---     data BLOB NOT NULL DEFAULT (x''),
-    data TEXT NOT NULL DEFAULT '',
-    rev_id BIGINT NOT NULL DEFAULT 0
-);

+ 0 - 0
frontend/rust-lib/flowy-database/migrations/2021-09-22-074638_flowy-doc-op/down.sql → frontend/rust-lib/flowy-database/migrations/2021-09-22-074638_revision/down.sql


+ 0 - 0
frontend/rust-lib/flowy-database/migrations/2021-09-22-074638_flowy-doc-op/up.sql → frontend/rust-lib/flowy-database/migrations/2021-09-22-074638_revision/up.sql


+ 0 - 2
frontend/rust-lib/flowy-database/migrations/2022-03-04-101530_flowy-grid/down.sql

@@ -1,2 +0,0 @@
--- This file should undo anything in `up.sql`
-DROP TABLE kv_table;

+ 0 - 5
frontend/rust-lib/flowy-database/migrations/2022-03-04-101530_flowy-grid/up.sql

@@ -1,5 +0,0 @@
--- Your SQL goes here
-CREATE TABLE kv_table (
-   key TEXT NOT NULL PRIMARY KEY,
-   value BLOB NOT NULL DEFAULT (x'')
-);

+ 1 - 0
frontend/rust-lib/flowy-database/migrations/2022-03-11-025536_flowy-grid/down.sql → frontend/rust-lib/flowy-database/migrations/2022-03-11-025536_grid/down.sql

@@ -1,3 +1,4 @@
 -- This file should undo anything in `up.sql`
+DROP TABLE kv_table;
 DROP TABLE grid_rev_table;
 DROP TABLE grid_meta_rev_table;

+ 4 - 0
frontend/rust-lib/flowy-database/migrations/2022-03-11-025536_flowy-grid/up.sql → frontend/rust-lib/flowy-database/migrations/2022-03-11-025536_grid/up.sql

@@ -1,4 +1,8 @@
 -- Your SQL goes here
+CREATE TABLE kv_table (
+    key TEXT NOT NULL PRIMARY KEY,
+    value BLOB NOT NULL DEFAULT (x'')
+);
 CREATE TABLE grid_rev_table (
     id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
     object_id TEXT NOT NULL DEFAULT '',

+ 0 - 0
frontend/rust-lib/flowy-database/migrations/2022-04-05-015536_flowy-grid-block-index/down.sql → frontend/rust-lib/flowy-database/migrations/2022-04-05-015536_grid-block-index/down.sql


+ 0 - 0
frontend/rust-lib/flowy-database/migrations/2022-04-05-015536_flowy-grid-block-index/up.sql → frontend/rust-lib/flowy-database/migrations/2022-04-05-015536_grid-block-index/up.sql


+ 1 - 0
frontend/rust-lib/flowy-database/migrations/2022-06-11-090029_view-add-col/down.sql

@@ -0,0 +1 @@
+-- This file should undo anything in `up.sql`

+ 2 - 0
frontend/rust-lib/flowy-database/migrations/2022-06-11-090029_view-add-col/up.sql

@@ -0,0 +1,2 @@
+-- Your SQL goes here
+ALTER TABLE view_table ADD COLUMN ext_data TEXT NOT NULL DEFAULT '';

+ 1 - 9
frontend/rust-lib/flowy-database/src/schema.rs

@@ -13,14 +13,6 @@ table! {
     }
 }
 
-table! {
-    doc_table (id) {
-        id -> Text,
-        data -> Text,
-        rev_id -> BigInt,
-    }
-}
-
 table! {
     grid_block_index_table (row_id) {
         row_id -> Text,
@@ -102,6 +94,7 @@ table! {
         view_type -> Integer,
         version -> BigInt,
         is_trash -> Bool,
+        ext_data -> Text,
     }
 }
 
@@ -119,7 +112,6 @@ table! {
 
 allow_tables_to_appear_in_same_query!(
     app_table,
-    doc_table,
     grid_block_index_table,
     grid_meta_rev_table,
     grid_rev_table,

+ 2 - 1
frontend/rust-lib/flowy-folder/src/services/persistence/version_1/view_sql.rs

@@ -79,6 +79,7 @@ pub(crate) struct ViewTable {
     pub view_type: SqlViewDataType,
     pub version: i64,
     pub is_trash: bool,
+    pub ext_data: String,
 }
 
 impl ViewTable {
@@ -120,7 +121,7 @@ impl std::convert::From<ViewTable> for View {
             modified_time: table.modified_time,
             version: table.version,
             create_time: table.create_time,
-            ext_data: "".to_string(),
+            ext_data: table.ext_data,
             thumbnail: table.thumbnail,
             // Store the view in ViewTable was deprecated since v0.0.2.
             // No need worry about plugin_type.