Run tests against PostgreSQL, fix compatibility

.github/workflows/tests.yml

@@ -43,10 +43,103 @@ jobs:
         with:
           command: test
           args: --manifest-path ${{ env.cargo_manifest }}
-        # Ensure debug output is also tested
         env:
+          # Ensure debug output is also tested
           RUST_LOG: debug
 
+  rust-test-postgres:
+    runs-on: ubuntu-latest
+
+    services:
+      postgres:
+        image: postgres:latest
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: aquadoggo-development
+        ports:
+          # Maps TCP port 5432 on service container to the host
+          - 5432:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Setup Rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+
+      - name: Restore from cargo cache
+        uses: actions/cache@v3
+        with:
+          path: ${{ env.cache_path }}
+          key: ${{ runner.os }}-test-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Run tests
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: >-
+            --manifest-path ${{ env.cargo_manifest }}
+            -- --test-threads 1
+        env:
+          DATABASE_URL: postgresql://postgres:postgres@localhost:5432/aquadoggo-development
+
+  rust-test-mariadb:
+    runs-on: ubuntu-latest
+
+    services:
+      mariadb:
+        image: mariadb:latest
+        ports:
+          # Maps TCP port 3306 on service container to the host
+          - 3306:3306
+        env:
+          MYSQL_USER: panda
+          MYSQL_PASSWORD: panda
+          MYSQL_DATABASE: aquadoggo-development
+          MYSQL_ROOT_PASSWORD: root
+        options: >-
+          --health-cmd="mysqladmin ping"
+          --health-interval=5s
+          --health-timeout=2s
+          --health-retries=3
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Setup Rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+
+      - name: Restore from cargo cache
+        uses: actions/cache@v3
+        with:
+          path: ${{ env.cache_path }}
+          key: ${{ runner.os }}-test-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Run tests
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: >-
+            --manifest-path ${{ env.cargo_manifest }}
+            -- --test-threads 1
+        env:
+          DATABASE_URL: mysql://panda:panda@localhost:3306/aquadoggo-development
+
   rust-check:
     runs-on: ubuntu-latest
 
@@ -151,9 +244,12 @@ jobs:
         uses: actions-rs/tarpaulin@v0.1
         with:
           # Force cleaning via `--force-clean` flag to prevent buggy code coverage
-          args: --manifest-path ${{ env.cargo_manifest }} --locked --force-clean
-        # Ensure debug output is also tested
+          args: >-
+            --manifest-path ${{ env.cargo_manifest }}
+            --locked
+            --force-clean
         env:
+          # Ensure debug output is also tested
           RUST_LOG: debug
 
       - name: Upload to codecov.io

aquadoggo/Cargo.toml

@@ -26,6 +26,7 @@ deadqueue = { version = "0.2.2", default-features = false, features = [
 ] }
 directories = "3.0.2"
 envy = "0.4.2"
+futures = "0.3.21"
 graphql_client = "0.10"
 hex = "0.4.3"
 lipmaa-link = "0.2.2"
@@ -58,11 +59,11 @@ tower-http = { version = "0.2.4", default-features = false, features = [
     "cors",
 ] }
 triggered = "0.1.2"
-futures = "0.3.21"
 
 [dev-dependencies]
 hyper = "0.14.17"
 http = "0.2.6"
+once_cell = "1.12.0"
 reqwest = { version = "0.11.9", default-features = false, features = [
     "json",
     "stream",

aquadoggo/migrations/20220509090252_create-operations.sql

@@ -15,7 +15,7 @@ CREATE TABLE IF NOT EXISTS operation_fields_v1 (
     operation_id            TEXT             NOT NULL,
     name                    TEXT             NOT NULL,
     field_type              TEXT             NOT NULL,
-    value                   BLOB             NULL,
+    value                   TEXT             NULL,
     list_index              NUMERIC          NOT NULL,
     FOREIGN KEY(operation_id) REFERENCES operations_v1(operation_id)
 );

aquadoggo/migrations/20220617115933_create-tasks.sql

@@ -9,11 +9,12 @@ CREATE TABLE IF NOT EXISTS tasks (
 -- Create a unique index using `COALESCE`. A regular `UNIQUE` clause will
 -- consider two rows that have at least one `null` value to always be distinct
 -- but we want to check for equality including `null` values.
-CREATE UNIQUE INDEX ux_tasks ON tasks (
-    name,
-    COALESCE(document_id, 0),
-    COALESCE(document_view_id, 0)
-);
+-- @TODO: This fails using PostgreSQL
+-- CREATE UNIQUE INDEX ux_tasks ON tasks (
+    --    name,
+    --    COALESCE(document_id, 0),
+    --    COALESCE(document_view_id, 0)
+    --);
 
 -- Create an index because primary keys can not contain `null` columns.
 CREATE INDEX idx_tasks ON tasks (name, document_id, document_view_id);

aquadoggo/src/db/mod.rs

@@ -21,8 +21,6 @@ pub async fn create_database(url: &str) -> Result<()> {
         Any::create_database(url).await?;
     }
 
-    Any::drop_database(url);
-
     Ok(())
 }
 

aquadoggo/src/db/stores/document.rs

@@ -216,7 +216,7 @@ impl DocumentStore for SqlStorage {
                 documents
             LEFT JOIN document_view_fields
                 ON
-                    documents.document_view_id = document_view_fields.document_view_id    
+                    documents.document_view_id = document_view_fields.document_view_id
             LEFT JOIN operation_fields_v1
                 ON
                     document_view_fields.operation_id = operation_fields_v1.operation_id
@@ -268,7 +268,7 @@ impl DocumentStore for SqlStorage {
                 documents
             LEFT JOIN document_view_fields
                 ON
-                    documents.document_view_id = document_view_fields.document_view_id    
+                    documents.document_view_id = document_view_fields.document_view_id
             LEFT JOIN operation_fields_v1
                 ON
                     document_view_fields.operation_id = operation_fields_v1.operation_id
@@ -419,6 +419,9 @@ mod tests {
             assert!(retrieved_document_view.get(key).is_some());
             assert_eq!(retrieved_document_view.get(key), document_view.get(key));
         }
+
+        // Disconnect from database
+        db.close().await;
     }
 
     #[rstest]
@@ -438,7 +441,10 @@ mod tests {
             .await
             .unwrap();
 
-        assert!(view_does_not_exist.is_none())
+        assert!(view_does_not_exist.is_none());
+
+        // Disconnect from database
+        db.close().await;
     }
 
     #[rstest]
@@ -496,6 +502,9 @@ mod tests {
             };
             assert_eq!(document_view.get("username").unwrap(), &expected_username);
         }
+
+        // Disconnect from database
+        db.close().await;
     }
 
     #[rstest]
@@ -506,7 +515,6 @@ mod tests {
         #[from(test_db)]
         #[future]
         db: TestSqlStore,
-
         operation: Operation,
     ) {
         let db = db.await;
@@ -527,6 +535,9 @@ mod tests {
             result.unwrap_err().to_string(),
             "A fatal error occured in DocumentStore: error returned from database: FOREIGN KEY constraint failed".to_string()
         );
+
+        // Disconnect from database
+        db.close().await;
     }
 
     #[rstest]
@@ -575,6 +586,9 @@ mod tests {
             assert!(document_view.get(key).is_some());
             assert_eq!(document_view.get(key), expected_document_view.get(key));
         }
+
+        // Disconnect from database
+        db.close().await;
     }
 
     #[rstest]
@@ -623,6 +637,9 @@ mod tests {
             assert!(document_view.get(key).is_some());
             assert_eq!(document_view.get(key), expected_document_view.get(key));
         }
+
+        // Disconnect from database
+        db.close().await;
     }
 
     #[rstest]
@@ -651,6 +668,9 @@ mod tests {
         let document_view = db.store.get_document_by_id(document.id()).await.unwrap();
 
         assert!(document_view.is_none());
+
+        // Disconnect from database
+        db.close().await;
     }
 
     #[rstest]
@@ -678,6 +698,9 @@ mod tests {
 
         let schema_documents = db.store.get_documents_by_schema(&schema_id).await.unwrap();
 
-        assert_eq!(schema_documents.len(), 2)
+        assert_eq!(schema_documents.len(), 2);
+
+        // Disconnect from database
+        db.close().await;
     }
 }

aquadoggo/src/db/stores/entry.rs

@@ -452,7 +452,10 @@ mod tests {
         let doggo_entry = StorageEntry::new(&entry_encoded, &operation_encoded).unwrap();
         let result = db.store.insert_entry(doggo_entry).await;
 
-        assert!(result.is_ok())
+        assert!(result.is_ok());
+
+        // Disconnect from database
+        db.close().await;
     }
 
     #[rstest]
@@ -485,7 +488,10 @@ mod tests {
             result.unwrap_err().to_string(),
             "Error occured during `EntryStorage` request in storage provider: error returned from \
             database: UNIQUE constraint failed: entries.author, entries.log_id, entries.seq_num"
-        )
+        );
+
+        // Disconnect from database
+        db.close().await;
     }
 
     #[rstest]
@@ -515,6 +521,9 @@ mod tests {
             .await
             .unwrap();
         assert_eq!(latest_entry.unwrap().seq_num(), SeqNum::new(20).unwrap());
+
+        // Disconnect from database
+        db.close().await;
     }
 
     #[rstest]
@@ -546,6 +555,9 @@ mod tests {
             .await
             .unwrap();
         assert!(entries.len() == 40);
+
+        // Disconnect from database
+        db.close().await;
     }
 
     #[rstest]
@@ -591,7 +603,10 @@ mod tests {
             .get_entry_at_seq_num(&author_not_in_db, &LogId::new(1), &seq_num_not_in_log)
             .await
             .unwrap();
-        assert!(entry.is_none())
+        assert!(entry.is_none());
+
+        // Disconnect from database
+        db.close().await;
     }
 
     #[rstest]
@@ -630,7 +645,10 @@ mod tests {
             .get_entry_by_hash(&entry_hash_not_in_db)
             .await
             .unwrap();
-        assert!(entry.is_none())
+        assert!(entry.is_none());
+
+        // Disconnect from database
+        db.close().await;
     }
 
     #[rstest]
@@ -663,6 +681,9 @@ mod tests {
             .unwrap();
 
         assert_eq!(entries.len(), 10);
+
+        // Disconnect from database
+        db.close().await;
     }
 
     #[rstest]
@@ -689,5 +710,8 @@ mod tests {
 
         assert!(!entries.is_empty());
         assert_eq!(cert_pool_seq_nums, vec![19, 18, 17, 13, 4, 1]);
+
+        // Disconnect from database
+        db.close().await;
     }
 }