fixing save remote server, timestamptz for postgres, updating nav bar on

sync

Author: athanclark

src-tauri/src/lib.rs

@@ -6,7 +6,7 @@ use crate::mysql::actually_sync_databases_mysql;
 mod postgres;
 use crate::postgres::actually_sync_databases_postgres;
 mod migrations;
-use crate::migrations::{SQLITE_MIGRATIONS, MYSQL_PG_MIGRATIONS};
+use crate::migrations::{SQLITE_MIGRATIONS, MYSQL_MIGRATIONS, PG_MIGRATIONS};
 
 use tauri::{
     State,
@@ -134,7 +134,7 @@ async fn sync_databases(db_instances: State<'_, DbInstances>) -> Result<(), Vec<
                             .ssl_mode(MySqlSslMode::Required);
                         let e_conn: Result<MySqlPool, String> = run_migrations_and_get_pool(
                             conn_options,
-                            MYSQL_PG_MIGRATIONS.clone(),
+                            MYSQL_MIGRATIONS.clone(),
                             auto_sync_time,
                         ).await;
                         info!("e_conn returned");
@@ -165,7 +165,7 @@ async fn sync_databases(db_instances: State<'_, DbInstances>) -> Result<(), Vec<
                             .ssl_mode(PgSslMode::VerifyFull);
                         let e_conn: Result<PgPool, String> = run_migrations_and_get_pool(
                             conn_options,
-                            MYSQL_PG_MIGRATIONS.clone(),
+                            PG_MIGRATIONS.clone(),
                             auto_sync_time,
                         ).await;
                         match e_conn {
@@ -241,7 +241,7 @@ async fn check_database(db_instances: State<'_, DbInstances>, db_id: &str) -> Re
                         .ssl_mode(MySqlSslMode::Required);
                     let conn: MySqlPool = run_migrations_and_get_pool(
                         conn_options,
-                        MYSQL_PG_MIGRATIONS.clone(),
+                        MYSQL_MIGRATIONS.clone(),
                         auto_sync_time,
                     ).await?;
                     // let conn = MySqlPool::connect_with(conn_options).await.map_err(|e| e.to_string())?;
@@ -259,7 +259,7 @@ async fn check_database(db_instances: State<'_, DbInstances>, db_id: &str) -> Re
                         .ssl_mode(PgSslMode::VerifyFull);
                     let conn: PgPool = run_migrations_and_get_pool(
                         conn_options,
-                        MYSQL_PG_MIGRATIONS.clone(),
+                        PG_MIGRATIONS.clone(),
                         auto_sync_time,
                     ).await?;
                     // let conn = PgPool::connect_with(conn_options).await.map_err(|e| e.to_string())?;

src-tauri/src/migrations.rs

@@ -168,7 +168,7 @@ END;
         },
     ]);
 
-    pub static ref MYSQL_PG_MIGRATIONS: MigrationList = MigrationList(vec![
+    pub static ref MYSQL_MIGRATIONS: MigrationList = MigrationList(vec![
         Migration {
             version: 1,
             description: "create_initial_tables",
@@ -221,6 +221,72 @@ CHECK (trash IN (0, 1));
 CREATE TABLE IF NOT EXISTS deleted (
     id VARCHAR(32) PRIMARY KEY
 );
+",
+        },
+    ]);
+
+    pub static ref PG_MIGRATIONS: MigrationList = MigrationList(vec![
+        Migration {
+            version: 1,
+            description: "create_initial_tables",
+            kind: MigrationKind::Up,
+            sql: "
+CREATE TABLE IF NOT EXISTS books (
+    id VARCHAR(32) PRIMARY KEY,
+    name TEXT,
+    modified TIMESTAMP NOT NULL
+);
+CREATE TABLE IF NOT EXISTS documents (
+    id VARCHAR(32) PRIMARY KEY,
+    book VARCHAR(32) NOT NULL,
+    name TEXT,
+    content TEXT,
+    syntax TEXT NOT NULL,
+    modified TIMESTAMP NOT NULL,
+    FOREIGN KEY (book)
+        REFERENCES books(id)
+        ON DELETE CASCADE
+        ON UPDATE CASCADE
+);
+",
+        },
+        Migration {
+            version: 3,
+            description: "add_icons_to_books_and_documents",
+            kind: MigrationKind::Up,
+            sql: "
+ALTER TABLE books ADD COLUMN icon TEXT;
+ALTER TABLE books ADD COLUMN icon_color TEXT;
+ALTER TABLE documents ADD COLUMN icon TEXT;
+ALTER TABLE documents ADD COLUMN icon_color TEXT;
+",
+        },
+        Migration {
+            version: 4,
+            description: "trash",
+            kind: MigrationKind::Up,
+            sql: "
+ALTER TABLE books ADD COLUMN trash INTEGER NOT NULL DEFAULT 0
+CHECK (trash IN (0, 1));
+",
+        },
+        Migration {
+            version: 5,
+            description: "permanently_deleted",
+            kind: MigrationKind::Up,
+            sql: "
+CREATE TABLE IF NOT EXISTS deleted (
+    id VARCHAR(32) PRIMARY KEY
+);
+",
+        },
+        Migration {
+            version: 6,
+            description: "utc_timestamp",
+            kind: MigrationKind::Up,
+            sql: "
+ALTER TABLE books ALTER COLUMN modified TYPE TIMESTAMPTZ;
+ALTER TABLE documents ALTER COLUMN modified TYPE TIMESTAMPTZ;
 ",
         },
     ]);

src/App.tsx

@@ -66,6 +66,7 @@ function App() {
           color: "green",
           autoClose: true,
         });
+        setReloadNav(!reloadNav);
       } catch(e) {
         console.warn("sync_databases failed", e);
         notifications.update({
@@ -76,6 +77,11 @@ function App() {
           autoClose: false,
         })
         setAutoSync(false);
+        const db = await Database.load(__LOCAL_DB);
+        await db.execute(
+          "UPDATE settings SET value = 'false' WHERE key = 'auto_sync'",
+          []
+        );
       }
     }
     go();

src/Settings.tsx

@@ -144,7 +144,7 @@ function Settings({
         try {
           const db = await Database.load(__LOCAL_DB);
           await db.execute(
-            "UPDATE remote_servers (host, port, db, user, password, db_type) SET ($1, $2, $3, $4, $5, $6) WHERE id = $7",
+            "UPDATE remote_servers SET host = $1, port = $2, db = $3, user = $4, password = $5, db_type = $6 WHERE id = $7",
             [s.host, s.port, s.db, s.user, s.password, s.dbType, s.id]
           );
           actuallyReload();