Merge pull request #1602 from ardriveapp/master

Update dev with migration hotfix
ardriveapp · Feb 1, 2024 · c827feb · c827feb
2 parents 0e999ae + 52cbc90
commit c827feb
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 26 deletions.
diff --git a/lib/models/daos/drive_dao/drive_dao.dart b/lib/models/daos/drive_dao/drive_dao.dart
@@ -132,7 +132,7 @@ class DriveDao extends DatabaseAccessor<Database> with _$DriveDaoMixin {
           driveId: driveId,
           name: name,
           path: rootPath,
-          isHidden: false,
+          isHidden: const Value(false),
         ),
       );
     });
@@ -392,7 +392,7 @@ class DriveDao extends DatabaseAccessor<Database> with _$DriveDaoMixin {
       parentFolderId: Value(parentFolderId),
       name: folderName,
       path: path,
-      isHidden: false,
+      isHidden: const Value(false),
     );
     await into(folderEntries).insert(folderEntriesCompanion);
 
@@ -459,7 +459,7 @@ class DriveDao extends DatabaseAccessor<Database> with _$DriveDaoMixin {
       lastModifiedDate: entity.lastModifiedDate ?? DateTime.now(),
       dataContentType: Value(entity.dataContentType),
       pinnedDataOwnerAddress: Value(entity.pinnedDataOwnerAddress),
-      isHidden: entity.isHidden ?? false,
+      isHidden: Value(entity.isHidden ?? false),
     );
 
     return into(fileEntries).insert(

diff --git a/lib/models/file_revision.dart b/lib/models/file_revision.dart
@@ -22,7 +22,7 @@ extension FileRevisionsCompanionExtensions on FileRevisionsCompanion {
         customGQLTags: customGQLTags,
         customJsonMetadata: customJsonMetadata,
         pinnedDataOwnerAddress: pinnedDataOwnerAddress,
-        isHidden: isHidden.value,
+        isHidden: isHidden,
       );
 
   /// Returns a list of [NetworkTransactionsCompanion] representing the metadata and data transactions
@@ -58,7 +58,7 @@ extension FileEntityExtensions on FileEntity {
         customGQLTags: Value(customGqlTagsAsString),
         customJsonMetadata: Value(customJsonMetadataAsString),
         pinnedDataOwnerAddress: Value(pinnedDataOwnerAddress),
-        isHidden: isHidden ?? false,
+        isHidden: Value(isHidden ?? false),
       );
 
   FileRevision toRevision({

diff --git a/lib/models/folder_revision.dart b/lib/models/folder_revision.dart
@@ -21,7 +21,7 @@ extension FolderRevisionCompanionExtensions on FolderRevisionsCompanion {
         lastUpdated: dateCreated,
         customGQLTags: customGQLTags,
         customJsonMetadata: customJsonMetadata,
-        isHidden: isHidden.value,
+        isHidden: isHidden,
       );
 
   /// Returns a [NetworkTransactionsCompanion] representing the metadata transaction
@@ -47,7 +47,7 @@ extension FolderEntityExtensions on FolderEntity {
         action: performedAction,
         customGQLTags: Value(customGqlTagsAsString),
         customJsonMetadata: Value(customJsonMetadataAsString),
-        isHidden: isHidden ?? false,
+        isHidden: Value(isHidden ?? false),
       );
 
   /// Returns the action performed on the folder that lead to the new revision.

diff --git a/lib/models/tables/file_entries.drift b/lib/models/tables/file_entries.drift
@@ -18,7 +18,7 @@ CREATE TABLE file_entries (
     customJsonMetadata TEXT,
     customGQLTags TEXT,
 
-    isHidden BOOLEAN NOT NULL,
+    isHidden BOOLEAN NOT NULL DEFAULT FALSE,
 
     dateCreated DATETIME NOT NULL DEFAULT (strftime('%s','now')),
     lastUpdated DATETIME NOT NULL DEFAULT (strftime('%s','now')),

diff --git a/lib/models/tables/file_revisions.drift b/lib/models/tables/file_revisions.drift
@@ -25,7 +25,7 @@ CREATE TABLE file_revisions (
 
     pinnedDataOwnerAddress TEXT,
 
-    isHidden BOOLEAN NOT NULL,
+    isHidden BOOLEAN NOT NULL DEFAULT FALSE,
 
     PRIMARY KEY (fileId, driveId, dateCreated),
     FOREIGN KEY (metadataTxId) REFERENCES network_transactions(id),

diff --git a/lib/models/tables/folder_entries.drift b/lib/models/tables/folder_entries.drift
@@ -13,7 +13,7 @@ CREATE TABLE folder_entries (
     customJsonMetadata TEXT,
     customGQLTags TEXT,
 
-    isHidden BOOLEAN NOT NULL,
+    isHidden BOOLEAN NOT NULL DEFAULT FALSE,
 
     PRIMARY KEY (id, driveId)
 ) As FolderEntry;
diff --git a/lib/models/tables/folder_revisions.drift b/lib/models/tables/folder_revisions.drift
@@ -16,7 +16,7 @@ CREATE TABLE folder_revisions (
     customJsonMetadata TEXT,
     customGQLTags TEXT,
 
-    isHidden BOOLEAN NOT NULL,
+    isHidden BOOLEAN NOT NULL DEFAULT FALSE,
 
     PRIMARY KEY (folderId, driveId, dateCreated),
     FOREIGN KEY (metadataTxId) REFERENCES network_transactions(id)

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -3,7 +3,7 @@ description: Secure, permanent storage
 
 publish_to: 'none'
 
-version: 2.33.0
+version: 2.33.1
 
 environment:
   sdk: '>=3.0.2 <4.0.0'

diff --git a/test/blocs/fs_entry_move_bloc_test.dart b/test/blocs/fs_entry_move_bloc_test.dart
@@ -69,23 +69,23 @@ void main() {
             driveId: driveId,
             name: 'fake-drive-name',
             path: '',
-            isHidden: false,
+            isHidden: const Value(false),
           ),
           FolderEntriesCompanion.insert(
             id: nestedFolderId,
             driveId: driveId,
             parentFolderId: Value(rootFolderId),
             name: nestedFolderId,
             path: '/$nestedFolderId',
-            isHidden: false,
+            isHidden: const Value(false),
           ),
           FolderEntriesCompanion.insert(
             id: conflictTestFolderId,
             driveId: driveId,
             parentFolderId: Value(rootFolderId),
             name: conflictTestFolderId,
             path: '/$conflictTestFolderId',
-            isHidden: false,
+            isHidden: const Value(false),
           ),
         ]);
         // Insert fake files
@@ -107,7 +107,7 @@ void main() {
                   dateCreated: Value(defaultDate),
                   lastModifiedDate: defaultDate,
                   dataContentType: const Value(''),
-                  isHidden: false,
+                  isHidden: const Value(false),
                 );
               },
             ),
@@ -126,7 +126,7 @@ void main() {
                   dateCreated: Value(defaultDate),
                   lastModifiedDate: defaultDate,
                   dataContentType: const Value(''),
-                  isHidden: false,
+                  isHidden: const Value(false),
                 );
               },
             ),
@@ -152,7 +152,7 @@ void main() {
                   dateCreated: Value(defaultDate),
                   lastModifiedDate: defaultDate,
                   dataContentType: const Value(''),
-                  isHidden: false,
+                  isHidden: const Value(false),
                 );
               },
             ),
@@ -172,7 +172,7 @@ void main() {
                   dateCreated: Value(defaultDate),
                   lastModifiedDate: defaultDate,
                   dataContentType: const Value(''),
-                  isHidden: false,
+                  isHidden: const Value(false),
                 );
               },
             ),

diff --git a/test/test_utils/utils.dart b/test/test_utils/utils.dart
@@ -66,15 +66,15 @@ Future<void> addTestFilesToDb(
           driveId: driveId,
           name: 'fake-drive-name',
           path: '',
-          isHidden: false,
+          isHidden: const Value(false),
         ),
         FolderEntriesCompanion.insert(
           id: nestedFolderId,
           driveId: driveId,
           parentFolderId: Value(rootFolderId),
           name: nestedFolderId,
           path: '/$nestedFolderId',
-          isHidden: false,
+          isHidden: const Value(false),
         ),
         ...List.generate(
           emptyNestedFolderCount,
@@ -86,7 +86,7 @@ Future<void> addTestFilesToDb(
               parentFolderId: Value(rootFolderId),
               name: folderId,
               path: '/$folderId',
-              isHidden: false,
+              isHidden: const Value(false),
             );
           },
         )..shuffle(Random(0)),
@@ -111,7 +111,7 @@ Future<void> addTestFilesToDb(
               dateCreated: Value(defaultDate),
               lastModifiedDate: defaultDate,
               dataContentType: const Value(''),
-              isHidden: false,
+              isHidden: const Value(false),
             );
           },
         )..shuffle(Random(0)),
@@ -130,7 +130,7 @@ Future<void> addTestFilesToDb(
               dateCreated: Value(defaultDate),
               lastModifiedDate: defaultDate,
               dataContentType: const Value(''),
-              isHidden: false,
+              isHidden: const Value(false),
             );
           },
         )..shuffle(Random(0)),
@@ -156,7 +156,7 @@ Future<void> addTestFilesToDb(
               dateCreated: Value(defaultDate),
               lastModifiedDate: defaultDate,
               dataContentType: const Value(''),
-              isHidden: false,
+              isHidden: const Value(false),
             );
           },
         )..shuffle(Random(0)),
@@ -176,7 +176,7 @@ Future<void> addTestFilesToDb(
               dateCreated: Value(defaultDate),
               lastModifiedDate: defaultDate,
               dataContentType: const Value(''),
-              isHidden: false,
+              isHidden: const Value(false),
             );
           },
         )..shuffle(Random(0)),