fix #231

lib/src/database/daos/messages_dao.dart

@@ -210,6 +210,15 @@ class MessagesDao extends DatabaseAccessor<TwonlyDatabase>
         .go();
   }
 
+  Future deleteMessagesByContactIdAndOtherMessageId(
+      int contactId, int messageOtherId) {
+    return (delete(messages)
+          ..where((t) =>
+              t.contactId.equals(contactId) &
+              t.messageOtherId.equals(messageOtherId)))
+        .go();
+  }
+
   Future deleteMessagesByMessageId(int messageId) {
     return (delete(messages)..where((t) => t.messageId.equals(messageId))).go();
   }

lib/src/database/tables/media_uploads_table.dart

@@ -2,14 +2,6 @@ import 'dart:convert';
 import 'package:drift/drift.dart';
 
 enum UploadState {
-  // legacy
-  addedToMessagesDb,
-  isCompressed,
-  isEncrypted,
-  hasUploadToken,
-  isUploaded,
-  // ^^ legacy  ^^
-
   pending,
   readyToUpload,
   uploadTaskStarted,
@@ -29,17 +21,8 @@ class MediaUploads extends Table {
   /// exists in UploadState.addedToMessagesDb
   TextColumn get messageIds => text().map(IntListTypeConverter()).nullable()();
 
-  /// exsists in UploadState.isEncrypted
   TextColumn get encryptionData =>
       text().map(MediaEncryptionDataConverter()).nullable()();
-
-  /// exsists in UploadState.hasUploadToken
-  TextColumn get uploadTokens =>
-      text().map(MediaUploadTokensConverter()).nullable()();
-
-  /// exists in UploadState.addedToMessagesDb
-  TextColumn get alreadyNotified =>
-      text().map(IntListTypeConverter()).withDefault(Constant("[]"))();
 }
 
 // --- state ----
@@ -105,29 +88,6 @@ class MediaEncryptionData {
   }
 }
 
-class MediaUploadTokens {
-  late List<int> uploadToken;
-  late List<List<int>> downloadTokens;
-
-  MediaUploadTokens();
-
-  Map<String, dynamic> toJson() {
-    return {
-      'uploadToken': uploadToken,
-      'downloadTokens': downloadTokens,
-    };
-  }
-
-  factory MediaUploadTokens.fromJson(Map<String, dynamic> json) {
-    MediaUploadTokens state = MediaUploadTokens();
-    state.uploadToken = List<int>.from(json['uploadToken']);
-    state.downloadTokens = List<List<int>>.from(
-      json['downloadTokens'].map((token) => List<int>.from(token)),
-    );
-    return state;
-  }
-}
-
 // --- converters ----
 
 class IntListTypeConverter extends TypeConverter<List<int>, String> {
@@ -193,29 +153,3 @@ class MediaEncryptionDataConverter
     return value.toJson();
   }
 }
-
-class MediaUploadTokensConverter
-    extends TypeConverter<MediaUploadTokens, String>
-    with JsonTypeConverter2<MediaUploadTokens, String, Map<String, Object?>> {
-  const MediaUploadTokensConverter();
-
-  @override
-  MediaUploadTokens fromSql(String fromDb) {
-    return fromJson(json.decode(fromDb) as Map<String, dynamic>);
-  }
-
-  @override
-  String toSql(MediaUploadTokens value) {
-    return json.encode(toJson(value));
-  }
-
-  @override
-  MediaUploadTokens fromJson(Map<String, Object?> json) {
-    return MediaUploadTokens.fromJson(json);
-  }
-
-  @override
-  Map<String, Object?> toJson(MediaUploadTokens value) {
-    return value.toJson();
-  }
-}

lib/src/database/tables/messages_table.dart

@@ -25,6 +25,12 @@ enum DownloadState {
   downloaded,
 }
 
+enum MediaRetransmitting {
+  none,
+  requested,
+  retransmitted,
+}
+
 @DataClassName('Message')
 class Messages extends Table {
   IntColumn get contactId => integer().references(Contacts, #userId)();
@@ -48,6 +54,8 @@ class Messages extends Table {
       boolean().withDefault(Constant(false))();
 
   BoolColumn get errorWhileSending => boolean().withDefault(Constant(false))();
+  TextColumn get mediaRetransmissionState => textEnum<MediaRetransmitting>()
+      .withDefault(Constant(MediaRetransmitting.none.name))();
 
   TextColumn get kind => textEnum<MessageKind>()();
   TextColumn get contentJson => text().nullable()();

lib/src/database/twonly_database.dart

@@ -54,7 +54,7 @@ class TwonlyDatabase extends _$TwonlyDatabase {
   TwonlyDatabase.forTesting(DatabaseConnection super.connection);
 
   @override
-  int get schemaVersion => 14;
+  int get schemaVersion => 15;
 
   static QueryExecutor _openConnection() {
     return driftDatabase(
@@ -81,7 +81,7 @@ class TwonlyDatabase extends _$TwonlyDatabase {
               schema.contacts, schema.contacts.deleteMessagesAfterXMinutes);
         },
         from3To4: (m, schema) async {
-          m.createTable(mediaUploads);
+          m.createTable(schema.mediaUploads);
           await m.alterTable(TableMigration(
             schema.mediaUploads,
             columnTransformer: {
@@ -115,12 +115,12 @@ class TwonlyDatabase extends _$TwonlyDatabase {
           ));
         },
         from9To10: (m, schema) async {
-          m.createTable(signalContactPreKeys);
+          m.createTable(schema.signalContactPreKeys);
-          m.createTable(signalContactSignedPreKeys);
+          m.createTable(schema.signalContactSignedPreKeys);
           m.addColumn(schema.contacts, schema.contacts.deleted);
         },
         from10To11: (m, schema) async {
-          m.createTable(messageRetransmissions);
+          m.createTable(schema.messageRetransmissions);
         },
         from11To12: (m, schema) async {
           m.addColumn(schema.messageRetransmissions,
@@ -134,6 +134,12 @@ class TwonlyDatabase extends _$TwonlyDatabase {
           m.addColumn(schema.messageRetransmissions,
               schema.messageRetransmissions.encryptedHash);
         },
+        from14To15: (m, schema) async {
+          m.dropColumn(schema.mediaUploads, "upload_tokens");
+          m.dropColumn(schema.mediaUploads, "already_notified");
+          m.addColumn(
+              schema.messages, schema.messages.mediaRetransmissionState);
+        },
       ),
     );
   }

lib/src/database/twonly_database.g.dart

@@ -1199,6 +1199,15 @@ class $MessagesTable extends Messages with TableInfo<$MessagesTable, Message> {
           'CHECK ("error_while_sending" IN (0, 1))'),
       defaultValue: Constant(false));
   @override
+  late final GeneratedColumnWithTypeConverter<MediaRetransmitting, String>
+      mediaRetransmissionState = GeneratedColumn<String>(
+              'media_retransmission_state', aliasedName, false,
+              type: DriftSqlType.string,
+              requiredDuringInsert: false,
+              defaultValue: Constant(MediaRetransmitting.none.name))
+          .withConverter<MediaRetransmitting>(
+              $MessagesTable.$convertermediaRetransmissionState);
+  @override
   late final GeneratedColumnWithTypeConverter<MessageKind, String> kind =
       GeneratedColumn<String>('kind', aliasedName, false,
               type: DriftSqlType.string, requiredDuringInsert: true)
@@ -1244,6 +1253,7 @@ class $MessagesTable extends Messages with TableInfo<$MessagesTable, Message> {
         downloadState,
         acknowledgeByServer,
         errorWhileSending,
+        mediaRetransmissionState,
         kind,
         contentJson,
         openedAt,
@@ -1378,6 +1388,10 @@ class $MessagesTable extends Messages with TableInfo<$MessagesTable, Message> {
           DriftSqlType.bool, data['${effectivePrefix}acknowledge_by_server'])!,
       errorWhileSending: attachedDatabase.typeMapping.read(
           DriftSqlType.bool, data['${effectivePrefix}error_while_sending'])!,
+      mediaRetransmissionState: $MessagesTable
+          .$convertermediaRetransmissionState
+          .fromSql(attachedDatabase.typeMapping.read(DriftSqlType.string,
+              data['${effectivePrefix}media_retransmission_state'])!),
       kind: $MessagesTable.$converterkind.fromSql(attachedDatabase.typeMapping
           .read(DriftSqlType.string, data['${effectivePrefix}kind'])!),
       contentJson: attachedDatabase.typeMapping
@@ -1398,6 +1412,9 @@ class $MessagesTable extends Messages with TableInfo<$MessagesTable, Message> {
 
   static JsonTypeConverter2<DownloadState, int, int> $converterdownloadState =
       const EnumIndexConverter<DownloadState>(DownloadState.values);
+  static JsonTypeConverter2<MediaRetransmitting, String, String>
+      $convertermediaRetransmissionState =
+      const EnumNameConverter<MediaRetransmitting>(MediaRetransmitting.values);
   static JsonTypeConverter2<MessageKind, String, String> $converterkind =
       const EnumNameConverter<MessageKind>(MessageKind.values);
 }
@@ -1415,6 +1432,7 @@ class Message extends DataClass implements Insertable<Message> {
   final DownloadState downloadState;
   final bool acknowledgeByServer;
   final bool errorWhileSending;
+  final MediaRetransmitting mediaRetransmissionState;
   final MessageKind kind;
   final String? contentJson;
   final DateTime? openedAt;
@@ -1433,6 +1451,7 @@ class Message extends DataClass implements Insertable<Message> {
       required this.downloadState,
       required this.acknowledgeByServer,
       required this.errorWhileSending,
+      required this.mediaRetransmissionState,
       required this.kind,
       this.contentJson,
       this.openedAt,
@@ -1467,6 +1486,11 @@ class Message extends DataClass implements Insertable<Message> {
     }
     map['acknowledge_by_server'] = Variable<bool>(acknowledgeByServer);
     map['error_while_sending'] = Variable<bool>(errorWhileSending);
+    {
+      map['media_retransmission_state'] = Variable<String>($MessagesTable
+          .$convertermediaRetransmissionState
+          .toSql(mediaRetransmissionState));
+    }
     {
       map['kind'] = Variable<String>($MessagesTable.$converterkind.toSql(kind));
     }
@@ -1505,6 +1529,7 @@ class Message extends DataClass implements Insertable<Message> {
       downloadState: Value(downloadState),
       acknowledgeByServer: Value(acknowledgeByServer),
       errorWhileSending: Value(errorWhileSending),
+      mediaRetransmissionState: Value(mediaRetransmissionState),
       kind: Value(kind),
       contentJson: contentJson == null && nullToAbsent
           ? const Value.absent()
@@ -1537,6 +1562,9 @@ class Message extends DataClass implements Insertable<Message> {
       acknowledgeByServer:
           serializer.fromJson<bool>(json['acknowledgeByServer']),
       errorWhileSending: serializer.fromJson<bool>(json['errorWhileSending']),
+      mediaRetransmissionState:
+          $MessagesTable.$convertermediaRetransmissionState.fromJson(
+              serializer.fromJson<String>(json['mediaRetransmissionState'])),
       kind: $MessagesTable.$converterkind
           .fromJson(serializer.fromJson<String>(json['kind'])),
       contentJson: serializer.fromJson<String?>(json['contentJson']),
@@ -1563,6 +1591,9 @@ class Message extends DataClass implements Insertable<Message> {
           $MessagesTable.$converterdownloadState.toJson(downloadState)),
       'acknowledgeByServer': serializer.toJson<bool>(acknowledgeByServer),
       'errorWhileSending': serializer.toJson<bool>(errorWhileSending),
+      'mediaRetransmissionState': serializer.toJson<String>($MessagesTable
+          .$convertermediaRetransmissionState
+          .toJson(mediaRetransmissionState)),
       'kind':
           serializer.toJson<String>($MessagesTable.$converterkind.toJson(kind)),
       'contentJson': serializer.toJson<String?>(contentJson),
@@ -1585,6 +1616,7 @@ class Message extends DataClass implements Insertable<Message> {
           DownloadState? downloadState,
           bool? acknowledgeByServer,
           bool? errorWhileSending,
+          MediaRetransmitting? mediaRetransmissionState,
           MessageKind? kind,
           Value<String?> contentJson = const Value.absent(),
           Value<DateTime?> openedAt = const Value.absent(),
@@ -1611,6 +1643,8 @@ class Message extends DataClass implements Insertable<Message> {
         downloadState: downloadState ?? this.downloadState,
         acknowledgeByServer: acknowledgeByServer ?? this.acknowledgeByServer,
         errorWhileSending: errorWhileSending ?? this.errorWhileSending,
+        mediaRetransmissionState:
+            mediaRetransmissionState ?? this.mediaRetransmissionState,
         kind: kind ?? this.kind,
         contentJson: contentJson.present ? contentJson.value : this.contentJson,
         openedAt: openedAt.present ? openedAt.value : this.openedAt,
@@ -1650,6 +1684,9 @@ class Message extends DataClass implements Insertable<Message> {
       errorWhileSending: data.errorWhileSending.present
           ? data.errorWhileSending.value
           : this.errorWhileSending,
+      mediaRetransmissionState: data.mediaRetransmissionState.present
+          ? data.mediaRetransmissionState.value
+          : this.mediaRetransmissionState,
       kind: data.kind.present ? data.kind.value : this.kind,
       contentJson:
           data.contentJson.present ? data.contentJson.value : this.contentJson,
@@ -1674,6 +1711,7 @@ class Message extends DataClass implements Insertable<Message> {
           ..write('downloadState: $downloadState, ')
           ..write('acknowledgeByServer: $acknowledgeByServer, ')
           ..write('errorWhileSending: $errorWhileSending, ')
+          ..write('mediaRetransmissionState: $mediaRetransmissionState, ')
           ..write('kind: $kind, ')
           ..write('contentJson: $contentJson, ')
           ..write('openedAt: $openedAt, ')
@@ -1697,6 +1735,7 @@ class Message extends DataClass implements Insertable<Message> {
       downloadState,
       acknowledgeByServer,
       errorWhileSending,
+      mediaRetransmissionState,
       kind,
       contentJson,
       openedAt,
@@ -1718,6 +1757,7 @@ class Message extends DataClass implements Insertable<Message> {
           other.downloadState == this.downloadState &&
           other.acknowledgeByServer == this.acknowledgeByServer &&
           other.errorWhileSending == this.errorWhileSending &&
+          other.mediaRetransmissionState == this.mediaRetransmissionState &&
           other.kind == this.kind &&
           other.contentJson == this.contentJson &&
           other.openedAt == this.openedAt &&
@@ -1738,6 +1778,7 @@ class MessagesCompanion extends UpdateCompanion<Message> {
   final Value<DownloadState> downloadState;
   final Value<bool> acknowledgeByServer;
   final Value<bool> errorWhileSending;
+  final Value<MediaRetransmitting> mediaRetransmissionState;
   final Value<MessageKind> kind;
   final Value<String?> contentJson;
   final Value<DateTime?> openedAt;
@@ -1756,6 +1797,7 @@ class MessagesCompanion extends UpdateCompanion<Message> {
     this.downloadState = const Value.absent(),
     this.acknowledgeByServer = const Value.absent(),
     this.errorWhileSending = const Value.absent(),
+    this.mediaRetransmissionState = const Value.absent(),
     this.kind = const Value.absent(),
     this.contentJson = const Value.absent(),
     this.openedAt = const Value.absent(),
@@ -1775,6 +1817,7 @@ class MessagesCompanion extends UpdateCompanion<Message> {
     this.downloadState = const Value.absent(),
     this.acknowledgeByServer = const Value.absent(),
     this.errorWhileSending = const Value.absent(),
+    this.mediaRetransmissionState = const Value.absent(),
     required MessageKind kind,
     this.contentJson = const Value.absent(),
     this.openedAt = const Value.absent(),
@@ -1795,6 +1838,7 @@ class MessagesCompanion extends UpdateCompanion<Message> {
     Expression<int>? downloadState,
     Expression<bool>? acknowledgeByServer,
     Expression<bool>? errorWhileSending,
+    Expression<String>? mediaRetransmissionState,
     Expression<String>? kind,
     Expression<String>? contentJson,
     Expression<DateTime>? openedAt,
@@ -1817,6 +1861,8 @@ class MessagesCompanion extends UpdateCompanion<Message> {
       if (acknowledgeByServer != null)
         'acknowledge_by_server': acknowledgeByServer,
       if (errorWhileSending != null) 'error_while_sending': errorWhileSending,
+      if (mediaRetransmissionState != null)
+        'media_retransmission_state': mediaRetransmissionState,
       if (kind != null) 'kind': kind,
       if (contentJson != null) 'content_json': contentJson,
       if (openedAt != null) 'opened_at': openedAt,
@@ -1838,6 +1884,7 @@ class MessagesCompanion extends UpdateCompanion<Message> {
       Value<DownloadState>? downloadState,
       Value<bool>? acknowledgeByServer,
       Value<bool>? errorWhileSending,
+      Value<MediaRetransmitting>? mediaRetransmissionState,
       Value<MessageKind>? kind,
       Value<String?>? contentJson,
       Value<DateTime?>? openedAt,
@@ -1857,6 +1904,8 @@ class MessagesCompanion extends UpdateCompanion<Message> {
       downloadState: downloadState ?? this.downloadState,
       acknowledgeByServer: acknowledgeByServer ?? this.acknowledgeByServer,
       errorWhileSending: errorWhileSending ?? this.errorWhileSending,
+      mediaRetransmissionState:
+          mediaRetransmissionState ?? this.mediaRetransmissionState,
       kind: kind ?? this.kind,
       contentJson: contentJson ?? this.contentJson,
       openedAt: openedAt ?? this.openedAt,
@@ -1906,6 +1955,11 @@ class MessagesCompanion extends UpdateCompanion<Message> {
     if (errorWhileSending.present) {
       map['error_while_sending'] = Variable<bool>(errorWhileSending.value);
     }
+    if (mediaRetransmissionState.present) {
+      map['media_retransmission_state'] = Variable<String>($MessagesTable
+          .$convertermediaRetransmissionState
+          .toSql(mediaRetransmissionState.value));
+    }
     if (kind.present) {
       map['kind'] =
           Variable<String>($MessagesTable.$converterkind.toSql(kind.value));
@@ -1940,6 +1994,7 @@ class MessagesCompanion extends UpdateCompanion<Message> {
           ..write('downloadState: $downloadState, ')
           ..write('acknowledgeByServer: $acknowledgeByServer, ')
           ..write('errorWhileSending: $errorWhileSending, ')
+          ..write('mediaRetransmissionState: $mediaRetransmissionState, ')
           ..write('kind: $kind, ')
           ..write('contentJson: $contentJson, ')
           ..write('openedAt: $openedAt, ')
@@ -1992,30 +2047,8 @@ class $MediaUploadsTable extends MediaUploads
           .withConverter<MediaEncryptionData?>(
               $MediaUploadsTable.$converterencryptionDatan);
   @override
-  late final GeneratedColumnWithTypeConverter<MediaUploadTokens?, String>
+  List<GeneratedColumn> get $columns =>
-      uploadTokens = GeneratedColumn<String>('upload_tokens', aliasedName, true,
+      [mediaUploadId, state, metadata, messageIds, encryptionData];
-              type: DriftSqlType.string, requiredDuringInsert: false)
-          .withConverter<MediaUploadTokens?>(
-              $MediaUploadsTable.$converteruploadTokensn);
-  @override
-  late final GeneratedColumnWithTypeConverter<List<int>, String>
-      alreadyNotified = GeneratedColumn<String>(
-              'already_notified', aliasedName, false,
-              type: DriftSqlType.string,
-              requiredDuringInsert: false,
-              defaultValue: Constant("[]"))
-          .withConverter<List<int>>(
-              $MediaUploadsTable.$converteralreadyNotified);
-  @override
-  List<GeneratedColumn> get $columns => [
-        mediaUploadId,
-        state,
-        metadata,
-        messageIds,
-        encryptionData,
-        uploadTokens,
-        alreadyNotified
-      ];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -2055,12 +2088,6 @@ class $MediaUploadsTable extends MediaUploads
       encryptionData: $MediaUploadsTable.$converterencryptionDatan.fromSql(
           attachedDatabase.typeMapping.read(
               DriftSqlType.string, data['${effectivePrefix}encryption_data'])),
-      uploadTokens: $MediaUploadsTable.$converteruploadTokensn.fromSql(
-          attachedDatabase.typeMapping.read(
-              DriftSqlType.string, data['${effectivePrefix}upload_tokens'])),
-      alreadyNotified: $MediaUploadsTable.$converteralreadyNotified.fromSql(
-          attachedDatabase.typeMapping.read(DriftSqlType.string,
-              data['${effectivePrefix}already_notified'])!),
     );
   }
 
@@ -2085,13 +2112,6 @@ class $MediaUploadsTable extends MediaUploads
   static JsonTypeConverter2<MediaEncryptionData?, String?,
           Map<String, Object?>?> $converterencryptionDatan =
       JsonTypeConverter2.asNullable($converterencryptionData);
-  static JsonTypeConverter2<MediaUploadTokens, String, Map<String, Object?>>
-      $converteruploadTokens = MediaUploadTokensConverter();
-  static JsonTypeConverter2<MediaUploadTokens?, String?, Map<String, Object?>?>
-      $converteruploadTokensn =
-      JsonTypeConverter2.asNullable($converteruploadTokens);
-  static TypeConverter<List<int>, String> $converteralreadyNotified =
-      IntListTypeConverter();
 }
 
 class MediaUpload extends DataClass implements Insertable<MediaUpload> {
@@ -2101,23 +2121,13 @@ class MediaUpload extends DataClass implements Insertable<MediaUpload> {
 
   /// exists in UploadState.addedToMessagesDb
   final List<int>? messageIds;
-
-  /// exsists in UploadState.isEncrypted
   final MediaEncryptionData? encryptionData;
-
-  /// exsists in UploadState.hasUploadToken
-  final MediaUploadTokens? uploadTokens;
-
-  /// exists in UploadState.addedToMessagesDb
-  final List<int> alreadyNotified;
   const MediaUpload(
       {required this.mediaUploadId,
       required this.state,
       this.metadata,
       this.messageIds,
-      this.encryptionData,
+      this.encryptionData});
-      this.uploadTokens,
-      required this.alreadyNotified});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
@@ -2138,14 +2148,6 @@ class MediaUpload extends DataClass implements Insertable<MediaUpload> {
       map['encryption_data'] = Variable<String>(
           $MediaUploadsTable.$converterencryptionDatan.toSql(encryptionData));
     }
-    if (!nullToAbsent || uploadTokens != null) {
-      map['upload_tokens'] = Variable<String>(
-          $MediaUploadsTable.$converteruploadTokensn.toSql(uploadTokens));
-    }
-    {
-      map['already_notified'] = Variable<String>(
-          $MediaUploadsTable.$converteralreadyNotified.toSql(alreadyNotified));
-    }
     return map;
   }
 
@@ -2162,10 +2164,6 @@ class MediaUpload extends DataClass implements Insertable<MediaUpload> {
       encryptionData: encryptionData == null && nullToAbsent
           ? const Value.absent()
           : Value(encryptionData),
-      uploadTokens: uploadTokens == null && nullToAbsent
-          ? const Value.absent()
-          : Value(uploadTokens),
-      alreadyNotified: Value(alreadyNotified),
     );
   }
 
@@ -2181,9 +2179,6 @@ class MediaUpload extends DataClass implements Insertable<MediaUpload> {
       messageIds: serializer.fromJson<List<int>?>(json['messageIds']),
       encryptionData: $MediaUploadsTable.$converterencryptionDatan.fromJson(
           serializer.fromJson<Map<String, Object?>?>(json['encryptionData'])),
-      uploadTokens: $MediaUploadsTable.$converteruploadTokensn.fromJson(
-          serializer.fromJson<Map<String, Object?>?>(json['uploadTokens'])),
-      alreadyNotified: serializer.fromJson<List<int>>(json['alreadyNotified']),
     );
   }
   @override
@@ -2198,9 +2193,6 @@ class MediaUpload extends DataClass implements Insertable<MediaUpload> {
       'messageIds': serializer.toJson<List<int>?>(messageIds),
       'encryptionData': serializer.toJson<Map<String, Object?>?>(
           $MediaUploadsTable.$converterencryptionDatan.toJson(encryptionData)),
-      'uploadTokens': serializer.toJson<Map<String, Object?>?>(
-          $MediaUploadsTable.$converteruploadTokensn.toJson(uploadTokens)),
-      'alreadyNotified': serializer.toJson<List<int>>(alreadyNotified),
     };
   }
 
@@ -2209,9 +2201,7 @@ class MediaUpload extends DataClass implements Insertable<MediaUpload> {
           UploadState? state,
           Value<MediaUploadMetadata?> metadata = const Value.absent(),
           Value<List<int>?> messageIds = const Value.absent(),
-          Value<MediaEncryptionData?> encryptionData = const Value.absent(),
+          Value<MediaEncryptionData?> encryptionData = const Value.absent()}) =>
-          Value<MediaUploadTokens?> uploadTokens = const Value.absent(),
-          List<int>? alreadyNotified}) =>
       MediaUpload(
         mediaUploadId: mediaUploadId ?? this.mediaUploadId,
         state: state ?? this.state,
@@ -2219,9 +2209,6 @@ class MediaUpload extends DataClass implements Insertable<MediaUpload> {
         messageIds: messageIds.present ? messageIds.value : this.messageIds,
         encryptionData:
             encryptionData.present ? encryptionData.value : this.encryptionData,
-        uploadTokens:
-            uploadTokens.present ? uploadTokens.value : this.uploadTokens,
-        alreadyNotified: alreadyNotified ?? this.alreadyNotified,
       );
   MediaUpload copyWithCompanion(MediaUploadsCompanion data) {
     return MediaUpload(
@@ -2235,12 +2222,6 @@ class MediaUpload extends DataClass implements Insertable<MediaUpload> {
       encryptionData: data.encryptionData.present
           ? data.encryptionData.value
           : this.encryptionData,
-      uploadTokens: data.uploadTokens.present
-          ? data.uploadTokens.value
-          : this.uploadTokens,
-      alreadyNotified: data.alreadyNotified.present
-          ? data.alreadyNotified.value
-          : this.alreadyNotified,
     );
   }
 
@@ -2251,16 +2232,14 @@ class MediaUpload extends DataClass implements Insertable<MediaUpload> {
           ..write('state: $state, ')
           ..write('metadata: $metadata, ')
           ..write('messageIds: $messageIds, ')
-          ..write('encryptionData: $encryptionData, ')
+          ..write('encryptionData: $encryptionData')
-          ..write('uploadTokens: $uploadTokens, ')
-          ..write('alreadyNotified: $alreadyNotified')
           ..write(')'))
         .toString();
   }
 
   @override
-  int get hashCode => Object.hash(mediaUploadId, state, metadata, messageIds,
+  int get hashCode =>
-      encryptionData, uploadTokens, alreadyNotified);
+      Object.hash(mediaUploadId, state, metadata, messageIds, encryptionData);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -2269,9 +2248,7 @@ class MediaUpload extends DataClass implements Insertable<MediaUpload> {
           other.state == this.state &&
           other.metadata == this.metadata &&
           other.messageIds == this.messageIds &&
-          other.encryptionData == this.encryptionData &&
+          other.encryptionData == this.encryptionData);
-          other.uploadTokens == this.uploadTokens &&
-          other.alreadyNotified == this.alreadyNotified);
 }
 
 class MediaUploadsCompanion extends UpdateCompanion<MediaUpload> {
@@ -2280,16 +2257,12 @@ class MediaUploadsCompanion extends UpdateCompanion<MediaUpload> {
   final Value<MediaUploadMetadata?> metadata;
   final Value<List<int>?> messageIds;
   final Value<MediaEncryptionData?> encryptionData;
-  final Value<MediaUploadTokens?> uploadTokens;
-  final Value<List<int>> alreadyNotified;
   const MediaUploadsCompanion({
     this.mediaUploadId = const Value.absent(),
     this.state = const Value.absent(),
     this.metadata = const Value.absent(),
     this.messageIds = const Value.absent(),
     this.encryptionData = const Value.absent(),
-    this.uploadTokens = const Value.absent(),
-    this.alreadyNotified = const Value.absent(),
   });
   MediaUploadsCompanion.insert({
     this.mediaUploadId = const Value.absent(),
@@ -2297,8 +2270,6 @@ class MediaUploadsCompanion extends UpdateCompanion<MediaUpload> {
     this.metadata = const Value.absent(),
     this.messageIds = const Value.absent(),
     this.encryptionData = const Value.absent(),
-    this.uploadTokens = const Value.absent(),
-    this.alreadyNotified = const Value.absent(),
   });
   static Insertable<MediaUpload> custom({
     Expression<int>? mediaUploadId,
@@ -2306,8 +2277,6 @@ class MediaUploadsCompanion extends UpdateCompanion<MediaUpload> {
     Expression<String>? metadata,
     Expression<String>? messageIds,
     Expression<String>? encryptionData,
-    Expression<String>? uploadTokens,
-    Expression<String>? alreadyNotified,
   }) {
     return RawValuesInsertable({
       if (mediaUploadId != null) 'media_upload_id': mediaUploadId,
@@ -2315,8 +2284,6 @@ class MediaUploadsCompanion extends UpdateCompanion<MediaUpload> {
       if (metadata != null) 'metadata': metadata,
       if (messageIds != null) 'message_ids': messageIds,
       if (encryptionData != null) 'encryption_data': encryptionData,
-      if (uploadTokens != null) 'upload_tokens': uploadTokens,
-      if (alreadyNotified != null) 'already_notified': alreadyNotified,
     });
   }
 
@@ -2325,17 +2292,13 @@ class MediaUploadsCompanion extends UpdateCompanion<MediaUpload> {
       Value<UploadState>? state,
       Value<MediaUploadMetadata?>? metadata,
       Value<List<int>?>? messageIds,
-      Value<MediaEncryptionData?>? encryptionData,
+      Value<MediaEncryptionData?>? encryptionData}) {
-      Value<MediaUploadTokens?>? uploadTokens,
-      Value<List<int>>? alreadyNotified}) {
     return MediaUploadsCompanion(
       mediaUploadId: mediaUploadId ?? this.mediaUploadId,
       state: state ?? this.state,
       metadata: metadata ?? this.metadata,
       messageIds: messageIds ?? this.messageIds,
       encryptionData: encryptionData ?? this.encryptionData,
-      uploadTokens: uploadTokens ?? this.uploadTokens,
-      alreadyNotified: alreadyNotified ?? this.alreadyNotified,
     );
   }
 
@@ -2362,15 +2325,6 @@ class MediaUploadsCompanion extends UpdateCompanion<MediaUpload> {
           .$converterencryptionDatan
           .toSql(encryptionData.value));
     }
-    if (uploadTokens.present) {
-      map['upload_tokens'] = Variable<String>(
-          $MediaUploadsTable.$converteruploadTokensn.toSql(uploadTokens.value));
-    }
-    if (alreadyNotified.present) {
-      map['already_notified'] = Variable<String>($MediaUploadsTable
-          .$converteralreadyNotified
-          .toSql(alreadyNotified.value));
-    }
     return map;
   }
 
@@ -2381,9 +2335,7 @@ class MediaUploadsCompanion extends UpdateCompanion<MediaUpload> {
           ..write('state: $state, ')
           ..write('metadata: $metadata, ')
           ..write('messageIds: $messageIds, ')
-          ..write('encryptionData: $encryptionData, ')
+          ..write('encryptionData: $encryptionData')
-          ..write('uploadTokens: $uploadTokens, ')
-          ..write('alreadyNotified: $alreadyNotified')
           ..write(')'))
         .toString();
   }
@@ -5308,6 +5260,7 @@ typedef $$MessagesTableCreateCompanionBuilder = MessagesCompanion Function({
   Value<DownloadState> downloadState,
   Value<bool> acknowledgeByServer,
   Value<bool> errorWhileSending,
+  Value<MediaRetransmitting> mediaRetransmissionState,
   required MessageKind kind,
   Value<String?> contentJson,
   Value<DateTime?> openedAt,
@@ -5327,6 +5280,7 @@ typedef $$MessagesTableUpdateCompanionBuilder = MessagesCompanion Function({
   Value<DownloadState> downloadState,
   Value<bool> acknowledgeByServer,
   Value<bool> errorWhileSending,
+  Value<MediaRetransmitting> mediaRetransmissionState,
   Value<MessageKind> kind,
   Value<String?> contentJson,
   Value<DateTime?> openedAt,
@@ -5425,6 +5379,12 @@ class $$MessagesTableFilterComposer
       column: $table.errorWhileSending,
       builder: (column) => ColumnFilters(column));
 
+  ColumnWithTypeConverterFilters<MediaRetransmitting, MediaRetransmitting,
+          String>
+      get mediaRetransmissionState => $composableBuilder(
+          column: $table.mediaRetransmissionState,
+          builder: (column) => ColumnWithTypeConverterFilters(column));
+
   ColumnWithTypeConverterFilters<MessageKind, MessageKind, String> get kind =>
       $composableBuilder(
           column: $table.kind,
@@ -5537,6 +5497,10 @@ class $$MessagesTableOrderingComposer
       column: $table.errorWhileSending,
       builder: (column) => ColumnOrderings(column));
 
+  ColumnOrderings<String> get mediaRetransmissionState => $composableBuilder(
+      column: $table.mediaRetransmissionState,
+      builder: (column) => ColumnOrderings(column));
+
   ColumnOrderings<String> get kind => $composableBuilder(
       column: $table.kind, builder: (column) => ColumnOrderings(column));
 
@@ -5616,6 +5580,10 @@ class $$MessagesTableAnnotationComposer
   GeneratedColumn<bool> get errorWhileSending => $composableBuilder(
       column: $table.errorWhileSending, builder: (column) => column);
 
+  GeneratedColumnWithTypeConverter<MediaRetransmitting, String>
+      get mediaRetransmissionState => $composableBuilder(
+          column: $table.mediaRetransmissionState, builder: (column) => column);
+
   GeneratedColumnWithTypeConverter<MessageKind, String> get kind =>
       $composableBuilder(column: $table.kind, builder: (column) => column);
 
@@ -5710,6 +5678,8 @@ class $$MessagesTableTableManager extends RootTableManager<
             Value<DownloadState> downloadState = const Value.absent(),
             Value<bool> acknowledgeByServer = const Value.absent(),
             Value<bool> errorWhileSending = const Value.absent(),
+            Value<MediaRetransmitting> mediaRetransmissionState =
+                const Value.absent(),
             Value<MessageKind> kind = const Value.absent(),
             Value<String?> contentJson = const Value.absent(),
             Value<DateTime?> openedAt = const Value.absent(),
@@ -5729,6 +5699,7 @@ class $$MessagesTableTableManager extends RootTableManager<
             downloadState: downloadState,
             acknowledgeByServer: acknowledgeByServer,
             errorWhileSending: errorWhileSending,
+            mediaRetransmissionState: mediaRetransmissionState,
             kind: kind,
             contentJson: contentJson,
             openedAt: openedAt,
@@ -5748,6 +5719,8 @@ class $$MessagesTableTableManager extends RootTableManager<
             Value<DownloadState> downloadState = const Value.absent(),
             Value<bool> acknowledgeByServer = const Value.absent(),
             Value<bool> errorWhileSending = const Value.absent(),
+            Value<MediaRetransmitting> mediaRetransmissionState =
+                const Value.absent(),
             required MessageKind kind,
             Value<String?> contentJson = const Value.absent(),
             Value<DateTime?> openedAt = const Value.absent(),
@@ -5767,6 +5740,7 @@ class $$MessagesTableTableManager extends RootTableManager<
             downloadState: downloadState,
             acknowledgeByServer: acknowledgeByServer,
             errorWhileSending: errorWhileSending,
+            mediaRetransmissionState: mediaRetransmissionState,
             kind: kind,
             contentJson: contentJson,
             openedAt: openedAt,
@@ -5851,8 +5825,6 @@ typedef $$MediaUploadsTableCreateCompanionBuilder = MediaUploadsCompanion
   Value<MediaUploadMetadata?> metadata,
   Value<List<int>?> messageIds,
   Value<MediaEncryptionData?> encryptionData,
-  Value<MediaUploadTokens?> uploadTokens,
-  Value<List<int>> alreadyNotified,
 });
 typedef $$MediaUploadsTableUpdateCompanionBuilder = MediaUploadsCompanion
     Function({
@@ -5861,8 +5833,6 @@ typedef $$MediaUploadsTableUpdateCompanionBuilder = MediaUploadsCompanion
   Value<MediaUploadMetadata?> metadata,
   Value<List<int>?> messageIds,
   Value<MediaEncryptionData?> encryptionData,
-  Value<MediaUploadTokens?> uploadTokens,
-  Value<List<int>> alreadyNotified,
 });
 
 class $$MediaUploadsTableFilterComposer
@@ -5898,16 +5868,6 @@ class $$MediaUploadsTableFilterComposer
       get encryptionData => $composableBuilder(
           column: $table.encryptionData,
           builder: (column) => ColumnWithTypeConverterFilters(column));
-
-  ColumnWithTypeConverterFilters<MediaUploadTokens?, MediaUploadTokens, String>
-      get uploadTokens => $composableBuilder(
-          column: $table.uploadTokens,
-          builder: (column) => ColumnWithTypeConverterFilters(column));
-
-  ColumnWithTypeConverterFilters<List<int>, List<int>, String>
-      get alreadyNotified => $composableBuilder(
-          column: $table.alreadyNotified,
-          builder: (column) => ColumnWithTypeConverterFilters(column));
 }
 
 class $$MediaUploadsTableOrderingComposer
@@ -5935,14 +5895,6 @@ class $$MediaUploadsTableOrderingComposer
   ColumnOrderings<String> get encryptionData => $composableBuilder(
       column: $table.encryptionData,
       builder: (column) => ColumnOrderings(column));
-
-  ColumnOrderings<String> get uploadTokens => $composableBuilder(
-      column: $table.uploadTokens,
-      builder: (column) => ColumnOrderings(column));
-
-  ColumnOrderings<String> get alreadyNotified => $composableBuilder(
-      column: $table.alreadyNotified,
-      builder: (column) => ColumnOrderings(column));
 }
 
 class $$MediaUploadsTableAnnotationComposer
@@ -5970,14 +5922,6 @@ class $$MediaUploadsTableAnnotationComposer
   GeneratedColumnWithTypeConverter<MediaEncryptionData?, String>
       get encryptionData => $composableBuilder(
           column: $table.encryptionData, builder: (column) => column);
-
-  GeneratedColumnWithTypeConverter<MediaUploadTokens?, String>
-      get uploadTokens => $composableBuilder(
-          column: $table.uploadTokens, builder: (column) => column);
-
-  GeneratedColumnWithTypeConverter<List<int>, String> get alreadyNotified =>
-      $composableBuilder(
-          column: $table.alreadyNotified, builder: (column) => column);
 }
 
 class $$MediaUploadsTableTableManager extends RootTableManager<
@@ -6011,8 +5955,6 @@ class $$MediaUploadsTableTableManager extends RootTableManager<
             Value<MediaUploadMetadata?> metadata = const Value.absent(),
             Value<List<int>?> messageIds = const Value.absent(),
             Value<MediaEncryptionData?> encryptionData = const Value.absent(),
-            Value<MediaUploadTokens?> uploadTokens = const Value.absent(),
-            Value<List<int>> alreadyNotified = const Value.absent(),
           }) =>
               MediaUploadsCompanion(
             mediaUploadId: mediaUploadId,
@@ -6020,8 +5962,6 @@ class $$MediaUploadsTableTableManager extends RootTableManager<
             metadata: metadata,
             messageIds: messageIds,
             encryptionData: encryptionData,
-            uploadTokens: uploadTokens,
-            alreadyNotified: alreadyNotified,
           ),
           createCompanionCallback: ({
             Value<int> mediaUploadId = const Value.absent(),
@@ -6029,8 +5969,6 @@ class $$MediaUploadsTableTableManager extends RootTableManager<
             Value<MediaUploadMetadata?> metadata = const Value.absent(),
             Value<List<int>?> messageIds = const Value.absent(),
             Value<MediaEncryptionData?> encryptionData = const Value.absent(),
-            Value<MediaUploadTokens?> uploadTokens = const Value.absent(),
-            Value<List<int>> alreadyNotified = const Value.absent(),
           }) =>
               MediaUploadsCompanion.insert(
             mediaUploadId: mediaUploadId,
@@ -6038,8 +5976,6 @@ class $$MediaUploadsTableTableManager extends RootTableManager<
             metadata: metadata,
             messageIds: messageIds,
             encryptionData: encryptionData,
-            uploadTokens: uploadTokens,
-            alreadyNotified: alreadyNotified,
           ),
           withReferenceMapper: (p0) => p0
               .map((e) => (e.readTable(table), BaseReferences(db, table, e)))

lib/src/database/twonly_database.steps.dart

@@ -3206,6 +3206,297 @@ class Shape18 extends i0.VersionedTable {
 i1.GeneratedColumn<i2.Uint8List> _column_69(String aliasedName) =>
     i1.GeneratedColumn<i2.Uint8List>('encrypted_hash', aliasedName, true,
         type: i1.DriftSqlType.blob);
+
+final class Schema15 extends i0.VersionedSchema {
+  Schema15({required super.database}) : super(version: 15);
+  @override
+  late final List<i1.DatabaseSchemaEntity> entities = [
+    contacts,
+    messages,
+    mediaUploads,
+    mediaDownloads,
+    signalIdentityKeyStores,
+    signalPreKeyStores,
+    signalSenderKeyStores,
+    signalSessionStores,
+    signalContactPreKeys,
+    signalContactSignedPreKeys,
+    messageRetransmissions,
+  ];
+  late final Shape13 contacts = Shape13(
+      source: i0.VersionedTable(
+        entityName: 'contacts',
+        withoutRowId: false,
+        isStrict: false,
+        tableConstraints: [
+          'PRIMARY KEY(user_id)',
+        ],
+        columns: [
+          _column_0,
+          _column_1,
+          _column_2,
+          _column_3,
+          _column_4,
+          _column_5,
+          _column_6,
+          _column_7,
+          _column_8,
+          _column_9,
+          _column_39,
+          _column_53,
+          _column_57,
+          _column_54,
+          _column_40,
+          _column_10,
+          _column_11,
+          _column_12,
+          _column_13,
+          _column_14,
+          _column_55,
+          _column_15,
+          _column_16,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+  late final Shape19 messages = Shape19(
+      source: i0.VersionedTable(
+        entityName: 'messages',
+        withoutRowId: false,
+        isStrict: false,
+        tableConstraints: [],
+        columns: [
+          _column_17,
+          _column_18,
+          _column_19,
+          _column_48,
+          _column_49,
+          _column_20,
+          _column_21,
+          _column_22,
+          _column_52,
+          _column_23,
+          _column_24,
+          _column_25,
+          _column_70,
+          _column_26,
+          _column_27,
+          _column_28,
+          _column_29,
+          _column_30,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+  late final Shape20 mediaUploads = Shape20(
+      source: i0.VersionedTable(
+        entityName: 'media_uploads',
+        withoutRowId: false,
+        isStrict: false,
+        tableConstraints: [],
+        columns: [
+          _column_41,
+          _column_42,
+          _column_56,
+          _column_44,
+          _column_45,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+  late final Shape9 mediaDownloads = Shape9(
+      source: i0.VersionedTable(
+        entityName: 'media_downloads',
+        withoutRowId: false,
+        isStrict: false,
+        tableConstraints: [],
+        columns: [
+          _column_50,
+          _column_51,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+  late final Shape2 signalIdentityKeyStores = Shape2(
+      source: i0.VersionedTable(
+        entityName: 'signal_identity_key_stores',
+        withoutRowId: false,
+        isStrict: false,
+        tableConstraints: [
+          'PRIMARY KEY(device_id, name)',
+        ],
+        columns: [
+          _column_31,
+          _column_32,
+          _column_33,
+          _column_10,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+  late final Shape3 signalPreKeyStores = Shape3(
+      source: i0.VersionedTable(
+        entityName: 'signal_pre_key_stores',
+        withoutRowId: false,
+        isStrict: false,
+        tableConstraints: [
+          'PRIMARY KEY(pre_key_id)',
+        ],
+        columns: [
+          _column_34,
+          _column_35,
+          _column_10,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+  late final Shape4 signalSenderKeyStores = Shape4(
+      source: i0.VersionedTable(
+        entityName: 'signal_sender_key_stores',
+        withoutRowId: false,
+        isStrict: false,
+        tableConstraints: [
+          'PRIMARY KEY(sender_key_name)',
+        ],
+        columns: [
+          _column_36,
+          _column_37,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+  late final Shape5 signalSessionStores = Shape5(
+      source: i0.VersionedTable(
+        entityName: 'signal_session_stores',
+        withoutRowId: false,
+        isStrict: false,
+        tableConstraints: [
+          'PRIMARY KEY(device_id, name)',
+        ],
+        columns: [
+          _column_31,
+          _column_32,
+          _column_38,
+          _column_10,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+  late final Shape14 signalContactPreKeys = Shape14(
+      source: i0.VersionedTable(
+        entityName: 'signal_contact_pre_keys',
+        withoutRowId: false,
+        isStrict: false,
+        tableConstraints: [
+          'PRIMARY KEY(contact_id, pre_key_id)',
+        ],
+        columns: [
+          _column_58,
+          _column_34,
+          _column_35,
+          _column_10,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+  late final Shape15 signalContactSignedPreKeys = Shape15(
+      source: i0.VersionedTable(
+        entityName: 'signal_contact_signed_pre_keys',
+        withoutRowId: false,
+        isStrict: false,
+        tableConstraints: [
+          'PRIMARY KEY(contact_id)',
+        ],
+        columns: [
+          _column_58,
+          _column_59,
+          _column_60,
+          _column_61,
+          _column_10,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+  late final Shape18 messageRetransmissions = Shape18(
+      source: i0.VersionedTable(
+        entityName: 'message_retransmissions',
+        withoutRowId: false,
+        isStrict: false,
+        tableConstraints: [],
+        columns: [
+          _column_62,
+          _column_63,
+          _column_64,
+          _column_65,
+          _column_66,
+          _column_69,
+          _column_67,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+}
+
+class Shape19 extends i0.VersionedTable {
+  Shape19({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<int> get contactId =>
+      columnsByName['contact_id']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get messageId =>
+      columnsByName['message_id']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get messageOtherId =>
+      columnsByName['message_other_id']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get mediaUploadId =>
+      columnsByName['media_upload_id']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get mediaDownloadId =>
+      columnsByName['media_download_id']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get responseToMessageId =>
+      columnsByName['response_to_message_id']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get responseToOtherMessageId =>
+      columnsByName['response_to_other_message_id']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<bool> get acknowledgeByUser =>
+      columnsByName['acknowledge_by_user']! as i1.GeneratedColumn<bool>;
+  i1.GeneratedColumn<bool> get mediaStored =>
+      columnsByName['media_stored']! as i1.GeneratedColumn<bool>;
+  i1.GeneratedColumn<int> get downloadState =>
+      columnsByName['download_state']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<bool> get acknowledgeByServer =>
+      columnsByName['acknowledge_by_server']! as i1.GeneratedColumn<bool>;
+  i1.GeneratedColumn<bool> get errorWhileSending =>
+      columnsByName['error_while_sending']! as i1.GeneratedColumn<bool>;
+  i1.GeneratedColumn<String> get mediaRetransmissionState =>
+      columnsByName['media_retransmission_state']!
+          as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get kind =>
+      columnsByName['kind']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get contentJson =>
+      columnsByName['content_json']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<DateTime> get openedAt =>
+      columnsByName['opened_at']! as i1.GeneratedColumn<DateTime>;
+  i1.GeneratedColumn<DateTime> get sendAt =>
+      columnsByName['send_at']! as i1.GeneratedColumn<DateTime>;
+  i1.GeneratedColumn<DateTime> get updatedAt =>
+      columnsByName['updated_at']! as i1.GeneratedColumn<DateTime>;
+}
+
+i1.GeneratedColumn<String> _column_70(String aliasedName) =>
+    i1.GeneratedColumn<String>('media_retransmission_state', aliasedName, false,
+        type: i1.DriftSqlType.string,
+        defaultValue: const CustomExpression('\'none\''));
+
+class Shape20 extends i0.VersionedTable {
+  Shape20({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<int> get mediaUploadId =>
+      columnsByName['media_upload_id']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get state =>
+      columnsByName['state']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get metadata =>
+      columnsByName['metadata']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get messageIds =>
+      columnsByName['message_ids']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get encryptionData =>
+      columnsByName['encryption_data']! as i1.GeneratedColumn<String>;
+}
+
 i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
   required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3,
@@ -3220,6 +3511,7 @@ i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema12 schema) from11To12,
   required Future<void> Function(i1.Migrator m, Schema13 schema) from12To13,
   required Future<void> Function(i1.Migrator m, Schema14 schema) from13To14,
+  required Future<void> Function(i1.Migrator m, Schema15 schema) from14To15,
 }) {
   return (currentVersion, database) async {
     switch (currentVersion) {
@@ -3288,6 +3580,11 @@ i0.MigrationStepWithVersion migrationSteps({
         final migrator = i1.Migrator(database, schema);
         await from13To14(migrator, schema);
         return 14;
+      case 14:
+        final schema = Schema15(database: database);
+        final migrator = i1.Migrator(database, schema);
+        await from14To15(migrator, schema);
+        return 15;
       default:
         throw ArgumentError.value('Unknown migration from $currentVersion');
     }
@@ -3308,6 +3605,7 @@ i1.OnUpgrade stepByStep({
   required Future<void> Function(i1.Migrator m, Schema12 schema) from11To12,
   required Future<void> Function(i1.Migrator m, Schema13 schema) from12To13,
   required Future<void> Function(i1.Migrator m, Schema14 schema) from13To14,
+  required Future<void> Function(i1.Migrator m, Schema15 schema) from14To15,
 }) =>
     i0.VersionedSchema.stepByStepHelper(
         step: migrationSteps(
@@ -3324,4 +3622,5 @@ i1.OnUpgrade stepByStep({
       from11To12: from11To12,
       from12To13: from12To13,
       from13To14: from13To14,
+      from14To15: from14To15,
     ));

lib/src/localization/app_de.arb

@@ -327,5 +327,6 @@
     "inviteFriendsShareText": "Wechseln wir zu twonly: {url}",
     "appOutdated": "Deine Version von twonly ist veraltet.",
     "appOutdatedBtn": "Jetzt aktualisieren.",
-    "doubleClickToReopen": "Doppelklicken zum\nerneuten Öffnen."
+    "doubleClickToReopen": "Doppelklicken zum\nerneuten Öffnen.",
+    "retransmissionRequested": "Wird erneut versucht."
 }

lib/src/localization/app_en.arb

@@ -484,5 +484,6 @@
   "inviteFriendsShareText": "Let's switch to twonly: {url}",
   "appOutdated": "Your version of twonly is out of date.",
   "appOutdatedBtn": "Update Now",
-  "doubleClickToReopen": "Double-click\nto open again"
+  "doubleClickToReopen": "Double-click\nto open again",
+  "retransmissionRequested": "Retransmission requested"
 }

lib/src/localization/generated/app_localizations.dart

@@ -2005,6 +2005,12 @@ abstract class AppLocalizations {
   /// In en, this message translates to:
   /// **'Double-click\nto open again'**
   String get doubleClickToReopen;
+
+  /// No description provided for @retransmissionRequested.
+  ///
+  /// In en, this message translates to:
+  /// **'Retransmission requested'**
+  String get retransmissionRequested;
 }
 
 class _AppLocalizationsDelegate

lib/src/localization/generated/app_localizations_de.dart

@@ -1063,4 +1063,7 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get doubleClickToReopen => 'Doppelklicken zum\nerneuten Öffnen.';
+
+  @override
+  String get retransmissionRequested => 'Wird erneut versucht.';
 }

lib/src/localization/generated/app_localizations_en.dart

@@ -1057,4 +1057,7 @@ class AppLocalizationsEn extends AppLocalizations {
 
   @override
   String get doubleClickToReopen => 'Double-click\nto open again';
+
+  @override
+  String get retransmissionRequested => 'Retransmission requested';
 }

lib/src/model/json/message.dart

@@ -5,7 +5,7 @@ import 'package:twonly/src/utils/misc.dart';
 Color getMessageColorFromType(MessageContent content, BuildContext context) {
   Color color;
 
-  if (content is TextMessageContent || content is StoredMediaFileContent) {
+  if (content is TextMessageContent) {
     color = Colors.blueAccent;
   } else {
     if (content is MediaMessageContent) {
@@ -36,13 +36,15 @@ extension MessageKindExtension on MessageKind {
 class MessageJson {
   final MessageKind kind;
   final MessageContent? content;
-  final int? messageId;
+  final int? messageReceiverId;
+  final int? messageSenderId;
   int? retransId;
   DateTime timestamp;
 
   MessageJson({
     required this.kind,
-    this.messageId,
+    this.messageReceiverId,
+    this.messageSenderId,
     this.retransId,
     required this.content,
     required this.timestamp,
@@ -58,7 +60,8 @@ class MessageJson {
 
     return MessageJson(
       kind: kind,
-      messageId: (json['messageId'] as num?)?.toInt(),
+      messageReceiverId: (json['messageReceiverId'] as num?)?.toInt(),
+      messageSenderId: (json['messageSenderId'] as num?)?.toInt(),
       retransId: (json['retransId'] as num?)?.toInt(),
       content: MessageContent.fromJson(
           kind, json['content'] as Map<String, dynamic>),
@@ -69,7 +72,8 @@ class MessageJson {
   Map<String, dynamic> toJson() => <String, dynamic>{
         'kind': kind.name,
         'content': content?.toJson(),
-        'messageId': messageId,
+        'messageReceiverId': messageReceiverId,
+        'messageSenderId': messageSenderId,
         'retransId': retransId,
         'timestamp': timestamp.toUtc().millisecondsSinceEpoch,
       };
@@ -86,8 +90,6 @@ class MessageContent {
         return TextMessageContent.fromJson(json);
       case MessageKind.profileChange:
         return ProfileContent.fromJson(json);
-      case MessageKind.storedMediaFile:
-        return StoredMediaFileContent.fromJson(json);
       case MessageKind.pushKey:
         return PushKeyContent.fromJson(json);
       case MessageKind.reopenedMedia:
@@ -196,20 +198,6 @@ class TextMessageContent extends MessageContent {
   }
 }
 
-class StoredMediaFileContent extends MessageContent {
-  int messageId;
-  StoredMediaFileContent({required this.messageId});
-
-  static StoredMediaFileContent fromJson(Map json) {
-    return StoredMediaFileContent(messageId: json['messageId']);
-  }
-
-  @override
-  Map toJson() {
-    return {'messageId': messageId};
-  }
-}
-
 class ReopenedMediaFileContent extends MessageContent {
   int messageId;
   ReopenedMediaFileContent({required this.messageId});

lib/src/services/api/media_download.dart

@@ -81,7 +81,8 @@ Future handleDownloadStatusUpdate(TaskStatusUpdate update) async {
   bool failed = false;
 
   if (update.status == TaskStatus.failed ||
-      update.status == TaskStatus.canceled) {
+      update.status == TaskStatus.canceled ||
+      update.status == TaskStatus.notFound) {
     failed = true;
   } else if (update.status == TaskStatus.complete) {
     if (update.responseStatusCode == 200) {
@@ -89,10 +90,11 @@ Future handleDownloadStatusUpdate(TaskStatusUpdate update) async {
     } else {
       failed = true;
       Log.error(
-          "Got invalid response status code: ${update.responseStatusCode}");
+        "Got invalid response status code: ${update.responseStatusCode}",
+      );
     }
   } else {
-    Log.info("Got $update for $messageId");
+    Log.info("Got ${update.status} for $messageId");
     return;
   }
   await handleDownloadStatusUpdateInternal(messageId, failed);
@@ -213,19 +215,20 @@ Future<void> downloadFileFast(
   final String filePath = "${directory.path}/$filename";
 
   final response =
-      await http.get(Uri.parse(apiUrl)).timeout(Duration(seconds: 6));
+      await http.get(Uri.parse(apiUrl)).timeout(Duration(seconds: 10));
 
   if (response.statusCode == 200) {
     await File(filePath).writeAsBytes(response.bodyBytes);
-    Log.info('Download successful: $filePath');
+    Log.info('Fast Download successful: $filePath');
     await handleDownloadStatusUpdateInternal(messageId, false);
     return;
   } else {
-    if (response.statusCode == 404) {
+    if (response.statusCode == 404 || response.statusCode == 403) {
       await handleDownloadStatusUpdateInternal(messageId, true);
       return;
     }
-    throw Exception("Fast upload failed with status: ${response.statusCode}");
+    // can be tried again
+    throw Exception("Fast download failed with status: ${response.statusCode}");
   }
 }
 
@@ -248,16 +251,17 @@ Future handleEncryptedFile(int messageId) async {
   MediaMessageContent content =
       MediaMessageContent.fromJson(jsonDecode(msg.contentJson!));
 
-  final chacha20 = FlutterChacha20.poly1305Aead();
-  SecretKeyData secretKeyData = SecretKeyData(content.encryptionKey!);
-
-  SecretBox secretBox = SecretBox(
-    encryptedBytes,
-    nonce: content.encryptionNonce!,
-    mac: Mac(content.encryptionMac!),
-  );
-
   try {
+    final chacha20 = FlutterChacha20.poly1305Aead();
+    SecretKeyData secretKeyData = SecretKeyData(content.encryptionKey!);
+
+    SecretBox secretBox = SecretBox(
+      encryptedBytes,
+      nonce: content.encryptionNonce!,
+      mac: Mac(content.encryptionMac!),
+    );
+
+    // try {
     final plaintextBytes =
         await chacha20.decrypt(secretBox, secretKey: secretKeyData);
     var imageBytes = Uint8List.fromList(plaintextBytes);
@@ -269,11 +273,43 @@ Future handleEncryptedFile(int messageId) async {
     }
 
     await writeMediaFile(msg.messageId, "png", imageBytes);
+    // } catch (e) {
+    //   Log.error(
+    //       "could not decrypt the media file in the second try. reporting error to user: $e");
+    //   handleMediaError(msg);
+    //   return;
+    // }
   } catch (e) {
-    Log.error(
+    Log.error("$e");
-        "could not decrypt the media file in the second try. reporting error to user: $e");
+
-    handleMediaError(msg);
+    /// legacy support
-    return;
+    final chacha20 = Xchacha20.poly1305Aead();
+    SecretKeyData secretKeyData = SecretKeyData(content.encryptionKey!);
+
+    SecretBox secretBox = SecretBox(
+      encryptedBytes,
+      nonce: content.encryptionNonce!,
+      mac: Mac(content.encryptionMac!),
+    );
+
+    try {
+      final plaintextBytes =
+          await chacha20.decrypt(secretBox, secretKey: secretKeyData);
+      var imageBytes = Uint8List.fromList(plaintextBytes);
+
+      if (content.isVideo) {
+        final extractedBytes = extractUint8Lists(imageBytes);
+        imageBytes = extractedBytes[0];
+        await writeMediaFile(msg.messageId, "mp4", extractedBytes[1]);
+      }
+
+      await writeMediaFile(msg.messageId, "png", imageBytes);
+    } catch (e) {
+      Log.error(
+          "could not decrypt the media file in the second try. reporting error to user: $e");
+      handleMediaError(msg);
+      return;
+    }
   }
 
   await twonlyDB.messagesDao.updateMessageByMessageId(
@@ -281,6 +317,8 @@ Future handleEncryptedFile(int messageId) async {
     MessagesCompanion(downloadState: Value(DownloadState.downloaded)),
   );
 
+  Log.info("Download and decryption of ${msg.messageId} was successful");
+
   await deleteMediaFile(msg.messageId, "encrypted");
 
   apiService.downloadDone(content.downloadToken!);
@@ -367,6 +405,8 @@ Future<void> purgeMediaFiles(Directory directory) async {
                 );
 
                 DateTime oneDayAgo = DateTime.now().subtract(Duration(days: 1));
+                DateTime twoDaysAgo =
+                    DateTime.now().subtract(Duration(days: 1));
 
                 if (((message.openedAt == null ||
                         oneDayAgo.isBefore(message.openedAt!)) &&
@@ -378,7 +418,12 @@ Future<void> purgeMediaFiles(Directory directory) async {
                     canBeDeleted = false;
                   }
                 }
-                if (message.acknowledgeByServer) {
+
+                /// In case the image is not yet opened but successfully uploaded
+                /// to the server preserve the image for two days in case of an receiving error will happen
+                ///  and then delete them as well.
+                if (message.acknowledgeByServer &&
+                    twoDaysAgo.isAfter(message.sendAt)) {
                   // Preserve images which can be stored by the other person...
                   if (content.maxShowTime != gMediaShowInfinite) {
                     canBeDeleted = true;

lib/src/services/api/media_upload.dart

@@ -517,17 +517,30 @@ Future handleMediaUpload(MediaUpload media) async {
 
   if (media.messageIds == null) return;
 
-  List<Uint8List> downloadTokens =
+  List<int> messageIds = media.messageIds!;
-      createDownloadTokens(media.messageIds!.length);
+
+  List<Uint8List> downloadTokens = [];
 
   List<TextMessage> messagesOnSuccess = [];
 
-  for (var i = 0; i < media.messageIds!.length; i++) {
+  for (var i = 0; i < messageIds.length; i++) {
+    Message? message = await twonlyDB.messagesDao
+        .getMessageByMessageId(messageIds[i])
+        .getSingleOrNull();
+    if (message == null) continue;
+
+    if (message.downloadState == DownloadState.downloaded) {
+      // only upload message which are not yet uploaded (or in case of an error re-uploaded)
+      continue;
+    }
+
+    final downloadToken = createDownloadToken();
+
     MessageJson msg = MessageJson(
       kind: MessageKind.media,
-      messageId: media.messageIds![i],
+      messageSenderId: messageIds[i],
       content: MediaMessageContent(
-        downloadToken: downloadTokens[i],
+        downloadToken: downloadToken,
         maxShowTime: media.metadata!.maxShowTime,
         isRealTwonly: media.metadata!.isRealTwonly,
         isVideo: media.metadata!.isVideo,
@@ -542,12 +555,6 @@ Future handleMediaUpload(MediaUpload media) async {
     Uint8List plaintextContent =
         Uint8List.fromList(gzip.encode(utf8.encode(jsonEncode(msg.toJson()))));
 
-    Message? message = await twonlyDB.messagesDao
-        .getMessageByMessageId(media.messageIds![i])
-        .getSingleOrNull();
-
-    if (message == null) continue;
-
     Contact? contact = await twonlyDB.contactsDao
         .getContactByUserId(message.contactId)
         .getSingleOrNull();
@@ -597,6 +604,7 @@ Future handleMediaUpload(MediaUpload media) async {
     }
 
     messagesOnSuccess.add(messageOnSuccess);
+    downloadTokens.add(downloadToken);
   }
 
   final uploadRequest = UploadRequest(
@@ -849,17 +857,12 @@ Uint8List hexToUint8List(String hex) => Uint8List.fromList(List<int>.generate(
     hex.length ~/ 2,
     (i) => int.parse(hex.substring(i * 2, i * 2 + 2), radix: 16)));
 
-List<Uint8List> createDownloadTokens(int n) {
+Uint8List createDownloadToken() {
   final Random random = Random();
-  List<Uint8List> tokens = [];
 
-  for (int i = 0; i < n; i++) {
+  Uint8List token = Uint8List(32);
-    Uint8List token = Uint8List(32);
+  for (int j = 0; j < 32; j++) {
-    for (int j = 0; j < 32; j++) {
+    token[j] = random.nextInt(256); // Generate a random byte (0-255)
-      token[j] = random.nextInt(256); // Generate a random byte (0-255)
-    }
-    tokens.add(token);
   }
-
+  return token;
-  return tokens;
 }

lib/src/services/api/messages.dart

@@ -231,7 +231,7 @@ Future sendTextMessage(
 
   MessageJson msg = MessageJson(
     kind: MessageKind.textMessage,
-    messageId: messageId,
+    messageSenderId: messageId,
     content: content,
     timestamp: messageSendAt,
   );
@@ -257,7 +257,7 @@ Future notifyContactAboutOpeningMessage(
       fromUserId,
       MessageJson(
         kind: MessageKind.opened,
-        messageId: messageOtherId,
+        messageReceiverId: messageOtherId,
         content: MessageContent(),
         timestamp: DateTime.now(),
       ),

lib/src/services/api/server_messages.dart

@@ -3,9 +3,11 @@ import 'dart:io';
 import 'package:cryptography_plus/cryptography_plus.dart';
 import 'package:drift/drift.dart';
 import 'package:fixnum/fixnum.dart';
+import 'package:flutter/foundation.dart';
 import 'package:libsignal_protocol_dart/libsignal_protocol_dart.dart';
 import 'package:mutex/mutex.dart';
 import 'package:twonly/globals.dart';
+import 'package:twonly/src/database/tables/media_uploads_table.dart';
 import 'package:twonly/src/database/twonly_database.dart';
 import 'package:twonly/src/database/tables/messages_table.dart';
 import 'package:twonly/src/model/json/message.dart';
@@ -96,10 +98,10 @@ Future<client.Response> handleNewMessage(int fromUserId, Uint8List body) async {
       fromUserId,
       MessageJson(
         kind: MessageKind.ack,
-        messageId: null,
         content: AckContent(
-            messageIdToAck: message.messageId,
+          messageIdToAck: message.messageSenderId,
-            retransIdToAck: message.retransId!),
+          retransIdToAck: message.retransId!,
+        ),
         timestamp: DateTime.now(),
       ),
     );
@@ -166,29 +168,69 @@ Future<client.Response> handleNewMessage(int fromUserId, Uint8List body) async {
       }
 
     case MessageKind.receiveMediaError:
-      if (message.messageId != null) {
+      if (message.messageReceiverId != null) {
-        await twonlyDB.messagesDao.updateMessageByOtherUser(
+        final openedMessage = await twonlyDB.messagesDao
-          fromUserId,
+            .getMessageByIdAndContactId(fromUserId, message.messageReceiverId!)
-          message.messageId!,
+            .getSingleOrNull();
-          MessagesCompanion(
+
-            errorWhileSending: Value(true),
+        if (openedMessage != null) {
-          ),
+          /// message found
-        );
+
+          /// checks if
+          ///   1. this was a media upload
+          ///   2. the media was not already retransmitted
+          ///   3. the media was send in the last two days
+          if (openedMessage.mediaUploadId != null &&
+              openedMessage.mediaRetransmissionState ==
+                  MediaRetransmitting.none &&
+              openedMessage.sendAt
+                  .isAfter(DateTime.now().subtract(Duration(days: 2)))) {
+            // reset the media upload state to pending,
+            // this will cause the media to be re-encrypted again
+            twonlyDB.mediaUploadsDao.updateMediaUpload(
+              openedMessage.mediaUploadId!,
+              MediaUploadsCompanion(
+                state: Value(
+                  UploadState.pending,
+                ),
+              ),
+            );
+            // reset the message upload so the upload will be done again
+            await twonlyDB.messagesDao.updateMessageByOtherUser(
+              fromUserId,
+              message.messageReceiverId!,
+              MessagesCompanion(
+                downloadState: Value(DownloadState.pending),
+                mediaRetransmissionState:
+                    Value(MediaRetransmitting.retransmitted),
+              ),
+            );
+            retryMediaUpload(false);
+          } else {
+            await twonlyDB.messagesDao.updateMessageByOtherUser(
+              fromUserId,
+              message.messageReceiverId!,
+              MessagesCompanion(
+                errorWhileSending: Value(true),
+              ),
+            );
+          }
+        }
       }
 
     case MessageKind.opened:
-      if (message.messageId != null) {
+      if (message.messageReceiverId != null) {
         final update = MessagesCompanion(
           openedAt: Value(message.timestamp),
           errorWhileSending: Value(false),
         );
         await twonlyDB.messagesDao.updateMessageByOtherUser(
           fromUserId,
-          message.messageId!,
+          message.messageReceiverId!,
           update,
         );
         final openedMessage = await twonlyDB.messagesDao
-            .getMessageByMessageId(message.messageId!)
+            .getMessageByMessageId(message.messageReceiverId!)
             .getSingleOrNull();
         if (openedMessage != null &&
             openedMessage.kind == MessageKind.textMessage) {
@@ -242,41 +284,52 @@ Future<client.Response> handleNewMessage(int fromUserId, Uint8List body) async {
           message.kind != MessageKind.storedMediaFile &&
           message.kind != MessageKind.reopenedMedia) {
         Log.error("Got unknown MessageKind $message");
-      } else if (message.content == null || message.messageId == null) {
+      } else if (message.messageSenderId == null) {
-        Log.error("Content or messageid not defined $message");
+        Log.error("Messageid not defined $message");
       } else {
-        final content = message.content!;
+        if (message.kind == MessageKind.storedMediaFile) {
-
+          if (message.messageReceiverId != null) {
-        if (content is StoredMediaFileContent) {
+            /// stored media file just updates the message
-          /// stored media file just updates the message
+            await twonlyDB.messagesDao.updateMessageByOtherUser(
-          await twonlyDB.messagesDao.updateMessageByOtherUser(
+              fromUserId,
-            fromUserId,
+              message.messageReceiverId!,
-            content.messageId,
+              MessagesCompanion(
-            MessagesCompanion(
+                mediaStored: Value(true),
-              mediaStored: Value(true),
+                errorWhileSending: Value(false),
-              errorWhileSending: Value(false),
+              ),
-            ),
+            );
-          );
+            final msg = await twonlyDB.messagesDao
-          final message = await twonlyDB.messagesDao
+                .getMessageByIdAndContactId(
-              .getMessageByIdAndContactId(fromUserId, content.messageId)
+                    fromUserId, message.messageReceiverId!)
-              .getSingleOrNull();
+                .getSingleOrNull();
-          if (message != null && message.mediaUploadId != null) {
+            if (msg != null && msg.mediaUploadId != null) {
-            final filePath =
+              final filePath =
-                await getMediaFilePath(message.mediaUploadId, "send");
+                  await getMediaFilePath(msg.mediaUploadId, "send");
-            if (filePath.contains("mp4")) {
+              if (filePath.contains("mp4")) {
-              createThumbnailsForVideo(File(filePath));
+                createThumbnailsForVideo(File(filePath));
-            } else {
+              } else {
-              createThumbnailsForImage(File(filePath));
+                createThumbnailsForImage(File(filePath));
+              }
             }
           }
-        } else {
+        } else if (message.content != null) {
+          final content = message.content!;
           // when a message is received doubled ignore it...
-          if ((await twonlyDB.messagesDao
+
-              .containsOtherMessageId(fromUserId, message.messageId!))) {
+          final openedMessage = await twonlyDB.messagesDao
-            Log.error(
+              .getMessageByOtherMessageId(fromUserId, message.messageSenderId!)
-                "Got a duplicated message from other user: ${message.messageId!}");
+              .getSingleOrNull();
-            var ok = client.Response_Ok()..none = true;
+
-            return client.Response()..ok = ok;
+          if (openedMessage != null) {
+            if (openedMessage.errorWhileSending) {
+              await twonlyDB.messagesDao
+                  .deleteMessagesByMessageId(openedMessage.messageId);
+            } else {
+              Log.error(
+                  "Got a duplicated message from other user: ${message.messageSenderId!}");
+              var ok = client.Response_Ok()..none = true;
+              return client.Response()..ok = ok;
+            }
           }
 
           int? responseToMessageId;
@@ -324,7 +377,7 @@ Future<client.Response> handleNewMessage(int fromUserId, Uint8List body) async {
           final update = MessagesCompanion(
             contactId: Value(fromUserId),
             kind: Value(message.kind),
-            messageOtherId: Value(message.messageId),
+            messageOtherId: Value(message.messageSenderId),
             contentJson: Value(contentJson),
             acknowledgeByServer: Value(true),
             acknowledgeByUser: Value(acknowledgeByUser),
@@ -359,6 +412,8 @@ Future<client.Response> handleNewMessage(int fromUserId, Uint8List body) async {
               startDownloadMedia(msg, false);
             }
           }
+        } else {
+          Log.error("Content is not defined $message");
         }
 
         // unarchive contact when receiving a new message

lib/src/services/api/utils.dart

@@ -74,6 +74,9 @@ Future handleMediaError(Message message) async {
     message.messageId,
     MessagesCompanion(
       errorWhileSending: Value(true),
+      mediaRetransmissionState: Value(
+        MediaRetransmitting.requested,
+      ),
     ),
   );
   if (message.messageOtherId != null) {
@@ -81,10 +84,11 @@ Future handleMediaError(Message message) async {
       null,
       message.contactId,
       MessageJson(
-          kind: MessageKind.receiveMediaError,
+        kind: MessageKind.receiveMediaError,
-          timestamp: DateTime.now(),
+        timestamp: DateTime.now(),
-          content: MessageContent(),
+        content: MessageContent(),
-          messageId: message.messageOtherId),
+        messageReceiverId: message.messageOtherId,
+      ),
     );
   }
 }

lib/src/views/chats/chat_messages_components/chat_media_entry.dart

@@ -81,7 +81,7 @@ class _ChatMediaEntryState extends State<ChatMediaEntry> {
             widget.contact.userId,
             MessageJson(
               kind: MessageKind.reopenedMedia,
-              messageId: widget.message.messageId,
+              messageSenderId: widget.message.messageId,
               content: ReopenedMediaFileContent(
                 messageId: widget.message.messageOtherId!,
               ),

lib/src/views/chats/media_viewer.view.dart

@@ -313,10 +313,9 @@ class _MediaViewerViewState extends State<MediaViewerView> {
       widget.contact.userId,
       MessageJson(
         kind: MessageKind.storedMediaFile,
-        messageId: allMediaFiles.first.messageId,
+        messageSenderId: allMediaFiles.first.messageId,
-        content: StoredMediaFileContent(
+        messageReceiverId: allMediaFiles.first.messageOtherId!,
-          messageId: allMediaFiles.first.messageOtherId!,
+        content: MessageContent(),
-        ),
         timestamp: DateTime.now(),
       ),
       pushNotification: PushNotification(kind: PushKind.storedMediaFile),

lib/src/views/components/message_send_state_icon.dart

@@ -175,6 +175,14 @@ class _MessageSendStateIconState extends State<MessageSendStateIcon> {
         text = "Error";
       }
 
+      if (message.mediaRetransmissionState == MediaRetransmitting.requested) {
+        icon = FaIcon(FontAwesomeIcons.clockRotateLeft, size: 12, color: color);
+        textWidget = Text(
+          context.lang.retransmissionRequested,
+          style: TextStyle(fontSize: 9),
+        );
+      }
+
       if (message.kind == MessageKind.media) {
         icons.insert(0, icon);
       } else {

lib/src/views/settings/help/contact_us.view.dart

@@ -10,7 +10,7 @@ import 'package:twonly/globals.dart';
 import 'package:twonly/src/constants/secure_storage_keys.dart';
 import 'package:twonly/src/model/protobuf/api/http/http_requests.pb.dart';
 import 'package:twonly/src/services/api/media_upload.dart'
-    show createDownloadTokens, uint8ListToHex;
+    show uint8ListToHex, createDownloadToken;
 import 'package:twonly/src/utils/log.dart';
 import 'package:twonly/src/utils/misc.dart';
 import 'package:twonly/src/views/settings/help/contact_us/submit_message.view.dart';
@@ -33,7 +33,7 @@ class _ContactUsState extends State<ContactUsView> {
 
   Future<String?> uploadDebugLog() async {
     if (debugLogDownloadToken != null) return debugLogDownloadToken;
-    Uint8List downloadToken = createDownloadTokens(1)[0];
+    Uint8List downloadToken = createDownloadToken();
 
     String debugLog = await loadLogFile();
 

test/drift/twonly_database/generated/schema.dart

@@ -17,6 +17,7 @@ import 'schema_v11.dart' as v11;
 import 'schema_v12.dart' as v12;
 import 'schema_v13.dart' as v13;
 import 'schema_v14.dart' as v14;
+import 'schema_v15.dart' as v15;
 
 class GeneratedHelper implements SchemaInstantiationHelper {
   @override
@@ -50,10 +51,28 @@ class GeneratedHelper implements SchemaInstantiationHelper {
         return v13.DatabaseAtV13(db);
       case 14:
         return v14.DatabaseAtV14(db);
+      case 15:
+        return v15.DatabaseAtV15(db);
       default:
         throw MissingSchemaException(version, versions);
     }
   }
 
-  static const versions = const [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14];
+  static const versions = const [
+    1,
+    2,
+    3,
+    4,
+    5,
+    6,
+    7,
+    8,
+    9,
+    10,
+    11,
+    12,
+    13,
+    14,
+    15
+  ];
 }

test/drift/twonly_database/generated/schema_v1.dart

@@ -1,4 +1,5 @@
 // dart format width=80
+import 'dart:typed_data' as i2;
 // GENERATED CODE, DO NOT EDIT BY HAND.
 // ignore_for_file: type=lint
 import 'package:drift/drift.dart';
@@ -1262,8 +1263,8 @@ class SignalIdentityKeyStores extends Table
   late final GeneratedColumn<String> name = GeneratedColumn<String>(
       'name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> identityKey =
+  late final GeneratedColumn<i2.Uint8List> identityKey =
-      GeneratedColumn<Uint8List>('identity_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('identity_key', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
@@ -1307,7 +1308,7 @@ class SignalIdentityKeyStoresData extends DataClass
     implements Insertable<SignalIdentityKeyStoresData> {
   final int deviceId;
   final String name;
-  final Uint8List identityKey;
+  final i2.Uint8List identityKey;
   final DateTime createdAt;
   const SignalIdentityKeyStoresData(
       {required this.deviceId,
@@ -1319,7 +1320,7 @@ class SignalIdentityKeyStoresData extends DataClass
     final map = <String, Expression>{};
     map['device_id'] = Variable<int>(deviceId);
     map['name'] = Variable<String>(name);
-    map['identity_key'] = Variable<Uint8List>(identityKey);
+    map['identity_key'] = Variable<i2.Uint8List>(identityKey);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -1339,7 +1340,7 @@ class SignalIdentityKeyStoresData extends DataClass
     return SignalIdentityKeyStoresData(
       deviceId: serializer.fromJson<int>(json['deviceId']),
       name: serializer.fromJson<String>(json['name']),
-      identityKey: serializer.fromJson<Uint8List>(json['identityKey']),
+      identityKey: serializer.fromJson<i2.Uint8List>(json['identityKey']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -1349,7 +1350,7 @@ class SignalIdentityKeyStoresData extends DataClass
     return <String, dynamic>{
       'deviceId': serializer.toJson<int>(deviceId),
       'name': serializer.toJson<String>(name),
-      'identityKey': serializer.toJson<Uint8List>(identityKey),
+      'identityKey': serializer.toJson<i2.Uint8List>(identityKey),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -1357,7 +1358,7 @@ class SignalIdentityKeyStoresData extends DataClass
   SignalIdentityKeyStoresData copyWith(
           {int? deviceId,
           String? name,
-          Uint8List? identityKey,
+          i2.Uint8List? identityKey,
           DateTime? createdAt}) =>
       SignalIdentityKeyStoresData(
         deviceId: deviceId ?? this.deviceId,
@@ -1404,7 +1405,7 @@ class SignalIdentityKeyStoresCompanion
     extends UpdateCompanion<SignalIdentityKeyStoresData> {
   final Value<int> deviceId;
   final Value<String> name;
-  final Value<Uint8List> identityKey;
+  final Value<i2.Uint8List> identityKey;
   final Value<DateTime> createdAt;
   final Value<int> rowid;
   const SignalIdentityKeyStoresCompanion({
@@ -1417,7 +1418,7 @@ class SignalIdentityKeyStoresCompanion
   SignalIdentityKeyStoresCompanion.insert({
     required int deviceId,
     required String name,
-    required Uint8List identityKey,
+    required i2.Uint8List identityKey,
     this.createdAt = const Value.absent(),
     this.rowid = const Value.absent(),
   })  : deviceId = Value(deviceId),
@@ -1426,7 +1427,7 @@ class SignalIdentityKeyStoresCompanion
   static Insertable<SignalIdentityKeyStoresData> custom({
     Expression<int>? deviceId,
     Expression<String>? name,
-    Expression<Uint8List>? identityKey,
+    Expression<i2.Uint8List>? identityKey,
     Expression<DateTime>? createdAt,
     Expression<int>? rowid,
   }) {
@@ -1442,7 +1443,7 @@ class SignalIdentityKeyStoresCompanion
   SignalIdentityKeyStoresCompanion copyWith(
       {Value<int>? deviceId,
       Value<String>? name,
-      Value<Uint8List>? identityKey,
+      Value<i2.Uint8List>? identityKey,
       Value<DateTime>? createdAt,
       Value<int>? rowid}) {
     return SignalIdentityKeyStoresCompanion(
@@ -1464,7 +1465,7 @@ class SignalIdentityKeyStoresCompanion
       map['name'] = Variable<String>(name.value);
     }
     if (identityKey.present) {
-      map['identity_key'] = Variable<Uint8List>(identityKey.value);
+      map['identity_key'] = Variable<i2.Uint8List>(identityKey.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -1497,9 +1498,9 @@ class SignalPreKeyStores extends Table
   late final GeneratedColumn<int> preKeyId = GeneratedColumn<int>(
       'pre_key_id', aliasedName, false,
       type: DriftSqlType.int, requiredDuringInsert: false);
-  late final GeneratedColumn<Uint8List> preKey = GeneratedColumn<Uint8List>(
+  late final GeneratedColumn<i2.Uint8List> preKey =
-      'pre_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('pre_key', aliasedName, false,
-      type: DriftSqlType.blob, requiredDuringInsert: true);
+          type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
       type: DriftSqlType.dateTime,
@@ -1537,7 +1538,7 @@ class SignalPreKeyStores extends Table
 class SignalPreKeyStoresData extends DataClass
     implements Insertable<SignalPreKeyStoresData> {
   final int preKeyId;
-  final Uint8List preKey;
+  final i2.Uint8List preKey;
   final DateTime createdAt;
   const SignalPreKeyStoresData(
       {required this.preKeyId, required this.preKey, required this.createdAt});
@@ -1545,7 +1546,7 @@ class SignalPreKeyStoresData extends DataClass
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
     map['pre_key_id'] = Variable<int>(preKeyId);
-    map['pre_key'] = Variable<Uint8List>(preKey);
+    map['pre_key'] = Variable<i2.Uint8List>(preKey);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -1563,7 +1564,7 @@ class SignalPreKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return SignalPreKeyStoresData(
       preKeyId: serializer.fromJson<int>(json['preKeyId']),
-      preKey: serializer.fromJson<Uint8List>(json['preKey']),
+      preKey: serializer.fromJson<i2.Uint8List>(json['preKey']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -1572,13 +1573,13 @@ class SignalPreKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return <String, dynamic>{
       'preKeyId': serializer.toJson<int>(preKeyId),
-      'preKey': serializer.toJson<Uint8List>(preKey),
+      'preKey': serializer.toJson<i2.Uint8List>(preKey),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
 
   SignalPreKeyStoresData copyWith(
-          {int? preKeyId, Uint8List? preKey, DateTime? createdAt}) =>
+          {int? preKeyId, i2.Uint8List? preKey, DateTime? createdAt}) =>
       SignalPreKeyStoresData(
         preKeyId: preKeyId ?? this.preKeyId,
         preKey: preKey ?? this.preKey,
@@ -1617,7 +1618,7 @@ class SignalPreKeyStoresData extends DataClass
 class SignalPreKeyStoresCompanion
     extends UpdateCompanion<SignalPreKeyStoresData> {
   final Value<int> preKeyId;
-  final Value<Uint8List> preKey;
+  final Value<i2.Uint8List> preKey;
   final Value<DateTime> createdAt;
   const SignalPreKeyStoresCompanion({
     this.preKeyId = const Value.absent(),
@@ -1626,12 +1627,12 @@ class SignalPreKeyStoresCompanion
   });
   SignalPreKeyStoresCompanion.insert({
     this.preKeyId = const Value.absent(),
-    required Uint8List preKey,
+    required i2.Uint8List preKey,
     this.createdAt = const Value.absent(),
   }) : preKey = Value(preKey);
   static Insertable<SignalPreKeyStoresData> custom({
     Expression<int>? preKeyId,
-    Expression<Uint8List>? preKey,
+    Expression<i2.Uint8List>? preKey,
     Expression<DateTime>? createdAt,
   }) {
     return RawValuesInsertable({
@@ -1643,7 +1644,7 @@ class SignalPreKeyStoresCompanion
 
   SignalPreKeyStoresCompanion copyWith(
       {Value<int>? preKeyId,
-      Value<Uint8List>? preKey,
+      Value<i2.Uint8List>? preKey,
       Value<DateTime>? createdAt}) {
     return SignalPreKeyStoresCompanion(
       preKeyId: preKeyId ?? this.preKeyId,
@@ -1659,7 +1660,7 @@ class SignalPreKeyStoresCompanion
       map['pre_key_id'] = Variable<int>(preKeyId.value);
     }
     if (preKey.present) {
-      map['pre_key'] = Variable<Uint8List>(preKey.value);
+      map['pre_key'] = Variable<i2.Uint8List>(preKey.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -1687,9 +1688,9 @@ class SignalSenderKeyStores extends Table
   late final GeneratedColumn<String> senderKeyName = GeneratedColumn<String>(
       'sender_key_name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> senderKey = GeneratedColumn<Uint8List>(
+  late final GeneratedColumn<i2.Uint8List> senderKey =
-      'sender_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('sender_key', aliasedName, false,
-      type: DriftSqlType.blob, requiredDuringInsert: true);
+          type: DriftSqlType.blob, requiredDuringInsert: true);
   @override
   List<GeneratedColumn> get $columns => [senderKeyName, senderKey];
   @override
@@ -1720,14 +1721,14 @@ class SignalSenderKeyStores extends Table
 class SignalSenderKeyStoresData extends DataClass
     implements Insertable<SignalSenderKeyStoresData> {
   final String senderKeyName;
-  final Uint8List senderKey;
+  final i2.Uint8List senderKey;
   const SignalSenderKeyStoresData(
       {required this.senderKeyName, required this.senderKey});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
     map['sender_key_name'] = Variable<String>(senderKeyName);
-    map['sender_key'] = Variable<Uint8List>(senderKey);
+    map['sender_key'] = Variable<i2.Uint8List>(senderKey);
     return map;
   }
 
@@ -1743,7 +1744,7 @@ class SignalSenderKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return SignalSenderKeyStoresData(
       senderKeyName: serializer.fromJson<String>(json['senderKeyName']),
-      senderKey: serializer.fromJson<Uint8List>(json['senderKey']),
+      senderKey: serializer.fromJson<i2.Uint8List>(json['senderKey']),
     );
   }
   @override
@@ -1751,12 +1752,12 @@ class SignalSenderKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return <String, dynamic>{
       'senderKeyName': serializer.toJson<String>(senderKeyName),
-      'senderKey': serializer.toJson<Uint8List>(senderKey),
+      'senderKey': serializer.toJson<i2.Uint8List>(senderKey),
     };
   }
 
   SignalSenderKeyStoresData copyWith(
-          {String? senderKeyName, Uint8List? senderKey}) =>
+          {String? senderKeyName, i2.Uint8List? senderKey}) =>
       SignalSenderKeyStoresData(
         senderKeyName: senderKeyName ?? this.senderKeyName,
         senderKey: senderKey ?? this.senderKey,
@@ -1794,7 +1795,7 @@ class SignalSenderKeyStoresData extends DataClass
 class SignalSenderKeyStoresCompanion
     extends UpdateCompanion<SignalSenderKeyStoresData> {
   final Value<String> senderKeyName;
-  final Value<Uint8List> senderKey;
+  final Value<i2.Uint8List> senderKey;
   final Value<int> rowid;
   const SignalSenderKeyStoresCompanion({
     this.senderKeyName = const Value.absent(),
@@ -1803,13 +1804,13 @@ class SignalSenderKeyStoresCompanion
   });
   SignalSenderKeyStoresCompanion.insert({
     required String senderKeyName,
-    required Uint8List senderKey,
+    required i2.Uint8List senderKey,
     this.rowid = const Value.absent(),
   })  : senderKeyName = Value(senderKeyName),
         senderKey = Value(senderKey);
   static Insertable<SignalSenderKeyStoresData> custom({
     Expression<String>? senderKeyName,
-    Expression<Uint8List>? senderKey,
+    Expression<i2.Uint8List>? senderKey,
     Expression<int>? rowid,
   }) {
     return RawValuesInsertable({
@@ -1821,7 +1822,7 @@ class SignalSenderKeyStoresCompanion
 
   SignalSenderKeyStoresCompanion copyWith(
       {Value<String>? senderKeyName,
-      Value<Uint8List>? senderKey,
+      Value<i2.Uint8List>? senderKey,
       Value<int>? rowid}) {
     return SignalSenderKeyStoresCompanion(
       senderKeyName: senderKeyName ?? this.senderKeyName,
@@ -1837,7 +1838,7 @@ class SignalSenderKeyStoresCompanion
       map['sender_key_name'] = Variable<String>(senderKeyName.value);
     }
     if (senderKey.present) {
-      map['sender_key'] = Variable<Uint8List>(senderKey.value);
+      map['sender_key'] = Variable<i2.Uint8List>(senderKey.value);
     }
     if (rowid.present) {
       map['rowid'] = Variable<int>(rowid.value);
@@ -1868,8 +1869,8 @@ class SignalSessionStores extends Table
   late final GeneratedColumn<String> name = GeneratedColumn<String>(
       'name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> sessionRecord =
+  late final GeneratedColumn<i2.Uint8List> sessionRecord =
-      GeneratedColumn<Uint8List>('session_record', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('session_record', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
@@ -1913,7 +1914,7 @@ class SignalSessionStoresData extends DataClass
     implements Insertable<SignalSessionStoresData> {
   final int deviceId;
   final String name;
-  final Uint8List sessionRecord;
+  final i2.Uint8List sessionRecord;
   final DateTime createdAt;
   const SignalSessionStoresData(
       {required this.deviceId,
@@ -1925,7 +1926,7 @@ class SignalSessionStoresData extends DataClass
     final map = <String, Expression>{};
     map['device_id'] = Variable<int>(deviceId);
     map['name'] = Variable<String>(name);
-    map['session_record'] = Variable<Uint8List>(sessionRecord);
+    map['session_record'] = Variable<i2.Uint8List>(sessionRecord);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -1945,7 +1946,7 @@ class SignalSessionStoresData extends DataClass
     return SignalSessionStoresData(
       deviceId: serializer.fromJson<int>(json['deviceId']),
       name: serializer.fromJson<String>(json['name']),
-      sessionRecord: serializer.fromJson<Uint8List>(json['sessionRecord']),
+      sessionRecord: serializer.fromJson<i2.Uint8List>(json['sessionRecord']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -1955,7 +1956,7 @@ class SignalSessionStoresData extends DataClass
     return <String, dynamic>{
       'deviceId': serializer.toJson<int>(deviceId),
       'name': serializer.toJson<String>(name),
-      'sessionRecord': serializer.toJson<Uint8List>(sessionRecord),
+      'sessionRecord': serializer.toJson<i2.Uint8List>(sessionRecord),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -1963,7 +1964,7 @@ class SignalSessionStoresData extends DataClass
   SignalSessionStoresData copyWith(
           {int? deviceId,
           String? name,
-          Uint8List? sessionRecord,
+          i2.Uint8List? sessionRecord,
           DateTime? createdAt}) =>
       SignalSessionStoresData(
         deviceId: deviceId ?? this.deviceId,
@@ -2010,7 +2011,7 @@ class SignalSessionStoresCompanion
     extends UpdateCompanion<SignalSessionStoresData> {
   final Value<int> deviceId;
   final Value<String> name;
-  final Value<Uint8List> sessionRecord;
+  final Value<i2.Uint8List> sessionRecord;
   final Value<DateTime> createdAt;
   final Value<int> rowid;
   const SignalSessionStoresCompanion({
@@ -2023,7 +2024,7 @@ class SignalSessionStoresCompanion
   SignalSessionStoresCompanion.insert({
     required int deviceId,
     required String name,
-    required Uint8List sessionRecord,
+    required i2.Uint8List sessionRecord,
     this.createdAt = const Value.absent(),
     this.rowid = const Value.absent(),
   })  : deviceId = Value(deviceId),
@@ -2032,7 +2033,7 @@ class SignalSessionStoresCompanion
   static Insertable<SignalSessionStoresData> custom({
     Expression<int>? deviceId,
     Expression<String>? name,
-    Expression<Uint8List>? sessionRecord,
+    Expression<i2.Uint8List>? sessionRecord,
     Expression<DateTime>? createdAt,
     Expression<int>? rowid,
   }) {
@@ -2048,7 +2049,7 @@ class SignalSessionStoresCompanion
   SignalSessionStoresCompanion copyWith(
       {Value<int>? deviceId,
       Value<String>? name,
-      Value<Uint8List>? sessionRecord,
+      Value<i2.Uint8List>? sessionRecord,
       Value<DateTime>? createdAt,
       Value<int>? rowid}) {
     return SignalSessionStoresCompanion(
@@ -2070,7 +2071,7 @@ class SignalSessionStoresCompanion
       map['name'] = Variable<String>(name.value);
     }
     if (sessionRecord.present) {
-      map['session_record'] = Variable<Uint8List>(sessionRecord.value);
+      map['session_record'] = Variable<i2.Uint8List>(sessionRecord.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);

test/drift/twonly_database/generated/schema_v10.dart

@@ -1,4 +1,5 @@
 // dart format width=80
+import 'dart:typed_data' as i2;
 // GENERATED CODE, DO NOT EDIT BY HAND.
 // ignore_for_file: type=lint
 import 'package:drift/drift.dart';
@@ -2132,8 +2133,8 @@ class SignalIdentityKeyStores extends Table
   late final GeneratedColumn<String> name = GeneratedColumn<String>(
       'name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> identityKey =
+  late final GeneratedColumn<i2.Uint8List> identityKey =
-      GeneratedColumn<Uint8List>('identity_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('identity_key', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
@@ -2177,7 +2178,7 @@ class SignalIdentityKeyStoresData extends DataClass
     implements Insertable<SignalIdentityKeyStoresData> {
   final int deviceId;
   final String name;
-  final Uint8List identityKey;
+  final i2.Uint8List identityKey;
   final DateTime createdAt;
   const SignalIdentityKeyStoresData(
       {required this.deviceId,
@@ -2189,7 +2190,7 @@ class SignalIdentityKeyStoresData extends DataClass
     final map = <String, Expression>{};
     map['device_id'] = Variable<int>(deviceId);
     map['name'] = Variable<String>(name);
-    map['identity_key'] = Variable<Uint8List>(identityKey);
+    map['identity_key'] = Variable<i2.Uint8List>(identityKey);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -2209,7 +2210,7 @@ class SignalIdentityKeyStoresData extends DataClass
     return SignalIdentityKeyStoresData(
       deviceId: serializer.fromJson<int>(json['deviceId']),
       name: serializer.fromJson<String>(json['name']),
-      identityKey: serializer.fromJson<Uint8List>(json['identityKey']),
+      identityKey: serializer.fromJson<i2.Uint8List>(json['identityKey']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -2219,7 +2220,7 @@ class SignalIdentityKeyStoresData extends DataClass
     return <String, dynamic>{
       'deviceId': serializer.toJson<int>(deviceId),
       'name': serializer.toJson<String>(name),
-      'identityKey': serializer.toJson<Uint8List>(identityKey),
+      'identityKey': serializer.toJson<i2.Uint8List>(identityKey),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -2227,7 +2228,7 @@ class SignalIdentityKeyStoresData extends DataClass
   SignalIdentityKeyStoresData copyWith(
           {int? deviceId,
           String? name,
-          Uint8List? identityKey,
+          i2.Uint8List? identityKey,
           DateTime? createdAt}) =>
       SignalIdentityKeyStoresData(
         deviceId: deviceId ?? this.deviceId,
@@ -2274,7 +2275,7 @@ class SignalIdentityKeyStoresCompanion
     extends UpdateCompanion<SignalIdentityKeyStoresData> {
   final Value<int> deviceId;
   final Value<String> name;
-  final Value<Uint8List> identityKey;
+  final Value<i2.Uint8List> identityKey;
   final Value<DateTime> createdAt;
   final Value<int> rowid;
   const SignalIdentityKeyStoresCompanion({
@@ -2287,7 +2288,7 @@ class SignalIdentityKeyStoresCompanion
   SignalIdentityKeyStoresCompanion.insert({
     required int deviceId,
     required String name,
-    required Uint8List identityKey,
+    required i2.Uint8List identityKey,
     this.createdAt = const Value.absent(),
     this.rowid = const Value.absent(),
   })  : deviceId = Value(deviceId),
@@ -2296,7 +2297,7 @@ class SignalIdentityKeyStoresCompanion
   static Insertable<SignalIdentityKeyStoresData> custom({
     Expression<int>? deviceId,
     Expression<String>? name,
-    Expression<Uint8List>? identityKey,
+    Expression<i2.Uint8List>? identityKey,
     Expression<DateTime>? createdAt,
     Expression<int>? rowid,
   }) {
@@ -2312,7 +2313,7 @@ class SignalIdentityKeyStoresCompanion
   SignalIdentityKeyStoresCompanion copyWith(
       {Value<int>? deviceId,
       Value<String>? name,
-      Value<Uint8List>? identityKey,
+      Value<i2.Uint8List>? identityKey,
       Value<DateTime>? createdAt,
       Value<int>? rowid}) {
     return SignalIdentityKeyStoresCompanion(
@@ -2334,7 +2335,7 @@ class SignalIdentityKeyStoresCompanion
       map['name'] = Variable<String>(name.value);
     }
     if (identityKey.present) {
-      map['identity_key'] = Variable<Uint8List>(identityKey.value);
+      map['identity_key'] = Variable<i2.Uint8List>(identityKey.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -2367,9 +2368,9 @@ class SignalPreKeyStores extends Table
   late final GeneratedColumn<int> preKeyId = GeneratedColumn<int>(
       'pre_key_id', aliasedName, false,
       type: DriftSqlType.int, requiredDuringInsert: false);
-  late final GeneratedColumn<Uint8List> preKey = GeneratedColumn<Uint8List>(
+  late final GeneratedColumn<i2.Uint8List> preKey =
-      'pre_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('pre_key', aliasedName, false,
-      type: DriftSqlType.blob, requiredDuringInsert: true);
+          type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
       type: DriftSqlType.dateTime,
@@ -2407,7 +2408,7 @@ class SignalPreKeyStores extends Table
 class SignalPreKeyStoresData extends DataClass
     implements Insertable<SignalPreKeyStoresData> {
   final int preKeyId;
-  final Uint8List preKey;
+  final i2.Uint8List preKey;
   final DateTime createdAt;
   const SignalPreKeyStoresData(
       {required this.preKeyId, required this.preKey, required this.createdAt});
@@ -2415,7 +2416,7 @@ class SignalPreKeyStoresData extends DataClass
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
     map['pre_key_id'] = Variable<int>(preKeyId);
-    map['pre_key'] = Variable<Uint8List>(preKey);
+    map['pre_key'] = Variable<i2.Uint8List>(preKey);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -2433,7 +2434,7 @@ class SignalPreKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return SignalPreKeyStoresData(
       preKeyId: serializer.fromJson<int>(json['preKeyId']),
-      preKey: serializer.fromJson<Uint8List>(json['preKey']),
+      preKey: serializer.fromJson<i2.Uint8List>(json['preKey']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -2442,13 +2443,13 @@ class SignalPreKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return <String, dynamic>{
       'preKeyId': serializer.toJson<int>(preKeyId),
-      'preKey': serializer.toJson<Uint8List>(preKey),
+      'preKey': serializer.toJson<i2.Uint8List>(preKey),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
 
   SignalPreKeyStoresData copyWith(
-          {int? preKeyId, Uint8List? preKey, DateTime? createdAt}) =>
+          {int? preKeyId, i2.Uint8List? preKey, DateTime? createdAt}) =>
       SignalPreKeyStoresData(
         preKeyId: preKeyId ?? this.preKeyId,
         preKey: preKey ?? this.preKey,
@@ -2487,7 +2488,7 @@ class SignalPreKeyStoresData extends DataClass
 class SignalPreKeyStoresCompanion
     extends UpdateCompanion<SignalPreKeyStoresData> {
   final Value<int> preKeyId;
-  final Value<Uint8List> preKey;
+  final Value<i2.Uint8List> preKey;
   final Value<DateTime> createdAt;
   const SignalPreKeyStoresCompanion({
     this.preKeyId = const Value.absent(),
@@ -2496,12 +2497,12 @@ class SignalPreKeyStoresCompanion
   });
   SignalPreKeyStoresCompanion.insert({
     this.preKeyId = const Value.absent(),
-    required Uint8List preKey,
+    required i2.Uint8List preKey,
     this.createdAt = const Value.absent(),
   }) : preKey = Value(preKey);
   static Insertable<SignalPreKeyStoresData> custom({
     Expression<int>? preKeyId,
-    Expression<Uint8List>? preKey,
+    Expression<i2.Uint8List>? preKey,
     Expression<DateTime>? createdAt,
   }) {
     return RawValuesInsertable({
@@ -2513,7 +2514,7 @@ class SignalPreKeyStoresCompanion
 
   SignalPreKeyStoresCompanion copyWith(
       {Value<int>? preKeyId,
-      Value<Uint8List>? preKey,
+      Value<i2.Uint8List>? preKey,
       Value<DateTime>? createdAt}) {
     return SignalPreKeyStoresCompanion(
       preKeyId: preKeyId ?? this.preKeyId,
@@ -2529,7 +2530,7 @@ class SignalPreKeyStoresCompanion
       map['pre_key_id'] = Variable<int>(preKeyId.value);
     }
     if (preKey.present) {
-      map['pre_key'] = Variable<Uint8List>(preKey.value);
+      map['pre_key'] = Variable<i2.Uint8List>(preKey.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -2557,9 +2558,9 @@ class SignalSenderKeyStores extends Table
   late final GeneratedColumn<String> senderKeyName = GeneratedColumn<String>(
       'sender_key_name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> senderKey = GeneratedColumn<Uint8List>(
+  late final GeneratedColumn<i2.Uint8List> senderKey =
-      'sender_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('sender_key', aliasedName, false,
-      type: DriftSqlType.blob, requiredDuringInsert: true);
+          type: DriftSqlType.blob, requiredDuringInsert: true);
   @override
   List<GeneratedColumn> get $columns => [senderKeyName, senderKey];
   @override
@@ -2590,14 +2591,14 @@ class SignalSenderKeyStores extends Table
 class SignalSenderKeyStoresData extends DataClass
     implements Insertable<SignalSenderKeyStoresData> {
   final String senderKeyName;
-  final Uint8List senderKey;
+  final i2.Uint8List senderKey;
   const SignalSenderKeyStoresData(
       {required this.senderKeyName, required this.senderKey});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
     map['sender_key_name'] = Variable<String>(senderKeyName);
-    map['sender_key'] = Variable<Uint8List>(senderKey);
+    map['sender_key'] = Variable<i2.Uint8List>(senderKey);
     return map;
   }
 
@@ -2613,7 +2614,7 @@ class SignalSenderKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return SignalSenderKeyStoresData(
       senderKeyName: serializer.fromJson<String>(json['senderKeyName']),
-      senderKey: serializer.fromJson<Uint8List>(json['senderKey']),
+      senderKey: serializer.fromJson<i2.Uint8List>(json['senderKey']),
     );
   }
   @override
@@ -2621,12 +2622,12 @@ class SignalSenderKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return <String, dynamic>{
       'senderKeyName': serializer.toJson<String>(senderKeyName),
-      'senderKey': serializer.toJson<Uint8List>(senderKey),
+      'senderKey': serializer.toJson<i2.Uint8List>(senderKey),
     };
   }
 
   SignalSenderKeyStoresData copyWith(
-          {String? senderKeyName, Uint8List? senderKey}) =>
+          {String? senderKeyName, i2.Uint8List? senderKey}) =>
       SignalSenderKeyStoresData(
         senderKeyName: senderKeyName ?? this.senderKeyName,
         senderKey: senderKey ?? this.senderKey,
@@ -2664,7 +2665,7 @@ class SignalSenderKeyStoresData extends DataClass
 class SignalSenderKeyStoresCompanion
     extends UpdateCompanion<SignalSenderKeyStoresData> {
   final Value<String> senderKeyName;
-  final Value<Uint8List> senderKey;
+  final Value<i2.Uint8List> senderKey;
   final Value<int> rowid;
   const SignalSenderKeyStoresCompanion({
     this.senderKeyName = const Value.absent(),
@@ -2673,13 +2674,13 @@ class SignalSenderKeyStoresCompanion
   });
   SignalSenderKeyStoresCompanion.insert({
     required String senderKeyName,
-    required Uint8List senderKey,
+    required i2.Uint8List senderKey,
     this.rowid = const Value.absent(),
   })  : senderKeyName = Value(senderKeyName),
         senderKey = Value(senderKey);
   static Insertable<SignalSenderKeyStoresData> custom({
     Expression<String>? senderKeyName,
-    Expression<Uint8List>? senderKey,
+    Expression<i2.Uint8List>? senderKey,
     Expression<int>? rowid,
   }) {
     return RawValuesInsertable({
@@ -2691,7 +2692,7 @@ class SignalSenderKeyStoresCompanion
 
   SignalSenderKeyStoresCompanion copyWith(
       {Value<String>? senderKeyName,
-      Value<Uint8List>? senderKey,
+      Value<i2.Uint8List>? senderKey,
       Value<int>? rowid}) {
     return SignalSenderKeyStoresCompanion(
       senderKeyName: senderKeyName ?? this.senderKeyName,
@@ -2707,7 +2708,7 @@ class SignalSenderKeyStoresCompanion
       map['sender_key_name'] = Variable<String>(senderKeyName.value);
     }
     if (senderKey.present) {
-      map['sender_key'] = Variable<Uint8List>(senderKey.value);
+      map['sender_key'] = Variable<i2.Uint8List>(senderKey.value);
     }
     if (rowid.present) {
       map['rowid'] = Variable<int>(rowid.value);
@@ -2738,8 +2739,8 @@ class SignalSessionStores extends Table
   late final GeneratedColumn<String> name = GeneratedColumn<String>(
       'name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> sessionRecord =
+  late final GeneratedColumn<i2.Uint8List> sessionRecord =
-      GeneratedColumn<Uint8List>('session_record', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('session_record', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
@@ -2783,7 +2784,7 @@ class SignalSessionStoresData extends DataClass
     implements Insertable<SignalSessionStoresData> {
   final int deviceId;
   final String name;
-  final Uint8List sessionRecord;
+  final i2.Uint8List sessionRecord;
   final DateTime createdAt;
   const SignalSessionStoresData(
       {required this.deviceId,
@@ -2795,7 +2796,7 @@ class SignalSessionStoresData extends DataClass
     final map = <String, Expression>{};
     map['device_id'] = Variable<int>(deviceId);
     map['name'] = Variable<String>(name);
-    map['session_record'] = Variable<Uint8List>(sessionRecord);
+    map['session_record'] = Variable<i2.Uint8List>(sessionRecord);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -2815,7 +2816,7 @@ class SignalSessionStoresData extends DataClass
     return SignalSessionStoresData(
       deviceId: serializer.fromJson<int>(json['deviceId']),
       name: serializer.fromJson<String>(json['name']),
-      sessionRecord: serializer.fromJson<Uint8List>(json['sessionRecord']),
+      sessionRecord: serializer.fromJson<i2.Uint8List>(json['sessionRecord']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -2825,7 +2826,7 @@ class SignalSessionStoresData extends DataClass
     return <String, dynamic>{
       'deviceId': serializer.toJson<int>(deviceId),
       'name': serializer.toJson<String>(name),
-      'sessionRecord': serializer.toJson<Uint8List>(sessionRecord),
+      'sessionRecord': serializer.toJson<i2.Uint8List>(sessionRecord),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -2833,7 +2834,7 @@ class SignalSessionStoresData extends DataClass
   SignalSessionStoresData copyWith(
           {int? deviceId,
           String? name,
-          Uint8List? sessionRecord,
+          i2.Uint8List? sessionRecord,
           DateTime? createdAt}) =>
       SignalSessionStoresData(
         deviceId: deviceId ?? this.deviceId,
@@ -2880,7 +2881,7 @@ class SignalSessionStoresCompanion
     extends UpdateCompanion<SignalSessionStoresData> {
   final Value<int> deviceId;
   final Value<String> name;
-  final Value<Uint8List> sessionRecord;
+  final Value<i2.Uint8List> sessionRecord;
   final Value<DateTime> createdAt;
   final Value<int> rowid;
   const SignalSessionStoresCompanion({
@@ -2893,7 +2894,7 @@ class SignalSessionStoresCompanion
   SignalSessionStoresCompanion.insert({
     required int deviceId,
     required String name,
-    required Uint8List sessionRecord,
+    required i2.Uint8List sessionRecord,
     this.createdAt = const Value.absent(),
     this.rowid = const Value.absent(),
   })  : deviceId = Value(deviceId),
@@ -2902,7 +2903,7 @@ class SignalSessionStoresCompanion
   static Insertable<SignalSessionStoresData> custom({
     Expression<int>? deviceId,
     Expression<String>? name,
-    Expression<Uint8List>? sessionRecord,
+    Expression<i2.Uint8List>? sessionRecord,
     Expression<DateTime>? createdAt,
     Expression<int>? rowid,
   }) {
@@ -2918,7 +2919,7 @@ class SignalSessionStoresCompanion
   SignalSessionStoresCompanion copyWith(
       {Value<int>? deviceId,
       Value<String>? name,
-      Value<Uint8List>? sessionRecord,
+      Value<i2.Uint8List>? sessionRecord,
       Value<DateTime>? createdAt,
       Value<int>? rowid}) {
     return SignalSessionStoresCompanion(
@@ -2940,7 +2941,7 @@ class SignalSessionStoresCompanion
       map['name'] = Variable<String>(name.value);
     }
     if (sessionRecord.present) {
-      map['session_record'] = Variable<Uint8List>(sessionRecord.value);
+      map['session_record'] = Variable<i2.Uint8List>(sessionRecord.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -2976,9 +2977,9 @@ class SignalContactPreKeys extends Table
   late final GeneratedColumn<int> preKeyId = GeneratedColumn<int>(
       'pre_key_id', aliasedName, false,
       type: DriftSqlType.int, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> preKey = GeneratedColumn<Uint8List>(
+  late final GeneratedColumn<i2.Uint8List> preKey =
-      'pre_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('pre_key', aliasedName, false,
-      type: DriftSqlType.blob, requiredDuringInsert: true);
+          type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
       type: DriftSqlType.dateTime,
@@ -3021,7 +3022,7 @@ class SignalContactPreKeysData extends DataClass
     implements Insertable<SignalContactPreKeysData> {
   final int contactId;
   final int preKeyId;
-  final Uint8List preKey;
+  final i2.Uint8List preKey;
   final DateTime createdAt;
   const SignalContactPreKeysData(
       {required this.contactId,
@@ -3033,7 +3034,7 @@ class SignalContactPreKeysData extends DataClass
     final map = <String, Expression>{};
     map['contact_id'] = Variable<int>(contactId);
     map['pre_key_id'] = Variable<int>(preKeyId);
-    map['pre_key'] = Variable<Uint8List>(preKey);
+    map['pre_key'] = Variable<i2.Uint8List>(preKey);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -3053,7 +3054,7 @@ class SignalContactPreKeysData extends DataClass
     return SignalContactPreKeysData(
       contactId: serializer.fromJson<int>(json['contactId']),
       preKeyId: serializer.fromJson<int>(json['preKeyId']),
-      preKey: serializer.fromJson<Uint8List>(json['preKey']),
+      preKey: serializer.fromJson<i2.Uint8List>(json['preKey']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -3063,7 +3064,7 @@ class SignalContactPreKeysData extends DataClass
     return <String, dynamic>{
       'contactId': serializer.toJson<int>(contactId),
       'preKeyId': serializer.toJson<int>(preKeyId),
-      'preKey': serializer.toJson<Uint8List>(preKey),
+      'preKey': serializer.toJson<i2.Uint8List>(preKey),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -3071,7 +3072,7 @@ class SignalContactPreKeysData extends DataClass
   SignalContactPreKeysData copyWith(
           {int? contactId,
           int? preKeyId,
-          Uint8List? preKey,
+          i2.Uint8List? preKey,
           DateTime? createdAt}) =>
       SignalContactPreKeysData(
         contactId: contactId ?? this.contactId,
@@ -3117,7 +3118,7 @@ class SignalContactPreKeysCompanion
     extends UpdateCompanion<SignalContactPreKeysData> {
   final Value<int> contactId;
   final Value<int> preKeyId;
-  final Value<Uint8List> preKey;
+  final Value<i2.Uint8List> preKey;
   final Value<DateTime> createdAt;
   final Value<int> rowid;
   const SignalContactPreKeysCompanion({
@@ -3130,7 +3131,7 @@ class SignalContactPreKeysCompanion
   SignalContactPreKeysCompanion.insert({
     required int contactId,
     required int preKeyId,
-    required Uint8List preKey,
+    required i2.Uint8List preKey,
     this.createdAt = const Value.absent(),
     this.rowid = const Value.absent(),
   })  : contactId = Value(contactId),
@@ -3139,7 +3140,7 @@ class SignalContactPreKeysCompanion
   static Insertable<SignalContactPreKeysData> custom({
     Expression<int>? contactId,
     Expression<int>? preKeyId,
-    Expression<Uint8List>? preKey,
+    Expression<i2.Uint8List>? preKey,
     Expression<DateTime>? createdAt,
     Expression<int>? rowid,
   }) {
@@ -3155,7 +3156,7 @@ class SignalContactPreKeysCompanion
   SignalContactPreKeysCompanion copyWith(
       {Value<int>? contactId,
       Value<int>? preKeyId,
-      Value<Uint8List>? preKey,
+      Value<i2.Uint8List>? preKey,
       Value<DateTime>? createdAt,
       Value<int>? rowid}) {
     return SignalContactPreKeysCompanion(
@@ -3177,7 +3178,7 @@ class SignalContactPreKeysCompanion
       map['pre_key_id'] = Variable<int>(preKeyId.value);
     }
     if (preKey.present) {
-      map['pre_key'] = Variable<Uint8List>(preKey.value);
+      map['pre_key'] = Variable<i2.Uint8List>(preKey.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -3213,11 +3214,12 @@ class SignalContactSignedPreKeys extends Table
   late final GeneratedColumn<int> signedPreKeyId = GeneratedColumn<int>(
       'signed_pre_key_id', aliasedName, false,
       type: DriftSqlType.int, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> signedPreKey =
+  late final GeneratedColumn<i2.Uint8List> signedPreKey =
-      GeneratedColumn<Uint8List>('signed_pre_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('signed_pre_key', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> signedPreKeySignature =
+  late final GeneratedColumn<i2.Uint8List> signedPreKeySignature =
-      GeneratedColumn<Uint8List>('signed_pre_key_signature', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>(
+          'signed_pre_key_signature', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
@@ -3269,8 +3271,8 @@ class SignalContactSignedPreKeysData extends DataClass
     implements Insertable<SignalContactSignedPreKeysData> {
   final int contactId;
   final int signedPreKeyId;
-  final Uint8List signedPreKey;
+  final i2.Uint8List signedPreKey;
-  final Uint8List signedPreKeySignature;
+  final i2.Uint8List signedPreKeySignature;
   final DateTime createdAt;
   const SignalContactSignedPreKeysData(
       {required this.contactId,
@@ -3283,9 +3285,9 @@ class SignalContactSignedPreKeysData extends DataClass
     final map = <String, Expression>{};
     map['contact_id'] = Variable<int>(contactId);
     map['signed_pre_key_id'] = Variable<int>(signedPreKeyId);
-    map['signed_pre_key'] = Variable<Uint8List>(signedPreKey);
+    map['signed_pre_key'] = Variable<i2.Uint8List>(signedPreKey);
     map['signed_pre_key_signature'] =
-        Variable<Uint8List>(signedPreKeySignature);
+        Variable<i2.Uint8List>(signedPreKeySignature);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -3306,9 +3308,9 @@ class SignalContactSignedPreKeysData extends DataClass
     return SignalContactSignedPreKeysData(
       contactId: serializer.fromJson<int>(json['contactId']),
       signedPreKeyId: serializer.fromJson<int>(json['signedPreKeyId']),
-      signedPreKey: serializer.fromJson<Uint8List>(json['signedPreKey']),
+      signedPreKey: serializer.fromJson<i2.Uint8List>(json['signedPreKey']),
       signedPreKeySignature:
-          serializer.fromJson<Uint8List>(json['signedPreKeySignature']),
+          serializer.fromJson<i2.Uint8List>(json['signedPreKeySignature']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -3318,9 +3320,9 @@ class SignalContactSignedPreKeysData extends DataClass
     return <String, dynamic>{
       'contactId': serializer.toJson<int>(contactId),
       'signedPreKeyId': serializer.toJson<int>(signedPreKeyId),
-      'signedPreKey': serializer.toJson<Uint8List>(signedPreKey),
+      'signedPreKey': serializer.toJson<i2.Uint8List>(signedPreKey),
       'signedPreKeySignature':
-          serializer.toJson<Uint8List>(signedPreKeySignature),
+          serializer.toJson<i2.Uint8List>(signedPreKeySignature),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -3328,8 +3330,8 @@ class SignalContactSignedPreKeysData extends DataClass
   SignalContactSignedPreKeysData copyWith(
           {int? contactId,
           int? signedPreKeyId,
-          Uint8List? signedPreKey,
+          i2.Uint8List? signedPreKey,
-          Uint8List? signedPreKeySignature,
+          i2.Uint8List? signedPreKeySignature,
           DateTime? createdAt}) =>
       SignalContactSignedPreKeysData(
         contactId: contactId ?? this.contactId,
@@ -3391,8 +3393,8 @@ class SignalContactSignedPreKeysCompanion
     extends UpdateCompanion<SignalContactSignedPreKeysData> {
   final Value<int> contactId;
   final Value<int> signedPreKeyId;
-  final Value<Uint8List> signedPreKey;
+  final Value<i2.Uint8List> signedPreKey;
-  final Value<Uint8List> signedPreKeySignature;
+  final Value<i2.Uint8List> signedPreKeySignature;
   final Value<DateTime> createdAt;
   const SignalContactSignedPreKeysCompanion({
     this.contactId = const Value.absent(),
@@ -3404,8 +3406,8 @@ class SignalContactSignedPreKeysCompanion
   SignalContactSignedPreKeysCompanion.insert({
     this.contactId = const Value.absent(),
     required int signedPreKeyId,
-    required Uint8List signedPreKey,
+    required i2.Uint8List signedPreKey,
-    required Uint8List signedPreKeySignature,
+    required i2.Uint8List signedPreKeySignature,
     this.createdAt = const Value.absent(),
   })  : signedPreKeyId = Value(signedPreKeyId),
         signedPreKey = Value(signedPreKey),
@@ -3413,8 +3415,8 @@ class SignalContactSignedPreKeysCompanion
   static Insertable<SignalContactSignedPreKeysData> custom({
     Expression<int>? contactId,
     Expression<int>? signedPreKeyId,
-    Expression<Uint8List>? signedPreKey,
+    Expression<i2.Uint8List>? signedPreKey,
-    Expression<Uint8List>? signedPreKeySignature,
+    Expression<i2.Uint8List>? signedPreKeySignature,
     Expression<DateTime>? createdAt,
   }) {
     return RawValuesInsertable({
@@ -3430,8 +3432,8 @@ class SignalContactSignedPreKeysCompanion
   SignalContactSignedPreKeysCompanion copyWith(
       {Value<int>? contactId,
       Value<int>? signedPreKeyId,
-      Value<Uint8List>? signedPreKey,
+      Value<i2.Uint8List>? signedPreKey,
-      Value<Uint8List>? signedPreKeySignature,
+      Value<i2.Uint8List>? signedPreKeySignature,
       Value<DateTime>? createdAt}) {
     return SignalContactSignedPreKeysCompanion(
       contactId: contactId ?? this.contactId,
@@ -3453,11 +3455,11 @@ class SignalContactSignedPreKeysCompanion
       map['signed_pre_key_id'] = Variable<int>(signedPreKeyId.value);
     }
     if (signedPreKey.present) {
-      map['signed_pre_key'] = Variable<Uint8List>(signedPreKey.value);
+      map['signed_pre_key'] = Variable<i2.Uint8List>(signedPreKey.value);
     }
     if (signedPreKeySignature.present) {
       map['signed_pre_key_signature'] =
-          Variable<Uint8List>(signedPreKeySignature.value);
+          Variable<i2.Uint8List>(signedPreKeySignature.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);

test/drift/twonly_database/generated/schema_v11.dart

@@ -1,4 +1,5 @@
 // dart format width=80
+import 'dart:typed_data' as i2;
 // GENERATED CODE, DO NOT EDIT BY HAND.
 // ignore_for_file: type=lint
 import 'package:drift/drift.dart';
@@ -2132,8 +2133,8 @@ class SignalIdentityKeyStores extends Table
   late final GeneratedColumn<String> name = GeneratedColumn<String>(
       'name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> identityKey =
+  late final GeneratedColumn<i2.Uint8List> identityKey =
-      GeneratedColumn<Uint8List>('identity_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('identity_key', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
@@ -2177,7 +2178,7 @@ class SignalIdentityKeyStoresData extends DataClass
     implements Insertable<SignalIdentityKeyStoresData> {
   final int deviceId;
   final String name;
-  final Uint8List identityKey;
+  final i2.Uint8List identityKey;
   final DateTime createdAt;
   const SignalIdentityKeyStoresData(
       {required this.deviceId,
@@ -2189,7 +2190,7 @@ class SignalIdentityKeyStoresData extends DataClass
     final map = <String, Expression>{};
     map['device_id'] = Variable<int>(deviceId);
     map['name'] = Variable<String>(name);
-    map['identity_key'] = Variable<Uint8List>(identityKey);
+    map['identity_key'] = Variable<i2.Uint8List>(identityKey);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -2209,7 +2210,7 @@ class SignalIdentityKeyStoresData extends DataClass
     return SignalIdentityKeyStoresData(
       deviceId: serializer.fromJson<int>(json['deviceId']),
       name: serializer.fromJson<String>(json['name']),
-      identityKey: serializer.fromJson<Uint8List>(json['identityKey']),
+      identityKey: serializer.fromJson<i2.Uint8List>(json['identityKey']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -2219,7 +2220,7 @@ class SignalIdentityKeyStoresData extends DataClass
     return <String, dynamic>{
       'deviceId': serializer.toJson<int>(deviceId),
       'name': serializer.toJson<String>(name),
-      'identityKey': serializer.toJson<Uint8List>(identityKey),
+      'identityKey': serializer.toJson<i2.Uint8List>(identityKey),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -2227,7 +2228,7 @@ class SignalIdentityKeyStoresData extends DataClass
   SignalIdentityKeyStoresData copyWith(
           {int? deviceId,
           String? name,
-          Uint8List? identityKey,
+          i2.Uint8List? identityKey,
           DateTime? createdAt}) =>
       SignalIdentityKeyStoresData(
         deviceId: deviceId ?? this.deviceId,
@@ -2274,7 +2275,7 @@ class SignalIdentityKeyStoresCompanion
     extends UpdateCompanion<SignalIdentityKeyStoresData> {
   final Value<int> deviceId;
   final Value<String> name;
-  final Value<Uint8List> identityKey;
+  final Value<i2.Uint8List> identityKey;
   final Value<DateTime> createdAt;
   final Value<int> rowid;
   const SignalIdentityKeyStoresCompanion({
@@ -2287,7 +2288,7 @@ class SignalIdentityKeyStoresCompanion
   SignalIdentityKeyStoresCompanion.insert({
     required int deviceId,
     required String name,
-    required Uint8List identityKey,
+    required i2.Uint8List identityKey,
     this.createdAt = const Value.absent(),
     this.rowid = const Value.absent(),
   })  : deviceId = Value(deviceId),
@@ -2296,7 +2297,7 @@ class SignalIdentityKeyStoresCompanion
   static Insertable<SignalIdentityKeyStoresData> custom({
     Expression<int>? deviceId,
     Expression<String>? name,
-    Expression<Uint8List>? identityKey,
+    Expression<i2.Uint8List>? identityKey,
     Expression<DateTime>? createdAt,
     Expression<int>? rowid,
   }) {
@@ -2312,7 +2313,7 @@ class SignalIdentityKeyStoresCompanion
   SignalIdentityKeyStoresCompanion copyWith(
       {Value<int>? deviceId,
       Value<String>? name,
-      Value<Uint8List>? identityKey,
+      Value<i2.Uint8List>? identityKey,
       Value<DateTime>? createdAt,
       Value<int>? rowid}) {
     return SignalIdentityKeyStoresCompanion(
@@ -2334,7 +2335,7 @@ class SignalIdentityKeyStoresCompanion
       map['name'] = Variable<String>(name.value);
     }
     if (identityKey.present) {
-      map['identity_key'] = Variable<Uint8List>(identityKey.value);
+      map['identity_key'] = Variable<i2.Uint8List>(identityKey.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -2367,9 +2368,9 @@ class SignalPreKeyStores extends Table
   late final GeneratedColumn<int> preKeyId = GeneratedColumn<int>(
       'pre_key_id', aliasedName, false,
       type: DriftSqlType.int, requiredDuringInsert: false);
-  late final GeneratedColumn<Uint8List> preKey = GeneratedColumn<Uint8List>(
+  late final GeneratedColumn<i2.Uint8List> preKey =
-      'pre_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('pre_key', aliasedName, false,
-      type: DriftSqlType.blob, requiredDuringInsert: true);
+          type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
       type: DriftSqlType.dateTime,
@@ -2407,7 +2408,7 @@ class SignalPreKeyStores extends Table
 class SignalPreKeyStoresData extends DataClass
     implements Insertable<SignalPreKeyStoresData> {
   final int preKeyId;
-  final Uint8List preKey;
+  final i2.Uint8List preKey;
   final DateTime createdAt;
   const SignalPreKeyStoresData(
       {required this.preKeyId, required this.preKey, required this.createdAt});
@@ -2415,7 +2416,7 @@ class SignalPreKeyStoresData extends DataClass
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
     map['pre_key_id'] = Variable<int>(preKeyId);
-    map['pre_key'] = Variable<Uint8List>(preKey);
+    map['pre_key'] = Variable<i2.Uint8List>(preKey);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -2433,7 +2434,7 @@ class SignalPreKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return SignalPreKeyStoresData(
       preKeyId: serializer.fromJson<int>(json['preKeyId']),
-      preKey: serializer.fromJson<Uint8List>(json['preKey']),
+      preKey: serializer.fromJson<i2.Uint8List>(json['preKey']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -2442,13 +2443,13 @@ class SignalPreKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return <String, dynamic>{
       'preKeyId': serializer.toJson<int>(preKeyId),
-      'preKey': serializer.toJson<Uint8List>(preKey),
+      'preKey': serializer.toJson<i2.Uint8List>(preKey),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
 
   SignalPreKeyStoresData copyWith(
-          {int? preKeyId, Uint8List? preKey, DateTime? createdAt}) =>
+          {int? preKeyId, i2.Uint8List? preKey, DateTime? createdAt}) =>
       SignalPreKeyStoresData(
         preKeyId: preKeyId ?? this.preKeyId,
         preKey: preKey ?? this.preKey,
@@ -2487,7 +2488,7 @@ class SignalPreKeyStoresData extends DataClass
 class SignalPreKeyStoresCompanion
     extends UpdateCompanion<SignalPreKeyStoresData> {
   final Value<int> preKeyId;
-  final Value<Uint8List> preKey;
+  final Value<i2.Uint8List> preKey;
   final Value<DateTime> createdAt;
   const SignalPreKeyStoresCompanion({
     this.preKeyId = const Value.absent(),
@@ -2496,12 +2497,12 @@ class SignalPreKeyStoresCompanion
   });
   SignalPreKeyStoresCompanion.insert({
     this.preKeyId = const Value.absent(),
-    required Uint8List preKey,
+    required i2.Uint8List preKey,
     this.createdAt = const Value.absent(),
   }) : preKey = Value(preKey);
   static Insertable<SignalPreKeyStoresData> custom({
     Expression<int>? preKeyId,
-    Expression<Uint8List>? preKey,
+    Expression<i2.Uint8List>? preKey,
     Expression<DateTime>? createdAt,
   }) {
     return RawValuesInsertable({
@@ -2513,7 +2514,7 @@ class SignalPreKeyStoresCompanion
 
   SignalPreKeyStoresCompanion copyWith(
       {Value<int>? preKeyId,
-      Value<Uint8List>? preKey,
+      Value<i2.Uint8List>? preKey,
       Value<DateTime>? createdAt}) {
     return SignalPreKeyStoresCompanion(
       preKeyId: preKeyId ?? this.preKeyId,
@@ -2529,7 +2530,7 @@ class SignalPreKeyStoresCompanion
       map['pre_key_id'] = Variable<int>(preKeyId.value);
     }
     if (preKey.present) {
-      map['pre_key'] = Variable<Uint8List>(preKey.value);
+      map['pre_key'] = Variable<i2.Uint8List>(preKey.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -2557,9 +2558,9 @@ class SignalSenderKeyStores extends Table
   late final GeneratedColumn<String> senderKeyName = GeneratedColumn<String>(
       'sender_key_name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> senderKey = GeneratedColumn<Uint8List>(
+  late final GeneratedColumn<i2.Uint8List> senderKey =
-      'sender_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('sender_key', aliasedName, false,
-      type: DriftSqlType.blob, requiredDuringInsert: true);
+          type: DriftSqlType.blob, requiredDuringInsert: true);
   @override
   List<GeneratedColumn> get $columns => [senderKeyName, senderKey];
   @override
@@ -2590,14 +2591,14 @@ class SignalSenderKeyStores extends Table
 class SignalSenderKeyStoresData extends DataClass
     implements Insertable<SignalSenderKeyStoresData> {
   final String senderKeyName;
-  final Uint8List senderKey;
+  final i2.Uint8List senderKey;
   const SignalSenderKeyStoresData(
       {required this.senderKeyName, required this.senderKey});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
     map['sender_key_name'] = Variable<String>(senderKeyName);
-    map['sender_key'] = Variable<Uint8List>(senderKey);
+    map['sender_key'] = Variable<i2.Uint8List>(senderKey);
     return map;
   }
 
@@ -2613,7 +2614,7 @@ class SignalSenderKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return SignalSenderKeyStoresData(
       senderKeyName: serializer.fromJson<String>(json['senderKeyName']),
-      senderKey: serializer.fromJson<Uint8List>(json['senderKey']),
+      senderKey: serializer.fromJson<i2.Uint8List>(json['senderKey']),
     );
   }
   @override
@@ -2621,12 +2622,12 @@ class SignalSenderKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return <String, dynamic>{
       'senderKeyName': serializer.toJson<String>(senderKeyName),
-      'senderKey': serializer.toJson<Uint8List>(senderKey),
+      'senderKey': serializer.toJson<i2.Uint8List>(senderKey),
     };
   }
 
   SignalSenderKeyStoresData copyWith(
-          {String? senderKeyName, Uint8List? senderKey}) =>
+          {String? senderKeyName, i2.Uint8List? senderKey}) =>
       SignalSenderKeyStoresData(
         senderKeyName: senderKeyName ?? this.senderKeyName,
         senderKey: senderKey ?? this.senderKey,
@@ -2664,7 +2665,7 @@ class SignalSenderKeyStoresData extends DataClass
 class SignalSenderKeyStoresCompanion
     extends UpdateCompanion<SignalSenderKeyStoresData> {
   final Value<String> senderKeyName;
-  final Value<Uint8List> senderKey;
+  final Value<i2.Uint8List> senderKey;
   final Value<int> rowid;
   const SignalSenderKeyStoresCompanion({
     this.senderKeyName = const Value.absent(),
@@ -2673,13 +2674,13 @@ class SignalSenderKeyStoresCompanion
   });
   SignalSenderKeyStoresCompanion.insert({
     required String senderKeyName,
-    required Uint8List senderKey,
+    required i2.Uint8List senderKey,
     this.rowid = const Value.absent(),
   })  : senderKeyName = Value(senderKeyName),
         senderKey = Value(senderKey);
   static Insertable<SignalSenderKeyStoresData> custom({
     Expression<String>? senderKeyName,
-    Expression<Uint8List>? senderKey,
+    Expression<i2.Uint8List>? senderKey,
     Expression<int>? rowid,
   }) {
     return RawValuesInsertable({
@@ -2691,7 +2692,7 @@ class SignalSenderKeyStoresCompanion
 
   SignalSenderKeyStoresCompanion copyWith(
       {Value<String>? senderKeyName,
-      Value<Uint8List>? senderKey,
+      Value<i2.Uint8List>? senderKey,
       Value<int>? rowid}) {
     return SignalSenderKeyStoresCompanion(
       senderKeyName: senderKeyName ?? this.senderKeyName,
@@ -2707,7 +2708,7 @@ class SignalSenderKeyStoresCompanion
       map['sender_key_name'] = Variable<String>(senderKeyName.value);
     }
     if (senderKey.present) {
-      map['sender_key'] = Variable<Uint8List>(senderKey.value);
+      map['sender_key'] = Variable<i2.Uint8List>(senderKey.value);
     }
     if (rowid.present) {
       map['rowid'] = Variable<int>(rowid.value);
@@ -2738,8 +2739,8 @@ class SignalSessionStores extends Table
   late final GeneratedColumn<String> name = GeneratedColumn<String>(
       'name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> sessionRecord =
+  late final GeneratedColumn<i2.Uint8List> sessionRecord =
-      GeneratedColumn<Uint8List>('session_record', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('session_record', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
@@ -2783,7 +2784,7 @@ class SignalSessionStoresData extends DataClass
     implements Insertable<SignalSessionStoresData> {
   final int deviceId;
   final String name;
-  final Uint8List sessionRecord;
+  final i2.Uint8List sessionRecord;
   final DateTime createdAt;
   const SignalSessionStoresData(
       {required this.deviceId,
@@ -2795,7 +2796,7 @@ class SignalSessionStoresData extends DataClass
     final map = <String, Expression>{};
     map['device_id'] = Variable<int>(deviceId);
     map['name'] = Variable<String>(name);
-    map['session_record'] = Variable<Uint8List>(sessionRecord);
+    map['session_record'] = Variable<i2.Uint8List>(sessionRecord);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -2815,7 +2816,7 @@ class SignalSessionStoresData extends DataClass
     return SignalSessionStoresData(
       deviceId: serializer.fromJson<int>(json['deviceId']),
       name: serializer.fromJson<String>(json['name']),
-      sessionRecord: serializer.fromJson<Uint8List>(json['sessionRecord']),
+      sessionRecord: serializer.fromJson<i2.Uint8List>(json['sessionRecord']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -2825,7 +2826,7 @@ class SignalSessionStoresData extends DataClass
     return <String, dynamic>{
       'deviceId': serializer.toJson<int>(deviceId),
       'name': serializer.toJson<String>(name),
-      'sessionRecord': serializer.toJson<Uint8List>(sessionRecord),
+      'sessionRecord': serializer.toJson<i2.Uint8List>(sessionRecord),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -2833,7 +2834,7 @@ class SignalSessionStoresData extends DataClass
   SignalSessionStoresData copyWith(
           {int? deviceId,
           String? name,
-          Uint8List? sessionRecord,
+          i2.Uint8List? sessionRecord,
           DateTime? createdAt}) =>
       SignalSessionStoresData(
         deviceId: deviceId ?? this.deviceId,
@@ -2880,7 +2881,7 @@ class SignalSessionStoresCompanion
     extends UpdateCompanion<SignalSessionStoresData> {
   final Value<int> deviceId;
   final Value<String> name;
-  final Value<Uint8List> sessionRecord;
+  final Value<i2.Uint8List> sessionRecord;
   final Value<DateTime> createdAt;
   final Value<int> rowid;
   const SignalSessionStoresCompanion({
@@ -2893,7 +2894,7 @@ class SignalSessionStoresCompanion
   SignalSessionStoresCompanion.insert({
     required int deviceId,
     required String name,
-    required Uint8List sessionRecord,
+    required i2.Uint8List sessionRecord,
     this.createdAt = const Value.absent(),
     this.rowid = const Value.absent(),
   })  : deviceId = Value(deviceId),
@@ -2902,7 +2903,7 @@ class SignalSessionStoresCompanion
   static Insertable<SignalSessionStoresData> custom({
     Expression<int>? deviceId,
     Expression<String>? name,
-    Expression<Uint8List>? sessionRecord,
+    Expression<i2.Uint8List>? sessionRecord,
     Expression<DateTime>? createdAt,
     Expression<int>? rowid,
   }) {
@@ -2918,7 +2919,7 @@ class SignalSessionStoresCompanion
   SignalSessionStoresCompanion copyWith(
       {Value<int>? deviceId,
       Value<String>? name,
-      Value<Uint8List>? sessionRecord,
+      Value<i2.Uint8List>? sessionRecord,
       Value<DateTime>? createdAt,
       Value<int>? rowid}) {
     return SignalSessionStoresCompanion(
@@ -2940,7 +2941,7 @@ class SignalSessionStoresCompanion
       map['name'] = Variable<String>(name.value);
     }
     if (sessionRecord.present) {
-      map['session_record'] = Variable<Uint8List>(sessionRecord.value);
+      map['session_record'] = Variable<i2.Uint8List>(sessionRecord.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -2976,9 +2977,9 @@ class SignalContactPreKeys extends Table
   late final GeneratedColumn<int> preKeyId = GeneratedColumn<int>(
       'pre_key_id', aliasedName, false,
       type: DriftSqlType.int, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> preKey = GeneratedColumn<Uint8List>(
+  late final GeneratedColumn<i2.Uint8List> preKey =
-      'pre_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('pre_key', aliasedName, false,
-      type: DriftSqlType.blob, requiredDuringInsert: true);
+          type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
       type: DriftSqlType.dateTime,
@@ -3021,7 +3022,7 @@ class SignalContactPreKeysData extends DataClass
     implements Insertable<SignalContactPreKeysData> {
   final int contactId;
   final int preKeyId;
-  final Uint8List preKey;
+  final i2.Uint8List preKey;
   final DateTime createdAt;
   const SignalContactPreKeysData(
       {required this.contactId,
@@ -3033,7 +3034,7 @@ class SignalContactPreKeysData extends DataClass
     final map = <String, Expression>{};
     map['contact_id'] = Variable<int>(contactId);
     map['pre_key_id'] = Variable<int>(preKeyId);
-    map['pre_key'] = Variable<Uint8List>(preKey);
+    map['pre_key'] = Variable<i2.Uint8List>(preKey);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -3053,7 +3054,7 @@ class SignalContactPreKeysData extends DataClass
     return SignalContactPreKeysData(
       contactId: serializer.fromJson<int>(json['contactId']),
       preKeyId: serializer.fromJson<int>(json['preKeyId']),
-      preKey: serializer.fromJson<Uint8List>(json['preKey']),
+      preKey: serializer.fromJson<i2.Uint8List>(json['preKey']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -3063,7 +3064,7 @@ class SignalContactPreKeysData extends DataClass
     return <String, dynamic>{
       'contactId': serializer.toJson<int>(contactId),
       'preKeyId': serializer.toJson<int>(preKeyId),
-      'preKey': serializer.toJson<Uint8List>(preKey),
+      'preKey': serializer.toJson<i2.Uint8List>(preKey),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -3071,7 +3072,7 @@ class SignalContactPreKeysData extends DataClass
   SignalContactPreKeysData copyWith(
           {int? contactId,
           int? preKeyId,
-          Uint8List? preKey,
+          i2.Uint8List? preKey,
           DateTime? createdAt}) =>
       SignalContactPreKeysData(
         contactId: contactId ?? this.contactId,
@@ -3117,7 +3118,7 @@ class SignalContactPreKeysCompanion
     extends UpdateCompanion<SignalContactPreKeysData> {
   final Value<int> contactId;
   final Value<int> preKeyId;
-  final Value<Uint8List> preKey;
+  final Value<i2.Uint8List> preKey;
   final Value<DateTime> createdAt;
   final Value<int> rowid;
   const SignalContactPreKeysCompanion({
@@ -3130,7 +3131,7 @@ class SignalContactPreKeysCompanion
   SignalContactPreKeysCompanion.insert({
     required int contactId,
     required int preKeyId,
-    required Uint8List preKey,
+    required i2.Uint8List preKey,
     this.createdAt = const Value.absent(),
     this.rowid = const Value.absent(),
   })  : contactId = Value(contactId),
@@ -3139,7 +3140,7 @@ class SignalContactPreKeysCompanion
   static Insertable<SignalContactPreKeysData> custom({
     Expression<int>? contactId,
     Expression<int>? preKeyId,
-    Expression<Uint8List>? preKey,
+    Expression<i2.Uint8List>? preKey,
     Expression<DateTime>? createdAt,
     Expression<int>? rowid,
   }) {
@@ -3155,7 +3156,7 @@ class SignalContactPreKeysCompanion
   SignalContactPreKeysCompanion copyWith(
       {Value<int>? contactId,
       Value<int>? preKeyId,
-      Value<Uint8List>? preKey,
+      Value<i2.Uint8List>? preKey,
       Value<DateTime>? createdAt,
       Value<int>? rowid}) {
     return SignalContactPreKeysCompanion(
@@ -3177,7 +3178,7 @@ class SignalContactPreKeysCompanion
       map['pre_key_id'] = Variable<int>(preKeyId.value);
     }
     if (preKey.present) {
-      map['pre_key'] = Variable<Uint8List>(preKey.value);
+      map['pre_key'] = Variable<i2.Uint8List>(preKey.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -3213,11 +3214,12 @@ class SignalContactSignedPreKeys extends Table
   late final GeneratedColumn<int> signedPreKeyId = GeneratedColumn<int>(
       'signed_pre_key_id', aliasedName, false,
       type: DriftSqlType.int, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> signedPreKey =
+  late final GeneratedColumn<i2.Uint8List> signedPreKey =
-      GeneratedColumn<Uint8List>('signed_pre_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('signed_pre_key', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> signedPreKeySignature =
+  late final GeneratedColumn<i2.Uint8List> signedPreKeySignature =
-      GeneratedColumn<Uint8List>('signed_pre_key_signature', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>(
+          'signed_pre_key_signature', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
@@ -3269,8 +3271,8 @@ class SignalContactSignedPreKeysData extends DataClass
     implements Insertable<SignalContactSignedPreKeysData> {
   final int contactId;
   final int signedPreKeyId;
-  final Uint8List signedPreKey;
+  final i2.Uint8List signedPreKey;
-  final Uint8List signedPreKeySignature;
+  final i2.Uint8List signedPreKeySignature;
   final DateTime createdAt;
   const SignalContactSignedPreKeysData(
       {required this.contactId,
@@ -3283,9 +3285,9 @@ class SignalContactSignedPreKeysData extends DataClass
     final map = <String, Expression>{};
     map['contact_id'] = Variable<int>(contactId);
     map['signed_pre_key_id'] = Variable<int>(signedPreKeyId);
-    map['signed_pre_key'] = Variable<Uint8List>(signedPreKey);
+    map['signed_pre_key'] = Variable<i2.Uint8List>(signedPreKey);
     map['signed_pre_key_signature'] =
-        Variable<Uint8List>(signedPreKeySignature);
+        Variable<i2.Uint8List>(signedPreKeySignature);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -3306,9 +3308,9 @@ class SignalContactSignedPreKeysData extends DataClass
     return SignalContactSignedPreKeysData(
       contactId: serializer.fromJson<int>(json['contactId']),
       signedPreKeyId: serializer.fromJson<int>(json['signedPreKeyId']),
-      signedPreKey: serializer.fromJson<Uint8List>(json['signedPreKey']),
+      signedPreKey: serializer.fromJson<i2.Uint8List>(json['signedPreKey']),
       signedPreKeySignature:
-          serializer.fromJson<Uint8List>(json['signedPreKeySignature']),
+          serializer.fromJson<i2.Uint8List>(json['signedPreKeySignature']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -3318,9 +3320,9 @@ class SignalContactSignedPreKeysData extends DataClass
     return <String, dynamic>{
       'contactId': serializer.toJson<int>(contactId),
       'signedPreKeyId': serializer.toJson<int>(signedPreKeyId),
-      'signedPreKey': serializer.toJson<Uint8List>(signedPreKey),
+      'signedPreKey': serializer.toJson<i2.Uint8List>(signedPreKey),
       'signedPreKeySignature':
-          serializer.toJson<Uint8List>(signedPreKeySignature),
+          serializer.toJson<i2.Uint8List>(signedPreKeySignature),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -3328,8 +3330,8 @@ class SignalContactSignedPreKeysData extends DataClass
   SignalContactSignedPreKeysData copyWith(
           {int? contactId,
           int? signedPreKeyId,
-          Uint8List? signedPreKey,
+          i2.Uint8List? signedPreKey,
-          Uint8List? signedPreKeySignature,
+          i2.Uint8List? signedPreKeySignature,
           DateTime? createdAt}) =>
       SignalContactSignedPreKeysData(
         contactId: contactId ?? this.contactId,
@@ -3391,8 +3393,8 @@ class SignalContactSignedPreKeysCompanion
     extends UpdateCompanion<SignalContactSignedPreKeysData> {
   final Value<int> contactId;
   final Value<int> signedPreKeyId;
-  final Value<Uint8List> signedPreKey;
+  final Value<i2.Uint8List> signedPreKey;
-  final Value<Uint8List> signedPreKeySignature;
+  final Value<i2.Uint8List> signedPreKeySignature;
   final Value<DateTime> createdAt;
   const SignalContactSignedPreKeysCompanion({
     this.contactId = const Value.absent(),
@@ -3404,8 +3406,8 @@ class SignalContactSignedPreKeysCompanion
   SignalContactSignedPreKeysCompanion.insert({
     this.contactId = const Value.absent(),
     required int signedPreKeyId,
-    required Uint8List signedPreKey,
+    required i2.Uint8List signedPreKey,
-    required Uint8List signedPreKeySignature,
+    required i2.Uint8List signedPreKeySignature,
     this.createdAt = const Value.absent(),
   })  : signedPreKeyId = Value(signedPreKeyId),
         signedPreKey = Value(signedPreKey),
@@ -3413,8 +3415,8 @@ class SignalContactSignedPreKeysCompanion
   static Insertable<SignalContactSignedPreKeysData> custom({
     Expression<int>? contactId,
     Expression<int>? signedPreKeyId,
-    Expression<Uint8List>? signedPreKey,
+    Expression<i2.Uint8List>? signedPreKey,
-    Expression<Uint8List>? signedPreKeySignature,
+    Expression<i2.Uint8List>? signedPreKeySignature,
     Expression<DateTime>? createdAt,
   }) {
     return RawValuesInsertable({
@@ -3430,8 +3432,8 @@ class SignalContactSignedPreKeysCompanion
   SignalContactSignedPreKeysCompanion copyWith(
       {Value<int>? contactId,
       Value<int>? signedPreKeyId,
-      Value<Uint8List>? signedPreKey,
+      Value<i2.Uint8List>? signedPreKey,
-      Value<Uint8List>? signedPreKeySignature,
+      Value<i2.Uint8List>? signedPreKeySignature,
       Value<DateTime>? createdAt}) {
     return SignalContactSignedPreKeysCompanion(
       contactId: contactId ?? this.contactId,
@@ -3453,11 +3455,11 @@ class SignalContactSignedPreKeysCompanion
       map['signed_pre_key_id'] = Variable<int>(signedPreKeyId.value);
     }
     if (signedPreKey.present) {
-      map['signed_pre_key'] = Variable<Uint8List>(signedPreKey.value);
+      map['signed_pre_key'] = Variable<i2.Uint8List>(signedPreKey.value);
     }
     if (signedPreKeySignature.present) {
       map['signed_pre_key_signature'] =
-          Variable<Uint8List>(signedPreKeySignature.value);
+          Variable<i2.Uint8List>(signedPreKeySignature.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -3503,12 +3505,12 @@ class MessageRetransmissions extends Table
       requiredDuringInsert: false,
       defaultConstraints: GeneratedColumn.constraintIsAlways(
           'REFERENCES messages (message_id) ON DELETE CASCADE'));
-  late final GeneratedColumn<Uint8List> plaintextContent =
+  late final GeneratedColumn<i2.Uint8List> plaintextContent =
-      GeneratedColumn<Uint8List>('plaintext_content', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('plaintext_content', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> pushData = GeneratedColumn<Uint8List>(
+  late final GeneratedColumn<i2.Uint8List> pushData =
-      'push_data', aliasedName, true,
+      GeneratedColumn<i2.Uint8List>('push_data', aliasedName, true,
-      type: DriftSqlType.blob, requiredDuringInsert: false);
+          type: DriftSqlType.blob, requiredDuringInsert: false);
   late final GeneratedColumn<DateTime> acknowledgeByServerAt =
       GeneratedColumn<DateTime>('acknowledge_by_server_at', aliasedName, true,
           type: DriftSqlType.dateTime, requiredDuringInsert: false);
@@ -3560,8 +3562,8 @@ class MessageRetransmissionsData extends DataClass
   final int retransmissionId;
   final int contactId;
   final int? messageId;
-  final Uint8List plaintextContent;
+  final i2.Uint8List plaintextContent;
-  final Uint8List? pushData;
+  final i2.Uint8List? pushData;
   final DateTime? acknowledgeByServerAt;
   const MessageRetransmissionsData(
       {required this.retransmissionId,
@@ -3578,9 +3580,9 @@ class MessageRetransmissionsData extends DataClass
     if (!nullToAbsent || messageId != null) {
       map['message_id'] = Variable<int>(messageId);
     }
-    map['plaintext_content'] = Variable<Uint8List>(plaintextContent);
+    map['plaintext_content'] = Variable<i2.Uint8List>(plaintextContent);
     if (!nullToAbsent || pushData != null) {
-      map['push_data'] = Variable<Uint8List>(pushData);
+      map['push_data'] = Variable<i2.Uint8List>(pushData);
     }
     if (!nullToAbsent || acknowledgeByServerAt != null) {
       map['acknowledge_by_server_at'] =
@@ -3614,8 +3616,8 @@ class MessageRetransmissionsData extends DataClass
       contactId: serializer.fromJson<int>(json['contactId']),
       messageId: serializer.fromJson<int?>(json['messageId']),
       plaintextContent:
-          serializer.fromJson<Uint8List>(json['plaintextContent']),
+          serializer.fromJson<i2.Uint8List>(json['plaintextContent']),
-      pushData: serializer.fromJson<Uint8List?>(json['pushData']),
+      pushData: serializer.fromJson<i2.Uint8List?>(json['pushData']),
       acknowledgeByServerAt:
           serializer.fromJson<DateTime?>(json['acknowledgeByServerAt']),
     );
@@ -3627,8 +3629,8 @@ class MessageRetransmissionsData extends DataClass
       'retransmissionId': serializer.toJson<int>(retransmissionId),
       'contactId': serializer.toJson<int>(contactId),
       'messageId': serializer.toJson<int?>(messageId),
-      'plaintextContent': serializer.toJson<Uint8List>(plaintextContent),
+      'plaintextContent': serializer.toJson<i2.Uint8List>(plaintextContent),
-      'pushData': serializer.toJson<Uint8List?>(pushData),
+      'pushData': serializer.toJson<i2.Uint8List?>(pushData),
       'acknowledgeByServerAt':
           serializer.toJson<DateTime?>(acknowledgeByServerAt),
     };
@@ -3638,8 +3640,8 @@ class MessageRetransmissionsData extends DataClass
           {int? retransmissionId,
           int? contactId,
           Value<int?> messageId = const Value.absent(),
-          Uint8List? plaintextContent,
+          i2.Uint8List? plaintextContent,
-          Value<Uint8List?> pushData = const Value.absent(),
+          Value<i2.Uint8List?> pushData = const Value.absent(),
           Value<DateTime?> acknowledgeByServerAt = const Value.absent()}) =>
       MessageRetransmissionsData(
         retransmissionId: retransmissionId ?? this.retransmissionId,
@@ -3708,8 +3710,8 @@ class MessageRetransmissionsCompanion
   final Value<int> retransmissionId;
   final Value<int> contactId;
   final Value<int?> messageId;
-  final Value<Uint8List> plaintextContent;
+  final Value<i2.Uint8List> plaintextContent;
-  final Value<Uint8List?> pushData;
+  final Value<i2.Uint8List?> pushData;
   final Value<DateTime?> acknowledgeByServerAt;
   const MessageRetransmissionsCompanion({
     this.retransmissionId = const Value.absent(),
@@ -3723,7 +3725,7 @@ class MessageRetransmissionsCompanion
     this.retransmissionId = const Value.absent(),
     required int contactId,
     this.messageId = const Value.absent(),
-    required Uint8List plaintextContent,
+    required i2.Uint8List plaintextContent,
     this.pushData = const Value.absent(),
     this.acknowledgeByServerAt = const Value.absent(),
   })  : contactId = Value(contactId),
@@ -3732,8 +3734,8 @@ class MessageRetransmissionsCompanion
     Expression<int>? retransmissionId,
     Expression<int>? contactId,
     Expression<int>? messageId,
-    Expression<Uint8List>? plaintextContent,
+    Expression<i2.Uint8List>? plaintextContent,
-    Expression<Uint8List>? pushData,
+    Expression<i2.Uint8List>? pushData,
     Expression<DateTime>? acknowledgeByServerAt,
   }) {
     return RawValuesInsertable({
@@ -3751,8 +3753,8 @@ class MessageRetransmissionsCompanion
       {Value<int>? retransmissionId,
       Value<int>? contactId,
       Value<int?>? messageId,
-      Value<Uint8List>? plaintextContent,
+      Value<i2.Uint8List>? plaintextContent,
-      Value<Uint8List?>? pushData,
+      Value<i2.Uint8List?>? pushData,
       Value<DateTime?>? acknowledgeByServerAt}) {
     return MessageRetransmissionsCompanion(
       retransmissionId: retransmissionId ?? this.retransmissionId,
@@ -3778,10 +3780,10 @@ class MessageRetransmissionsCompanion
       map['message_id'] = Variable<int>(messageId.value);
     }
     if (plaintextContent.present) {
-      map['plaintext_content'] = Variable<Uint8List>(plaintextContent.value);
+      map['plaintext_content'] = Variable<i2.Uint8List>(plaintextContent.value);
     }
     if (pushData.present) {
-      map['push_data'] = Variable<Uint8List>(pushData.value);
+      map['push_data'] = Variable<i2.Uint8List>(pushData.value);
     }
     if (acknowledgeByServerAt.present) {
       map['acknowledge_by_server_at'] =

test/drift/twonly_database/generated/schema_v12.dart

@@ -1,4 +1,5 @@
 // dart format width=80
+import 'dart:typed_data' as i2;
 // GENERATED CODE, DO NOT EDIT BY HAND.
 // ignore_for_file: type=lint
 import 'package:drift/drift.dart';
@@ -2132,8 +2133,8 @@ class SignalIdentityKeyStores extends Table
   late final GeneratedColumn<String> name = GeneratedColumn<String>(
       'name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> identityKey =
+  late final GeneratedColumn<i2.Uint8List> identityKey =
-      GeneratedColumn<Uint8List>('identity_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('identity_key', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
@@ -2177,7 +2178,7 @@ class SignalIdentityKeyStoresData extends DataClass
     implements Insertable<SignalIdentityKeyStoresData> {
   final int deviceId;
   final String name;
-  final Uint8List identityKey;
+  final i2.Uint8List identityKey;
   final DateTime createdAt;
   const SignalIdentityKeyStoresData(
       {required this.deviceId,
@@ -2189,7 +2190,7 @@ class SignalIdentityKeyStoresData extends DataClass
     final map = <String, Expression>{};
     map['device_id'] = Variable<int>(deviceId);
     map['name'] = Variable<String>(name);
-    map['identity_key'] = Variable<Uint8List>(identityKey);
+    map['identity_key'] = Variable<i2.Uint8List>(identityKey);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -2209,7 +2210,7 @@ class SignalIdentityKeyStoresData extends DataClass
     return SignalIdentityKeyStoresData(
       deviceId: serializer.fromJson<int>(json['deviceId']),
       name: serializer.fromJson<String>(json['name']),
-      identityKey: serializer.fromJson<Uint8List>(json['identityKey']),
+      identityKey: serializer.fromJson<i2.Uint8List>(json['identityKey']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -2219,7 +2220,7 @@ class SignalIdentityKeyStoresData extends DataClass
     return <String, dynamic>{
       'deviceId': serializer.toJson<int>(deviceId),
       'name': serializer.toJson<String>(name),
-      'identityKey': serializer.toJson<Uint8List>(identityKey),
+      'identityKey': serializer.toJson<i2.Uint8List>(identityKey),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -2227,7 +2228,7 @@ class SignalIdentityKeyStoresData extends DataClass
   SignalIdentityKeyStoresData copyWith(
           {int? deviceId,
           String? name,
-          Uint8List? identityKey,
+          i2.Uint8List? identityKey,
           DateTime? createdAt}) =>
       SignalIdentityKeyStoresData(
         deviceId: deviceId ?? this.deviceId,
@@ -2274,7 +2275,7 @@ class SignalIdentityKeyStoresCompanion
     extends UpdateCompanion<SignalIdentityKeyStoresData> {
   final Value<int> deviceId;
   final Value<String> name;
-  final Value<Uint8List> identityKey;
+  final Value<i2.Uint8List> identityKey;
   final Value<DateTime> createdAt;
   final Value<int> rowid;
   const SignalIdentityKeyStoresCompanion({
@@ -2287,7 +2288,7 @@ class SignalIdentityKeyStoresCompanion
   SignalIdentityKeyStoresCompanion.insert({
     required int deviceId,
     required String name,
-    required Uint8List identityKey,
+    required i2.Uint8List identityKey,
     this.createdAt = const Value.absent(),
     this.rowid = const Value.absent(),
   })  : deviceId = Value(deviceId),
@@ -2296,7 +2297,7 @@ class SignalIdentityKeyStoresCompanion
   static Insertable<SignalIdentityKeyStoresData> custom({
     Expression<int>? deviceId,
     Expression<String>? name,
-    Expression<Uint8List>? identityKey,
+    Expression<i2.Uint8List>? identityKey,
     Expression<DateTime>? createdAt,
     Expression<int>? rowid,
   }) {
@@ -2312,7 +2313,7 @@ class SignalIdentityKeyStoresCompanion
   SignalIdentityKeyStoresCompanion copyWith(
       {Value<int>? deviceId,
       Value<String>? name,
-      Value<Uint8List>? identityKey,
+      Value<i2.Uint8List>? identityKey,
       Value<DateTime>? createdAt,
       Value<int>? rowid}) {
     return SignalIdentityKeyStoresCompanion(
@@ -2334,7 +2335,7 @@ class SignalIdentityKeyStoresCompanion
       map['name'] = Variable<String>(name.value);
     }
     if (identityKey.present) {
-      map['identity_key'] = Variable<Uint8List>(identityKey.value);
+      map['identity_key'] = Variable<i2.Uint8List>(identityKey.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -2367,9 +2368,9 @@ class SignalPreKeyStores extends Table
   late final GeneratedColumn<int> preKeyId = GeneratedColumn<int>(
       'pre_key_id', aliasedName, false,
       type: DriftSqlType.int, requiredDuringInsert: false);
-  late final GeneratedColumn<Uint8List> preKey = GeneratedColumn<Uint8List>(
+  late final GeneratedColumn<i2.Uint8List> preKey =
-      'pre_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('pre_key', aliasedName, false,
-      type: DriftSqlType.blob, requiredDuringInsert: true);
+          type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
       type: DriftSqlType.dateTime,
@@ -2407,7 +2408,7 @@ class SignalPreKeyStores extends Table
 class SignalPreKeyStoresData extends DataClass
     implements Insertable<SignalPreKeyStoresData> {
   final int preKeyId;
-  final Uint8List preKey;
+  final i2.Uint8List preKey;
   final DateTime createdAt;
   const SignalPreKeyStoresData(
       {required this.preKeyId, required this.preKey, required this.createdAt});
@@ -2415,7 +2416,7 @@ class SignalPreKeyStoresData extends DataClass
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
     map['pre_key_id'] = Variable<int>(preKeyId);
-    map['pre_key'] = Variable<Uint8List>(preKey);
+    map['pre_key'] = Variable<i2.Uint8List>(preKey);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -2433,7 +2434,7 @@ class SignalPreKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return SignalPreKeyStoresData(
       preKeyId: serializer.fromJson<int>(json['preKeyId']),
-      preKey: serializer.fromJson<Uint8List>(json['preKey']),
+      preKey: serializer.fromJson<i2.Uint8List>(json['preKey']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -2442,13 +2443,13 @@ class SignalPreKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return <String, dynamic>{
       'preKeyId': serializer.toJson<int>(preKeyId),
-      'preKey': serializer.toJson<Uint8List>(preKey),
+      'preKey': serializer.toJson<i2.Uint8List>(preKey),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
 
   SignalPreKeyStoresData copyWith(
-          {int? preKeyId, Uint8List? preKey, DateTime? createdAt}) =>
+          {int? preKeyId, i2.Uint8List? preKey, DateTime? createdAt}) =>
       SignalPreKeyStoresData(
         preKeyId: preKeyId ?? this.preKeyId,
         preKey: preKey ?? this.preKey,
@@ -2487,7 +2488,7 @@ class SignalPreKeyStoresData extends DataClass
 class SignalPreKeyStoresCompanion
     extends UpdateCompanion<SignalPreKeyStoresData> {
   final Value<int> preKeyId;
-  final Value<Uint8List> preKey;
+  final Value<i2.Uint8List> preKey;
   final Value<DateTime> createdAt;
   const SignalPreKeyStoresCompanion({
     this.preKeyId = const Value.absent(),
@@ -2496,12 +2497,12 @@ class SignalPreKeyStoresCompanion
   });
   SignalPreKeyStoresCompanion.insert({
     this.preKeyId = const Value.absent(),
-    required Uint8List preKey,
+    required i2.Uint8List preKey,
     this.createdAt = const Value.absent(),
   }) : preKey = Value(preKey);
   static Insertable<SignalPreKeyStoresData> custom({
     Expression<int>? preKeyId,
-    Expression<Uint8List>? preKey,
+    Expression<i2.Uint8List>? preKey,
     Expression<DateTime>? createdAt,
   }) {
     return RawValuesInsertable({
@@ -2513,7 +2514,7 @@ class SignalPreKeyStoresCompanion
 
   SignalPreKeyStoresCompanion copyWith(
       {Value<int>? preKeyId,
-      Value<Uint8List>? preKey,
+      Value<i2.Uint8List>? preKey,
       Value<DateTime>? createdAt}) {
     return SignalPreKeyStoresCompanion(
       preKeyId: preKeyId ?? this.preKeyId,
@@ -2529,7 +2530,7 @@ class SignalPreKeyStoresCompanion
       map['pre_key_id'] = Variable<int>(preKeyId.value);
     }
     if (preKey.present) {
-      map['pre_key'] = Variable<Uint8List>(preKey.value);
+      map['pre_key'] = Variable<i2.Uint8List>(preKey.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -2557,9 +2558,9 @@ class SignalSenderKeyStores extends Table
   late final GeneratedColumn<String> senderKeyName = GeneratedColumn<String>(
       'sender_key_name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> senderKey = GeneratedColumn<Uint8List>(
+  late final GeneratedColumn<i2.Uint8List> senderKey =
-      'sender_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('sender_key', aliasedName, false,
-      type: DriftSqlType.blob, requiredDuringInsert: true);
+          type: DriftSqlType.blob, requiredDuringInsert: true);
   @override
   List<GeneratedColumn> get $columns => [senderKeyName, senderKey];
   @override
@@ -2590,14 +2591,14 @@ class SignalSenderKeyStores extends Table
 class SignalSenderKeyStoresData extends DataClass
     implements Insertable<SignalSenderKeyStoresData> {
   final String senderKeyName;
-  final Uint8List senderKey;
+  final i2.Uint8List senderKey;
   const SignalSenderKeyStoresData(
       {required this.senderKeyName, required this.senderKey});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
     map['sender_key_name'] = Variable<String>(senderKeyName);
-    map['sender_key'] = Variable<Uint8List>(senderKey);
+    map['sender_key'] = Variable<i2.Uint8List>(senderKey);
     return map;
   }
 
@@ -2613,7 +2614,7 @@ class SignalSenderKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return SignalSenderKeyStoresData(
       senderKeyName: serializer.fromJson<String>(json['senderKeyName']),
-      senderKey: serializer.fromJson<Uint8List>(json['senderKey']),
+      senderKey: serializer.fromJson<i2.Uint8List>(json['senderKey']),
     );
   }
   @override
@@ -2621,12 +2622,12 @@ class SignalSenderKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return <String, dynamic>{
       'senderKeyName': serializer.toJson<String>(senderKeyName),
-      'senderKey': serializer.toJson<Uint8List>(senderKey),
+      'senderKey': serializer.toJson<i2.Uint8List>(senderKey),
     };
   }
 
   SignalSenderKeyStoresData copyWith(
-          {String? senderKeyName, Uint8List? senderKey}) =>
+          {String? senderKeyName, i2.Uint8List? senderKey}) =>
       SignalSenderKeyStoresData(
         senderKeyName: senderKeyName ?? this.senderKeyName,
         senderKey: senderKey ?? this.senderKey,
@@ -2664,7 +2665,7 @@ class SignalSenderKeyStoresData extends DataClass
 class SignalSenderKeyStoresCompanion
     extends UpdateCompanion<SignalSenderKeyStoresData> {
   final Value<String> senderKeyName;
-  final Value<Uint8List> senderKey;
+  final Value<i2.Uint8List> senderKey;
   final Value<int> rowid;
   const SignalSenderKeyStoresCompanion({
     this.senderKeyName = const Value.absent(),
@@ -2673,13 +2674,13 @@ class SignalSenderKeyStoresCompanion
   });
   SignalSenderKeyStoresCompanion.insert({
     required String senderKeyName,
-    required Uint8List senderKey,
+    required i2.Uint8List senderKey,
     this.rowid = const Value.absent(),
   })  : senderKeyName = Value(senderKeyName),
         senderKey = Value(senderKey);
   static Insertable<SignalSenderKeyStoresData> custom({
     Expression<String>? senderKeyName,
-    Expression<Uint8List>? senderKey,
+    Expression<i2.Uint8List>? senderKey,
     Expression<int>? rowid,
   }) {
     return RawValuesInsertable({
@@ -2691,7 +2692,7 @@ class SignalSenderKeyStoresCompanion
 
   SignalSenderKeyStoresCompanion copyWith(
       {Value<String>? senderKeyName,
-      Value<Uint8List>? senderKey,
+      Value<i2.Uint8List>? senderKey,
       Value<int>? rowid}) {
     return SignalSenderKeyStoresCompanion(
       senderKeyName: senderKeyName ?? this.senderKeyName,
@@ -2707,7 +2708,7 @@ class SignalSenderKeyStoresCompanion
       map['sender_key_name'] = Variable<String>(senderKeyName.value);
     }
     if (senderKey.present) {
-      map['sender_key'] = Variable<Uint8List>(senderKey.value);
+      map['sender_key'] = Variable<i2.Uint8List>(senderKey.value);
     }
     if (rowid.present) {
       map['rowid'] = Variable<int>(rowid.value);
@@ -2738,8 +2739,8 @@ class SignalSessionStores extends Table
   late final GeneratedColumn<String> name = GeneratedColumn<String>(
       'name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> sessionRecord =
+  late final GeneratedColumn<i2.Uint8List> sessionRecord =
-      GeneratedColumn<Uint8List>('session_record', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('session_record', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
@@ -2783,7 +2784,7 @@ class SignalSessionStoresData extends DataClass
     implements Insertable<SignalSessionStoresData> {
   final int deviceId;
   final String name;
-  final Uint8List sessionRecord;
+  final i2.Uint8List sessionRecord;
   final DateTime createdAt;
   const SignalSessionStoresData(
       {required this.deviceId,
@@ -2795,7 +2796,7 @@ class SignalSessionStoresData extends DataClass
     final map = <String, Expression>{};
     map['device_id'] = Variable<int>(deviceId);
     map['name'] = Variable<String>(name);
-    map['session_record'] = Variable<Uint8List>(sessionRecord);
+    map['session_record'] = Variable<i2.Uint8List>(sessionRecord);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -2815,7 +2816,7 @@ class SignalSessionStoresData extends DataClass
     return SignalSessionStoresData(
       deviceId: serializer.fromJson<int>(json['deviceId']),
       name: serializer.fromJson<String>(json['name']),
-      sessionRecord: serializer.fromJson<Uint8List>(json['sessionRecord']),
+      sessionRecord: serializer.fromJson<i2.Uint8List>(json['sessionRecord']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -2825,7 +2826,7 @@ class SignalSessionStoresData extends DataClass
     return <String, dynamic>{
       'deviceId': serializer.toJson<int>(deviceId),
       'name': serializer.toJson<String>(name),
-      'sessionRecord': serializer.toJson<Uint8List>(sessionRecord),
+      'sessionRecord': serializer.toJson<i2.Uint8List>(sessionRecord),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -2833,7 +2834,7 @@ class SignalSessionStoresData extends DataClass
   SignalSessionStoresData copyWith(
           {int? deviceId,
           String? name,
-          Uint8List? sessionRecord,
+          i2.Uint8List? sessionRecord,
           DateTime? createdAt}) =>
       SignalSessionStoresData(
         deviceId: deviceId ?? this.deviceId,
@@ -2880,7 +2881,7 @@ class SignalSessionStoresCompanion
     extends UpdateCompanion<SignalSessionStoresData> {
   final Value<int> deviceId;
   final Value<String> name;
-  final Value<Uint8List> sessionRecord;
+  final Value<i2.Uint8List> sessionRecord;
   final Value<DateTime> createdAt;
   final Value<int> rowid;
   const SignalSessionStoresCompanion({
@@ -2893,7 +2894,7 @@ class SignalSessionStoresCompanion
   SignalSessionStoresCompanion.insert({
     required int deviceId,
     required String name,
-    required Uint8List sessionRecord,
+    required i2.Uint8List sessionRecord,
     this.createdAt = const Value.absent(),
     this.rowid = const Value.absent(),
   })  : deviceId = Value(deviceId),
@@ -2902,7 +2903,7 @@ class SignalSessionStoresCompanion
   static Insertable<SignalSessionStoresData> custom({
     Expression<int>? deviceId,
     Expression<String>? name,
-    Expression<Uint8List>? sessionRecord,
+    Expression<i2.Uint8List>? sessionRecord,
     Expression<DateTime>? createdAt,
     Expression<int>? rowid,
   }) {
@@ -2918,7 +2919,7 @@ class SignalSessionStoresCompanion
   SignalSessionStoresCompanion copyWith(
       {Value<int>? deviceId,
       Value<String>? name,
-      Value<Uint8List>? sessionRecord,
+      Value<i2.Uint8List>? sessionRecord,
       Value<DateTime>? createdAt,
       Value<int>? rowid}) {
     return SignalSessionStoresCompanion(
@@ -2940,7 +2941,7 @@ class SignalSessionStoresCompanion
       map['name'] = Variable<String>(name.value);
     }
     if (sessionRecord.present) {
-      map['session_record'] = Variable<Uint8List>(sessionRecord.value);
+      map['session_record'] = Variable<i2.Uint8List>(sessionRecord.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -2976,9 +2977,9 @@ class SignalContactPreKeys extends Table
   late final GeneratedColumn<int> preKeyId = GeneratedColumn<int>(
       'pre_key_id', aliasedName, false,
       type: DriftSqlType.int, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> preKey = GeneratedColumn<Uint8List>(
+  late final GeneratedColumn<i2.Uint8List> preKey =
-      'pre_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('pre_key', aliasedName, false,
-      type: DriftSqlType.blob, requiredDuringInsert: true);
+          type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
       type: DriftSqlType.dateTime,
@@ -3021,7 +3022,7 @@ class SignalContactPreKeysData extends DataClass
     implements Insertable<SignalContactPreKeysData> {
   final int contactId;
   final int preKeyId;
-  final Uint8List preKey;
+  final i2.Uint8List preKey;
   final DateTime createdAt;
   const SignalContactPreKeysData(
       {required this.contactId,
@@ -3033,7 +3034,7 @@ class SignalContactPreKeysData extends DataClass
     final map = <String, Expression>{};
     map['contact_id'] = Variable<int>(contactId);
     map['pre_key_id'] = Variable<int>(preKeyId);
-    map['pre_key'] = Variable<Uint8List>(preKey);
+    map['pre_key'] = Variable<i2.Uint8List>(preKey);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -3053,7 +3054,7 @@ class SignalContactPreKeysData extends DataClass
     return SignalContactPreKeysData(
       contactId: serializer.fromJson<int>(json['contactId']),
       preKeyId: serializer.fromJson<int>(json['preKeyId']),
-      preKey: serializer.fromJson<Uint8List>(json['preKey']),
+      preKey: serializer.fromJson<i2.Uint8List>(json['preKey']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -3063,7 +3064,7 @@ class SignalContactPreKeysData extends DataClass
     return <String, dynamic>{
       'contactId': serializer.toJson<int>(contactId),
       'preKeyId': serializer.toJson<int>(preKeyId),
-      'preKey': serializer.toJson<Uint8List>(preKey),
+      'preKey': serializer.toJson<i2.Uint8List>(preKey),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -3071,7 +3072,7 @@ class SignalContactPreKeysData extends DataClass
   SignalContactPreKeysData copyWith(
           {int? contactId,
           int? preKeyId,
-          Uint8List? preKey,
+          i2.Uint8List? preKey,
           DateTime? createdAt}) =>
       SignalContactPreKeysData(
         contactId: contactId ?? this.contactId,
@@ -3117,7 +3118,7 @@ class SignalContactPreKeysCompanion
     extends UpdateCompanion<SignalContactPreKeysData> {
   final Value<int> contactId;
   final Value<int> preKeyId;
-  final Value<Uint8List> preKey;
+  final Value<i2.Uint8List> preKey;
   final Value<DateTime> createdAt;
   final Value<int> rowid;
   const SignalContactPreKeysCompanion({
@@ -3130,7 +3131,7 @@ class SignalContactPreKeysCompanion
   SignalContactPreKeysCompanion.insert({
     required int contactId,
     required int preKeyId,
-    required Uint8List preKey,
+    required i2.Uint8List preKey,
     this.createdAt = const Value.absent(),
     this.rowid = const Value.absent(),
   })  : contactId = Value(contactId),
@@ -3139,7 +3140,7 @@ class SignalContactPreKeysCompanion
   static Insertable<SignalContactPreKeysData> custom({
     Expression<int>? contactId,
     Expression<int>? preKeyId,
-    Expression<Uint8List>? preKey,
+    Expression<i2.Uint8List>? preKey,
     Expression<DateTime>? createdAt,
     Expression<int>? rowid,
   }) {
@@ -3155,7 +3156,7 @@ class SignalContactPreKeysCompanion
   SignalContactPreKeysCompanion copyWith(
       {Value<int>? contactId,
       Value<int>? preKeyId,
-      Value<Uint8List>? preKey,
+      Value<i2.Uint8List>? preKey,
       Value<DateTime>? createdAt,
       Value<int>? rowid}) {
     return SignalContactPreKeysCompanion(
@@ -3177,7 +3178,7 @@ class SignalContactPreKeysCompanion
       map['pre_key_id'] = Variable<int>(preKeyId.value);
     }
     if (preKey.present) {
-      map['pre_key'] = Variable<Uint8List>(preKey.value);
+      map['pre_key'] = Variable<i2.Uint8List>(preKey.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -3213,11 +3214,12 @@ class SignalContactSignedPreKeys extends Table
   late final GeneratedColumn<int> signedPreKeyId = GeneratedColumn<int>(
       'signed_pre_key_id', aliasedName, false,
       type: DriftSqlType.int, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> signedPreKey =
+  late final GeneratedColumn<i2.Uint8List> signedPreKey =
-      GeneratedColumn<Uint8List>('signed_pre_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('signed_pre_key', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> signedPreKeySignature =
+  late final GeneratedColumn<i2.Uint8List> signedPreKeySignature =
-      GeneratedColumn<Uint8List>('signed_pre_key_signature', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>(
+          'signed_pre_key_signature', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
@@ -3269,8 +3271,8 @@ class SignalContactSignedPreKeysData extends DataClass
     implements Insertable<SignalContactSignedPreKeysData> {
   final int contactId;
   final int signedPreKeyId;
-  final Uint8List signedPreKey;
+  final i2.Uint8List signedPreKey;
-  final Uint8List signedPreKeySignature;
+  final i2.Uint8List signedPreKeySignature;
   final DateTime createdAt;
   const SignalContactSignedPreKeysData(
       {required this.contactId,
@@ -3283,9 +3285,9 @@ class SignalContactSignedPreKeysData extends DataClass
     final map = <String, Expression>{};
     map['contact_id'] = Variable<int>(contactId);
     map['signed_pre_key_id'] = Variable<int>(signedPreKeyId);
-    map['signed_pre_key'] = Variable<Uint8List>(signedPreKey);
+    map['signed_pre_key'] = Variable<i2.Uint8List>(signedPreKey);
     map['signed_pre_key_signature'] =
-        Variable<Uint8List>(signedPreKeySignature);
+        Variable<i2.Uint8List>(signedPreKeySignature);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -3306,9 +3308,9 @@ class SignalContactSignedPreKeysData extends DataClass
     return SignalContactSignedPreKeysData(
       contactId: serializer.fromJson<int>(json['contactId']),
       signedPreKeyId: serializer.fromJson<int>(json['signedPreKeyId']),
-      signedPreKey: serializer.fromJson<Uint8List>(json['signedPreKey']),
+      signedPreKey: serializer.fromJson<i2.Uint8List>(json['signedPreKey']),
       signedPreKeySignature:
-          serializer.fromJson<Uint8List>(json['signedPreKeySignature']),
+          serializer.fromJson<i2.Uint8List>(json['signedPreKeySignature']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -3318,9 +3320,9 @@ class SignalContactSignedPreKeysData extends DataClass
     return <String, dynamic>{
       'contactId': serializer.toJson<int>(contactId),
       'signedPreKeyId': serializer.toJson<int>(signedPreKeyId),
-      'signedPreKey': serializer.toJson<Uint8List>(signedPreKey),
+      'signedPreKey': serializer.toJson<i2.Uint8List>(signedPreKey),
       'signedPreKeySignature':
-          serializer.toJson<Uint8List>(signedPreKeySignature),
+          serializer.toJson<i2.Uint8List>(signedPreKeySignature),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -3328,8 +3330,8 @@ class SignalContactSignedPreKeysData extends DataClass
   SignalContactSignedPreKeysData copyWith(
           {int? contactId,
           int? signedPreKeyId,
-          Uint8List? signedPreKey,
+          i2.Uint8List? signedPreKey,
-          Uint8List? signedPreKeySignature,
+          i2.Uint8List? signedPreKeySignature,
           DateTime? createdAt}) =>
       SignalContactSignedPreKeysData(
         contactId: contactId ?? this.contactId,
@@ -3391,8 +3393,8 @@ class SignalContactSignedPreKeysCompanion
     extends UpdateCompanion<SignalContactSignedPreKeysData> {
   final Value<int> contactId;
   final Value<int> signedPreKeyId;
-  final Value<Uint8List> signedPreKey;
+  final Value<i2.Uint8List> signedPreKey;
-  final Value<Uint8List> signedPreKeySignature;
+  final Value<i2.Uint8List> signedPreKeySignature;
   final Value<DateTime> createdAt;
   const SignalContactSignedPreKeysCompanion({
     this.contactId = const Value.absent(),
@@ -3404,8 +3406,8 @@ class SignalContactSignedPreKeysCompanion
   SignalContactSignedPreKeysCompanion.insert({
     this.contactId = const Value.absent(),
     required int signedPreKeyId,
-    required Uint8List signedPreKey,
+    required i2.Uint8List signedPreKey,
-    required Uint8List signedPreKeySignature,
+    required i2.Uint8List signedPreKeySignature,
     this.createdAt = const Value.absent(),
   })  : signedPreKeyId = Value(signedPreKeyId),
         signedPreKey = Value(signedPreKey),
@@ -3413,8 +3415,8 @@ class SignalContactSignedPreKeysCompanion
   static Insertable<SignalContactSignedPreKeysData> custom({
     Expression<int>? contactId,
     Expression<int>? signedPreKeyId,
-    Expression<Uint8List>? signedPreKey,
+    Expression<i2.Uint8List>? signedPreKey,
-    Expression<Uint8List>? signedPreKeySignature,
+    Expression<i2.Uint8List>? signedPreKeySignature,
     Expression<DateTime>? createdAt,
   }) {
     return RawValuesInsertable({
@@ -3430,8 +3432,8 @@ class SignalContactSignedPreKeysCompanion
   SignalContactSignedPreKeysCompanion copyWith(
       {Value<int>? contactId,
       Value<int>? signedPreKeyId,
-      Value<Uint8List>? signedPreKey,
+      Value<i2.Uint8List>? signedPreKey,
-      Value<Uint8List>? signedPreKeySignature,
+      Value<i2.Uint8List>? signedPreKeySignature,
       Value<DateTime>? createdAt}) {
     return SignalContactSignedPreKeysCompanion(
       contactId: contactId ?? this.contactId,
@@ -3453,11 +3455,11 @@ class SignalContactSignedPreKeysCompanion
       map['signed_pre_key_id'] = Variable<int>(signedPreKeyId.value);
     }
     if (signedPreKey.present) {
-      map['signed_pre_key'] = Variable<Uint8List>(signedPreKey.value);
+      map['signed_pre_key'] = Variable<i2.Uint8List>(signedPreKey.value);
     }
     if (signedPreKeySignature.present) {
       map['signed_pre_key_signature'] =
-          Variable<Uint8List>(signedPreKeySignature.value);
+          Variable<i2.Uint8List>(signedPreKeySignature.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -3503,12 +3505,12 @@ class MessageRetransmissions extends Table
       requiredDuringInsert: false,
       defaultConstraints: GeneratedColumn.constraintIsAlways(
           'REFERENCES messages (message_id) ON DELETE CASCADE'));
-  late final GeneratedColumn<Uint8List> plaintextContent =
+  late final GeneratedColumn<i2.Uint8List> plaintextContent =
-      GeneratedColumn<Uint8List>('plaintext_content', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('plaintext_content', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> pushData = GeneratedColumn<Uint8List>(
+  late final GeneratedColumn<i2.Uint8List> pushData =
-      'push_data', aliasedName, true,
+      GeneratedColumn<i2.Uint8List>('push_data', aliasedName, true,
-      type: DriftSqlType.blob, requiredDuringInsert: false);
+          type: DriftSqlType.blob, requiredDuringInsert: false);
   late final GeneratedColumn<bool> willNotGetACKByUser = GeneratedColumn<bool>(
       'will_not_get_a_c_k_by_user', aliasedName, false,
       type: DriftSqlType.bool,
@@ -3570,8 +3572,8 @@ class MessageRetransmissionsData extends DataClass
   final int retransmissionId;
   final int contactId;
   final int? messageId;
-  final Uint8List plaintextContent;
+  final i2.Uint8List plaintextContent;
-  final Uint8List? pushData;
+  final i2.Uint8List? pushData;
   final bool willNotGetACKByUser;
   final DateTime? acknowledgeByServerAt;
   const MessageRetransmissionsData(
@@ -3590,9 +3592,9 @@ class MessageRetransmissionsData extends DataClass
     if (!nullToAbsent || messageId != null) {
       map['message_id'] = Variable<int>(messageId);
     }
-    map['plaintext_content'] = Variable<Uint8List>(plaintextContent);
+    map['plaintext_content'] = Variable<i2.Uint8List>(plaintextContent);
     if (!nullToAbsent || pushData != null) {
-      map['push_data'] = Variable<Uint8List>(pushData);
+      map['push_data'] = Variable<i2.Uint8List>(pushData);
     }
     map['will_not_get_a_c_k_by_user'] = Variable<bool>(willNotGetACKByUser);
     if (!nullToAbsent || acknowledgeByServerAt != null) {
@@ -3628,8 +3630,8 @@ class MessageRetransmissionsData extends DataClass
       contactId: serializer.fromJson<int>(json['contactId']),
       messageId: serializer.fromJson<int?>(json['messageId']),
       plaintextContent:
-          serializer.fromJson<Uint8List>(json['plaintextContent']),
+          serializer.fromJson<i2.Uint8List>(json['plaintextContent']),
-      pushData: serializer.fromJson<Uint8List?>(json['pushData']),
+      pushData: serializer.fromJson<i2.Uint8List?>(json['pushData']),
       willNotGetACKByUser:
           serializer.fromJson<bool>(json['willNotGetACKByUser']),
       acknowledgeByServerAt:
@@ -3643,8 +3645,8 @@ class MessageRetransmissionsData extends DataClass
       'retransmissionId': serializer.toJson<int>(retransmissionId),
       'contactId': serializer.toJson<int>(contactId),
       'messageId': serializer.toJson<int?>(messageId),
-      'plaintextContent': serializer.toJson<Uint8List>(plaintextContent),
+      'plaintextContent': serializer.toJson<i2.Uint8List>(plaintextContent),
-      'pushData': serializer.toJson<Uint8List?>(pushData),
+      'pushData': serializer.toJson<i2.Uint8List?>(pushData),
       'willNotGetACKByUser': serializer.toJson<bool>(willNotGetACKByUser),
       'acknowledgeByServerAt':
           serializer.toJson<DateTime?>(acknowledgeByServerAt),
@@ -3655,8 +3657,8 @@ class MessageRetransmissionsData extends DataClass
           {int? retransmissionId,
           int? contactId,
           Value<int?> messageId = const Value.absent(),
-          Uint8List? plaintextContent,
+          i2.Uint8List? plaintextContent,
-          Value<Uint8List?> pushData = const Value.absent(),
+          Value<i2.Uint8List?> pushData = const Value.absent(),
           bool? willNotGetACKByUser,
           Value<DateTime?> acknowledgeByServerAt = const Value.absent()}) =>
       MessageRetransmissionsData(
@@ -3733,8 +3735,8 @@ class MessageRetransmissionsCompanion
   final Value<int> retransmissionId;
   final Value<int> contactId;
   final Value<int?> messageId;
-  final Value<Uint8List> plaintextContent;
+  final Value<i2.Uint8List> plaintextContent;
-  final Value<Uint8List?> pushData;
+  final Value<i2.Uint8List?> pushData;
   final Value<bool> willNotGetACKByUser;
   final Value<DateTime?> acknowledgeByServerAt;
   const MessageRetransmissionsCompanion({
@@ -3750,7 +3752,7 @@ class MessageRetransmissionsCompanion
     this.retransmissionId = const Value.absent(),
     required int contactId,
     this.messageId = const Value.absent(),
-    required Uint8List plaintextContent,
+    required i2.Uint8List plaintextContent,
     this.pushData = const Value.absent(),
     this.willNotGetACKByUser = const Value.absent(),
     this.acknowledgeByServerAt = const Value.absent(),
@@ -3760,8 +3762,8 @@ class MessageRetransmissionsCompanion
     Expression<int>? retransmissionId,
     Expression<int>? contactId,
     Expression<int>? messageId,
-    Expression<Uint8List>? plaintextContent,
+    Expression<i2.Uint8List>? plaintextContent,
-    Expression<Uint8List>? pushData,
+    Expression<i2.Uint8List>? pushData,
     Expression<bool>? willNotGetACKByUser,
     Expression<DateTime>? acknowledgeByServerAt,
   }) {
@@ -3782,8 +3784,8 @@ class MessageRetransmissionsCompanion
       {Value<int>? retransmissionId,
       Value<int>? contactId,
       Value<int?>? messageId,
-      Value<Uint8List>? plaintextContent,
+      Value<i2.Uint8List>? plaintextContent,
-      Value<Uint8List?>? pushData,
+      Value<i2.Uint8List?>? pushData,
       Value<bool>? willNotGetACKByUser,
       Value<DateTime?>? acknowledgeByServerAt}) {
     return MessageRetransmissionsCompanion(
@@ -3811,10 +3813,10 @@ class MessageRetransmissionsCompanion
       map['message_id'] = Variable<int>(messageId.value);
     }
     if (plaintextContent.present) {
-      map['plaintext_content'] = Variable<Uint8List>(plaintextContent.value);
+      map['plaintext_content'] = Variable<i2.Uint8List>(plaintextContent.value);
     }
     if (pushData.present) {
-      map['push_data'] = Variable<Uint8List>(pushData.value);
+      map['push_data'] = Variable<i2.Uint8List>(pushData.value);
     }
     if (willNotGetACKByUser.present) {
       map['will_not_get_a_c_k_by_user'] =

test/drift/twonly_database/generated/schema_v13.dart

@@ -1,4 +1,5 @@
 // dart format width=80
+import 'dart:typed_data' as i2;
 // GENERATED CODE, DO NOT EDIT BY HAND.
 // ignore_for_file: type=lint
 import 'package:drift/drift.dart';
@@ -2132,8 +2133,8 @@ class SignalIdentityKeyStores extends Table
   late final GeneratedColumn<String> name = GeneratedColumn<String>(
       'name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> identityKey =
+  late final GeneratedColumn<i2.Uint8List> identityKey =
-      GeneratedColumn<Uint8List>('identity_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('identity_key', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
@@ -2177,7 +2178,7 @@ class SignalIdentityKeyStoresData extends DataClass
     implements Insertable<SignalIdentityKeyStoresData> {
   final int deviceId;
   final String name;
-  final Uint8List identityKey;
+  final i2.Uint8List identityKey;
   final DateTime createdAt;
   const SignalIdentityKeyStoresData(
       {required this.deviceId,
@@ -2189,7 +2190,7 @@ class SignalIdentityKeyStoresData extends DataClass
     final map = <String, Expression>{};
     map['device_id'] = Variable<int>(deviceId);
     map['name'] = Variable<String>(name);
-    map['identity_key'] = Variable<Uint8List>(identityKey);
+    map['identity_key'] = Variable<i2.Uint8List>(identityKey);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -2209,7 +2210,7 @@ class SignalIdentityKeyStoresData extends DataClass
     return SignalIdentityKeyStoresData(
       deviceId: serializer.fromJson<int>(json['deviceId']),
       name: serializer.fromJson<String>(json['name']),
-      identityKey: serializer.fromJson<Uint8List>(json['identityKey']),
+      identityKey: serializer.fromJson<i2.Uint8List>(json['identityKey']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -2219,7 +2220,7 @@ class SignalIdentityKeyStoresData extends DataClass
     return <String, dynamic>{
       'deviceId': serializer.toJson<int>(deviceId),
       'name': serializer.toJson<String>(name),
-      'identityKey': serializer.toJson<Uint8List>(identityKey),
+      'identityKey': serializer.toJson<i2.Uint8List>(identityKey),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -2227,7 +2228,7 @@ class SignalIdentityKeyStoresData extends DataClass
   SignalIdentityKeyStoresData copyWith(
           {int? deviceId,
           String? name,
-          Uint8List? identityKey,
+          i2.Uint8List? identityKey,
           DateTime? createdAt}) =>
       SignalIdentityKeyStoresData(
         deviceId: deviceId ?? this.deviceId,
@@ -2274,7 +2275,7 @@ class SignalIdentityKeyStoresCompanion
     extends UpdateCompanion<SignalIdentityKeyStoresData> {
   final Value<int> deviceId;
   final Value<String> name;
-  final Value<Uint8List> identityKey;
+  final Value<i2.Uint8List> identityKey;
   final Value<DateTime> createdAt;
   final Value<int> rowid;
   const SignalIdentityKeyStoresCompanion({
@@ -2287,7 +2288,7 @@ class SignalIdentityKeyStoresCompanion
   SignalIdentityKeyStoresCompanion.insert({
     required int deviceId,
     required String name,
-    required Uint8List identityKey,
+    required i2.Uint8List identityKey,
     this.createdAt = const Value.absent(),
     this.rowid = const Value.absent(),
   })  : deviceId = Value(deviceId),
@@ -2296,7 +2297,7 @@ class SignalIdentityKeyStoresCompanion
   static Insertable<SignalIdentityKeyStoresData> custom({
     Expression<int>? deviceId,
     Expression<String>? name,
-    Expression<Uint8List>? identityKey,
+    Expression<i2.Uint8List>? identityKey,
     Expression<DateTime>? createdAt,
     Expression<int>? rowid,
   }) {
@@ -2312,7 +2313,7 @@ class SignalIdentityKeyStoresCompanion
   SignalIdentityKeyStoresCompanion copyWith(
       {Value<int>? deviceId,
       Value<String>? name,
-      Value<Uint8List>? identityKey,
+      Value<i2.Uint8List>? identityKey,
       Value<DateTime>? createdAt,
       Value<int>? rowid}) {
     return SignalIdentityKeyStoresCompanion(
@@ -2334,7 +2335,7 @@ class SignalIdentityKeyStoresCompanion
       map['name'] = Variable<String>(name.value);
     }
     if (identityKey.present) {
-      map['identity_key'] = Variable<Uint8List>(identityKey.value);
+      map['identity_key'] = Variable<i2.Uint8List>(identityKey.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -2367,9 +2368,9 @@ class SignalPreKeyStores extends Table
   late final GeneratedColumn<int> preKeyId = GeneratedColumn<int>(
       'pre_key_id', aliasedName, false,
       type: DriftSqlType.int, requiredDuringInsert: false);
-  late final GeneratedColumn<Uint8List> preKey = GeneratedColumn<Uint8List>(
+  late final GeneratedColumn<i2.Uint8List> preKey =
-      'pre_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('pre_key', aliasedName, false,
-      type: DriftSqlType.blob, requiredDuringInsert: true);
+          type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
       type: DriftSqlType.dateTime,
@@ -2407,7 +2408,7 @@ class SignalPreKeyStores extends Table
 class SignalPreKeyStoresData extends DataClass
     implements Insertable<SignalPreKeyStoresData> {
   final int preKeyId;
-  final Uint8List preKey;
+  final i2.Uint8List preKey;
   final DateTime createdAt;
   const SignalPreKeyStoresData(
       {required this.preKeyId, required this.preKey, required this.createdAt});
@@ -2415,7 +2416,7 @@ class SignalPreKeyStoresData extends DataClass
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
     map['pre_key_id'] = Variable<int>(preKeyId);
-    map['pre_key'] = Variable<Uint8List>(preKey);
+    map['pre_key'] = Variable<i2.Uint8List>(preKey);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -2433,7 +2434,7 @@ class SignalPreKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return SignalPreKeyStoresData(
       preKeyId: serializer.fromJson<int>(json['preKeyId']),
-      preKey: serializer.fromJson<Uint8List>(json['preKey']),
+      preKey: serializer.fromJson<i2.Uint8List>(json['preKey']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -2442,13 +2443,13 @@ class SignalPreKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return <String, dynamic>{
       'preKeyId': serializer.toJson<int>(preKeyId),
-      'preKey': serializer.toJson<Uint8List>(preKey),
+      'preKey': serializer.toJson<i2.Uint8List>(preKey),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
 
   SignalPreKeyStoresData copyWith(
-          {int? preKeyId, Uint8List? preKey, DateTime? createdAt}) =>
+          {int? preKeyId, i2.Uint8List? preKey, DateTime? createdAt}) =>
       SignalPreKeyStoresData(
         preKeyId: preKeyId ?? this.preKeyId,
         preKey: preKey ?? this.preKey,
@@ -2487,7 +2488,7 @@ class SignalPreKeyStoresData extends DataClass
 class SignalPreKeyStoresCompanion
     extends UpdateCompanion<SignalPreKeyStoresData> {
   final Value<int> preKeyId;
-  final Value<Uint8List> preKey;
+  final Value<i2.Uint8List> preKey;
   final Value<DateTime> createdAt;
   const SignalPreKeyStoresCompanion({
     this.preKeyId = const Value.absent(),
@@ -2496,12 +2497,12 @@ class SignalPreKeyStoresCompanion
   });
   SignalPreKeyStoresCompanion.insert({
     this.preKeyId = const Value.absent(),
-    required Uint8List preKey,
+    required i2.Uint8List preKey,
     this.createdAt = const Value.absent(),
   }) : preKey = Value(preKey);
   static Insertable<SignalPreKeyStoresData> custom({
     Expression<int>? preKeyId,
-    Expression<Uint8List>? preKey,
+    Expression<i2.Uint8List>? preKey,
     Expression<DateTime>? createdAt,
   }) {
     return RawValuesInsertable({
@@ -2513,7 +2514,7 @@ class SignalPreKeyStoresCompanion
 
   SignalPreKeyStoresCompanion copyWith(
       {Value<int>? preKeyId,
-      Value<Uint8List>? preKey,
+      Value<i2.Uint8List>? preKey,
       Value<DateTime>? createdAt}) {
     return SignalPreKeyStoresCompanion(
       preKeyId: preKeyId ?? this.preKeyId,
@@ -2529,7 +2530,7 @@ class SignalPreKeyStoresCompanion
       map['pre_key_id'] = Variable<int>(preKeyId.value);
     }
     if (preKey.present) {
-      map['pre_key'] = Variable<Uint8List>(preKey.value);
+      map['pre_key'] = Variable<i2.Uint8List>(preKey.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -2557,9 +2558,9 @@ class SignalSenderKeyStores extends Table
   late final GeneratedColumn<String> senderKeyName = GeneratedColumn<String>(
       'sender_key_name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> senderKey = GeneratedColumn<Uint8List>(
+  late final GeneratedColumn<i2.Uint8List> senderKey =
-      'sender_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('sender_key', aliasedName, false,
-      type: DriftSqlType.blob, requiredDuringInsert: true);
+          type: DriftSqlType.blob, requiredDuringInsert: true);
   @override
   List<GeneratedColumn> get $columns => [senderKeyName, senderKey];
   @override
@@ -2590,14 +2591,14 @@ class SignalSenderKeyStores extends Table
 class SignalSenderKeyStoresData extends DataClass
     implements Insertable<SignalSenderKeyStoresData> {
   final String senderKeyName;
-  final Uint8List senderKey;
+  final i2.Uint8List senderKey;
   const SignalSenderKeyStoresData(
       {required this.senderKeyName, required this.senderKey});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
     map['sender_key_name'] = Variable<String>(senderKeyName);
-    map['sender_key'] = Variable<Uint8List>(senderKey);
+    map['sender_key'] = Variable<i2.Uint8List>(senderKey);
     return map;
   }
 
@@ -2613,7 +2614,7 @@ class SignalSenderKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return SignalSenderKeyStoresData(
       senderKeyName: serializer.fromJson<String>(json['senderKeyName']),
-      senderKey: serializer.fromJson<Uint8List>(json['senderKey']),
+      senderKey: serializer.fromJson<i2.Uint8List>(json['senderKey']),
     );
   }
   @override
@@ -2621,12 +2622,12 @@ class SignalSenderKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return <String, dynamic>{
       'senderKeyName': serializer.toJson<String>(senderKeyName),
-      'senderKey': serializer.toJson<Uint8List>(senderKey),
+      'senderKey': serializer.toJson<i2.Uint8List>(senderKey),
     };
   }
 
   SignalSenderKeyStoresData copyWith(
-          {String? senderKeyName, Uint8List? senderKey}) =>
+          {String? senderKeyName, i2.Uint8List? senderKey}) =>
       SignalSenderKeyStoresData(
         senderKeyName: senderKeyName ?? this.senderKeyName,
         senderKey: senderKey ?? this.senderKey,
@@ -2664,7 +2665,7 @@ class SignalSenderKeyStoresData extends DataClass
 class SignalSenderKeyStoresCompanion
     extends UpdateCompanion<SignalSenderKeyStoresData> {
   final Value<String> senderKeyName;
-  final Value<Uint8List> senderKey;
+  final Value<i2.Uint8List> senderKey;
   final Value<int> rowid;
   const SignalSenderKeyStoresCompanion({
     this.senderKeyName = const Value.absent(),
@@ -2673,13 +2674,13 @@ class SignalSenderKeyStoresCompanion
   });
   SignalSenderKeyStoresCompanion.insert({
     required String senderKeyName,
-    required Uint8List senderKey,
+    required i2.Uint8List senderKey,
     this.rowid = const Value.absent(),
   })  : senderKeyName = Value(senderKeyName),
         senderKey = Value(senderKey);
   static Insertable<SignalSenderKeyStoresData> custom({
     Expression<String>? senderKeyName,
-    Expression<Uint8List>? senderKey,
+    Expression<i2.Uint8List>? senderKey,
     Expression<int>? rowid,
   }) {
     return RawValuesInsertable({
@@ -2691,7 +2692,7 @@ class SignalSenderKeyStoresCompanion
 
   SignalSenderKeyStoresCompanion copyWith(
       {Value<String>? senderKeyName,
-      Value<Uint8List>? senderKey,
+      Value<i2.Uint8List>? senderKey,
       Value<int>? rowid}) {
     return SignalSenderKeyStoresCompanion(
       senderKeyName: senderKeyName ?? this.senderKeyName,
@@ -2707,7 +2708,7 @@ class SignalSenderKeyStoresCompanion
       map['sender_key_name'] = Variable<String>(senderKeyName.value);
     }
     if (senderKey.present) {
-      map['sender_key'] = Variable<Uint8List>(senderKey.value);
+      map['sender_key'] = Variable<i2.Uint8List>(senderKey.value);
     }
     if (rowid.present) {
       map['rowid'] = Variable<int>(rowid.value);
@@ -2738,8 +2739,8 @@ class SignalSessionStores extends Table
   late final GeneratedColumn<String> name = GeneratedColumn<String>(
       'name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> sessionRecord =
+  late final GeneratedColumn<i2.Uint8List> sessionRecord =
-      GeneratedColumn<Uint8List>('session_record', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('session_record', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
@@ -2783,7 +2784,7 @@ class SignalSessionStoresData extends DataClass
     implements Insertable<SignalSessionStoresData> {
   final int deviceId;
   final String name;
-  final Uint8List sessionRecord;
+  final i2.Uint8List sessionRecord;
   final DateTime createdAt;
   const SignalSessionStoresData(
       {required this.deviceId,
@@ -2795,7 +2796,7 @@ class SignalSessionStoresData extends DataClass
     final map = <String, Expression>{};
     map['device_id'] = Variable<int>(deviceId);
     map['name'] = Variable<String>(name);
-    map['session_record'] = Variable<Uint8List>(sessionRecord);
+    map['session_record'] = Variable<i2.Uint8List>(sessionRecord);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -2815,7 +2816,7 @@ class SignalSessionStoresData extends DataClass
     return SignalSessionStoresData(
       deviceId: serializer.fromJson<int>(json['deviceId']),
       name: serializer.fromJson<String>(json['name']),
-      sessionRecord: serializer.fromJson<Uint8List>(json['sessionRecord']),
+      sessionRecord: serializer.fromJson<i2.Uint8List>(json['sessionRecord']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -2825,7 +2826,7 @@ class SignalSessionStoresData extends DataClass
     return <String, dynamic>{
       'deviceId': serializer.toJson<int>(deviceId),
       'name': serializer.toJson<String>(name),
-      'sessionRecord': serializer.toJson<Uint8List>(sessionRecord),
+      'sessionRecord': serializer.toJson<i2.Uint8List>(sessionRecord),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -2833,7 +2834,7 @@ class SignalSessionStoresData extends DataClass
   SignalSessionStoresData copyWith(
           {int? deviceId,
           String? name,
-          Uint8List? sessionRecord,
+          i2.Uint8List? sessionRecord,
           DateTime? createdAt}) =>
       SignalSessionStoresData(
         deviceId: deviceId ?? this.deviceId,
@@ -2880,7 +2881,7 @@ class SignalSessionStoresCompanion
     extends UpdateCompanion<SignalSessionStoresData> {
   final Value<int> deviceId;
   final Value<String> name;
-  final Value<Uint8List> sessionRecord;
+  final Value<i2.Uint8List> sessionRecord;
   final Value<DateTime> createdAt;
   final Value<int> rowid;
   const SignalSessionStoresCompanion({
@@ -2893,7 +2894,7 @@ class SignalSessionStoresCompanion
   SignalSessionStoresCompanion.insert({
     required int deviceId,
     required String name,
-    required Uint8List sessionRecord,
+    required i2.Uint8List sessionRecord,
     this.createdAt = const Value.absent(),
     this.rowid = const Value.absent(),
   })  : deviceId = Value(deviceId),
@@ -2902,7 +2903,7 @@ class SignalSessionStoresCompanion
   static Insertable<SignalSessionStoresData> custom({
     Expression<int>? deviceId,
     Expression<String>? name,
-    Expression<Uint8List>? sessionRecord,
+    Expression<i2.Uint8List>? sessionRecord,
     Expression<DateTime>? createdAt,
     Expression<int>? rowid,
   }) {
@@ -2918,7 +2919,7 @@ class SignalSessionStoresCompanion
   SignalSessionStoresCompanion copyWith(
       {Value<int>? deviceId,
       Value<String>? name,
-      Value<Uint8List>? sessionRecord,
+      Value<i2.Uint8List>? sessionRecord,
       Value<DateTime>? createdAt,
       Value<int>? rowid}) {
     return SignalSessionStoresCompanion(
@@ -2940,7 +2941,7 @@ class SignalSessionStoresCompanion
       map['name'] = Variable<String>(name.value);
     }
     if (sessionRecord.present) {
-      map['session_record'] = Variable<Uint8List>(sessionRecord.value);
+      map['session_record'] = Variable<i2.Uint8List>(sessionRecord.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -2976,9 +2977,9 @@ class SignalContactPreKeys extends Table
   late final GeneratedColumn<int> preKeyId = GeneratedColumn<int>(
       'pre_key_id', aliasedName, false,
       type: DriftSqlType.int, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> preKey = GeneratedColumn<Uint8List>(
+  late final GeneratedColumn<i2.Uint8List> preKey =
-      'pre_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('pre_key', aliasedName, false,
-      type: DriftSqlType.blob, requiredDuringInsert: true);
+          type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
       type: DriftSqlType.dateTime,
@@ -3021,7 +3022,7 @@ class SignalContactPreKeysData extends DataClass
     implements Insertable<SignalContactPreKeysData> {
   final int contactId;
   final int preKeyId;
-  final Uint8List preKey;
+  final i2.Uint8List preKey;
   final DateTime createdAt;
   const SignalContactPreKeysData(
       {required this.contactId,
@@ -3033,7 +3034,7 @@ class SignalContactPreKeysData extends DataClass
     final map = <String, Expression>{};
     map['contact_id'] = Variable<int>(contactId);
     map['pre_key_id'] = Variable<int>(preKeyId);
-    map['pre_key'] = Variable<Uint8List>(preKey);
+    map['pre_key'] = Variable<i2.Uint8List>(preKey);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -3053,7 +3054,7 @@ class SignalContactPreKeysData extends DataClass
     return SignalContactPreKeysData(
       contactId: serializer.fromJson<int>(json['contactId']),
       preKeyId: serializer.fromJson<int>(json['preKeyId']),
-      preKey: serializer.fromJson<Uint8List>(json['preKey']),
+      preKey: serializer.fromJson<i2.Uint8List>(json['preKey']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -3063,7 +3064,7 @@ class SignalContactPreKeysData extends DataClass
     return <String, dynamic>{
       'contactId': serializer.toJson<int>(contactId),
       'preKeyId': serializer.toJson<int>(preKeyId),
-      'preKey': serializer.toJson<Uint8List>(preKey),
+      'preKey': serializer.toJson<i2.Uint8List>(preKey),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -3071,7 +3072,7 @@ class SignalContactPreKeysData extends DataClass
   SignalContactPreKeysData copyWith(
           {int? contactId,
           int? preKeyId,
-          Uint8List? preKey,
+          i2.Uint8List? preKey,
           DateTime? createdAt}) =>
       SignalContactPreKeysData(
         contactId: contactId ?? this.contactId,
@@ -3117,7 +3118,7 @@ class SignalContactPreKeysCompanion
     extends UpdateCompanion<SignalContactPreKeysData> {
   final Value<int> contactId;
   final Value<int> preKeyId;
-  final Value<Uint8List> preKey;
+  final Value<i2.Uint8List> preKey;
   final Value<DateTime> createdAt;
   final Value<int> rowid;
   const SignalContactPreKeysCompanion({
@@ -3130,7 +3131,7 @@ class SignalContactPreKeysCompanion
   SignalContactPreKeysCompanion.insert({
     required int contactId,
     required int preKeyId,
-    required Uint8List preKey,
+    required i2.Uint8List preKey,
     this.createdAt = const Value.absent(),
     this.rowid = const Value.absent(),
   })  : contactId = Value(contactId),
@@ -3139,7 +3140,7 @@ class SignalContactPreKeysCompanion
   static Insertable<SignalContactPreKeysData> custom({
     Expression<int>? contactId,
     Expression<int>? preKeyId,
-    Expression<Uint8List>? preKey,
+    Expression<i2.Uint8List>? preKey,
     Expression<DateTime>? createdAt,
     Expression<int>? rowid,
   }) {
@@ -3155,7 +3156,7 @@ class SignalContactPreKeysCompanion
   SignalContactPreKeysCompanion copyWith(
       {Value<int>? contactId,
       Value<int>? preKeyId,
-      Value<Uint8List>? preKey,
+      Value<i2.Uint8List>? preKey,
       Value<DateTime>? createdAt,
       Value<int>? rowid}) {
     return SignalContactPreKeysCompanion(
@@ -3177,7 +3178,7 @@ class SignalContactPreKeysCompanion
       map['pre_key_id'] = Variable<int>(preKeyId.value);
     }
     if (preKey.present) {
-      map['pre_key'] = Variable<Uint8List>(preKey.value);
+      map['pre_key'] = Variable<i2.Uint8List>(preKey.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -3213,11 +3214,12 @@ class SignalContactSignedPreKeys extends Table
   late final GeneratedColumn<int> signedPreKeyId = GeneratedColumn<int>(
       'signed_pre_key_id', aliasedName, false,
       type: DriftSqlType.int, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> signedPreKey =
+  late final GeneratedColumn<i2.Uint8List> signedPreKey =
-      GeneratedColumn<Uint8List>('signed_pre_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('signed_pre_key', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> signedPreKeySignature =
+  late final GeneratedColumn<i2.Uint8List> signedPreKeySignature =
-      GeneratedColumn<Uint8List>('signed_pre_key_signature', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>(
+          'signed_pre_key_signature', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
@@ -3269,8 +3271,8 @@ class SignalContactSignedPreKeysData extends DataClass
     implements Insertable<SignalContactSignedPreKeysData> {
   final int contactId;
   final int signedPreKeyId;
-  final Uint8List signedPreKey;
+  final i2.Uint8List signedPreKey;
-  final Uint8List signedPreKeySignature;
+  final i2.Uint8List signedPreKeySignature;
   final DateTime createdAt;
   const SignalContactSignedPreKeysData(
       {required this.contactId,
@@ -3283,9 +3285,9 @@ class SignalContactSignedPreKeysData extends DataClass
     final map = <String, Expression>{};
     map['contact_id'] = Variable<int>(contactId);
     map['signed_pre_key_id'] = Variable<int>(signedPreKeyId);
-    map['signed_pre_key'] = Variable<Uint8List>(signedPreKey);
+    map['signed_pre_key'] = Variable<i2.Uint8List>(signedPreKey);
     map['signed_pre_key_signature'] =
-        Variable<Uint8List>(signedPreKeySignature);
+        Variable<i2.Uint8List>(signedPreKeySignature);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -3306,9 +3308,9 @@ class SignalContactSignedPreKeysData extends DataClass
     return SignalContactSignedPreKeysData(
       contactId: serializer.fromJson<int>(json['contactId']),
       signedPreKeyId: serializer.fromJson<int>(json['signedPreKeyId']),
-      signedPreKey: serializer.fromJson<Uint8List>(json['signedPreKey']),
+      signedPreKey: serializer.fromJson<i2.Uint8List>(json['signedPreKey']),
       signedPreKeySignature:
-          serializer.fromJson<Uint8List>(json['signedPreKeySignature']),
+          serializer.fromJson<i2.Uint8List>(json['signedPreKeySignature']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -3318,9 +3320,9 @@ class SignalContactSignedPreKeysData extends DataClass
     return <String, dynamic>{
       'contactId': serializer.toJson<int>(contactId),
       'signedPreKeyId': serializer.toJson<int>(signedPreKeyId),
-      'signedPreKey': serializer.toJson<Uint8List>(signedPreKey),
+      'signedPreKey': serializer.toJson<i2.Uint8List>(signedPreKey),
       'signedPreKeySignature':
-          serializer.toJson<Uint8List>(signedPreKeySignature),
+          serializer.toJson<i2.Uint8List>(signedPreKeySignature),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -3328,8 +3330,8 @@ class SignalContactSignedPreKeysData extends DataClass
   SignalContactSignedPreKeysData copyWith(
           {int? contactId,
           int? signedPreKeyId,
-          Uint8List? signedPreKey,
+          i2.Uint8List? signedPreKey,
-          Uint8List? signedPreKeySignature,
+          i2.Uint8List? signedPreKeySignature,
           DateTime? createdAt}) =>
       SignalContactSignedPreKeysData(
         contactId: contactId ?? this.contactId,
@@ -3391,8 +3393,8 @@ class SignalContactSignedPreKeysCompanion
     extends UpdateCompanion<SignalContactSignedPreKeysData> {
   final Value<int> contactId;
   final Value<int> signedPreKeyId;
-  final Value<Uint8List> signedPreKey;
+  final Value<i2.Uint8List> signedPreKey;
-  final Value<Uint8List> signedPreKeySignature;
+  final Value<i2.Uint8List> signedPreKeySignature;
   final Value<DateTime> createdAt;
   const SignalContactSignedPreKeysCompanion({
     this.contactId = const Value.absent(),
@@ -3404,8 +3406,8 @@ class SignalContactSignedPreKeysCompanion
   SignalContactSignedPreKeysCompanion.insert({
     this.contactId = const Value.absent(),
     required int signedPreKeyId,
-    required Uint8List signedPreKey,
+    required i2.Uint8List signedPreKey,
-    required Uint8List signedPreKeySignature,
+    required i2.Uint8List signedPreKeySignature,
     this.createdAt = const Value.absent(),
   })  : signedPreKeyId = Value(signedPreKeyId),
         signedPreKey = Value(signedPreKey),
@@ -3413,8 +3415,8 @@ class SignalContactSignedPreKeysCompanion
   static Insertable<SignalContactSignedPreKeysData> custom({
     Expression<int>? contactId,
     Expression<int>? signedPreKeyId,
-    Expression<Uint8List>? signedPreKey,
+    Expression<i2.Uint8List>? signedPreKey,
-    Expression<Uint8List>? signedPreKeySignature,
+    Expression<i2.Uint8List>? signedPreKeySignature,
     Expression<DateTime>? createdAt,
   }) {
     return RawValuesInsertable({
@@ -3430,8 +3432,8 @@ class SignalContactSignedPreKeysCompanion
   SignalContactSignedPreKeysCompanion copyWith(
       {Value<int>? contactId,
       Value<int>? signedPreKeyId,
-      Value<Uint8List>? signedPreKey,
+      Value<i2.Uint8List>? signedPreKey,
-      Value<Uint8List>? signedPreKeySignature,
+      Value<i2.Uint8List>? signedPreKeySignature,
       Value<DateTime>? createdAt}) {
     return SignalContactSignedPreKeysCompanion(
       contactId: contactId ?? this.contactId,
@@ -3453,11 +3455,11 @@ class SignalContactSignedPreKeysCompanion
       map['signed_pre_key_id'] = Variable<int>(signedPreKeyId.value);
     }
     if (signedPreKey.present) {
-      map['signed_pre_key'] = Variable<Uint8List>(signedPreKey.value);
+      map['signed_pre_key'] = Variable<i2.Uint8List>(signedPreKey.value);
     }
     if (signedPreKeySignature.present) {
       map['signed_pre_key_signature'] =
-          Variable<Uint8List>(signedPreKeySignature.value);
+          Variable<i2.Uint8List>(signedPreKeySignature.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -3503,12 +3505,12 @@ class MessageRetransmissions extends Table
       requiredDuringInsert: false,
       defaultConstraints: GeneratedColumn.constraintIsAlways(
           'REFERENCES messages (message_id) ON DELETE CASCADE'));
-  late final GeneratedColumn<Uint8List> plaintextContent =
+  late final GeneratedColumn<i2.Uint8List> plaintextContent =
-      GeneratedColumn<Uint8List>('plaintext_content', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('plaintext_content', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> pushData = GeneratedColumn<Uint8List>(
+  late final GeneratedColumn<i2.Uint8List> pushData =
-      'push_data', aliasedName, true,
+      GeneratedColumn<i2.Uint8List>('push_data', aliasedName, true,
-      type: DriftSqlType.blob, requiredDuringInsert: false);
+          type: DriftSqlType.blob, requiredDuringInsert: false);
   late final GeneratedColumn<DateTime> acknowledgeByServerAt =
       GeneratedColumn<DateTime>('acknowledge_by_server_at', aliasedName, true,
           type: DriftSqlType.dateTime, requiredDuringInsert: false);
@@ -3560,8 +3562,8 @@ class MessageRetransmissionsData extends DataClass
   final int retransmissionId;
   final int contactId;
   final int? messageId;
-  final Uint8List plaintextContent;
+  final i2.Uint8List plaintextContent;
-  final Uint8List? pushData;
+  final i2.Uint8List? pushData;
   final DateTime? acknowledgeByServerAt;
   const MessageRetransmissionsData(
       {required this.retransmissionId,
@@ -3578,9 +3580,9 @@ class MessageRetransmissionsData extends DataClass
     if (!nullToAbsent || messageId != null) {
       map['message_id'] = Variable<int>(messageId);
     }
-    map['plaintext_content'] = Variable<Uint8List>(plaintextContent);
+    map['plaintext_content'] = Variable<i2.Uint8List>(plaintextContent);
     if (!nullToAbsent || pushData != null) {
-      map['push_data'] = Variable<Uint8List>(pushData);
+      map['push_data'] = Variable<i2.Uint8List>(pushData);
     }
     if (!nullToAbsent || acknowledgeByServerAt != null) {
       map['acknowledge_by_server_at'] =
@@ -3614,8 +3616,8 @@ class MessageRetransmissionsData extends DataClass
       contactId: serializer.fromJson<int>(json['contactId']),
       messageId: serializer.fromJson<int?>(json['messageId']),
       plaintextContent:
-          serializer.fromJson<Uint8List>(json['plaintextContent']),
+          serializer.fromJson<i2.Uint8List>(json['plaintextContent']),
-      pushData: serializer.fromJson<Uint8List?>(json['pushData']),
+      pushData: serializer.fromJson<i2.Uint8List?>(json['pushData']),
       acknowledgeByServerAt:
           serializer.fromJson<DateTime?>(json['acknowledgeByServerAt']),
     );
@@ -3627,8 +3629,8 @@ class MessageRetransmissionsData extends DataClass
       'retransmissionId': serializer.toJson<int>(retransmissionId),
       'contactId': serializer.toJson<int>(contactId),
       'messageId': serializer.toJson<int?>(messageId),
-      'plaintextContent': serializer.toJson<Uint8List>(plaintextContent),
+      'plaintextContent': serializer.toJson<i2.Uint8List>(plaintextContent),
-      'pushData': serializer.toJson<Uint8List?>(pushData),
+      'pushData': serializer.toJson<i2.Uint8List?>(pushData),
       'acknowledgeByServerAt':
           serializer.toJson<DateTime?>(acknowledgeByServerAt),
     };
@@ -3638,8 +3640,8 @@ class MessageRetransmissionsData extends DataClass
           {int? retransmissionId,
           int? contactId,
           Value<int?> messageId = const Value.absent(),
-          Uint8List? plaintextContent,
+          i2.Uint8List? plaintextContent,
-          Value<Uint8List?> pushData = const Value.absent(),
+          Value<i2.Uint8List?> pushData = const Value.absent(),
           Value<DateTime?> acknowledgeByServerAt = const Value.absent()}) =>
       MessageRetransmissionsData(
         retransmissionId: retransmissionId ?? this.retransmissionId,
@@ -3708,8 +3710,8 @@ class MessageRetransmissionsCompanion
   final Value<int> retransmissionId;
   final Value<int> contactId;
   final Value<int?> messageId;
-  final Value<Uint8List> plaintextContent;
+  final Value<i2.Uint8List> plaintextContent;
-  final Value<Uint8List?> pushData;
+  final Value<i2.Uint8List?> pushData;
   final Value<DateTime?> acknowledgeByServerAt;
   const MessageRetransmissionsCompanion({
     this.retransmissionId = const Value.absent(),
@@ -3723,7 +3725,7 @@ class MessageRetransmissionsCompanion
     this.retransmissionId = const Value.absent(),
     required int contactId,
     this.messageId = const Value.absent(),
-    required Uint8List plaintextContent,
+    required i2.Uint8List plaintextContent,
     this.pushData = const Value.absent(),
     this.acknowledgeByServerAt = const Value.absent(),
   })  : contactId = Value(contactId),
@@ -3732,8 +3734,8 @@ class MessageRetransmissionsCompanion
     Expression<int>? retransmissionId,
     Expression<int>? contactId,
     Expression<int>? messageId,
-    Expression<Uint8List>? plaintextContent,
+    Expression<i2.Uint8List>? plaintextContent,
-    Expression<Uint8List>? pushData,
+    Expression<i2.Uint8List>? pushData,
     Expression<DateTime>? acknowledgeByServerAt,
   }) {
     return RawValuesInsertable({
@@ -3751,8 +3753,8 @@ class MessageRetransmissionsCompanion
       {Value<int>? retransmissionId,
       Value<int>? contactId,
       Value<int?>? messageId,
-      Value<Uint8List>? plaintextContent,
+      Value<i2.Uint8List>? plaintextContent,
-      Value<Uint8List?>? pushData,
+      Value<i2.Uint8List?>? pushData,
       Value<DateTime?>? acknowledgeByServerAt}) {
     return MessageRetransmissionsCompanion(
       retransmissionId: retransmissionId ?? this.retransmissionId,
@@ -3778,10 +3780,10 @@ class MessageRetransmissionsCompanion
       map['message_id'] = Variable<int>(messageId.value);
     }
     if (plaintextContent.present) {
-      map['plaintext_content'] = Variable<Uint8List>(plaintextContent.value);
+      map['plaintext_content'] = Variable<i2.Uint8List>(plaintextContent.value);
     }
     if (pushData.present) {
-      map['push_data'] = Variable<Uint8List>(pushData.value);
+      map['push_data'] = Variable<i2.Uint8List>(pushData.value);
     }
     if (acknowledgeByServerAt.present) {
       map['acknowledge_by_server_at'] =

test/drift/twonly_database/generated/schema_v14.dart

@@ -1,4 +1,5 @@
 // dart format width=80
+import 'dart:typed_data' as i2;
 // GENERATED CODE, DO NOT EDIT BY HAND.
 // ignore_for_file: type=lint
 import 'package:drift/drift.dart';
@@ -2132,8 +2133,8 @@ class SignalIdentityKeyStores extends Table
   late final GeneratedColumn<String> name = GeneratedColumn<String>(
       'name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> identityKey =
+  late final GeneratedColumn<i2.Uint8List> identityKey =
-      GeneratedColumn<Uint8List>('identity_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('identity_key', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
@@ -2177,7 +2178,7 @@ class SignalIdentityKeyStoresData extends DataClass
     implements Insertable<SignalIdentityKeyStoresData> {
   final int deviceId;
   final String name;
-  final Uint8List identityKey;
+  final i2.Uint8List identityKey;
   final DateTime createdAt;
   const SignalIdentityKeyStoresData(
       {required this.deviceId,
@@ -2189,7 +2190,7 @@ class SignalIdentityKeyStoresData extends DataClass
     final map = <String, Expression>{};
     map['device_id'] = Variable<int>(deviceId);
     map['name'] = Variable<String>(name);
-    map['identity_key'] = Variable<Uint8List>(identityKey);
+    map['identity_key'] = Variable<i2.Uint8List>(identityKey);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -2209,7 +2210,7 @@ class SignalIdentityKeyStoresData extends DataClass
     return SignalIdentityKeyStoresData(
       deviceId: serializer.fromJson<int>(json['deviceId']),
       name: serializer.fromJson<String>(json['name']),
-      identityKey: serializer.fromJson<Uint8List>(json['identityKey']),
+      identityKey: serializer.fromJson<i2.Uint8List>(json['identityKey']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -2219,7 +2220,7 @@ class SignalIdentityKeyStoresData extends DataClass
     return <String, dynamic>{
       'deviceId': serializer.toJson<int>(deviceId),
       'name': serializer.toJson<String>(name),
-      'identityKey': serializer.toJson<Uint8List>(identityKey),
+      'identityKey': serializer.toJson<i2.Uint8List>(identityKey),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -2227,7 +2228,7 @@ class SignalIdentityKeyStoresData extends DataClass
   SignalIdentityKeyStoresData copyWith(
           {int? deviceId,
           String? name,
-          Uint8List? identityKey,
+          i2.Uint8List? identityKey,
           DateTime? createdAt}) =>
       SignalIdentityKeyStoresData(
         deviceId: deviceId ?? this.deviceId,
@@ -2274,7 +2275,7 @@ class SignalIdentityKeyStoresCompanion
     extends UpdateCompanion<SignalIdentityKeyStoresData> {
   final Value<int> deviceId;
   final Value<String> name;
-  final Value<Uint8List> identityKey;
+  final Value<i2.Uint8List> identityKey;
   final Value<DateTime> createdAt;
   final Value<int> rowid;
   const SignalIdentityKeyStoresCompanion({
@@ -2287,7 +2288,7 @@ class SignalIdentityKeyStoresCompanion
   SignalIdentityKeyStoresCompanion.insert({
     required int deviceId,
     required String name,
-    required Uint8List identityKey,
+    required i2.Uint8List identityKey,
     this.createdAt = const Value.absent(),
     this.rowid = const Value.absent(),
   })  : deviceId = Value(deviceId),
@@ -2296,7 +2297,7 @@ class SignalIdentityKeyStoresCompanion
   static Insertable<SignalIdentityKeyStoresData> custom({
     Expression<int>? deviceId,
     Expression<String>? name,
-    Expression<Uint8List>? identityKey,
+    Expression<i2.Uint8List>? identityKey,
     Expression<DateTime>? createdAt,
     Expression<int>? rowid,
   }) {
@@ -2312,7 +2313,7 @@ class SignalIdentityKeyStoresCompanion
   SignalIdentityKeyStoresCompanion copyWith(
       {Value<int>? deviceId,
       Value<String>? name,
-      Value<Uint8List>? identityKey,
+      Value<i2.Uint8List>? identityKey,
       Value<DateTime>? createdAt,
       Value<int>? rowid}) {
     return SignalIdentityKeyStoresCompanion(
@@ -2334,7 +2335,7 @@ class SignalIdentityKeyStoresCompanion
       map['name'] = Variable<String>(name.value);
     }
     if (identityKey.present) {
-      map['identity_key'] = Variable<Uint8List>(identityKey.value);
+      map['identity_key'] = Variable<i2.Uint8List>(identityKey.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -2367,9 +2368,9 @@ class SignalPreKeyStores extends Table
   late final GeneratedColumn<int> preKeyId = GeneratedColumn<int>(
       'pre_key_id', aliasedName, false,
       type: DriftSqlType.int, requiredDuringInsert: false);
-  late final GeneratedColumn<Uint8List> preKey = GeneratedColumn<Uint8List>(
+  late final GeneratedColumn<i2.Uint8List> preKey =
-      'pre_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('pre_key', aliasedName, false,
-      type: DriftSqlType.blob, requiredDuringInsert: true);
+          type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
       type: DriftSqlType.dateTime,
@@ -2407,7 +2408,7 @@ class SignalPreKeyStores extends Table
 class SignalPreKeyStoresData extends DataClass
     implements Insertable<SignalPreKeyStoresData> {
   final int preKeyId;
-  final Uint8List preKey;
+  final i2.Uint8List preKey;
   final DateTime createdAt;
   const SignalPreKeyStoresData(
       {required this.preKeyId, required this.preKey, required this.createdAt});
@@ -2415,7 +2416,7 @@ class SignalPreKeyStoresData extends DataClass
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
     map['pre_key_id'] = Variable<int>(preKeyId);
-    map['pre_key'] = Variable<Uint8List>(preKey);
+    map['pre_key'] = Variable<i2.Uint8List>(preKey);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -2433,7 +2434,7 @@ class SignalPreKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return SignalPreKeyStoresData(
       preKeyId: serializer.fromJson<int>(json['preKeyId']),
-      preKey: serializer.fromJson<Uint8List>(json['preKey']),
+      preKey: serializer.fromJson<i2.Uint8List>(json['preKey']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -2442,13 +2443,13 @@ class SignalPreKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return <String, dynamic>{
       'preKeyId': serializer.toJson<int>(preKeyId),
-      'preKey': serializer.toJson<Uint8List>(preKey),
+      'preKey': serializer.toJson<i2.Uint8List>(preKey),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
 
   SignalPreKeyStoresData copyWith(
-          {int? preKeyId, Uint8List? preKey, DateTime? createdAt}) =>
+          {int? preKeyId, i2.Uint8List? preKey, DateTime? createdAt}) =>
       SignalPreKeyStoresData(
         preKeyId: preKeyId ?? this.preKeyId,
         preKey: preKey ?? this.preKey,
@@ -2487,7 +2488,7 @@ class SignalPreKeyStoresData extends DataClass
 class SignalPreKeyStoresCompanion
     extends UpdateCompanion<SignalPreKeyStoresData> {
   final Value<int> preKeyId;
-  final Value<Uint8List> preKey;
+  final Value<i2.Uint8List> preKey;
   final Value<DateTime> createdAt;
   const SignalPreKeyStoresCompanion({
     this.preKeyId = const Value.absent(),
@@ -2496,12 +2497,12 @@ class SignalPreKeyStoresCompanion
   });
   SignalPreKeyStoresCompanion.insert({
     this.preKeyId = const Value.absent(),
-    required Uint8List preKey,
+    required i2.Uint8List preKey,
     this.createdAt = const Value.absent(),
   }) : preKey = Value(preKey);
   static Insertable<SignalPreKeyStoresData> custom({
     Expression<int>? preKeyId,
-    Expression<Uint8List>? preKey,
+    Expression<i2.Uint8List>? preKey,
     Expression<DateTime>? createdAt,
   }) {
     return RawValuesInsertable({
@@ -2513,7 +2514,7 @@ class SignalPreKeyStoresCompanion
 
   SignalPreKeyStoresCompanion copyWith(
       {Value<int>? preKeyId,
-      Value<Uint8List>? preKey,
+      Value<i2.Uint8List>? preKey,
       Value<DateTime>? createdAt}) {
     return SignalPreKeyStoresCompanion(
       preKeyId: preKeyId ?? this.preKeyId,
@@ -2529,7 +2530,7 @@ class SignalPreKeyStoresCompanion
       map['pre_key_id'] = Variable<int>(preKeyId.value);
     }
     if (preKey.present) {
-      map['pre_key'] = Variable<Uint8List>(preKey.value);
+      map['pre_key'] = Variable<i2.Uint8List>(preKey.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -2557,9 +2558,9 @@ class SignalSenderKeyStores extends Table
   late final GeneratedColumn<String> senderKeyName = GeneratedColumn<String>(
       'sender_key_name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> senderKey = GeneratedColumn<Uint8List>(
+  late final GeneratedColumn<i2.Uint8List> senderKey =
-      'sender_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('sender_key', aliasedName, false,
-      type: DriftSqlType.blob, requiredDuringInsert: true);
+          type: DriftSqlType.blob, requiredDuringInsert: true);
   @override
   List<GeneratedColumn> get $columns => [senderKeyName, senderKey];
   @override
@@ -2590,14 +2591,14 @@ class SignalSenderKeyStores extends Table
 class SignalSenderKeyStoresData extends DataClass
     implements Insertable<SignalSenderKeyStoresData> {
   final String senderKeyName;
-  final Uint8List senderKey;
+  final i2.Uint8List senderKey;
   const SignalSenderKeyStoresData(
       {required this.senderKeyName, required this.senderKey});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
     map['sender_key_name'] = Variable<String>(senderKeyName);
-    map['sender_key'] = Variable<Uint8List>(senderKey);
+    map['sender_key'] = Variable<i2.Uint8List>(senderKey);
     return map;
   }
 
@@ -2613,7 +2614,7 @@ class SignalSenderKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return SignalSenderKeyStoresData(
       senderKeyName: serializer.fromJson<String>(json['senderKeyName']),
-      senderKey: serializer.fromJson<Uint8List>(json['senderKey']),
+      senderKey: serializer.fromJson<i2.Uint8List>(json['senderKey']),
     );
   }
   @override
@@ -2621,12 +2622,12 @@ class SignalSenderKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return <String, dynamic>{
       'senderKeyName': serializer.toJson<String>(senderKeyName),
-      'senderKey': serializer.toJson<Uint8List>(senderKey),
+      'senderKey': serializer.toJson<i2.Uint8List>(senderKey),
     };
   }
 
   SignalSenderKeyStoresData copyWith(
-          {String? senderKeyName, Uint8List? senderKey}) =>
+          {String? senderKeyName, i2.Uint8List? senderKey}) =>
       SignalSenderKeyStoresData(
         senderKeyName: senderKeyName ?? this.senderKeyName,
         senderKey: senderKey ?? this.senderKey,
@@ -2664,7 +2665,7 @@ class SignalSenderKeyStoresData extends DataClass
 class SignalSenderKeyStoresCompanion
     extends UpdateCompanion<SignalSenderKeyStoresData> {
   final Value<String> senderKeyName;
-  final Value<Uint8List> senderKey;
+  final Value<i2.Uint8List> senderKey;
   final Value<int> rowid;
   const SignalSenderKeyStoresCompanion({
     this.senderKeyName = const Value.absent(),
@@ -2673,13 +2674,13 @@ class SignalSenderKeyStoresCompanion
   });
   SignalSenderKeyStoresCompanion.insert({
     required String senderKeyName,
-    required Uint8List senderKey,
+    required i2.Uint8List senderKey,
     this.rowid = const Value.absent(),
   })  : senderKeyName = Value(senderKeyName),
         senderKey = Value(senderKey);
   static Insertable<SignalSenderKeyStoresData> custom({
     Expression<String>? senderKeyName,
-    Expression<Uint8List>? senderKey,
+    Expression<i2.Uint8List>? senderKey,
     Expression<int>? rowid,
   }) {
     return RawValuesInsertable({
@@ -2691,7 +2692,7 @@ class SignalSenderKeyStoresCompanion
 
   SignalSenderKeyStoresCompanion copyWith(
       {Value<String>? senderKeyName,
-      Value<Uint8List>? senderKey,
+      Value<i2.Uint8List>? senderKey,
       Value<int>? rowid}) {
     return SignalSenderKeyStoresCompanion(
       senderKeyName: senderKeyName ?? this.senderKeyName,
@@ -2707,7 +2708,7 @@ class SignalSenderKeyStoresCompanion
       map['sender_key_name'] = Variable<String>(senderKeyName.value);
     }
     if (senderKey.present) {
-      map['sender_key'] = Variable<Uint8List>(senderKey.value);
+      map['sender_key'] = Variable<i2.Uint8List>(senderKey.value);
     }
     if (rowid.present) {
       map['rowid'] = Variable<int>(rowid.value);
@@ -2738,8 +2739,8 @@ class SignalSessionStores extends Table
   late final GeneratedColumn<String> name = GeneratedColumn<String>(
       'name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> sessionRecord =
+  late final GeneratedColumn<i2.Uint8List> sessionRecord =
-      GeneratedColumn<Uint8List>('session_record', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('session_record', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
@@ -2783,7 +2784,7 @@ class SignalSessionStoresData extends DataClass
     implements Insertable<SignalSessionStoresData> {
   final int deviceId;
   final String name;
-  final Uint8List sessionRecord;
+  final i2.Uint8List sessionRecord;
   final DateTime createdAt;
   const SignalSessionStoresData(
       {required this.deviceId,
@@ -2795,7 +2796,7 @@ class SignalSessionStoresData extends DataClass
     final map = <String, Expression>{};
     map['device_id'] = Variable<int>(deviceId);
     map['name'] = Variable<String>(name);
-    map['session_record'] = Variable<Uint8List>(sessionRecord);
+    map['session_record'] = Variable<i2.Uint8List>(sessionRecord);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -2815,7 +2816,7 @@ class SignalSessionStoresData extends DataClass
     return SignalSessionStoresData(
       deviceId: serializer.fromJson<int>(json['deviceId']),
       name: serializer.fromJson<String>(json['name']),
-      sessionRecord: serializer.fromJson<Uint8List>(json['sessionRecord']),
+      sessionRecord: serializer.fromJson<i2.Uint8List>(json['sessionRecord']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -2825,7 +2826,7 @@ class SignalSessionStoresData extends DataClass
     return <String, dynamic>{
       'deviceId': serializer.toJson<int>(deviceId),
       'name': serializer.toJson<String>(name),
-      'sessionRecord': serializer.toJson<Uint8List>(sessionRecord),
+      'sessionRecord': serializer.toJson<i2.Uint8List>(sessionRecord),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -2833,7 +2834,7 @@ class SignalSessionStoresData extends DataClass
   SignalSessionStoresData copyWith(
           {int? deviceId,
           String? name,
-          Uint8List? sessionRecord,
+          i2.Uint8List? sessionRecord,
           DateTime? createdAt}) =>
       SignalSessionStoresData(
         deviceId: deviceId ?? this.deviceId,
@@ -2880,7 +2881,7 @@ class SignalSessionStoresCompanion
     extends UpdateCompanion<SignalSessionStoresData> {
   final Value<int> deviceId;
   final Value<String> name;
-  final Value<Uint8List> sessionRecord;
+  final Value<i2.Uint8List> sessionRecord;
   final Value<DateTime> createdAt;
   final Value<int> rowid;
   const SignalSessionStoresCompanion({
@@ -2893,7 +2894,7 @@ class SignalSessionStoresCompanion
   SignalSessionStoresCompanion.insert({
     required int deviceId,
     required String name,
-    required Uint8List sessionRecord,
+    required i2.Uint8List sessionRecord,
     this.createdAt = const Value.absent(),
     this.rowid = const Value.absent(),
   })  : deviceId = Value(deviceId),
@@ -2902,7 +2903,7 @@ class SignalSessionStoresCompanion
   static Insertable<SignalSessionStoresData> custom({
     Expression<int>? deviceId,
     Expression<String>? name,
-    Expression<Uint8List>? sessionRecord,
+    Expression<i2.Uint8List>? sessionRecord,
     Expression<DateTime>? createdAt,
     Expression<int>? rowid,
   }) {
@@ -2918,7 +2919,7 @@ class SignalSessionStoresCompanion
   SignalSessionStoresCompanion copyWith(
       {Value<int>? deviceId,
       Value<String>? name,
-      Value<Uint8List>? sessionRecord,
+      Value<i2.Uint8List>? sessionRecord,
       Value<DateTime>? createdAt,
       Value<int>? rowid}) {
     return SignalSessionStoresCompanion(
@@ -2940,7 +2941,7 @@ class SignalSessionStoresCompanion
       map['name'] = Variable<String>(name.value);
     }
     if (sessionRecord.present) {
-      map['session_record'] = Variable<Uint8List>(sessionRecord.value);
+      map['session_record'] = Variable<i2.Uint8List>(sessionRecord.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -2976,9 +2977,9 @@ class SignalContactPreKeys extends Table
   late final GeneratedColumn<int> preKeyId = GeneratedColumn<int>(
       'pre_key_id', aliasedName, false,
       type: DriftSqlType.int, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> preKey = GeneratedColumn<Uint8List>(
+  late final GeneratedColumn<i2.Uint8List> preKey =
-      'pre_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('pre_key', aliasedName, false,
-      type: DriftSqlType.blob, requiredDuringInsert: true);
+          type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
       type: DriftSqlType.dateTime,
@@ -3021,7 +3022,7 @@ class SignalContactPreKeysData extends DataClass
     implements Insertable<SignalContactPreKeysData> {
   final int contactId;
   final int preKeyId;
-  final Uint8List preKey;
+  final i2.Uint8List preKey;
   final DateTime createdAt;
   const SignalContactPreKeysData(
       {required this.contactId,
@@ -3033,7 +3034,7 @@ class SignalContactPreKeysData extends DataClass
     final map = <String, Expression>{};
     map['contact_id'] = Variable<int>(contactId);
     map['pre_key_id'] = Variable<int>(preKeyId);
-    map['pre_key'] = Variable<Uint8List>(preKey);
+    map['pre_key'] = Variable<i2.Uint8List>(preKey);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -3053,7 +3054,7 @@ class SignalContactPreKeysData extends DataClass
     return SignalContactPreKeysData(
       contactId: serializer.fromJson<int>(json['contactId']),
       preKeyId: serializer.fromJson<int>(json['preKeyId']),
-      preKey: serializer.fromJson<Uint8List>(json['preKey']),
+      preKey: serializer.fromJson<i2.Uint8List>(json['preKey']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -3063,7 +3064,7 @@ class SignalContactPreKeysData extends DataClass
     return <String, dynamic>{
       'contactId': serializer.toJson<int>(contactId),
       'preKeyId': serializer.toJson<int>(preKeyId),
-      'preKey': serializer.toJson<Uint8List>(preKey),
+      'preKey': serializer.toJson<i2.Uint8List>(preKey),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -3071,7 +3072,7 @@ class SignalContactPreKeysData extends DataClass
   SignalContactPreKeysData copyWith(
           {int? contactId,
           int? preKeyId,
-          Uint8List? preKey,
+          i2.Uint8List? preKey,
           DateTime? createdAt}) =>
       SignalContactPreKeysData(
         contactId: contactId ?? this.contactId,
@@ -3117,7 +3118,7 @@ class SignalContactPreKeysCompanion
     extends UpdateCompanion<SignalContactPreKeysData> {
   final Value<int> contactId;
   final Value<int> preKeyId;
-  final Value<Uint8List> preKey;
+  final Value<i2.Uint8List> preKey;
   final Value<DateTime> createdAt;
   final Value<int> rowid;
   const SignalContactPreKeysCompanion({
@@ -3130,7 +3131,7 @@ class SignalContactPreKeysCompanion
   SignalContactPreKeysCompanion.insert({
     required int contactId,
     required int preKeyId,
-    required Uint8List preKey,
+    required i2.Uint8List preKey,
     this.createdAt = const Value.absent(),
     this.rowid = const Value.absent(),
   })  : contactId = Value(contactId),
@@ -3139,7 +3140,7 @@ class SignalContactPreKeysCompanion
   static Insertable<SignalContactPreKeysData> custom({
     Expression<int>? contactId,
     Expression<int>? preKeyId,
-    Expression<Uint8List>? preKey,
+    Expression<i2.Uint8List>? preKey,
     Expression<DateTime>? createdAt,
     Expression<int>? rowid,
   }) {
@@ -3155,7 +3156,7 @@ class SignalContactPreKeysCompanion
   SignalContactPreKeysCompanion copyWith(
       {Value<int>? contactId,
       Value<int>? preKeyId,
-      Value<Uint8List>? preKey,
+      Value<i2.Uint8List>? preKey,
       Value<DateTime>? createdAt,
       Value<int>? rowid}) {
     return SignalContactPreKeysCompanion(
@@ -3177,7 +3178,7 @@ class SignalContactPreKeysCompanion
       map['pre_key_id'] = Variable<int>(preKeyId.value);
     }
     if (preKey.present) {
-      map['pre_key'] = Variable<Uint8List>(preKey.value);
+      map['pre_key'] = Variable<i2.Uint8List>(preKey.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -3213,11 +3214,12 @@ class SignalContactSignedPreKeys extends Table
   late final GeneratedColumn<int> signedPreKeyId = GeneratedColumn<int>(
       'signed_pre_key_id', aliasedName, false,
       type: DriftSqlType.int, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> signedPreKey =
+  late final GeneratedColumn<i2.Uint8List> signedPreKey =
-      GeneratedColumn<Uint8List>('signed_pre_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('signed_pre_key', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> signedPreKeySignature =
+  late final GeneratedColumn<i2.Uint8List> signedPreKeySignature =
-      GeneratedColumn<Uint8List>('signed_pre_key_signature', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>(
+          'signed_pre_key_signature', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
@@ -3269,8 +3271,8 @@ class SignalContactSignedPreKeysData extends DataClass
     implements Insertable<SignalContactSignedPreKeysData> {
   final int contactId;
   final int signedPreKeyId;
-  final Uint8List signedPreKey;
+  final i2.Uint8List signedPreKey;
-  final Uint8List signedPreKeySignature;
+  final i2.Uint8List signedPreKeySignature;
   final DateTime createdAt;
   const SignalContactSignedPreKeysData(
       {required this.contactId,
@@ -3283,9 +3285,9 @@ class SignalContactSignedPreKeysData extends DataClass
     final map = <String, Expression>{};
     map['contact_id'] = Variable<int>(contactId);
     map['signed_pre_key_id'] = Variable<int>(signedPreKeyId);
-    map['signed_pre_key'] = Variable<Uint8List>(signedPreKey);
+    map['signed_pre_key'] = Variable<i2.Uint8List>(signedPreKey);
     map['signed_pre_key_signature'] =
-        Variable<Uint8List>(signedPreKeySignature);
+        Variable<i2.Uint8List>(signedPreKeySignature);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -3306,9 +3308,9 @@ class SignalContactSignedPreKeysData extends DataClass
     return SignalContactSignedPreKeysData(
       contactId: serializer.fromJson<int>(json['contactId']),
       signedPreKeyId: serializer.fromJson<int>(json['signedPreKeyId']),
-      signedPreKey: serializer.fromJson<Uint8List>(json['signedPreKey']),
+      signedPreKey: serializer.fromJson<i2.Uint8List>(json['signedPreKey']),
       signedPreKeySignature:
-          serializer.fromJson<Uint8List>(json['signedPreKeySignature']),
+          serializer.fromJson<i2.Uint8List>(json['signedPreKeySignature']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -3318,9 +3320,9 @@ class SignalContactSignedPreKeysData extends DataClass
     return <String, dynamic>{
       'contactId': serializer.toJson<int>(contactId),
       'signedPreKeyId': serializer.toJson<int>(signedPreKeyId),
-      'signedPreKey': serializer.toJson<Uint8List>(signedPreKey),
+      'signedPreKey': serializer.toJson<i2.Uint8List>(signedPreKey),
       'signedPreKeySignature':
-          serializer.toJson<Uint8List>(signedPreKeySignature),
+          serializer.toJson<i2.Uint8List>(signedPreKeySignature),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -3328,8 +3330,8 @@ class SignalContactSignedPreKeysData extends DataClass
   SignalContactSignedPreKeysData copyWith(
           {int? contactId,
           int? signedPreKeyId,
-          Uint8List? signedPreKey,
+          i2.Uint8List? signedPreKey,
-          Uint8List? signedPreKeySignature,
+          i2.Uint8List? signedPreKeySignature,
           DateTime? createdAt}) =>
       SignalContactSignedPreKeysData(
         contactId: contactId ?? this.contactId,
@@ -3391,8 +3393,8 @@ class SignalContactSignedPreKeysCompanion
     extends UpdateCompanion<SignalContactSignedPreKeysData> {
   final Value<int> contactId;
   final Value<int> signedPreKeyId;
-  final Value<Uint8List> signedPreKey;
+  final Value<i2.Uint8List> signedPreKey;
-  final Value<Uint8List> signedPreKeySignature;
+  final Value<i2.Uint8List> signedPreKeySignature;
   final Value<DateTime> createdAt;
   const SignalContactSignedPreKeysCompanion({
     this.contactId = const Value.absent(),
@@ -3404,8 +3406,8 @@ class SignalContactSignedPreKeysCompanion
   SignalContactSignedPreKeysCompanion.insert({
     this.contactId = const Value.absent(),
     required int signedPreKeyId,
-    required Uint8List signedPreKey,
+    required i2.Uint8List signedPreKey,
-    required Uint8List signedPreKeySignature,
+    required i2.Uint8List signedPreKeySignature,
     this.createdAt = const Value.absent(),
   })  : signedPreKeyId = Value(signedPreKeyId),
         signedPreKey = Value(signedPreKey),
@@ -3413,8 +3415,8 @@ class SignalContactSignedPreKeysCompanion
   static Insertable<SignalContactSignedPreKeysData> custom({
     Expression<int>? contactId,
     Expression<int>? signedPreKeyId,
-    Expression<Uint8List>? signedPreKey,
+    Expression<i2.Uint8List>? signedPreKey,
-    Expression<Uint8List>? signedPreKeySignature,
+    Expression<i2.Uint8List>? signedPreKeySignature,
     Expression<DateTime>? createdAt,
   }) {
     return RawValuesInsertable({
@@ -3430,8 +3432,8 @@ class SignalContactSignedPreKeysCompanion
   SignalContactSignedPreKeysCompanion copyWith(
       {Value<int>? contactId,
       Value<int>? signedPreKeyId,
-      Value<Uint8List>? signedPreKey,
+      Value<i2.Uint8List>? signedPreKey,
-      Value<Uint8List>? signedPreKeySignature,
+      Value<i2.Uint8List>? signedPreKeySignature,
       Value<DateTime>? createdAt}) {
     return SignalContactSignedPreKeysCompanion(
       contactId: contactId ?? this.contactId,
@@ -3453,11 +3455,11 @@ class SignalContactSignedPreKeysCompanion
       map['signed_pre_key_id'] = Variable<int>(signedPreKeyId.value);
     }
     if (signedPreKey.present) {
-      map['signed_pre_key'] = Variable<Uint8List>(signedPreKey.value);
+      map['signed_pre_key'] = Variable<i2.Uint8List>(signedPreKey.value);
     }
     if (signedPreKeySignature.present) {
       map['signed_pre_key_signature'] =
-          Variable<Uint8List>(signedPreKeySignature.value);
+          Variable<i2.Uint8List>(signedPreKeySignature.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -3503,14 +3505,14 @@ class MessageRetransmissions extends Table
       requiredDuringInsert: false,
       defaultConstraints: GeneratedColumn.constraintIsAlways(
           'REFERENCES messages (message_id) ON DELETE CASCADE'));
-  late final GeneratedColumn<Uint8List> plaintextContent =
+  late final GeneratedColumn<i2.Uint8List> plaintextContent =
-      GeneratedColumn<Uint8List>('plaintext_content', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('plaintext_content', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> pushData = GeneratedColumn<Uint8List>(
+  late final GeneratedColumn<i2.Uint8List> pushData =
-      'push_data', aliasedName, true,
+      GeneratedColumn<i2.Uint8List>('push_data', aliasedName, true,
-      type: DriftSqlType.blob, requiredDuringInsert: false);
+          type: DriftSqlType.blob, requiredDuringInsert: false);
-  late final GeneratedColumn<Uint8List> encryptedHash =
+  late final GeneratedColumn<i2.Uint8List> encryptedHash =
-      GeneratedColumn<Uint8List>('encrypted_hash', aliasedName, true,
+      GeneratedColumn<i2.Uint8List>('encrypted_hash', aliasedName, true,
           type: DriftSqlType.blob, requiredDuringInsert: false);
   late final GeneratedColumn<DateTime> acknowledgeByServerAt =
       GeneratedColumn<DateTime>('acknowledge_by_server_at', aliasedName, true,
@@ -3566,9 +3568,9 @@ class MessageRetransmissionsData extends DataClass
   final int retransmissionId;
   final int contactId;
   final int? messageId;
-  final Uint8List plaintextContent;
+  final i2.Uint8List plaintextContent;
-  final Uint8List? pushData;
+  final i2.Uint8List? pushData;
-  final Uint8List? encryptedHash;
+  final i2.Uint8List? encryptedHash;
   final DateTime? acknowledgeByServerAt;
   const MessageRetransmissionsData(
       {required this.retransmissionId,
@@ -3586,12 +3588,12 @@ class MessageRetransmissionsData extends DataClass
     if (!nullToAbsent || messageId != null) {
       map['message_id'] = Variable<int>(messageId);
     }
-    map['plaintext_content'] = Variable<Uint8List>(plaintextContent);
+    map['plaintext_content'] = Variable<i2.Uint8List>(plaintextContent);
     if (!nullToAbsent || pushData != null) {
-      map['push_data'] = Variable<Uint8List>(pushData);
+      map['push_data'] = Variable<i2.Uint8List>(pushData);
     }
     if (!nullToAbsent || encryptedHash != null) {
-      map['encrypted_hash'] = Variable<Uint8List>(encryptedHash);
+      map['encrypted_hash'] = Variable<i2.Uint8List>(encryptedHash);
     }
     if (!nullToAbsent || acknowledgeByServerAt != null) {
       map['acknowledge_by_server_at'] =
@@ -3628,9 +3630,9 @@ class MessageRetransmissionsData extends DataClass
       contactId: serializer.fromJson<int>(json['contactId']),
       messageId: serializer.fromJson<int?>(json['messageId']),
       plaintextContent:
-          serializer.fromJson<Uint8List>(json['plaintextContent']),
+          serializer.fromJson<i2.Uint8List>(json['plaintextContent']),
-      pushData: serializer.fromJson<Uint8List?>(json['pushData']),
+      pushData: serializer.fromJson<i2.Uint8List?>(json['pushData']),
-      encryptedHash: serializer.fromJson<Uint8List?>(json['encryptedHash']),
+      encryptedHash: serializer.fromJson<i2.Uint8List?>(json['encryptedHash']),
       acknowledgeByServerAt:
           serializer.fromJson<DateTime?>(json['acknowledgeByServerAt']),
     );
@@ -3642,9 +3644,9 @@ class MessageRetransmissionsData extends DataClass
       'retransmissionId': serializer.toJson<int>(retransmissionId),
       'contactId': serializer.toJson<int>(contactId),
       'messageId': serializer.toJson<int?>(messageId),
-      'plaintextContent': serializer.toJson<Uint8List>(plaintextContent),
+      'plaintextContent': serializer.toJson<i2.Uint8List>(plaintextContent),
-      'pushData': serializer.toJson<Uint8List?>(pushData),
+      'pushData': serializer.toJson<i2.Uint8List?>(pushData),
-      'encryptedHash': serializer.toJson<Uint8List?>(encryptedHash),
+      'encryptedHash': serializer.toJson<i2.Uint8List?>(encryptedHash),
       'acknowledgeByServerAt':
           serializer.toJson<DateTime?>(acknowledgeByServerAt),
     };
@@ -3654,9 +3656,9 @@ class MessageRetransmissionsData extends DataClass
           {int? retransmissionId,
           int? contactId,
           Value<int?> messageId = const Value.absent(),
-          Uint8List? plaintextContent,
+          i2.Uint8List? plaintextContent,
-          Value<Uint8List?> pushData = const Value.absent(),
+          Value<i2.Uint8List?> pushData = const Value.absent(),
-          Value<Uint8List?> encryptedHash = const Value.absent(),
+          Value<i2.Uint8List?> encryptedHash = const Value.absent(),
           Value<DateTime?> acknowledgeByServerAt = const Value.absent()}) =>
       MessageRetransmissionsData(
         retransmissionId: retransmissionId ?? this.retransmissionId,
@@ -3733,9 +3735,9 @@ class MessageRetransmissionsCompanion
   final Value<int> retransmissionId;
   final Value<int> contactId;
   final Value<int?> messageId;
-  final Value<Uint8List> plaintextContent;
+  final Value<i2.Uint8List> plaintextContent;
-  final Value<Uint8List?> pushData;
+  final Value<i2.Uint8List?> pushData;
-  final Value<Uint8List?> encryptedHash;
+  final Value<i2.Uint8List?> encryptedHash;
   final Value<DateTime?> acknowledgeByServerAt;
   const MessageRetransmissionsCompanion({
     this.retransmissionId = const Value.absent(),
@@ -3750,7 +3752,7 @@ class MessageRetransmissionsCompanion
     this.retransmissionId = const Value.absent(),
     required int contactId,
     this.messageId = const Value.absent(),
-    required Uint8List plaintextContent,
+    required i2.Uint8List plaintextContent,
     this.pushData = const Value.absent(),
     this.encryptedHash = const Value.absent(),
     this.acknowledgeByServerAt = const Value.absent(),
@@ -3760,9 +3762,9 @@ class MessageRetransmissionsCompanion
     Expression<int>? retransmissionId,
     Expression<int>? contactId,
     Expression<int>? messageId,
-    Expression<Uint8List>? plaintextContent,
+    Expression<i2.Uint8List>? plaintextContent,
-    Expression<Uint8List>? pushData,
+    Expression<i2.Uint8List>? pushData,
-    Expression<Uint8List>? encryptedHash,
+    Expression<i2.Uint8List>? encryptedHash,
     Expression<DateTime>? acknowledgeByServerAt,
   }) {
     return RawValuesInsertable({
@@ -3781,9 +3783,9 @@ class MessageRetransmissionsCompanion
       {Value<int>? retransmissionId,
       Value<int>? contactId,
       Value<int?>? messageId,
-      Value<Uint8List>? plaintextContent,
+      Value<i2.Uint8List>? plaintextContent,
-      Value<Uint8List?>? pushData,
+      Value<i2.Uint8List?>? pushData,
-      Value<Uint8List?>? encryptedHash,
+      Value<i2.Uint8List?>? encryptedHash,
       Value<DateTime?>? acknowledgeByServerAt}) {
     return MessageRetransmissionsCompanion(
       retransmissionId: retransmissionId ?? this.retransmissionId,
@@ -3810,13 +3812,13 @@ class MessageRetransmissionsCompanion
       map['message_id'] = Variable<int>(messageId.value);
     }
     if (plaintextContent.present) {
-      map['plaintext_content'] = Variable<Uint8List>(plaintextContent.value);
+      map['plaintext_content'] = Variable<i2.Uint8List>(plaintextContent.value);
     }
     if (pushData.present) {
-      map['push_data'] = Variable<Uint8List>(pushData.value);
+      map['push_data'] = Variable<i2.Uint8List>(pushData.value);
     }
     if (encryptedHash.present) {
-      map['encrypted_hash'] = Variable<Uint8List>(encryptedHash.value);
+      map['encrypted_hash'] = Variable<i2.Uint8List>(encryptedHash.value);
     }
     if (acknowledgeByServerAt.present) {
       map['acknowledge_by_server_at'] =

test/drift/twonly_database/generated/schema_v2.dart

@@ -1,4 +1,5 @@
 // dart format width=80
+import 'dart:typed_data' as i2;
 // GENERATED CODE, DO NOT EDIT BY HAND.
 // ignore_for_file: type=lint
 import 'package:drift/drift.dart';
@@ -1297,8 +1298,8 @@ class SignalIdentityKeyStores extends Table
   late final GeneratedColumn<String> name = GeneratedColumn<String>(
       'name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> identityKey =
+  late final GeneratedColumn<i2.Uint8List> identityKey =
-      GeneratedColumn<Uint8List>('identity_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('identity_key', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
@@ -1342,7 +1343,7 @@ class SignalIdentityKeyStoresData extends DataClass
     implements Insertable<SignalIdentityKeyStoresData> {
   final int deviceId;
   final String name;
-  final Uint8List identityKey;
+  final i2.Uint8List identityKey;
   final DateTime createdAt;
   const SignalIdentityKeyStoresData(
       {required this.deviceId,
@@ -1354,7 +1355,7 @@ class SignalIdentityKeyStoresData extends DataClass
     final map = <String, Expression>{};
     map['device_id'] = Variable<int>(deviceId);
     map['name'] = Variable<String>(name);
-    map['identity_key'] = Variable<Uint8List>(identityKey);
+    map['identity_key'] = Variable<i2.Uint8List>(identityKey);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -1374,7 +1375,7 @@ class SignalIdentityKeyStoresData extends DataClass
     return SignalIdentityKeyStoresData(
       deviceId: serializer.fromJson<int>(json['deviceId']),
       name: serializer.fromJson<String>(json['name']),
-      identityKey: serializer.fromJson<Uint8List>(json['identityKey']),
+      identityKey: serializer.fromJson<i2.Uint8List>(json['identityKey']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -1384,7 +1385,7 @@ class SignalIdentityKeyStoresData extends DataClass
     return <String, dynamic>{
       'deviceId': serializer.toJson<int>(deviceId),
       'name': serializer.toJson<String>(name),
-      'identityKey': serializer.toJson<Uint8List>(identityKey),
+      'identityKey': serializer.toJson<i2.Uint8List>(identityKey),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -1392,7 +1393,7 @@ class SignalIdentityKeyStoresData extends DataClass
   SignalIdentityKeyStoresData copyWith(
           {int? deviceId,
           String? name,
-          Uint8List? identityKey,
+          i2.Uint8List? identityKey,
           DateTime? createdAt}) =>
       SignalIdentityKeyStoresData(
         deviceId: deviceId ?? this.deviceId,
@@ -1439,7 +1440,7 @@ class SignalIdentityKeyStoresCompanion
     extends UpdateCompanion<SignalIdentityKeyStoresData> {
   final Value<int> deviceId;
   final Value<String> name;
-  final Value<Uint8List> identityKey;
+  final Value<i2.Uint8List> identityKey;
   final Value<DateTime> createdAt;
   final Value<int> rowid;
   const SignalIdentityKeyStoresCompanion({
@@ -1452,7 +1453,7 @@ class SignalIdentityKeyStoresCompanion
   SignalIdentityKeyStoresCompanion.insert({
     required int deviceId,
     required String name,
-    required Uint8List identityKey,
+    required i2.Uint8List identityKey,
     this.createdAt = const Value.absent(),
     this.rowid = const Value.absent(),
   })  : deviceId = Value(deviceId),
@@ -1461,7 +1462,7 @@ class SignalIdentityKeyStoresCompanion
   static Insertable<SignalIdentityKeyStoresData> custom({
     Expression<int>? deviceId,
     Expression<String>? name,
-    Expression<Uint8List>? identityKey,
+    Expression<i2.Uint8List>? identityKey,
     Expression<DateTime>? createdAt,
     Expression<int>? rowid,
   }) {
@@ -1477,7 +1478,7 @@ class SignalIdentityKeyStoresCompanion
   SignalIdentityKeyStoresCompanion copyWith(
       {Value<int>? deviceId,
       Value<String>? name,
-      Value<Uint8List>? identityKey,
+      Value<i2.Uint8List>? identityKey,
       Value<DateTime>? createdAt,
       Value<int>? rowid}) {
     return SignalIdentityKeyStoresCompanion(
@@ -1499,7 +1500,7 @@ class SignalIdentityKeyStoresCompanion
       map['name'] = Variable<String>(name.value);
     }
     if (identityKey.present) {
-      map['identity_key'] = Variable<Uint8List>(identityKey.value);
+      map['identity_key'] = Variable<i2.Uint8List>(identityKey.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -1532,9 +1533,9 @@ class SignalPreKeyStores extends Table
   late final GeneratedColumn<int> preKeyId = GeneratedColumn<int>(
       'pre_key_id', aliasedName, false,
       type: DriftSqlType.int, requiredDuringInsert: false);
-  late final GeneratedColumn<Uint8List> preKey = GeneratedColumn<Uint8List>(
+  late final GeneratedColumn<i2.Uint8List> preKey =
-      'pre_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('pre_key', aliasedName, false,
-      type: DriftSqlType.blob, requiredDuringInsert: true);
+          type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
       type: DriftSqlType.dateTime,
@@ -1572,7 +1573,7 @@ class SignalPreKeyStores extends Table
 class SignalPreKeyStoresData extends DataClass
     implements Insertable<SignalPreKeyStoresData> {
   final int preKeyId;
-  final Uint8List preKey;
+  final i2.Uint8List preKey;
   final DateTime createdAt;
   const SignalPreKeyStoresData(
       {required this.preKeyId, required this.preKey, required this.createdAt});
@@ -1580,7 +1581,7 @@ class SignalPreKeyStoresData extends DataClass
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
     map['pre_key_id'] = Variable<int>(preKeyId);
-    map['pre_key'] = Variable<Uint8List>(preKey);
+    map['pre_key'] = Variable<i2.Uint8List>(preKey);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -1598,7 +1599,7 @@ class SignalPreKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return SignalPreKeyStoresData(
       preKeyId: serializer.fromJson<int>(json['preKeyId']),
-      preKey: serializer.fromJson<Uint8List>(json['preKey']),
+      preKey: serializer.fromJson<i2.Uint8List>(json['preKey']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -1607,13 +1608,13 @@ class SignalPreKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return <String, dynamic>{
       'preKeyId': serializer.toJson<int>(preKeyId),
-      'preKey': serializer.toJson<Uint8List>(preKey),
+      'preKey': serializer.toJson<i2.Uint8List>(preKey),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
 
   SignalPreKeyStoresData copyWith(
-          {int? preKeyId, Uint8List? preKey, DateTime? createdAt}) =>
+          {int? preKeyId, i2.Uint8List? preKey, DateTime? createdAt}) =>
       SignalPreKeyStoresData(
         preKeyId: preKeyId ?? this.preKeyId,
         preKey: preKey ?? this.preKey,
@@ -1652,7 +1653,7 @@ class SignalPreKeyStoresData extends DataClass
 class SignalPreKeyStoresCompanion
     extends UpdateCompanion<SignalPreKeyStoresData> {
   final Value<int> preKeyId;
-  final Value<Uint8List> preKey;
+  final Value<i2.Uint8List> preKey;
   final Value<DateTime> createdAt;
   const SignalPreKeyStoresCompanion({
     this.preKeyId = const Value.absent(),
@@ -1661,12 +1662,12 @@ class SignalPreKeyStoresCompanion
   });
   SignalPreKeyStoresCompanion.insert({
     this.preKeyId = const Value.absent(),
-    required Uint8List preKey,
+    required i2.Uint8List preKey,
     this.createdAt = const Value.absent(),
   }) : preKey = Value(preKey);
   static Insertable<SignalPreKeyStoresData> custom({
     Expression<int>? preKeyId,
-    Expression<Uint8List>? preKey,
+    Expression<i2.Uint8List>? preKey,
     Expression<DateTime>? createdAt,
   }) {
     return RawValuesInsertable({
@@ -1678,7 +1679,7 @@ class SignalPreKeyStoresCompanion
 
   SignalPreKeyStoresCompanion copyWith(
       {Value<int>? preKeyId,
-      Value<Uint8List>? preKey,
+      Value<i2.Uint8List>? preKey,
       Value<DateTime>? createdAt}) {
     return SignalPreKeyStoresCompanion(
       preKeyId: preKeyId ?? this.preKeyId,
@@ -1694,7 +1695,7 @@ class SignalPreKeyStoresCompanion
       map['pre_key_id'] = Variable<int>(preKeyId.value);
     }
     if (preKey.present) {
-      map['pre_key'] = Variable<Uint8List>(preKey.value);
+      map['pre_key'] = Variable<i2.Uint8List>(preKey.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -1722,9 +1723,9 @@ class SignalSenderKeyStores extends Table
   late final GeneratedColumn<String> senderKeyName = GeneratedColumn<String>(
       'sender_key_name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> senderKey = GeneratedColumn<Uint8List>(
+  late final GeneratedColumn<i2.Uint8List> senderKey =
-      'sender_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('sender_key', aliasedName, false,
-      type: DriftSqlType.blob, requiredDuringInsert: true);
+          type: DriftSqlType.blob, requiredDuringInsert: true);
   @override
   List<GeneratedColumn> get $columns => [senderKeyName, senderKey];
   @override
@@ -1755,14 +1756,14 @@ class SignalSenderKeyStores extends Table
 class SignalSenderKeyStoresData extends DataClass
     implements Insertable<SignalSenderKeyStoresData> {
   final String senderKeyName;
-  final Uint8List senderKey;
+  final i2.Uint8List senderKey;
   const SignalSenderKeyStoresData(
       {required this.senderKeyName, required this.senderKey});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
     map['sender_key_name'] = Variable<String>(senderKeyName);
-    map['sender_key'] = Variable<Uint8List>(senderKey);
+    map['sender_key'] = Variable<i2.Uint8List>(senderKey);
     return map;
   }
 
@@ -1778,7 +1779,7 @@ class SignalSenderKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return SignalSenderKeyStoresData(
       senderKeyName: serializer.fromJson<String>(json['senderKeyName']),
-      senderKey: serializer.fromJson<Uint8List>(json['senderKey']),
+      senderKey: serializer.fromJson<i2.Uint8List>(json['senderKey']),
     );
   }
   @override
@@ -1786,12 +1787,12 @@ class SignalSenderKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return <String, dynamic>{
       'senderKeyName': serializer.toJson<String>(senderKeyName),
-      'senderKey': serializer.toJson<Uint8List>(senderKey),
+      'senderKey': serializer.toJson<i2.Uint8List>(senderKey),
     };
   }
 
   SignalSenderKeyStoresData copyWith(
-          {String? senderKeyName, Uint8List? senderKey}) =>
+          {String? senderKeyName, i2.Uint8List? senderKey}) =>
       SignalSenderKeyStoresData(
         senderKeyName: senderKeyName ?? this.senderKeyName,
         senderKey: senderKey ?? this.senderKey,
@@ -1829,7 +1830,7 @@ class SignalSenderKeyStoresData extends DataClass
 class SignalSenderKeyStoresCompanion
     extends UpdateCompanion<SignalSenderKeyStoresData> {
   final Value<String> senderKeyName;
-  final Value<Uint8List> senderKey;
+  final Value<i2.Uint8List> senderKey;
   final Value<int> rowid;
   const SignalSenderKeyStoresCompanion({
     this.senderKeyName = const Value.absent(),
@@ -1838,13 +1839,13 @@ class SignalSenderKeyStoresCompanion
   });
   SignalSenderKeyStoresCompanion.insert({
     required String senderKeyName,
-    required Uint8List senderKey,
+    required i2.Uint8List senderKey,
     this.rowid = const Value.absent(),
   })  : senderKeyName = Value(senderKeyName),
         senderKey = Value(senderKey);
   static Insertable<SignalSenderKeyStoresData> custom({
     Expression<String>? senderKeyName,
-    Expression<Uint8List>? senderKey,
+    Expression<i2.Uint8List>? senderKey,
     Expression<int>? rowid,
   }) {
     return RawValuesInsertable({
@@ -1856,7 +1857,7 @@ class SignalSenderKeyStoresCompanion
 
   SignalSenderKeyStoresCompanion copyWith(
       {Value<String>? senderKeyName,
-      Value<Uint8List>? senderKey,
+      Value<i2.Uint8List>? senderKey,
       Value<int>? rowid}) {
     return SignalSenderKeyStoresCompanion(
       senderKeyName: senderKeyName ?? this.senderKeyName,
@@ -1872,7 +1873,7 @@ class SignalSenderKeyStoresCompanion
       map['sender_key_name'] = Variable<String>(senderKeyName.value);
     }
     if (senderKey.present) {
-      map['sender_key'] = Variable<Uint8List>(senderKey.value);
+      map['sender_key'] = Variable<i2.Uint8List>(senderKey.value);
     }
     if (rowid.present) {
       map['rowid'] = Variable<int>(rowid.value);
@@ -1903,8 +1904,8 @@ class SignalSessionStores extends Table
   late final GeneratedColumn<String> name = GeneratedColumn<String>(
       'name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> sessionRecord =
+  late final GeneratedColumn<i2.Uint8List> sessionRecord =
-      GeneratedColumn<Uint8List>('session_record', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('session_record', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
@@ -1948,7 +1949,7 @@ class SignalSessionStoresData extends DataClass
     implements Insertable<SignalSessionStoresData> {
   final int deviceId;
   final String name;
-  final Uint8List sessionRecord;
+  final i2.Uint8List sessionRecord;
   final DateTime createdAt;
   const SignalSessionStoresData(
       {required this.deviceId,
@@ -1960,7 +1961,7 @@ class SignalSessionStoresData extends DataClass
     final map = <String, Expression>{};
     map['device_id'] = Variable<int>(deviceId);
     map['name'] = Variable<String>(name);
-    map['session_record'] = Variable<Uint8List>(sessionRecord);
+    map['session_record'] = Variable<i2.Uint8List>(sessionRecord);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -1980,7 +1981,7 @@ class SignalSessionStoresData extends DataClass
     return SignalSessionStoresData(
       deviceId: serializer.fromJson<int>(json['deviceId']),
       name: serializer.fromJson<String>(json['name']),
-      sessionRecord: serializer.fromJson<Uint8List>(json['sessionRecord']),
+      sessionRecord: serializer.fromJson<i2.Uint8List>(json['sessionRecord']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -1990,7 +1991,7 @@ class SignalSessionStoresData extends DataClass
     return <String, dynamic>{
       'deviceId': serializer.toJson<int>(deviceId),
       'name': serializer.toJson<String>(name),
-      'sessionRecord': serializer.toJson<Uint8List>(sessionRecord),
+      'sessionRecord': serializer.toJson<i2.Uint8List>(sessionRecord),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -1998,7 +1999,7 @@ class SignalSessionStoresData extends DataClass
   SignalSessionStoresData copyWith(
           {int? deviceId,
           String? name,
-          Uint8List? sessionRecord,
+          i2.Uint8List? sessionRecord,
           DateTime? createdAt}) =>
       SignalSessionStoresData(
         deviceId: deviceId ?? this.deviceId,
@@ -2045,7 +2046,7 @@ class SignalSessionStoresCompanion
     extends UpdateCompanion<SignalSessionStoresData> {
   final Value<int> deviceId;
   final Value<String> name;
-  final Value<Uint8List> sessionRecord;
+  final Value<i2.Uint8List> sessionRecord;
   final Value<DateTime> createdAt;
   final Value<int> rowid;
   const SignalSessionStoresCompanion({
@@ -2058,7 +2059,7 @@ class SignalSessionStoresCompanion
   SignalSessionStoresCompanion.insert({
     required int deviceId,
     required String name,
-    required Uint8List sessionRecord,
+    required i2.Uint8List sessionRecord,
     this.createdAt = const Value.absent(),
     this.rowid = const Value.absent(),
   })  : deviceId = Value(deviceId),
@@ -2067,7 +2068,7 @@ class SignalSessionStoresCompanion
   static Insertable<SignalSessionStoresData> custom({
     Expression<int>? deviceId,
     Expression<String>? name,
-    Expression<Uint8List>? sessionRecord,
+    Expression<i2.Uint8List>? sessionRecord,
     Expression<DateTime>? createdAt,
     Expression<int>? rowid,
   }) {
@@ -2083,7 +2084,7 @@ class SignalSessionStoresCompanion
   SignalSessionStoresCompanion copyWith(
       {Value<int>? deviceId,
       Value<String>? name,
-      Value<Uint8List>? sessionRecord,
+      Value<i2.Uint8List>? sessionRecord,
       Value<DateTime>? createdAt,
       Value<int>? rowid}) {
     return SignalSessionStoresCompanion(
@@ -2105,7 +2106,7 @@ class SignalSessionStoresCompanion
       map['name'] = Variable<String>(name.value);
     }
     if (sessionRecord.present) {
-      map['session_record'] = Variable<Uint8List>(sessionRecord.value);
+      map['session_record'] = Variable<i2.Uint8List>(sessionRecord.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);

test/drift/twonly_database/generated/schema_v3.dart

@@ -1,4 +1,5 @@
 // dart format width=80
+import 'dart:typed_data' as i2;
 // GENERATED CODE, DO NOT EDIT BY HAND.
 // ignore_for_file: type=lint
 import 'package:drift/drift.dart';
@@ -1373,8 +1374,8 @@ class SignalIdentityKeyStores extends Table
   late final GeneratedColumn<String> name = GeneratedColumn<String>(
       'name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> identityKey =
+  late final GeneratedColumn<i2.Uint8List> identityKey =
-      GeneratedColumn<Uint8List>('identity_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('identity_key', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
@@ -1418,7 +1419,7 @@ class SignalIdentityKeyStoresData extends DataClass
     implements Insertable<SignalIdentityKeyStoresData> {
   final int deviceId;
   final String name;
-  final Uint8List identityKey;
+  final i2.Uint8List identityKey;
   final DateTime createdAt;
   const SignalIdentityKeyStoresData(
       {required this.deviceId,
@@ -1430,7 +1431,7 @@ class SignalIdentityKeyStoresData extends DataClass
     final map = <String, Expression>{};
     map['device_id'] = Variable<int>(deviceId);
     map['name'] = Variable<String>(name);
-    map['identity_key'] = Variable<Uint8List>(identityKey);
+    map['identity_key'] = Variable<i2.Uint8List>(identityKey);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -1450,7 +1451,7 @@ class SignalIdentityKeyStoresData extends DataClass
     return SignalIdentityKeyStoresData(
       deviceId: serializer.fromJson<int>(json['deviceId']),
       name: serializer.fromJson<String>(json['name']),
-      identityKey: serializer.fromJson<Uint8List>(json['identityKey']),
+      identityKey: serializer.fromJson<i2.Uint8List>(json['identityKey']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -1460,7 +1461,7 @@ class SignalIdentityKeyStoresData extends DataClass
     return <String, dynamic>{
       'deviceId': serializer.toJson<int>(deviceId),
       'name': serializer.toJson<String>(name),
-      'identityKey': serializer.toJson<Uint8List>(identityKey),
+      'identityKey': serializer.toJson<i2.Uint8List>(identityKey),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -1468,7 +1469,7 @@ class SignalIdentityKeyStoresData extends DataClass
   SignalIdentityKeyStoresData copyWith(
           {int? deviceId,
           String? name,
-          Uint8List? identityKey,
+          i2.Uint8List? identityKey,
           DateTime? createdAt}) =>
       SignalIdentityKeyStoresData(
         deviceId: deviceId ?? this.deviceId,
@@ -1515,7 +1516,7 @@ class SignalIdentityKeyStoresCompanion
     extends UpdateCompanion<SignalIdentityKeyStoresData> {
   final Value<int> deviceId;
   final Value<String> name;
-  final Value<Uint8List> identityKey;
+  final Value<i2.Uint8List> identityKey;
   final Value<DateTime> createdAt;
   final Value<int> rowid;
   const SignalIdentityKeyStoresCompanion({
@@ -1528,7 +1529,7 @@ class SignalIdentityKeyStoresCompanion
   SignalIdentityKeyStoresCompanion.insert({
     required int deviceId,
     required String name,
-    required Uint8List identityKey,
+    required i2.Uint8List identityKey,
     this.createdAt = const Value.absent(),
     this.rowid = const Value.absent(),
   })  : deviceId = Value(deviceId),
@@ -1537,7 +1538,7 @@ class SignalIdentityKeyStoresCompanion
   static Insertable<SignalIdentityKeyStoresData> custom({
     Expression<int>? deviceId,
     Expression<String>? name,
-    Expression<Uint8List>? identityKey,
+    Expression<i2.Uint8List>? identityKey,
     Expression<DateTime>? createdAt,
     Expression<int>? rowid,
   }) {
@@ -1553,7 +1554,7 @@ class SignalIdentityKeyStoresCompanion
   SignalIdentityKeyStoresCompanion copyWith(
       {Value<int>? deviceId,
       Value<String>? name,
-      Value<Uint8List>? identityKey,
+      Value<i2.Uint8List>? identityKey,
       Value<DateTime>? createdAt,
       Value<int>? rowid}) {
     return SignalIdentityKeyStoresCompanion(
@@ -1575,7 +1576,7 @@ class SignalIdentityKeyStoresCompanion
       map['name'] = Variable<String>(name.value);
     }
     if (identityKey.present) {
-      map['identity_key'] = Variable<Uint8List>(identityKey.value);
+      map['identity_key'] = Variable<i2.Uint8List>(identityKey.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -1608,9 +1609,9 @@ class SignalPreKeyStores extends Table
   late final GeneratedColumn<int> preKeyId = GeneratedColumn<int>(
       'pre_key_id', aliasedName, false,
       type: DriftSqlType.int, requiredDuringInsert: false);
-  late final GeneratedColumn<Uint8List> preKey = GeneratedColumn<Uint8List>(
+  late final GeneratedColumn<i2.Uint8List> preKey =
-      'pre_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('pre_key', aliasedName, false,
-      type: DriftSqlType.blob, requiredDuringInsert: true);
+          type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
       type: DriftSqlType.dateTime,
@@ -1648,7 +1649,7 @@ class SignalPreKeyStores extends Table
 class SignalPreKeyStoresData extends DataClass
     implements Insertable<SignalPreKeyStoresData> {
   final int preKeyId;
-  final Uint8List preKey;
+  final i2.Uint8List preKey;
   final DateTime createdAt;
   const SignalPreKeyStoresData(
       {required this.preKeyId, required this.preKey, required this.createdAt});
@@ -1656,7 +1657,7 @@ class SignalPreKeyStoresData extends DataClass
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
     map['pre_key_id'] = Variable<int>(preKeyId);
-    map['pre_key'] = Variable<Uint8List>(preKey);
+    map['pre_key'] = Variable<i2.Uint8List>(preKey);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -1674,7 +1675,7 @@ class SignalPreKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return SignalPreKeyStoresData(
       preKeyId: serializer.fromJson<int>(json['preKeyId']),
-      preKey: serializer.fromJson<Uint8List>(json['preKey']),
+      preKey: serializer.fromJson<i2.Uint8List>(json['preKey']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -1683,13 +1684,13 @@ class SignalPreKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return <String, dynamic>{
       'preKeyId': serializer.toJson<int>(preKeyId),
-      'preKey': serializer.toJson<Uint8List>(preKey),
+      'preKey': serializer.toJson<i2.Uint8List>(preKey),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
 
   SignalPreKeyStoresData copyWith(
-          {int? preKeyId, Uint8List? preKey, DateTime? createdAt}) =>
+          {int? preKeyId, i2.Uint8List? preKey, DateTime? createdAt}) =>
       SignalPreKeyStoresData(
         preKeyId: preKeyId ?? this.preKeyId,
         preKey: preKey ?? this.preKey,
@@ -1728,7 +1729,7 @@ class SignalPreKeyStoresData extends DataClass
 class SignalPreKeyStoresCompanion
     extends UpdateCompanion<SignalPreKeyStoresData> {
   final Value<int> preKeyId;
-  final Value<Uint8List> preKey;
+  final Value<i2.Uint8List> preKey;
   final Value<DateTime> createdAt;
   const SignalPreKeyStoresCompanion({
     this.preKeyId = const Value.absent(),
@@ -1737,12 +1738,12 @@ class SignalPreKeyStoresCompanion
   });
   SignalPreKeyStoresCompanion.insert({
     this.preKeyId = const Value.absent(),
-    required Uint8List preKey,
+    required i2.Uint8List preKey,
     this.createdAt = const Value.absent(),
   }) : preKey = Value(preKey);
   static Insertable<SignalPreKeyStoresData> custom({
     Expression<int>? preKeyId,
-    Expression<Uint8List>? preKey,
+    Expression<i2.Uint8List>? preKey,
     Expression<DateTime>? createdAt,
   }) {
     return RawValuesInsertable({
@@ -1754,7 +1755,7 @@ class SignalPreKeyStoresCompanion
 
   SignalPreKeyStoresCompanion copyWith(
       {Value<int>? preKeyId,
-      Value<Uint8List>? preKey,
+      Value<i2.Uint8List>? preKey,
       Value<DateTime>? createdAt}) {
     return SignalPreKeyStoresCompanion(
       preKeyId: preKeyId ?? this.preKeyId,
@@ -1770,7 +1771,7 @@ class SignalPreKeyStoresCompanion
       map['pre_key_id'] = Variable<int>(preKeyId.value);
     }
     if (preKey.present) {
-      map['pre_key'] = Variable<Uint8List>(preKey.value);
+      map['pre_key'] = Variable<i2.Uint8List>(preKey.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -1798,9 +1799,9 @@ class SignalSenderKeyStores extends Table
   late final GeneratedColumn<String> senderKeyName = GeneratedColumn<String>(
       'sender_key_name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> senderKey = GeneratedColumn<Uint8List>(
+  late final GeneratedColumn<i2.Uint8List> senderKey =
-      'sender_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('sender_key', aliasedName, false,
-      type: DriftSqlType.blob, requiredDuringInsert: true);
+          type: DriftSqlType.blob, requiredDuringInsert: true);
   @override
   List<GeneratedColumn> get $columns => [senderKeyName, senderKey];
   @override
@@ -1831,14 +1832,14 @@ class SignalSenderKeyStores extends Table
 class SignalSenderKeyStoresData extends DataClass
     implements Insertable<SignalSenderKeyStoresData> {
   final String senderKeyName;
-  final Uint8List senderKey;
+  final i2.Uint8List senderKey;
   const SignalSenderKeyStoresData(
       {required this.senderKeyName, required this.senderKey});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
     map['sender_key_name'] = Variable<String>(senderKeyName);
-    map['sender_key'] = Variable<Uint8List>(senderKey);
+    map['sender_key'] = Variable<i2.Uint8List>(senderKey);
     return map;
   }
 
@@ -1854,7 +1855,7 @@ class SignalSenderKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return SignalSenderKeyStoresData(
       senderKeyName: serializer.fromJson<String>(json['senderKeyName']),
-      senderKey: serializer.fromJson<Uint8List>(json['senderKey']),
+      senderKey: serializer.fromJson<i2.Uint8List>(json['senderKey']),
     );
   }
   @override
@@ -1862,12 +1863,12 @@ class SignalSenderKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return <String, dynamic>{
       'senderKeyName': serializer.toJson<String>(senderKeyName),
-      'senderKey': serializer.toJson<Uint8List>(senderKey),
+      'senderKey': serializer.toJson<i2.Uint8List>(senderKey),
     };
   }
 
   SignalSenderKeyStoresData copyWith(
-          {String? senderKeyName, Uint8List? senderKey}) =>
+          {String? senderKeyName, i2.Uint8List? senderKey}) =>
       SignalSenderKeyStoresData(
         senderKeyName: senderKeyName ?? this.senderKeyName,
         senderKey: senderKey ?? this.senderKey,
@@ -1905,7 +1906,7 @@ class SignalSenderKeyStoresData extends DataClass
 class SignalSenderKeyStoresCompanion
     extends UpdateCompanion<SignalSenderKeyStoresData> {
   final Value<String> senderKeyName;
-  final Value<Uint8List> senderKey;
+  final Value<i2.Uint8List> senderKey;
   final Value<int> rowid;
   const SignalSenderKeyStoresCompanion({
     this.senderKeyName = const Value.absent(),
@@ -1914,13 +1915,13 @@ class SignalSenderKeyStoresCompanion
   });
   SignalSenderKeyStoresCompanion.insert({
     required String senderKeyName,
-    required Uint8List senderKey,
+    required i2.Uint8List senderKey,
     this.rowid = const Value.absent(),
   })  : senderKeyName = Value(senderKeyName),
         senderKey = Value(senderKey);
   static Insertable<SignalSenderKeyStoresData> custom({
     Expression<String>? senderKeyName,
-    Expression<Uint8List>? senderKey,
+    Expression<i2.Uint8List>? senderKey,
     Expression<int>? rowid,
   }) {
     return RawValuesInsertable({
@@ -1932,7 +1933,7 @@ class SignalSenderKeyStoresCompanion
 
   SignalSenderKeyStoresCompanion copyWith(
       {Value<String>? senderKeyName,
-      Value<Uint8List>? senderKey,
+      Value<i2.Uint8List>? senderKey,
       Value<int>? rowid}) {
     return SignalSenderKeyStoresCompanion(
       senderKeyName: senderKeyName ?? this.senderKeyName,
@@ -1948,7 +1949,7 @@ class SignalSenderKeyStoresCompanion
       map['sender_key_name'] = Variable<String>(senderKeyName.value);
     }
     if (senderKey.present) {
-      map['sender_key'] = Variable<Uint8List>(senderKey.value);
+      map['sender_key'] = Variable<i2.Uint8List>(senderKey.value);
     }
     if (rowid.present) {
       map['rowid'] = Variable<int>(rowid.value);
@@ -1979,8 +1980,8 @@ class SignalSessionStores extends Table
   late final GeneratedColumn<String> name = GeneratedColumn<String>(
       'name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> sessionRecord =
+  late final GeneratedColumn<i2.Uint8List> sessionRecord =
-      GeneratedColumn<Uint8List>('session_record', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('session_record', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
@@ -2024,7 +2025,7 @@ class SignalSessionStoresData extends DataClass
     implements Insertable<SignalSessionStoresData> {
   final int deviceId;
   final String name;
-  final Uint8List sessionRecord;
+  final i2.Uint8List sessionRecord;
   final DateTime createdAt;
   const SignalSessionStoresData(
       {required this.deviceId,
@@ -2036,7 +2037,7 @@ class SignalSessionStoresData extends DataClass
     final map = <String, Expression>{};
     map['device_id'] = Variable<int>(deviceId);
     map['name'] = Variable<String>(name);
-    map['session_record'] = Variable<Uint8List>(sessionRecord);
+    map['session_record'] = Variable<i2.Uint8List>(sessionRecord);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -2056,7 +2057,7 @@ class SignalSessionStoresData extends DataClass
     return SignalSessionStoresData(
       deviceId: serializer.fromJson<int>(json['deviceId']),
       name: serializer.fromJson<String>(json['name']),
-      sessionRecord: serializer.fromJson<Uint8List>(json['sessionRecord']),
+      sessionRecord: serializer.fromJson<i2.Uint8List>(json['sessionRecord']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -2066,7 +2067,7 @@ class SignalSessionStoresData extends DataClass
     return <String, dynamic>{
       'deviceId': serializer.toJson<int>(deviceId),
       'name': serializer.toJson<String>(name),
-      'sessionRecord': serializer.toJson<Uint8List>(sessionRecord),
+      'sessionRecord': serializer.toJson<i2.Uint8List>(sessionRecord),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -2074,7 +2075,7 @@ class SignalSessionStoresData extends DataClass
   SignalSessionStoresData copyWith(
           {int? deviceId,
           String? name,
-          Uint8List? sessionRecord,
+          i2.Uint8List? sessionRecord,
           DateTime? createdAt}) =>
       SignalSessionStoresData(
         deviceId: deviceId ?? this.deviceId,
@@ -2121,7 +2122,7 @@ class SignalSessionStoresCompanion
     extends UpdateCompanion<SignalSessionStoresData> {
   final Value<int> deviceId;
   final Value<String> name;
-  final Value<Uint8List> sessionRecord;
+  final Value<i2.Uint8List> sessionRecord;
   final Value<DateTime> createdAt;
   final Value<int> rowid;
   const SignalSessionStoresCompanion({
@@ -2134,7 +2135,7 @@ class SignalSessionStoresCompanion
   SignalSessionStoresCompanion.insert({
     required int deviceId,
     required String name,
-    required Uint8List sessionRecord,
+    required i2.Uint8List sessionRecord,
     this.createdAt = const Value.absent(),
     this.rowid = const Value.absent(),
   })  : deviceId = Value(deviceId),
@@ -2143,7 +2144,7 @@ class SignalSessionStoresCompanion
   static Insertable<SignalSessionStoresData> custom({
     Expression<int>? deviceId,
     Expression<String>? name,
-    Expression<Uint8List>? sessionRecord,
+    Expression<i2.Uint8List>? sessionRecord,
     Expression<DateTime>? createdAt,
     Expression<int>? rowid,
   }) {
@@ -2159,7 +2160,7 @@ class SignalSessionStoresCompanion
   SignalSessionStoresCompanion copyWith(
       {Value<int>? deviceId,
       Value<String>? name,
-      Value<Uint8List>? sessionRecord,
+      Value<i2.Uint8List>? sessionRecord,
       Value<DateTime>? createdAt,
       Value<int>? rowid}) {
     return SignalSessionStoresCompanion(
@@ -2181,7 +2182,7 @@ class SignalSessionStoresCompanion
       map['name'] = Variable<String>(name.value);
     }
     if (sessionRecord.present) {
-      map['session_record'] = Variable<Uint8List>(sessionRecord.value);
+      map['session_record'] = Variable<i2.Uint8List>(sessionRecord.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);

test/drift/twonly_database/generated/schema_v4.dart

@@ -1,4 +1,5 @@
 // dart format width=80
+import 'dart:typed_data' as i2;
 // GENERATED CODE, DO NOT EDIT BY HAND.
 // ignore_for_file: type=lint
 import 'package:drift/drift.dart';
@@ -1710,8 +1711,8 @@ class SignalIdentityKeyStores extends Table
   late final GeneratedColumn<String> name = GeneratedColumn<String>(
       'name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> identityKey =
+  late final GeneratedColumn<i2.Uint8List> identityKey =
-      GeneratedColumn<Uint8List>('identity_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('identity_key', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
@@ -1755,7 +1756,7 @@ class SignalIdentityKeyStoresData extends DataClass
     implements Insertable<SignalIdentityKeyStoresData> {
   final int deviceId;
   final String name;
-  final Uint8List identityKey;
+  final i2.Uint8List identityKey;
   final DateTime createdAt;
   const SignalIdentityKeyStoresData(
       {required this.deviceId,
@@ -1767,7 +1768,7 @@ class SignalIdentityKeyStoresData extends DataClass
     final map = <String, Expression>{};
     map['device_id'] = Variable<int>(deviceId);
     map['name'] = Variable<String>(name);
-    map['identity_key'] = Variable<Uint8List>(identityKey);
+    map['identity_key'] = Variable<i2.Uint8List>(identityKey);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -1787,7 +1788,7 @@ class SignalIdentityKeyStoresData extends DataClass
     return SignalIdentityKeyStoresData(
       deviceId: serializer.fromJson<int>(json['deviceId']),
       name: serializer.fromJson<String>(json['name']),
-      identityKey: serializer.fromJson<Uint8List>(json['identityKey']),
+      identityKey: serializer.fromJson<i2.Uint8List>(json['identityKey']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -1797,7 +1798,7 @@ class SignalIdentityKeyStoresData extends DataClass
     return <String, dynamic>{
       'deviceId': serializer.toJson<int>(deviceId),
       'name': serializer.toJson<String>(name),
-      'identityKey': serializer.toJson<Uint8List>(identityKey),
+      'identityKey': serializer.toJson<i2.Uint8List>(identityKey),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -1805,7 +1806,7 @@ class SignalIdentityKeyStoresData extends DataClass
   SignalIdentityKeyStoresData copyWith(
           {int? deviceId,
           String? name,
-          Uint8List? identityKey,
+          i2.Uint8List? identityKey,
           DateTime? createdAt}) =>
       SignalIdentityKeyStoresData(
         deviceId: deviceId ?? this.deviceId,
@@ -1852,7 +1853,7 @@ class SignalIdentityKeyStoresCompanion
     extends UpdateCompanion<SignalIdentityKeyStoresData> {
   final Value<int> deviceId;
   final Value<String> name;
-  final Value<Uint8List> identityKey;
+  final Value<i2.Uint8List> identityKey;
   final Value<DateTime> createdAt;
   final Value<int> rowid;
   const SignalIdentityKeyStoresCompanion({
@@ -1865,7 +1866,7 @@ class SignalIdentityKeyStoresCompanion
   SignalIdentityKeyStoresCompanion.insert({
     required int deviceId,
     required String name,
-    required Uint8List identityKey,
+    required i2.Uint8List identityKey,
     this.createdAt = const Value.absent(),
     this.rowid = const Value.absent(),
   })  : deviceId = Value(deviceId),
@@ -1874,7 +1875,7 @@ class SignalIdentityKeyStoresCompanion
   static Insertable<SignalIdentityKeyStoresData> custom({
     Expression<int>? deviceId,
     Expression<String>? name,
-    Expression<Uint8List>? identityKey,
+    Expression<i2.Uint8List>? identityKey,
     Expression<DateTime>? createdAt,
     Expression<int>? rowid,
   }) {
@@ -1890,7 +1891,7 @@ class SignalIdentityKeyStoresCompanion
   SignalIdentityKeyStoresCompanion copyWith(
       {Value<int>? deviceId,
       Value<String>? name,
-      Value<Uint8List>? identityKey,
+      Value<i2.Uint8List>? identityKey,
       Value<DateTime>? createdAt,
       Value<int>? rowid}) {
     return SignalIdentityKeyStoresCompanion(
@@ -1912,7 +1913,7 @@ class SignalIdentityKeyStoresCompanion
       map['name'] = Variable<String>(name.value);
     }
     if (identityKey.present) {
-      map['identity_key'] = Variable<Uint8List>(identityKey.value);
+      map['identity_key'] = Variable<i2.Uint8List>(identityKey.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -1945,9 +1946,9 @@ class SignalPreKeyStores extends Table
   late final GeneratedColumn<int> preKeyId = GeneratedColumn<int>(
       'pre_key_id', aliasedName, false,
       type: DriftSqlType.int, requiredDuringInsert: false);
-  late final GeneratedColumn<Uint8List> preKey = GeneratedColumn<Uint8List>(
+  late final GeneratedColumn<i2.Uint8List> preKey =
-      'pre_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('pre_key', aliasedName, false,
-      type: DriftSqlType.blob, requiredDuringInsert: true);
+          type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
       type: DriftSqlType.dateTime,
@@ -1985,7 +1986,7 @@ class SignalPreKeyStores extends Table
 class SignalPreKeyStoresData extends DataClass
     implements Insertable<SignalPreKeyStoresData> {
   final int preKeyId;
-  final Uint8List preKey;
+  final i2.Uint8List preKey;
   final DateTime createdAt;
   const SignalPreKeyStoresData(
       {required this.preKeyId, required this.preKey, required this.createdAt});
@@ -1993,7 +1994,7 @@ class SignalPreKeyStoresData extends DataClass
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
     map['pre_key_id'] = Variable<int>(preKeyId);
-    map['pre_key'] = Variable<Uint8List>(preKey);
+    map['pre_key'] = Variable<i2.Uint8List>(preKey);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -2011,7 +2012,7 @@ class SignalPreKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return SignalPreKeyStoresData(
       preKeyId: serializer.fromJson<int>(json['preKeyId']),
-      preKey: serializer.fromJson<Uint8List>(json['preKey']),
+      preKey: serializer.fromJson<i2.Uint8List>(json['preKey']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -2020,13 +2021,13 @@ class SignalPreKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return <String, dynamic>{
       'preKeyId': serializer.toJson<int>(preKeyId),
-      'preKey': serializer.toJson<Uint8List>(preKey),
+      'preKey': serializer.toJson<i2.Uint8List>(preKey),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
 
   SignalPreKeyStoresData copyWith(
-          {int? preKeyId, Uint8List? preKey, DateTime? createdAt}) =>
+          {int? preKeyId, i2.Uint8List? preKey, DateTime? createdAt}) =>
       SignalPreKeyStoresData(
         preKeyId: preKeyId ?? this.preKeyId,
         preKey: preKey ?? this.preKey,
@@ -2065,7 +2066,7 @@ class SignalPreKeyStoresData extends DataClass
 class SignalPreKeyStoresCompanion
     extends UpdateCompanion<SignalPreKeyStoresData> {
   final Value<int> preKeyId;
-  final Value<Uint8List> preKey;
+  final Value<i2.Uint8List> preKey;
   final Value<DateTime> createdAt;
   const SignalPreKeyStoresCompanion({
     this.preKeyId = const Value.absent(),
@@ -2074,12 +2075,12 @@ class SignalPreKeyStoresCompanion
   });
   SignalPreKeyStoresCompanion.insert({
     this.preKeyId = const Value.absent(),
-    required Uint8List preKey,
+    required i2.Uint8List preKey,
     this.createdAt = const Value.absent(),
   }) : preKey = Value(preKey);
   static Insertable<SignalPreKeyStoresData> custom({
     Expression<int>? preKeyId,
-    Expression<Uint8List>? preKey,
+    Expression<i2.Uint8List>? preKey,
     Expression<DateTime>? createdAt,
   }) {
     return RawValuesInsertable({
@@ -2091,7 +2092,7 @@ class SignalPreKeyStoresCompanion
 
   SignalPreKeyStoresCompanion copyWith(
       {Value<int>? preKeyId,
-      Value<Uint8List>? preKey,
+      Value<i2.Uint8List>? preKey,
       Value<DateTime>? createdAt}) {
     return SignalPreKeyStoresCompanion(
       preKeyId: preKeyId ?? this.preKeyId,
@@ -2107,7 +2108,7 @@ class SignalPreKeyStoresCompanion
       map['pre_key_id'] = Variable<int>(preKeyId.value);
     }
     if (preKey.present) {
-      map['pre_key'] = Variable<Uint8List>(preKey.value);
+      map['pre_key'] = Variable<i2.Uint8List>(preKey.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -2135,9 +2136,9 @@ class SignalSenderKeyStores extends Table
   late final GeneratedColumn<String> senderKeyName = GeneratedColumn<String>(
       'sender_key_name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> senderKey = GeneratedColumn<Uint8List>(
+  late final GeneratedColumn<i2.Uint8List> senderKey =
-      'sender_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('sender_key', aliasedName, false,
-      type: DriftSqlType.blob, requiredDuringInsert: true);
+          type: DriftSqlType.blob, requiredDuringInsert: true);
   @override
   List<GeneratedColumn> get $columns => [senderKeyName, senderKey];
   @override
@@ -2168,14 +2169,14 @@ class SignalSenderKeyStores extends Table
 class SignalSenderKeyStoresData extends DataClass
     implements Insertable<SignalSenderKeyStoresData> {
   final String senderKeyName;
-  final Uint8List senderKey;
+  final i2.Uint8List senderKey;
   const SignalSenderKeyStoresData(
       {required this.senderKeyName, required this.senderKey});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
     map['sender_key_name'] = Variable<String>(senderKeyName);
-    map['sender_key'] = Variable<Uint8List>(senderKey);
+    map['sender_key'] = Variable<i2.Uint8List>(senderKey);
     return map;
   }
 
@@ -2191,7 +2192,7 @@ class SignalSenderKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return SignalSenderKeyStoresData(
       senderKeyName: serializer.fromJson<String>(json['senderKeyName']),
-      senderKey: serializer.fromJson<Uint8List>(json['senderKey']),
+      senderKey: serializer.fromJson<i2.Uint8List>(json['senderKey']),
     );
   }
   @override
@@ -2199,12 +2200,12 @@ class SignalSenderKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return <String, dynamic>{
       'senderKeyName': serializer.toJson<String>(senderKeyName),
-      'senderKey': serializer.toJson<Uint8List>(senderKey),
+      'senderKey': serializer.toJson<i2.Uint8List>(senderKey),
     };
   }
 
   SignalSenderKeyStoresData copyWith(
-          {String? senderKeyName, Uint8List? senderKey}) =>
+          {String? senderKeyName, i2.Uint8List? senderKey}) =>
       SignalSenderKeyStoresData(
         senderKeyName: senderKeyName ?? this.senderKeyName,
         senderKey: senderKey ?? this.senderKey,
@@ -2242,7 +2243,7 @@ class SignalSenderKeyStoresData extends DataClass
 class SignalSenderKeyStoresCompanion
     extends UpdateCompanion<SignalSenderKeyStoresData> {
   final Value<String> senderKeyName;
-  final Value<Uint8List> senderKey;
+  final Value<i2.Uint8List> senderKey;
   final Value<int> rowid;
   const SignalSenderKeyStoresCompanion({
     this.senderKeyName = const Value.absent(),
@@ -2251,13 +2252,13 @@ class SignalSenderKeyStoresCompanion
   });
   SignalSenderKeyStoresCompanion.insert({
     required String senderKeyName,
-    required Uint8List senderKey,
+    required i2.Uint8List senderKey,
     this.rowid = const Value.absent(),
   })  : senderKeyName = Value(senderKeyName),
         senderKey = Value(senderKey);
   static Insertable<SignalSenderKeyStoresData> custom({
     Expression<String>? senderKeyName,
-    Expression<Uint8List>? senderKey,
+    Expression<i2.Uint8List>? senderKey,
     Expression<int>? rowid,
   }) {
     return RawValuesInsertable({
@@ -2269,7 +2270,7 @@ class SignalSenderKeyStoresCompanion
 
   SignalSenderKeyStoresCompanion copyWith(
       {Value<String>? senderKeyName,
-      Value<Uint8List>? senderKey,
+      Value<i2.Uint8List>? senderKey,
       Value<int>? rowid}) {
     return SignalSenderKeyStoresCompanion(
       senderKeyName: senderKeyName ?? this.senderKeyName,
@@ -2285,7 +2286,7 @@ class SignalSenderKeyStoresCompanion
       map['sender_key_name'] = Variable<String>(senderKeyName.value);
     }
     if (senderKey.present) {
-      map['sender_key'] = Variable<Uint8List>(senderKey.value);
+      map['sender_key'] = Variable<i2.Uint8List>(senderKey.value);
     }
     if (rowid.present) {
       map['rowid'] = Variable<int>(rowid.value);
@@ -2316,8 +2317,8 @@ class SignalSessionStores extends Table
   late final GeneratedColumn<String> name = GeneratedColumn<String>(
       'name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> sessionRecord =
+  late final GeneratedColumn<i2.Uint8List> sessionRecord =
-      GeneratedColumn<Uint8List>('session_record', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('session_record', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
@@ -2361,7 +2362,7 @@ class SignalSessionStoresData extends DataClass
     implements Insertable<SignalSessionStoresData> {
   final int deviceId;
   final String name;
-  final Uint8List sessionRecord;
+  final i2.Uint8List sessionRecord;
   final DateTime createdAt;
   const SignalSessionStoresData(
       {required this.deviceId,
@@ -2373,7 +2374,7 @@ class SignalSessionStoresData extends DataClass
     final map = <String, Expression>{};
     map['device_id'] = Variable<int>(deviceId);
     map['name'] = Variable<String>(name);
-    map['session_record'] = Variable<Uint8List>(sessionRecord);
+    map['session_record'] = Variable<i2.Uint8List>(sessionRecord);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -2393,7 +2394,7 @@ class SignalSessionStoresData extends DataClass
     return SignalSessionStoresData(
       deviceId: serializer.fromJson<int>(json['deviceId']),
       name: serializer.fromJson<String>(json['name']),
-      sessionRecord: serializer.fromJson<Uint8List>(json['sessionRecord']),
+      sessionRecord: serializer.fromJson<i2.Uint8List>(json['sessionRecord']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -2403,7 +2404,7 @@ class SignalSessionStoresData extends DataClass
     return <String, dynamic>{
       'deviceId': serializer.toJson<int>(deviceId),
       'name': serializer.toJson<String>(name),
-      'sessionRecord': serializer.toJson<Uint8List>(sessionRecord),
+      'sessionRecord': serializer.toJson<i2.Uint8List>(sessionRecord),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -2411,7 +2412,7 @@ class SignalSessionStoresData extends DataClass
   SignalSessionStoresData copyWith(
           {int? deviceId,
           String? name,
-          Uint8List? sessionRecord,
+          i2.Uint8List? sessionRecord,
           DateTime? createdAt}) =>
       SignalSessionStoresData(
         deviceId: deviceId ?? this.deviceId,
@@ -2458,7 +2459,7 @@ class SignalSessionStoresCompanion
     extends UpdateCompanion<SignalSessionStoresData> {
   final Value<int> deviceId;
   final Value<String> name;
-  final Value<Uint8List> sessionRecord;
+  final Value<i2.Uint8List> sessionRecord;
   final Value<DateTime> createdAt;
   final Value<int> rowid;
   const SignalSessionStoresCompanion({
@@ -2471,7 +2472,7 @@ class SignalSessionStoresCompanion
   SignalSessionStoresCompanion.insert({
     required int deviceId,
     required String name,
-    required Uint8List sessionRecord,
+    required i2.Uint8List sessionRecord,
     this.createdAt = const Value.absent(),
     this.rowid = const Value.absent(),
   })  : deviceId = Value(deviceId),
@@ -2480,7 +2481,7 @@ class SignalSessionStoresCompanion
   static Insertable<SignalSessionStoresData> custom({
     Expression<int>? deviceId,
     Expression<String>? name,
-    Expression<Uint8List>? sessionRecord,
+    Expression<i2.Uint8List>? sessionRecord,
     Expression<DateTime>? createdAt,
     Expression<int>? rowid,
   }) {
@@ -2496,7 +2497,7 @@ class SignalSessionStoresCompanion
   SignalSessionStoresCompanion copyWith(
       {Value<int>? deviceId,
       Value<String>? name,
-      Value<Uint8List>? sessionRecord,
+      Value<i2.Uint8List>? sessionRecord,
       Value<DateTime>? createdAt,
       Value<int>? rowid}) {
     return SignalSessionStoresCompanion(
@@ -2518,7 +2519,7 @@ class SignalSessionStoresCompanion
       map['name'] = Variable<String>(name.value);
     }
     if (sessionRecord.present) {
-      map['session_record'] = Variable<Uint8List>(sessionRecord.value);
+      map['session_record'] = Variable<i2.Uint8List>(sessionRecord.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);

test/drift/twonly_database/generated/schema_v5.dart

@@ -1,4 +1,5 @@
 // dart format width=80
+import 'dart:typed_data' as i2;
 // GENERATED CODE, DO NOT EDIT BY HAND.
 // ignore_for_file: type=lint
 import 'package:drift/drift.dart';
@@ -1956,8 +1957,8 @@ class SignalIdentityKeyStores extends Table
   late final GeneratedColumn<String> name = GeneratedColumn<String>(
       'name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> identityKey =
+  late final GeneratedColumn<i2.Uint8List> identityKey =
-      GeneratedColumn<Uint8List>('identity_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('identity_key', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
@@ -2001,7 +2002,7 @@ class SignalIdentityKeyStoresData extends DataClass
     implements Insertable<SignalIdentityKeyStoresData> {
   final int deviceId;
   final String name;
-  final Uint8List identityKey;
+  final i2.Uint8List identityKey;
   final DateTime createdAt;
   const SignalIdentityKeyStoresData(
       {required this.deviceId,
@@ -2013,7 +2014,7 @@ class SignalIdentityKeyStoresData extends DataClass
     final map = <String, Expression>{};
     map['device_id'] = Variable<int>(deviceId);
     map['name'] = Variable<String>(name);
-    map['identity_key'] = Variable<Uint8List>(identityKey);
+    map['identity_key'] = Variable<i2.Uint8List>(identityKey);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -2033,7 +2034,7 @@ class SignalIdentityKeyStoresData extends DataClass
     return SignalIdentityKeyStoresData(
       deviceId: serializer.fromJson<int>(json['deviceId']),
       name: serializer.fromJson<String>(json['name']),
-      identityKey: serializer.fromJson<Uint8List>(json['identityKey']),
+      identityKey: serializer.fromJson<i2.Uint8List>(json['identityKey']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -2043,7 +2044,7 @@ class SignalIdentityKeyStoresData extends DataClass
     return <String, dynamic>{
       'deviceId': serializer.toJson<int>(deviceId),
       'name': serializer.toJson<String>(name),
-      'identityKey': serializer.toJson<Uint8List>(identityKey),
+      'identityKey': serializer.toJson<i2.Uint8List>(identityKey),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -2051,7 +2052,7 @@ class SignalIdentityKeyStoresData extends DataClass
   SignalIdentityKeyStoresData copyWith(
           {int? deviceId,
           String? name,
-          Uint8List? identityKey,
+          i2.Uint8List? identityKey,
           DateTime? createdAt}) =>
       SignalIdentityKeyStoresData(
         deviceId: deviceId ?? this.deviceId,
@@ -2098,7 +2099,7 @@ class SignalIdentityKeyStoresCompanion
     extends UpdateCompanion<SignalIdentityKeyStoresData> {
   final Value<int> deviceId;
   final Value<String> name;
-  final Value<Uint8List> identityKey;
+  final Value<i2.Uint8List> identityKey;
   final Value<DateTime> createdAt;
   final Value<int> rowid;
   const SignalIdentityKeyStoresCompanion({
@@ -2111,7 +2112,7 @@ class SignalIdentityKeyStoresCompanion
   SignalIdentityKeyStoresCompanion.insert({
     required int deviceId,
     required String name,
-    required Uint8List identityKey,
+    required i2.Uint8List identityKey,
     this.createdAt = const Value.absent(),
     this.rowid = const Value.absent(),
   })  : deviceId = Value(deviceId),
@@ -2120,7 +2121,7 @@ class SignalIdentityKeyStoresCompanion
   static Insertable<SignalIdentityKeyStoresData> custom({
     Expression<int>? deviceId,
     Expression<String>? name,
-    Expression<Uint8List>? identityKey,
+    Expression<i2.Uint8List>? identityKey,
     Expression<DateTime>? createdAt,
     Expression<int>? rowid,
   }) {
@@ -2136,7 +2137,7 @@ class SignalIdentityKeyStoresCompanion
   SignalIdentityKeyStoresCompanion copyWith(
       {Value<int>? deviceId,
       Value<String>? name,
-      Value<Uint8List>? identityKey,
+      Value<i2.Uint8List>? identityKey,
       Value<DateTime>? createdAt,
       Value<int>? rowid}) {
     return SignalIdentityKeyStoresCompanion(
@@ -2158,7 +2159,7 @@ class SignalIdentityKeyStoresCompanion
       map['name'] = Variable<String>(name.value);
     }
     if (identityKey.present) {
-      map['identity_key'] = Variable<Uint8List>(identityKey.value);
+      map['identity_key'] = Variable<i2.Uint8List>(identityKey.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -2191,9 +2192,9 @@ class SignalPreKeyStores extends Table
   late final GeneratedColumn<int> preKeyId = GeneratedColumn<int>(
       'pre_key_id', aliasedName, false,
       type: DriftSqlType.int, requiredDuringInsert: false);
-  late final GeneratedColumn<Uint8List> preKey = GeneratedColumn<Uint8List>(
+  late final GeneratedColumn<i2.Uint8List> preKey =
-      'pre_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('pre_key', aliasedName, false,
-      type: DriftSqlType.blob, requiredDuringInsert: true);
+          type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
       type: DriftSqlType.dateTime,
@@ -2231,7 +2232,7 @@ class SignalPreKeyStores extends Table
 class SignalPreKeyStoresData extends DataClass
     implements Insertable<SignalPreKeyStoresData> {
   final int preKeyId;
-  final Uint8List preKey;
+  final i2.Uint8List preKey;
   final DateTime createdAt;
   const SignalPreKeyStoresData(
       {required this.preKeyId, required this.preKey, required this.createdAt});
@@ -2239,7 +2240,7 @@ class SignalPreKeyStoresData extends DataClass
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
     map['pre_key_id'] = Variable<int>(preKeyId);
-    map['pre_key'] = Variable<Uint8List>(preKey);
+    map['pre_key'] = Variable<i2.Uint8List>(preKey);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -2257,7 +2258,7 @@ class SignalPreKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return SignalPreKeyStoresData(
       preKeyId: serializer.fromJson<int>(json['preKeyId']),
-      preKey: serializer.fromJson<Uint8List>(json['preKey']),
+      preKey: serializer.fromJson<i2.Uint8List>(json['preKey']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -2266,13 +2267,13 @@ class SignalPreKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return <String, dynamic>{
       'preKeyId': serializer.toJson<int>(preKeyId),
-      'preKey': serializer.toJson<Uint8List>(preKey),
+      'preKey': serializer.toJson<i2.Uint8List>(preKey),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
 
   SignalPreKeyStoresData copyWith(
-          {int? preKeyId, Uint8List? preKey, DateTime? createdAt}) =>
+          {int? preKeyId, i2.Uint8List? preKey, DateTime? createdAt}) =>
       SignalPreKeyStoresData(
         preKeyId: preKeyId ?? this.preKeyId,
         preKey: preKey ?? this.preKey,
@@ -2311,7 +2312,7 @@ class SignalPreKeyStoresData extends DataClass
 class SignalPreKeyStoresCompanion
     extends UpdateCompanion<SignalPreKeyStoresData> {
   final Value<int> preKeyId;
-  final Value<Uint8List> preKey;
+  final Value<i2.Uint8List> preKey;
   final Value<DateTime> createdAt;
   const SignalPreKeyStoresCompanion({
     this.preKeyId = const Value.absent(),
@@ -2320,12 +2321,12 @@ class SignalPreKeyStoresCompanion
   });
   SignalPreKeyStoresCompanion.insert({
     this.preKeyId = const Value.absent(),
-    required Uint8List preKey,
+    required i2.Uint8List preKey,
     this.createdAt = const Value.absent(),
   }) : preKey = Value(preKey);
   static Insertable<SignalPreKeyStoresData> custom({
     Expression<int>? preKeyId,
-    Expression<Uint8List>? preKey,
+    Expression<i2.Uint8List>? preKey,
     Expression<DateTime>? createdAt,
   }) {
     return RawValuesInsertable({
@@ -2337,7 +2338,7 @@ class SignalPreKeyStoresCompanion
 
   SignalPreKeyStoresCompanion copyWith(
       {Value<int>? preKeyId,
-      Value<Uint8List>? preKey,
+      Value<i2.Uint8List>? preKey,
       Value<DateTime>? createdAt}) {
     return SignalPreKeyStoresCompanion(
       preKeyId: preKeyId ?? this.preKeyId,
@@ -2353,7 +2354,7 @@ class SignalPreKeyStoresCompanion
       map['pre_key_id'] = Variable<int>(preKeyId.value);
     }
     if (preKey.present) {
-      map['pre_key'] = Variable<Uint8List>(preKey.value);
+      map['pre_key'] = Variable<i2.Uint8List>(preKey.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -2381,9 +2382,9 @@ class SignalSenderKeyStores extends Table
   late final GeneratedColumn<String> senderKeyName = GeneratedColumn<String>(
       'sender_key_name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> senderKey = GeneratedColumn<Uint8List>(
+  late final GeneratedColumn<i2.Uint8List> senderKey =
-      'sender_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('sender_key', aliasedName, false,
-      type: DriftSqlType.blob, requiredDuringInsert: true);
+          type: DriftSqlType.blob, requiredDuringInsert: true);
   @override
   List<GeneratedColumn> get $columns => [senderKeyName, senderKey];
   @override
@@ -2414,14 +2415,14 @@ class SignalSenderKeyStores extends Table
 class SignalSenderKeyStoresData extends DataClass
     implements Insertable<SignalSenderKeyStoresData> {
   final String senderKeyName;
-  final Uint8List senderKey;
+  final i2.Uint8List senderKey;
   const SignalSenderKeyStoresData(
       {required this.senderKeyName, required this.senderKey});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
     map['sender_key_name'] = Variable<String>(senderKeyName);
-    map['sender_key'] = Variable<Uint8List>(senderKey);
+    map['sender_key'] = Variable<i2.Uint8List>(senderKey);
     return map;
   }
 
@@ -2437,7 +2438,7 @@ class SignalSenderKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return SignalSenderKeyStoresData(
       senderKeyName: serializer.fromJson<String>(json['senderKeyName']),
-      senderKey: serializer.fromJson<Uint8List>(json['senderKey']),
+      senderKey: serializer.fromJson<i2.Uint8List>(json['senderKey']),
     );
   }
   @override
@@ -2445,12 +2446,12 @@ class SignalSenderKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return <String, dynamic>{
       'senderKeyName': serializer.toJson<String>(senderKeyName),
-      'senderKey': serializer.toJson<Uint8List>(senderKey),
+      'senderKey': serializer.toJson<i2.Uint8List>(senderKey),
     };
   }
 
   SignalSenderKeyStoresData copyWith(
-          {String? senderKeyName, Uint8List? senderKey}) =>
+          {String? senderKeyName, i2.Uint8List? senderKey}) =>
       SignalSenderKeyStoresData(
         senderKeyName: senderKeyName ?? this.senderKeyName,
         senderKey: senderKey ?? this.senderKey,
@@ -2488,7 +2489,7 @@ class SignalSenderKeyStoresData extends DataClass
 class SignalSenderKeyStoresCompanion
     extends UpdateCompanion<SignalSenderKeyStoresData> {
   final Value<String> senderKeyName;
-  final Value<Uint8List> senderKey;
+  final Value<i2.Uint8List> senderKey;
   final Value<int> rowid;
   const SignalSenderKeyStoresCompanion({
     this.senderKeyName = const Value.absent(),
@@ -2497,13 +2498,13 @@ class SignalSenderKeyStoresCompanion
   });
   SignalSenderKeyStoresCompanion.insert({
     required String senderKeyName,
-    required Uint8List senderKey,
+    required i2.Uint8List senderKey,
     this.rowid = const Value.absent(),
   })  : senderKeyName = Value(senderKeyName),
         senderKey = Value(senderKey);
   static Insertable<SignalSenderKeyStoresData> custom({
     Expression<String>? senderKeyName,
-    Expression<Uint8List>? senderKey,
+    Expression<i2.Uint8List>? senderKey,
     Expression<int>? rowid,
   }) {
     return RawValuesInsertable({
@@ -2515,7 +2516,7 @@ class SignalSenderKeyStoresCompanion
 
   SignalSenderKeyStoresCompanion copyWith(
       {Value<String>? senderKeyName,
-      Value<Uint8List>? senderKey,
+      Value<i2.Uint8List>? senderKey,
       Value<int>? rowid}) {
     return SignalSenderKeyStoresCompanion(
       senderKeyName: senderKeyName ?? this.senderKeyName,
@@ -2531,7 +2532,7 @@ class SignalSenderKeyStoresCompanion
       map['sender_key_name'] = Variable<String>(senderKeyName.value);
     }
     if (senderKey.present) {
-      map['sender_key'] = Variable<Uint8List>(senderKey.value);
+      map['sender_key'] = Variable<i2.Uint8List>(senderKey.value);
     }
     if (rowid.present) {
       map['rowid'] = Variable<int>(rowid.value);
@@ -2562,8 +2563,8 @@ class SignalSessionStores extends Table
   late final GeneratedColumn<String> name = GeneratedColumn<String>(
       'name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> sessionRecord =
+  late final GeneratedColumn<i2.Uint8List> sessionRecord =
-      GeneratedColumn<Uint8List>('session_record', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('session_record', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
@@ -2607,7 +2608,7 @@ class SignalSessionStoresData extends DataClass
     implements Insertable<SignalSessionStoresData> {
   final int deviceId;
   final String name;
-  final Uint8List sessionRecord;
+  final i2.Uint8List sessionRecord;
   final DateTime createdAt;
   const SignalSessionStoresData(
       {required this.deviceId,
@@ -2619,7 +2620,7 @@ class SignalSessionStoresData extends DataClass
     final map = <String, Expression>{};
     map['device_id'] = Variable<int>(deviceId);
     map['name'] = Variable<String>(name);
-    map['session_record'] = Variable<Uint8List>(sessionRecord);
+    map['session_record'] = Variable<i2.Uint8List>(sessionRecord);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -2639,7 +2640,7 @@ class SignalSessionStoresData extends DataClass
     return SignalSessionStoresData(
       deviceId: serializer.fromJson<int>(json['deviceId']),
       name: serializer.fromJson<String>(json['name']),
-      sessionRecord: serializer.fromJson<Uint8List>(json['sessionRecord']),
+      sessionRecord: serializer.fromJson<i2.Uint8List>(json['sessionRecord']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -2649,7 +2650,7 @@ class SignalSessionStoresData extends DataClass
     return <String, dynamic>{
       'deviceId': serializer.toJson<int>(deviceId),
       'name': serializer.toJson<String>(name),
-      'sessionRecord': serializer.toJson<Uint8List>(sessionRecord),
+      'sessionRecord': serializer.toJson<i2.Uint8List>(sessionRecord),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -2657,7 +2658,7 @@ class SignalSessionStoresData extends DataClass
   SignalSessionStoresData copyWith(
           {int? deviceId,
           String? name,
-          Uint8List? sessionRecord,
+          i2.Uint8List? sessionRecord,
           DateTime? createdAt}) =>
       SignalSessionStoresData(
         deviceId: deviceId ?? this.deviceId,
@@ -2704,7 +2705,7 @@ class SignalSessionStoresCompanion
     extends UpdateCompanion<SignalSessionStoresData> {
   final Value<int> deviceId;
   final Value<String> name;
-  final Value<Uint8List> sessionRecord;
+  final Value<i2.Uint8List> sessionRecord;
   final Value<DateTime> createdAt;
   final Value<int> rowid;
   const SignalSessionStoresCompanion({
@@ -2717,7 +2718,7 @@ class SignalSessionStoresCompanion
   SignalSessionStoresCompanion.insert({
     required int deviceId,
     required String name,
-    required Uint8List sessionRecord,
+    required i2.Uint8List sessionRecord,
     this.createdAt = const Value.absent(),
     this.rowid = const Value.absent(),
   })  : deviceId = Value(deviceId),
@@ -2726,7 +2727,7 @@ class SignalSessionStoresCompanion
   static Insertable<SignalSessionStoresData> custom({
     Expression<int>? deviceId,
     Expression<String>? name,
-    Expression<Uint8List>? sessionRecord,
+    Expression<i2.Uint8List>? sessionRecord,
     Expression<DateTime>? createdAt,
     Expression<int>? rowid,
   }) {
@@ -2742,7 +2743,7 @@ class SignalSessionStoresCompanion
   SignalSessionStoresCompanion copyWith(
       {Value<int>? deviceId,
       Value<String>? name,
-      Value<Uint8List>? sessionRecord,
+      Value<i2.Uint8List>? sessionRecord,
       Value<DateTime>? createdAt,
       Value<int>? rowid}) {
     return SignalSessionStoresCompanion(
@@ -2764,7 +2765,7 @@ class SignalSessionStoresCompanion
       map['name'] = Variable<String>(name.value);
     }
     if (sessionRecord.present) {
-      map['session_record'] = Variable<Uint8List>(sessionRecord.value);
+      map['session_record'] = Variable<i2.Uint8List>(sessionRecord.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);

test/drift/twonly_database/generated/schema_v6.dart

@@ -1,4 +1,5 @@
 // dart format width=80
+import 'dart:typed_data' as i2;
 // GENERATED CODE, DO NOT EDIT BY HAND.
 // ignore_for_file: type=lint
 import 'package:drift/drift.dart';
@@ -1990,8 +1991,8 @@ class SignalIdentityKeyStores extends Table
   late final GeneratedColumn<String> name = GeneratedColumn<String>(
       'name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> identityKey =
+  late final GeneratedColumn<i2.Uint8List> identityKey =
-      GeneratedColumn<Uint8List>('identity_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('identity_key', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
@@ -2035,7 +2036,7 @@ class SignalIdentityKeyStoresData extends DataClass
     implements Insertable<SignalIdentityKeyStoresData> {
   final int deviceId;
   final String name;
-  final Uint8List identityKey;
+  final i2.Uint8List identityKey;
   final DateTime createdAt;
   const SignalIdentityKeyStoresData(
       {required this.deviceId,
@@ -2047,7 +2048,7 @@ class SignalIdentityKeyStoresData extends DataClass
     final map = <String, Expression>{};
     map['device_id'] = Variable<int>(deviceId);
     map['name'] = Variable<String>(name);
-    map['identity_key'] = Variable<Uint8List>(identityKey);
+    map['identity_key'] = Variable<i2.Uint8List>(identityKey);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -2067,7 +2068,7 @@ class SignalIdentityKeyStoresData extends DataClass
     return SignalIdentityKeyStoresData(
       deviceId: serializer.fromJson<int>(json['deviceId']),
       name: serializer.fromJson<String>(json['name']),
-      identityKey: serializer.fromJson<Uint8List>(json['identityKey']),
+      identityKey: serializer.fromJson<i2.Uint8List>(json['identityKey']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -2077,7 +2078,7 @@ class SignalIdentityKeyStoresData extends DataClass
     return <String, dynamic>{
       'deviceId': serializer.toJson<int>(deviceId),
       'name': serializer.toJson<String>(name),
-      'identityKey': serializer.toJson<Uint8List>(identityKey),
+      'identityKey': serializer.toJson<i2.Uint8List>(identityKey),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -2085,7 +2086,7 @@ class SignalIdentityKeyStoresData extends DataClass
   SignalIdentityKeyStoresData copyWith(
           {int? deviceId,
           String? name,
-          Uint8List? identityKey,
+          i2.Uint8List? identityKey,
           DateTime? createdAt}) =>
       SignalIdentityKeyStoresData(
         deviceId: deviceId ?? this.deviceId,
@@ -2132,7 +2133,7 @@ class SignalIdentityKeyStoresCompanion
     extends UpdateCompanion<SignalIdentityKeyStoresData> {
   final Value<int> deviceId;
   final Value<String> name;
-  final Value<Uint8List> identityKey;
+  final Value<i2.Uint8List> identityKey;
   final Value<DateTime> createdAt;
   final Value<int> rowid;
   const SignalIdentityKeyStoresCompanion({
@@ -2145,7 +2146,7 @@ class SignalIdentityKeyStoresCompanion
   SignalIdentityKeyStoresCompanion.insert({
     required int deviceId,
     required String name,
-    required Uint8List identityKey,
+    required i2.Uint8List identityKey,
     this.createdAt = const Value.absent(),
     this.rowid = const Value.absent(),
   })  : deviceId = Value(deviceId),
@@ -2154,7 +2155,7 @@ class SignalIdentityKeyStoresCompanion
   static Insertable<SignalIdentityKeyStoresData> custom({
     Expression<int>? deviceId,
     Expression<String>? name,
-    Expression<Uint8List>? identityKey,
+    Expression<i2.Uint8List>? identityKey,
     Expression<DateTime>? createdAt,
     Expression<int>? rowid,
   }) {
@@ -2170,7 +2171,7 @@ class SignalIdentityKeyStoresCompanion
   SignalIdentityKeyStoresCompanion copyWith(
       {Value<int>? deviceId,
       Value<String>? name,
-      Value<Uint8List>? identityKey,
+      Value<i2.Uint8List>? identityKey,
       Value<DateTime>? createdAt,
       Value<int>? rowid}) {
     return SignalIdentityKeyStoresCompanion(
@@ -2192,7 +2193,7 @@ class SignalIdentityKeyStoresCompanion
       map['name'] = Variable<String>(name.value);
     }
     if (identityKey.present) {
-      map['identity_key'] = Variable<Uint8List>(identityKey.value);
+      map['identity_key'] = Variable<i2.Uint8List>(identityKey.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -2225,9 +2226,9 @@ class SignalPreKeyStores extends Table
   late final GeneratedColumn<int> preKeyId = GeneratedColumn<int>(
       'pre_key_id', aliasedName, false,
       type: DriftSqlType.int, requiredDuringInsert: false);
-  late final GeneratedColumn<Uint8List> preKey = GeneratedColumn<Uint8List>(
+  late final GeneratedColumn<i2.Uint8List> preKey =
-      'pre_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('pre_key', aliasedName, false,
-      type: DriftSqlType.blob, requiredDuringInsert: true);
+          type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
       type: DriftSqlType.dateTime,
@@ -2265,7 +2266,7 @@ class SignalPreKeyStores extends Table
 class SignalPreKeyStoresData extends DataClass
     implements Insertable<SignalPreKeyStoresData> {
   final int preKeyId;
-  final Uint8List preKey;
+  final i2.Uint8List preKey;
   final DateTime createdAt;
   const SignalPreKeyStoresData(
       {required this.preKeyId, required this.preKey, required this.createdAt});
@@ -2273,7 +2274,7 @@ class SignalPreKeyStoresData extends DataClass
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
     map['pre_key_id'] = Variable<int>(preKeyId);
-    map['pre_key'] = Variable<Uint8List>(preKey);
+    map['pre_key'] = Variable<i2.Uint8List>(preKey);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -2291,7 +2292,7 @@ class SignalPreKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return SignalPreKeyStoresData(
       preKeyId: serializer.fromJson<int>(json['preKeyId']),
-      preKey: serializer.fromJson<Uint8List>(json['preKey']),
+      preKey: serializer.fromJson<i2.Uint8List>(json['preKey']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -2300,13 +2301,13 @@ class SignalPreKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return <String, dynamic>{
       'preKeyId': serializer.toJson<int>(preKeyId),
-      'preKey': serializer.toJson<Uint8List>(preKey),
+      'preKey': serializer.toJson<i2.Uint8List>(preKey),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
 
   SignalPreKeyStoresData copyWith(
-          {int? preKeyId, Uint8List? preKey, DateTime? createdAt}) =>
+          {int? preKeyId, i2.Uint8List? preKey, DateTime? createdAt}) =>
       SignalPreKeyStoresData(
         preKeyId: preKeyId ?? this.preKeyId,
         preKey: preKey ?? this.preKey,
@@ -2345,7 +2346,7 @@ class SignalPreKeyStoresData extends DataClass
 class SignalPreKeyStoresCompanion
     extends UpdateCompanion<SignalPreKeyStoresData> {
   final Value<int> preKeyId;
-  final Value<Uint8List> preKey;
+  final Value<i2.Uint8List> preKey;
   final Value<DateTime> createdAt;
   const SignalPreKeyStoresCompanion({
     this.preKeyId = const Value.absent(),
@@ -2354,12 +2355,12 @@ class SignalPreKeyStoresCompanion
   });
   SignalPreKeyStoresCompanion.insert({
     this.preKeyId = const Value.absent(),
-    required Uint8List preKey,
+    required i2.Uint8List preKey,
     this.createdAt = const Value.absent(),
   }) : preKey = Value(preKey);
   static Insertable<SignalPreKeyStoresData> custom({
     Expression<int>? preKeyId,
-    Expression<Uint8List>? preKey,
+    Expression<i2.Uint8List>? preKey,
     Expression<DateTime>? createdAt,
   }) {
     return RawValuesInsertable({
@@ -2371,7 +2372,7 @@ class SignalPreKeyStoresCompanion
 
   SignalPreKeyStoresCompanion copyWith(
       {Value<int>? preKeyId,
-      Value<Uint8List>? preKey,
+      Value<i2.Uint8List>? preKey,
       Value<DateTime>? createdAt}) {
     return SignalPreKeyStoresCompanion(
       preKeyId: preKeyId ?? this.preKeyId,
@@ -2387,7 +2388,7 @@ class SignalPreKeyStoresCompanion
       map['pre_key_id'] = Variable<int>(preKeyId.value);
     }
     if (preKey.present) {
-      map['pre_key'] = Variable<Uint8List>(preKey.value);
+      map['pre_key'] = Variable<i2.Uint8List>(preKey.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -2415,9 +2416,9 @@ class SignalSenderKeyStores extends Table
   late final GeneratedColumn<String> senderKeyName = GeneratedColumn<String>(
       'sender_key_name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> senderKey = GeneratedColumn<Uint8List>(
+  late final GeneratedColumn<i2.Uint8List> senderKey =
-      'sender_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('sender_key', aliasedName, false,
-      type: DriftSqlType.blob, requiredDuringInsert: true);
+          type: DriftSqlType.blob, requiredDuringInsert: true);
   @override
   List<GeneratedColumn> get $columns => [senderKeyName, senderKey];
   @override
@@ -2448,14 +2449,14 @@ class SignalSenderKeyStores extends Table
 class SignalSenderKeyStoresData extends DataClass
     implements Insertable<SignalSenderKeyStoresData> {
   final String senderKeyName;
-  final Uint8List senderKey;
+  final i2.Uint8List senderKey;
   const SignalSenderKeyStoresData(
       {required this.senderKeyName, required this.senderKey});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
     map['sender_key_name'] = Variable<String>(senderKeyName);
-    map['sender_key'] = Variable<Uint8List>(senderKey);
+    map['sender_key'] = Variable<i2.Uint8List>(senderKey);
     return map;
   }
 
@@ -2471,7 +2472,7 @@ class SignalSenderKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return SignalSenderKeyStoresData(
       senderKeyName: serializer.fromJson<String>(json['senderKeyName']),
-      senderKey: serializer.fromJson<Uint8List>(json['senderKey']),
+      senderKey: serializer.fromJson<i2.Uint8List>(json['senderKey']),
     );
   }
   @override
@@ -2479,12 +2480,12 @@ class SignalSenderKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return <String, dynamic>{
       'senderKeyName': serializer.toJson<String>(senderKeyName),
-      'senderKey': serializer.toJson<Uint8List>(senderKey),
+      'senderKey': serializer.toJson<i2.Uint8List>(senderKey),
     };
   }
 
   SignalSenderKeyStoresData copyWith(
-          {String? senderKeyName, Uint8List? senderKey}) =>
+          {String? senderKeyName, i2.Uint8List? senderKey}) =>
       SignalSenderKeyStoresData(
         senderKeyName: senderKeyName ?? this.senderKeyName,
         senderKey: senderKey ?? this.senderKey,
@@ -2522,7 +2523,7 @@ class SignalSenderKeyStoresData extends DataClass
 class SignalSenderKeyStoresCompanion
     extends UpdateCompanion<SignalSenderKeyStoresData> {
   final Value<String> senderKeyName;
-  final Value<Uint8List> senderKey;
+  final Value<i2.Uint8List> senderKey;
   final Value<int> rowid;
   const SignalSenderKeyStoresCompanion({
     this.senderKeyName = const Value.absent(),
@@ -2531,13 +2532,13 @@ class SignalSenderKeyStoresCompanion
   });
   SignalSenderKeyStoresCompanion.insert({
     required String senderKeyName,
-    required Uint8List senderKey,
+    required i2.Uint8List senderKey,
     this.rowid = const Value.absent(),
   })  : senderKeyName = Value(senderKeyName),
         senderKey = Value(senderKey);
   static Insertable<SignalSenderKeyStoresData> custom({
     Expression<String>? senderKeyName,
-    Expression<Uint8List>? senderKey,
+    Expression<i2.Uint8List>? senderKey,
     Expression<int>? rowid,
   }) {
     return RawValuesInsertable({
@@ -2549,7 +2550,7 @@ class SignalSenderKeyStoresCompanion
 
   SignalSenderKeyStoresCompanion copyWith(
       {Value<String>? senderKeyName,
-      Value<Uint8List>? senderKey,
+      Value<i2.Uint8List>? senderKey,
       Value<int>? rowid}) {
     return SignalSenderKeyStoresCompanion(
       senderKeyName: senderKeyName ?? this.senderKeyName,
@@ -2565,7 +2566,7 @@ class SignalSenderKeyStoresCompanion
       map['sender_key_name'] = Variable<String>(senderKeyName.value);
     }
     if (senderKey.present) {
-      map['sender_key'] = Variable<Uint8List>(senderKey.value);
+      map['sender_key'] = Variable<i2.Uint8List>(senderKey.value);
     }
     if (rowid.present) {
       map['rowid'] = Variable<int>(rowid.value);
@@ -2596,8 +2597,8 @@ class SignalSessionStores extends Table
   late final GeneratedColumn<String> name = GeneratedColumn<String>(
       'name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> sessionRecord =
+  late final GeneratedColumn<i2.Uint8List> sessionRecord =
-      GeneratedColumn<Uint8List>('session_record', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('session_record', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
@@ -2641,7 +2642,7 @@ class SignalSessionStoresData extends DataClass
     implements Insertable<SignalSessionStoresData> {
   final int deviceId;
   final String name;
-  final Uint8List sessionRecord;
+  final i2.Uint8List sessionRecord;
   final DateTime createdAt;
   const SignalSessionStoresData(
       {required this.deviceId,
@@ -2653,7 +2654,7 @@ class SignalSessionStoresData extends DataClass
     final map = <String, Expression>{};
     map['device_id'] = Variable<int>(deviceId);
     map['name'] = Variable<String>(name);
-    map['session_record'] = Variable<Uint8List>(sessionRecord);
+    map['session_record'] = Variable<i2.Uint8List>(sessionRecord);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -2673,7 +2674,7 @@ class SignalSessionStoresData extends DataClass
     return SignalSessionStoresData(
       deviceId: serializer.fromJson<int>(json['deviceId']),
       name: serializer.fromJson<String>(json['name']),
-      sessionRecord: serializer.fromJson<Uint8List>(json['sessionRecord']),
+      sessionRecord: serializer.fromJson<i2.Uint8List>(json['sessionRecord']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -2683,7 +2684,7 @@ class SignalSessionStoresData extends DataClass
     return <String, dynamic>{
       'deviceId': serializer.toJson<int>(deviceId),
       'name': serializer.toJson<String>(name),
-      'sessionRecord': serializer.toJson<Uint8List>(sessionRecord),
+      'sessionRecord': serializer.toJson<i2.Uint8List>(sessionRecord),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -2691,7 +2692,7 @@ class SignalSessionStoresData extends DataClass
   SignalSessionStoresData copyWith(
           {int? deviceId,
           String? name,
-          Uint8List? sessionRecord,
+          i2.Uint8List? sessionRecord,
           DateTime? createdAt}) =>
       SignalSessionStoresData(
         deviceId: deviceId ?? this.deviceId,
@@ -2738,7 +2739,7 @@ class SignalSessionStoresCompanion
     extends UpdateCompanion<SignalSessionStoresData> {
   final Value<int> deviceId;
   final Value<String> name;
-  final Value<Uint8List> sessionRecord;
+  final Value<i2.Uint8List> sessionRecord;
   final Value<DateTime> createdAt;
   final Value<int> rowid;
   const SignalSessionStoresCompanion({
@@ -2751,7 +2752,7 @@ class SignalSessionStoresCompanion
   SignalSessionStoresCompanion.insert({
     required int deviceId,
     required String name,
-    required Uint8List sessionRecord,
+    required i2.Uint8List sessionRecord,
     this.createdAt = const Value.absent(),
     this.rowid = const Value.absent(),
   })  : deviceId = Value(deviceId),
@@ -2760,7 +2761,7 @@ class SignalSessionStoresCompanion
   static Insertable<SignalSessionStoresData> custom({
     Expression<int>? deviceId,
     Expression<String>? name,
-    Expression<Uint8List>? sessionRecord,
+    Expression<i2.Uint8List>? sessionRecord,
     Expression<DateTime>? createdAt,
     Expression<int>? rowid,
   }) {
@@ -2776,7 +2777,7 @@ class SignalSessionStoresCompanion
   SignalSessionStoresCompanion copyWith(
       {Value<int>? deviceId,
       Value<String>? name,
-      Value<Uint8List>? sessionRecord,
+      Value<i2.Uint8List>? sessionRecord,
       Value<DateTime>? createdAt,
       Value<int>? rowid}) {
     return SignalSessionStoresCompanion(
@@ -2798,7 +2799,7 @@ class SignalSessionStoresCompanion
       map['name'] = Variable<String>(name.value);
     }
     if (sessionRecord.present) {
-      map['session_record'] = Variable<Uint8List>(sessionRecord.value);
+      map['session_record'] = Variable<i2.Uint8List>(sessionRecord.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);

test/drift/twonly_database/generated/schema_v7.dart

@@ -1,4 +1,5 @@
 // dart format width=80
+import 'dart:typed_data' as i2;
 // GENERATED CODE, DO NOT EDIT BY HAND.
 // ignore_for_file: type=lint
 import 'package:drift/drift.dart';
@@ -2023,8 +2024,8 @@ class SignalIdentityKeyStores extends Table
   late final GeneratedColumn<String> name = GeneratedColumn<String>(
       'name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> identityKey =
+  late final GeneratedColumn<i2.Uint8List> identityKey =
-      GeneratedColumn<Uint8List>('identity_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('identity_key', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
@@ -2068,7 +2069,7 @@ class SignalIdentityKeyStoresData extends DataClass
     implements Insertable<SignalIdentityKeyStoresData> {
   final int deviceId;
   final String name;
-  final Uint8List identityKey;
+  final i2.Uint8List identityKey;
   final DateTime createdAt;
   const SignalIdentityKeyStoresData(
       {required this.deviceId,
@@ -2080,7 +2081,7 @@ class SignalIdentityKeyStoresData extends DataClass
     final map = <String, Expression>{};
     map['device_id'] = Variable<int>(deviceId);
     map['name'] = Variable<String>(name);
-    map['identity_key'] = Variable<Uint8List>(identityKey);
+    map['identity_key'] = Variable<i2.Uint8List>(identityKey);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -2100,7 +2101,7 @@ class SignalIdentityKeyStoresData extends DataClass
     return SignalIdentityKeyStoresData(
       deviceId: serializer.fromJson<int>(json['deviceId']),
       name: serializer.fromJson<String>(json['name']),
-      identityKey: serializer.fromJson<Uint8List>(json['identityKey']),
+      identityKey: serializer.fromJson<i2.Uint8List>(json['identityKey']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -2110,7 +2111,7 @@ class SignalIdentityKeyStoresData extends DataClass
     return <String, dynamic>{
       'deviceId': serializer.toJson<int>(deviceId),
       'name': serializer.toJson<String>(name),
-      'identityKey': serializer.toJson<Uint8List>(identityKey),
+      'identityKey': serializer.toJson<i2.Uint8List>(identityKey),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -2118,7 +2119,7 @@ class SignalIdentityKeyStoresData extends DataClass
   SignalIdentityKeyStoresData copyWith(
           {int? deviceId,
           String? name,
-          Uint8List? identityKey,
+          i2.Uint8List? identityKey,
           DateTime? createdAt}) =>
       SignalIdentityKeyStoresData(
         deviceId: deviceId ?? this.deviceId,
@@ -2165,7 +2166,7 @@ class SignalIdentityKeyStoresCompanion
     extends UpdateCompanion<SignalIdentityKeyStoresData> {
   final Value<int> deviceId;
   final Value<String> name;
-  final Value<Uint8List> identityKey;
+  final Value<i2.Uint8List> identityKey;
   final Value<DateTime> createdAt;
   final Value<int> rowid;
   const SignalIdentityKeyStoresCompanion({
@@ -2178,7 +2179,7 @@ class SignalIdentityKeyStoresCompanion
   SignalIdentityKeyStoresCompanion.insert({
     required int deviceId,
     required String name,
-    required Uint8List identityKey,
+    required i2.Uint8List identityKey,
     this.createdAt = const Value.absent(),
     this.rowid = const Value.absent(),
   })  : deviceId = Value(deviceId),
@@ -2187,7 +2188,7 @@ class SignalIdentityKeyStoresCompanion
   static Insertable<SignalIdentityKeyStoresData> custom({
     Expression<int>? deviceId,
     Expression<String>? name,
-    Expression<Uint8List>? identityKey,
+    Expression<i2.Uint8List>? identityKey,
     Expression<DateTime>? createdAt,
     Expression<int>? rowid,
   }) {
@@ -2203,7 +2204,7 @@ class SignalIdentityKeyStoresCompanion
   SignalIdentityKeyStoresCompanion copyWith(
       {Value<int>? deviceId,
       Value<String>? name,
-      Value<Uint8List>? identityKey,
+      Value<i2.Uint8List>? identityKey,
       Value<DateTime>? createdAt,
       Value<int>? rowid}) {
     return SignalIdentityKeyStoresCompanion(
@@ -2225,7 +2226,7 @@ class SignalIdentityKeyStoresCompanion
       map['name'] = Variable<String>(name.value);
     }
     if (identityKey.present) {
-      map['identity_key'] = Variable<Uint8List>(identityKey.value);
+      map['identity_key'] = Variable<i2.Uint8List>(identityKey.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -2258,9 +2259,9 @@ class SignalPreKeyStores extends Table
   late final GeneratedColumn<int> preKeyId = GeneratedColumn<int>(
       'pre_key_id', aliasedName, false,
       type: DriftSqlType.int, requiredDuringInsert: false);
-  late final GeneratedColumn<Uint8List> preKey = GeneratedColumn<Uint8List>(
+  late final GeneratedColumn<i2.Uint8List> preKey =
-      'pre_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('pre_key', aliasedName, false,
-      type: DriftSqlType.blob, requiredDuringInsert: true);
+          type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
       type: DriftSqlType.dateTime,
@@ -2298,7 +2299,7 @@ class SignalPreKeyStores extends Table
 class SignalPreKeyStoresData extends DataClass
     implements Insertable<SignalPreKeyStoresData> {
   final int preKeyId;
-  final Uint8List preKey;
+  final i2.Uint8List preKey;
   final DateTime createdAt;
   const SignalPreKeyStoresData(
       {required this.preKeyId, required this.preKey, required this.createdAt});
@@ -2306,7 +2307,7 @@ class SignalPreKeyStoresData extends DataClass
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
     map['pre_key_id'] = Variable<int>(preKeyId);
-    map['pre_key'] = Variable<Uint8List>(preKey);
+    map['pre_key'] = Variable<i2.Uint8List>(preKey);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -2324,7 +2325,7 @@ class SignalPreKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return SignalPreKeyStoresData(
       preKeyId: serializer.fromJson<int>(json['preKeyId']),
-      preKey: serializer.fromJson<Uint8List>(json['preKey']),
+      preKey: serializer.fromJson<i2.Uint8List>(json['preKey']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -2333,13 +2334,13 @@ class SignalPreKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return <String, dynamic>{
       'preKeyId': serializer.toJson<int>(preKeyId),
-      'preKey': serializer.toJson<Uint8List>(preKey),
+      'preKey': serializer.toJson<i2.Uint8List>(preKey),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
 
   SignalPreKeyStoresData copyWith(
-          {int? preKeyId, Uint8List? preKey, DateTime? createdAt}) =>
+          {int? preKeyId, i2.Uint8List? preKey, DateTime? createdAt}) =>
       SignalPreKeyStoresData(
         preKeyId: preKeyId ?? this.preKeyId,
         preKey: preKey ?? this.preKey,
@@ -2378,7 +2379,7 @@ class SignalPreKeyStoresData extends DataClass
 class SignalPreKeyStoresCompanion
     extends UpdateCompanion<SignalPreKeyStoresData> {
   final Value<int> preKeyId;
-  final Value<Uint8List> preKey;
+  final Value<i2.Uint8List> preKey;
   final Value<DateTime> createdAt;
   const SignalPreKeyStoresCompanion({
     this.preKeyId = const Value.absent(),
@@ -2387,12 +2388,12 @@ class SignalPreKeyStoresCompanion
   });
   SignalPreKeyStoresCompanion.insert({
     this.preKeyId = const Value.absent(),
-    required Uint8List preKey,
+    required i2.Uint8List preKey,
     this.createdAt = const Value.absent(),
   }) : preKey = Value(preKey);
   static Insertable<SignalPreKeyStoresData> custom({
     Expression<int>? preKeyId,
-    Expression<Uint8List>? preKey,
+    Expression<i2.Uint8List>? preKey,
     Expression<DateTime>? createdAt,
   }) {
     return RawValuesInsertable({
@@ -2404,7 +2405,7 @@ class SignalPreKeyStoresCompanion
 
   SignalPreKeyStoresCompanion copyWith(
       {Value<int>? preKeyId,
-      Value<Uint8List>? preKey,
+      Value<i2.Uint8List>? preKey,
       Value<DateTime>? createdAt}) {
     return SignalPreKeyStoresCompanion(
       preKeyId: preKeyId ?? this.preKeyId,
@@ -2420,7 +2421,7 @@ class SignalPreKeyStoresCompanion
       map['pre_key_id'] = Variable<int>(preKeyId.value);
     }
     if (preKey.present) {
-      map['pre_key'] = Variable<Uint8List>(preKey.value);
+      map['pre_key'] = Variable<i2.Uint8List>(preKey.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -2448,9 +2449,9 @@ class SignalSenderKeyStores extends Table
   late final GeneratedColumn<String> senderKeyName = GeneratedColumn<String>(
       'sender_key_name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> senderKey = GeneratedColumn<Uint8List>(
+  late final GeneratedColumn<i2.Uint8List> senderKey =
-      'sender_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('sender_key', aliasedName, false,
-      type: DriftSqlType.blob, requiredDuringInsert: true);
+          type: DriftSqlType.blob, requiredDuringInsert: true);
   @override
   List<GeneratedColumn> get $columns => [senderKeyName, senderKey];
   @override
@@ -2481,14 +2482,14 @@ class SignalSenderKeyStores extends Table
 class SignalSenderKeyStoresData extends DataClass
     implements Insertable<SignalSenderKeyStoresData> {
   final String senderKeyName;
-  final Uint8List senderKey;
+  final i2.Uint8List senderKey;
   const SignalSenderKeyStoresData(
       {required this.senderKeyName, required this.senderKey});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
     map['sender_key_name'] = Variable<String>(senderKeyName);
-    map['sender_key'] = Variable<Uint8List>(senderKey);
+    map['sender_key'] = Variable<i2.Uint8List>(senderKey);
     return map;
   }
 
@@ -2504,7 +2505,7 @@ class SignalSenderKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return SignalSenderKeyStoresData(
       senderKeyName: serializer.fromJson<String>(json['senderKeyName']),
-      senderKey: serializer.fromJson<Uint8List>(json['senderKey']),
+      senderKey: serializer.fromJson<i2.Uint8List>(json['senderKey']),
     );
   }
   @override
@@ -2512,12 +2513,12 @@ class SignalSenderKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return <String, dynamic>{
       'senderKeyName': serializer.toJson<String>(senderKeyName),
-      'senderKey': serializer.toJson<Uint8List>(senderKey),
+      'senderKey': serializer.toJson<i2.Uint8List>(senderKey),
     };
   }
 
   SignalSenderKeyStoresData copyWith(
-          {String? senderKeyName, Uint8List? senderKey}) =>
+          {String? senderKeyName, i2.Uint8List? senderKey}) =>
       SignalSenderKeyStoresData(
         senderKeyName: senderKeyName ?? this.senderKeyName,
         senderKey: senderKey ?? this.senderKey,
@@ -2555,7 +2556,7 @@ class SignalSenderKeyStoresData extends DataClass
 class SignalSenderKeyStoresCompanion
     extends UpdateCompanion<SignalSenderKeyStoresData> {
   final Value<String> senderKeyName;
-  final Value<Uint8List> senderKey;
+  final Value<i2.Uint8List> senderKey;
   final Value<int> rowid;
   const SignalSenderKeyStoresCompanion({
     this.senderKeyName = const Value.absent(),
@@ -2564,13 +2565,13 @@ class SignalSenderKeyStoresCompanion
   });
   SignalSenderKeyStoresCompanion.insert({
     required String senderKeyName,
-    required Uint8List senderKey,
+    required i2.Uint8List senderKey,
     this.rowid = const Value.absent(),
   })  : senderKeyName = Value(senderKeyName),
         senderKey = Value(senderKey);
   static Insertable<SignalSenderKeyStoresData> custom({
     Expression<String>? senderKeyName,
-    Expression<Uint8List>? senderKey,
+    Expression<i2.Uint8List>? senderKey,
     Expression<int>? rowid,
   }) {
     return RawValuesInsertable({
@@ -2582,7 +2583,7 @@ class SignalSenderKeyStoresCompanion
 
   SignalSenderKeyStoresCompanion copyWith(
       {Value<String>? senderKeyName,
-      Value<Uint8List>? senderKey,
+      Value<i2.Uint8List>? senderKey,
       Value<int>? rowid}) {
     return SignalSenderKeyStoresCompanion(
       senderKeyName: senderKeyName ?? this.senderKeyName,
@@ -2598,7 +2599,7 @@ class SignalSenderKeyStoresCompanion
       map['sender_key_name'] = Variable<String>(senderKeyName.value);
     }
     if (senderKey.present) {
-      map['sender_key'] = Variable<Uint8List>(senderKey.value);
+      map['sender_key'] = Variable<i2.Uint8List>(senderKey.value);
     }
     if (rowid.present) {
       map['rowid'] = Variable<int>(rowid.value);
@@ -2629,8 +2630,8 @@ class SignalSessionStores extends Table
   late final GeneratedColumn<String> name = GeneratedColumn<String>(
       'name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> sessionRecord =
+  late final GeneratedColumn<i2.Uint8List> sessionRecord =
-      GeneratedColumn<Uint8List>('session_record', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('session_record', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
@@ -2674,7 +2675,7 @@ class SignalSessionStoresData extends DataClass
     implements Insertable<SignalSessionStoresData> {
   final int deviceId;
   final String name;
-  final Uint8List sessionRecord;
+  final i2.Uint8List sessionRecord;
   final DateTime createdAt;
   const SignalSessionStoresData(
       {required this.deviceId,
@@ -2686,7 +2687,7 @@ class SignalSessionStoresData extends DataClass
     final map = <String, Expression>{};
     map['device_id'] = Variable<int>(deviceId);
     map['name'] = Variable<String>(name);
-    map['session_record'] = Variable<Uint8List>(sessionRecord);
+    map['session_record'] = Variable<i2.Uint8List>(sessionRecord);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -2706,7 +2707,7 @@ class SignalSessionStoresData extends DataClass
     return SignalSessionStoresData(
       deviceId: serializer.fromJson<int>(json['deviceId']),
       name: serializer.fromJson<String>(json['name']),
-      sessionRecord: serializer.fromJson<Uint8List>(json['sessionRecord']),
+      sessionRecord: serializer.fromJson<i2.Uint8List>(json['sessionRecord']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -2716,7 +2717,7 @@ class SignalSessionStoresData extends DataClass
     return <String, dynamic>{
       'deviceId': serializer.toJson<int>(deviceId),
       'name': serializer.toJson<String>(name),
-      'sessionRecord': serializer.toJson<Uint8List>(sessionRecord),
+      'sessionRecord': serializer.toJson<i2.Uint8List>(sessionRecord),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -2724,7 +2725,7 @@ class SignalSessionStoresData extends DataClass
   SignalSessionStoresData copyWith(
           {int? deviceId,
           String? name,
-          Uint8List? sessionRecord,
+          i2.Uint8List? sessionRecord,
           DateTime? createdAt}) =>
       SignalSessionStoresData(
         deviceId: deviceId ?? this.deviceId,
@@ -2771,7 +2772,7 @@ class SignalSessionStoresCompanion
     extends UpdateCompanion<SignalSessionStoresData> {
   final Value<int> deviceId;
   final Value<String> name;
-  final Value<Uint8List> sessionRecord;
+  final Value<i2.Uint8List> sessionRecord;
   final Value<DateTime> createdAt;
   final Value<int> rowid;
   const SignalSessionStoresCompanion({
@@ -2784,7 +2785,7 @@ class SignalSessionStoresCompanion
   SignalSessionStoresCompanion.insert({
     required int deviceId,
     required String name,
-    required Uint8List sessionRecord,
+    required i2.Uint8List sessionRecord,
     this.createdAt = const Value.absent(),
     this.rowid = const Value.absent(),
   })  : deviceId = Value(deviceId),
@@ -2793,7 +2794,7 @@ class SignalSessionStoresCompanion
   static Insertable<SignalSessionStoresData> custom({
     Expression<int>? deviceId,
     Expression<String>? name,
-    Expression<Uint8List>? sessionRecord,
+    Expression<i2.Uint8List>? sessionRecord,
     Expression<DateTime>? createdAt,
     Expression<int>? rowid,
   }) {
@@ -2809,7 +2810,7 @@ class SignalSessionStoresCompanion
   SignalSessionStoresCompanion copyWith(
       {Value<int>? deviceId,
       Value<String>? name,
-      Value<Uint8List>? sessionRecord,
+      Value<i2.Uint8List>? sessionRecord,
       Value<DateTime>? createdAt,
       Value<int>? rowid}) {
     return SignalSessionStoresCompanion(
@@ -2831,7 +2832,7 @@ class SignalSessionStoresCompanion
       map['name'] = Variable<String>(name.value);
     }
     if (sessionRecord.present) {
-      map['session_record'] = Variable<Uint8List>(sessionRecord.value);
+      map['session_record'] = Variable<i2.Uint8List>(sessionRecord.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);

test/drift/twonly_database/generated/schema_v8.dart

@@ -1,4 +1,5 @@
 // dart format width=80
+import 'dart:typed_data' as i2;
 // GENERATED CODE, DO NOT EDIT BY HAND.
 // ignore_for_file: type=lint
 import 'package:drift/drift.dart';
@@ -2095,8 +2096,8 @@ class SignalIdentityKeyStores extends Table
   late final GeneratedColumn<String> name = GeneratedColumn<String>(
       'name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> identityKey =
+  late final GeneratedColumn<i2.Uint8List> identityKey =
-      GeneratedColumn<Uint8List>('identity_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('identity_key', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
@@ -2140,7 +2141,7 @@ class SignalIdentityKeyStoresData extends DataClass
     implements Insertable<SignalIdentityKeyStoresData> {
   final int deviceId;
   final String name;
-  final Uint8List identityKey;
+  final i2.Uint8List identityKey;
   final DateTime createdAt;
   const SignalIdentityKeyStoresData(
       {required this.deviceId,
@@ -2152,7 +2153,7 @@ class SignalIdentityKeyStoresData extends DataClass
     final map = <String, Expression>{};
     map['device_id'] = Variable<int>(deviceId);
     map['name'] = Variable<String>(name);
-    map['identity_key'] = Variable<Uint8List>(identityKey);
+    map['identity_key'] = Variable<i2.Uint8List>(identityKey);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -2172,7 +2173,7 @@ class SignalIdentityKeyStoresData extends DataClass
     return SignalIdentityKeyStoresData(
       deviceId: serializer.fromJson<int>(json['deviceId']),
       name: serializer.fromJson<String>(json['name']),
-      identityKey: serializer.fromJson<Uint8List>(json['identityKey']),
+      identityKey: serializer.fromJson<i2.Uint8List>(json['identityKey']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -2182,7 +2183,7 @@ class SignalIdentityKeyStoresData extends DataClass
     return <String, dynamic>{
       'deviceId': serializer.toJson<int>(deviceId),
       'name': serializer.toJson<String>(name),
-      'identityKey': serializer.toJson<Uint8List>(identityKey),
+      'identityKey': serializer.toJson<i2.Uint8List>(identityKey),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -2190,7 +2191,7 @@ class SignalIdentityKeyStoresData extends DataClass
   SignalIdentityKeyStoresData copyWith(
           {int? deviceId,
           String? name,
-          Uint8List? identityKey,
+          i2.Uint8List? identityKey,
           DateTime? createdAt}) =>
       SignalIdentityKeyStoresData(
         deviceId: deviceId ?? this.deviceId,
@@ -2237,7 +2238,7 @@ class SignalIdentityKeyStoresCompanion
     extends UpdateCompanion<SignalIdentityKeyStoresData> {
   final Value<int> deviceId;
   final Value<String> name;
-  final Value<Uint8List> identityKey;
+  final Value<i2.Uint8List> identityKey;
   final Value<DateTime> createdAt;
   final Value<int> rowid;
   const SignalIdentityKeyStoresCompanion({
@@ -2250,7 +2251,7 @@ class SignalIdentityKeyStoresCompanion
   SignalIdentityKeyStoresCompanion.insert({
     required int deviceId,
     required String name,
-    required Uint8List identityKey,
+    required i2.Uint8List identityKey,
     this.createdAt = const Value.absent(),
     this.rowid = const Value.absent(),
   })  : deviceId = Value(deviceId),
@@ -2259,7 +2260,7 @@ class SignalIdentityKeyStoresCompanion
   static Insertable<SignalIdentityKeyStoresData> custom({
     Expression<int>? deviceId,
     Expression<String>? name,
-    Expression<Uint8List>? identityKey,
+    Expression<i2.Uint8List>? identityKey,
     Expression<DateTime>? createdAt,
     Expression<int>? rowid,
   }) {
@@ -2275,7 +2276,7 @@ class SignalIdentityKeyStoresCompanion
   SignalIdentityKeyStoresCompanion copyWith(
       {Value<int>? deviceId,
       Value<String>? name,
-      Value<Uint8List>? identityKey,
+      Value<i2.Uint8List>? identityKey,
       Value<DateTime>? createdAt,
       Value<int>? rowid}) {
     return SignalIdentityKeyStoresCompanion(
@@ -2297,7 +2298,7 @@ class SignalIdentityKeyStoresCompanion
       map['name'] = Variable<String>(name.value);
     }
     if (identityKey.present) {
-      map['identity_key'] = Variable<Uint8List>(identityKey.value);
+      map['identity_key'] = Variable<i2.Uint8List>(identityKey.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -2330,9 +2331,9 @@ class SignalPreKeyStores extends Table
   late final GeneratedColumn<int> preKeyId = GeneratedColumn<int>(
       'pre_key_id', aliasedName, false,
       type: DriftSqlType.int, requiredDuringInsert: false);
-  late final GeneratedColumn<Uint8List> preKey = GeneratedColumn<Uint8List>(
+  late final GeneratedColumn<i2.Uint8List> preKey =
-      'pre_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('pre_key', aliasedName, false,
-      type: DriftSqlType.blob, requiredDuringInsert: true);
+          type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
       type: DriftSqlType.dateTime,
@@ -2370,7 +2371,7 @@ class SignalPreKeyStores extends Table
 class SignalPreKeyStoresData extends DataClass
     implements Insertable<SignalPreKeyStoresData> {
   final int preKeyId;
-  final Uint8List preKey;
+  final i2.Uint8List preKey;
   final DateTime createdAt;
   const SignalPreKeyStoresData(
       {required this.preKeyId, required this.preKey, required this.createdAt});
@@ -2378,7 +2379,7 @@ class SignalPreKeyStoresData extends DataClass
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
     map['pre_key_id'] = Variable<int>(preKeyId);
-    map['pre_key'] = Variable<Uint8List>(preKey);
+    map['pre_key'] = Variable<i2.Uint8List>(preKey);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -2396,7 +2397,7 @@ class SignalPreKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return SignalPreKeyStoresData(
       preKeyId: serializer.fromJson<int>(json['preKeyId']),
-      preKey: serializer.fromJson<Uint8List>(json['preKey']),
+      preKey: serializer.fromJson<i2.Uint8List>(json['preKey']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -2405,13 +2406,13 @@ class SignalPreKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return <String, dynamic>{
       'preKeyId': serializer.toJson<int>(preKeyId),
-      'preKey': serializer.toJson<Uint8List>(preKey),
+      'preKey': serializer.toJson<i2.Uint8List>(preKey),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
 
   SignalPreKeyStoresData copyWith(
-          {int? preKeyId, Uint8List? preKey, DateTime? createdAt}) =>
+          {int? preKeyId, i2.Uint8List? preKey, DateTime? createdAt}) =>
       SignalPreKeyStoresData(
         preKeyId: preKeyId ?? this.preKeyId,
         preKey: preKey ?? this.preKey,
@@ -2450,7 +2451,7 @@ class SignalPreKeyStoresData extends DataClass
 class SignalPreKeyStoresCompanion
     extends UpdateCompanion<SignalPreKeyStoresData> {
   final Value<int> preKeyId;
-  final Value<Uint8List> preKey;
+  final Value<i2.Uint8List> preKey;
   final Value<DateTime> createdAt;
   const SignalPreKeyStoresCompanion({
     this.preKeyId = const Value.absent(),
@@ -2459,12 +2460,12 @@ class SignalPreKeyStoresCompanion
   });
   SignalPreKeyStoresCompanion.insert({
     this.preKeyId = const Value.absent(),
-    required Uint8List preKey,
+    required i2.Uint8List preKey,
     this.createdAt = const Value.absent(),
   }) : preKey = Value(preKey);
   static Insertable<SignalPreKeyStoresData> custom({
     Expression<int>? preKeyId,
-    Expression<Uint8List>? preKey,
+    Expression<i2.Uint8List>? preKey,
     Expression<DateTime>? createdAt,
   }) {
     return RawValuesInsertable({
@@ -2476,7 +2477,7 @@ class SignalPreKeyStoresCompanion
 
   SignalPreKeyStoresCompanion copyWith(
       {Value<int>? preKeyId,
-      Value<Uint8List>? preKey,
+      Value<i2.Uint8List>? preKey,
       Value<DateTime>? createdAt}) {
     return SignalPreKeyStoresCompanion(
       preKeyId: preKeyId ?? this.preKeyId,
@@ -2492,7 +2493,7 @@ class SignalPreKeyStoresCompanion
       map['pre_key_id'] = Variable<int>(preKeyId.value);
     }
     if (preKey.present) {
-      map['pre_key'] = Variable<Uint8List>(preKey.value);
+      map['pre_key'] = Variable<i2.Uint8List>(preKey.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -2520,9 +2521,9 @@ class SignalSenderKeyStores extends Table
   late final GeneratedColumn<String> senderKeyName = GeneratedColumn<String>(
       'sender_key_name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> senderKey = GeneratedColumn<Uint8List>(
+  late final GeneratedColumn<i2.Uint8List> senderKey =
-      'sender_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('sender_key', aliasedName, false,
-      type: DriftSqlType.blob, requiredDuringInsert: true);
+          type: DriftSqlType.blob, requiredDuringInsert: true);
   @override
   List<GeneratedColumn> get $columns => [senderKeyName, senderKey];
   @override
@@ -2553,14 +2554,14 @@ class SignalSenderKeyStores extends Table
 class SignalSenderKeyStoresData extends DataClass
     implements Insertable<SignalSenderKeyStoresData> {
   final String senderKeyName;
-  final Uint8List senderKey;
+  final i2.Uint8List senderKey;
   const SignalSenderKeyStoresData(
       {required this.senderKeyName, required this.senderKey});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
     map['sender_key_name'] = Variable<String>(senderKeyName);
-    map['sender_key'] = Variable<Uint8List>(senderKey);
+    map['sender_key'] = Variable<i2.Uint8List>(senderKey);
     return map;
   }
 
@@ -2576,7 +2577,7 @@ class SignalSenderKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return SignalSenderKeyStoresData(
       senderKeyName: serializer.fromJson<String>(json['senderKeyName']),
-      senderKey: serializer.fromJson<Uint8List>(json['senderKey']),
+      senderKey: serializer.fromJson<i2.Uint8List>(json['senderKey']),
     );
   }
   @override
@@ -2584,12 +2585,12 @@ class SignalSenderKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return <String, dynamic>{
       'senderKeyName': serializer.toJson<String>(senderKeyName),
-      'senderKey': serializer.toJson<Uint8List>(senderKey),
+      'senderKey': serializer.toJson<i2.Uint8List>(senderKey),
     };
   }
 
   SignalSenderKeyStoresData copyWith(
-          {String? senderKeyName, Uint8List? senderKey}) =>
+          {String? senderKeyName, i2.Uint8List? senderKey}) =>
       SignalSenderKeyStoresData(
         senderKeyName: senderKeyName ?? this.senderKeyName,
         senderKey: senderKey ?? this.senderKey,
@@ -2627,7 +2628,7 @@ class SignalSenderKeyStoresData extends DataClass
 class SignalSenderKeyStoresCompanion
     extends UpdateCompanion<SignalSenderKeyStoresData> {
   final Value<String> senderKeyName;
-  final Value<Uint8List> senderKey;
+  final Value<i2.Uint8List> senderKey;
   final Value<int> rowid;
   const SignalSenderKeyStoresCompanion({
     this.senderKeyName = const Value.absent(),
@@ -2636,13 +2637,13 @@ class SignalSenderKeyStoresCompanion
   });
   SignalSenderKeyStoresCompanion.insert({
     required String senderKeyName,
-    required Uint8List senderKey,
+    required i2.Uint8List senderKey,
     this.rowid = const Value.absent(),
   })  : senderKeyName = Value(senderKeyName),
         senderKey = Value(senderKey);
   static Insertable<SignalSenderKeyStoresData> custom({
     Expression<String>? senderKeyName,
-    Expression<Uint8List>? senderKey,
+    Expression<i2.Uint8List>? senderKey,
     Expression<int>? rowid,
   }) {
     return RawValuesInsertable({
@@ -2654,7 +2655,7 @@ class SignalSenderKeyStoresCompanion
 
   SignalSenderKeyStoresCompanion copyWith(
       {Value<String>? senderKeyName,
-      Value<Uint8List>? senderKey,
+      Value<i2.Uint8List>? senderKey,
       Value<int>? rowid}) {
     return SignalSenderKeyStoresCompanion(
       senderKeyName: senderKeyName ?? this.senderKeyName,
@@ -2670,7 +2671,7 @@ class SignalSenderKeyStoresCompanion
       map['sender_key_name'] = Variable<String>(senderKeyName.value);
     }
     if (senderKey.present) {
-      map['sender_key'] = Variable<Uint8List>(senderKey.value);
+      map['sender_key'] = Variable<i2.Uint8List>(senderKey.value);
     }
     if (rowid.present) {
       map['rowid'] = Variable<int>(rowid.value);
@@ -2701,8 +2702,8 @@ class SignalSessionStores extends Table
   late final GeneratedColumn<String> name = GeneratedColumn<String>(
       'name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> sessionRecord =
+  late final GeneratedColumn<i2.Uint8List> sessionRecord =
-      GeneratedColumn<Uint8List>('session_record', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('session_record', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
@@ -2746,7 +2747,7 @@ class SignalSessionStoresData extends DataClass
     implements Insertable<SignalSessionStoresData> {
   final int deviceId;
   final String name;
-  final Uint8List sessionRecord;
+  final i2.Uint8List sessionRecord;
   final DateTime createdAt;
   const SignalSessionStoresData(
       {required this.deviceId,
@@ -2758,7 +2759,7 @@ class SignalSessionStoresData extends DataClass
     final map = <String, Expression>{};
     map['device_id'] = Variable<int>(deviceId);
     map['name'] = Variable<String>(name);
-    map['session_record'] = Variable<Uint8List>(sessionRecord);
+    map['session_record'] = Variable<i2.Uint8List>(sessionRecord);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -2778,7 +2779,7 @@ class SignalSessionStoresData extends DataClass
     return SignalSessionStoresData(
       deviceId: serializer.fromJson<int>(json['deviceId']),
       name: serializer.fromJson<String>(json['name']),
-      sessionRecord: serializer.fromJson<Uint8List>(json['sessionRecord']),
+      sessionRecord: serializer.fromJson<i2.Uint8List>(json['sessionRecord']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -2788,7 +2789,7 @@ class SignalSessionStoresData extends DataClass
     return <String, dynamic>{
       'deviceId': serializer.toJson<int>(deviceId),
       'name': serializer.toJson<String>(name),
-      'sessionRecord': serializer.toJson<Uint8List>(sessionRecord),
+      'sessionRecord': serializer.toJson<i2.Uint8List>(sessionRecord),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -2796,7 +2797,7 @@ class SignalSessionStoresData extends DataClass
   SignalSessionStoresData copyWith(
           {int? deviceId,
           String? name,
-          Uint8List? sessionRecord,
+          i2.Uint8List? sessionRecord,
           DateTime? createdAt}) =>
       SignalSessionStoresData(
         deviceId: deviceId ?? this.deviceId,
@@ -2843,7 +2844,7 @@ class SignalSessionStoresCompanion
     extends UpdateCompanion<SignalSessionStoresData> {
   final Value<int> deviceId;
   final Value<String> name;
-  final Value<Uint8List> sessionRecord;
+  final Value<i2.Uint8List> sessionRecord;
   final Value<DateTime> createdAt;
   final Value<int> rowid;
   const SignalSessionStoresCompanion({
@@ -2856,7 +2857,7 @@ class SignalSessionStoresCompanion
   SignalSessionStoresCompanion.insert({
     required int deviceId,
     required String name,
-    required Uint8List sessionRecord,
+    required i2.Uint8List sessionRecord,
     this.createdAt = const Value.absent(),
     this.rowid = const Value.absent(),
   })  : deviceId = Value(deviceId),
@@ -2865,7 +2866,7 @@ class SignalSessionStoresCompanion
   static Insertable<SignalSessionStoresData> custom({
     Expression<int>? deviceId,
     Expression<String>? name,
-    Expression<Uint8List>? sessionRecord,
+    Expression<i2.Uint8List>? sessionRecord,
     Expression<DateTime>? createdAt,
     Expression<int>? rowid,
   }) {
@@ -2881,7 +2882,7 @@ class SignalSessionStoresCompanion
   SignalSessionStoresCompanion copyWith(
       {Value<int>? deviceId,
       Value<String>? name,
-      Value<Uint8List>? sessionRecord,
+      Value<i2.Uint8List>? sessionRecord,
       Value<DateTime>? createdAt,
       Value<int>? rowid}) {
     return SignalSessionStoresCompanion(
@@ -2903,7 +2904,7 @@ class SignalSessionStoresCompanion
       map['name'] = Variable<String>(name.value);
     }
     if (sessionRecord.present) {
-      map['session_record'] = Variable<Uint8List>(sessionRecord.value);
+      map['session_record'] = Variable<i2.Uint8List>(sessionRecord.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);

test/drift/twonly_database/generated/schema_v9.dart

@@ -1,4 +1,5 @@
 // dart format width=80
+import 'dart:typed_data' as i2;
 // GENERATED CODE, DO NOT EDIT BY HAND.
 // ignore_for_file: type=lint
 import 'package:drift/drift.dart';
@@ -2099,8 +2100,8 @@ class SignalIdentityKeyStores extends Table
   late final GeneratedColumn<String> name = GeneratedColumn<String>(
       'name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> identityKey =
+  late final GeneratedColumn<i2.Uint8List> identityKey =
-      GeneratedColumn<Uint8List>('identity_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('identity_key', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
@@ -2144,7 +2145,7 @@ class SignalIdentityKeyStoresData extends DataClass
     implements Insertable<SignalIdentityKeyStoresData> {
   final int deviceId;
   final String name;
-  final Uint8List identityKey;
+  final i2.Uint8List identityKey;
   final DateTime createdAt;
   const SignalIdentityKeyStoresData(
       {required this.deviceId,
@@ -2156,7 +2157,7 @@ class SignalIdentityKeyStoresData extends DataClass
     final map = <String, Expression>{};
     map['device_id'] = Variable<int>(deviceId);
     map['name'] = Variable<String>(name);
-    map['identity_key'] = Variable<Uint8List>(identityKey);
+    map['identity_key'] = Variable<i2.Uint8List>(identityKey);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -2176,7 +2177,7 @@ class SignalIdentityKeyStoresData extends DataClass
     return SignalIdentityKeyStoresData(
       deviceId: serializer.fromJson<int>(json['deviceId']),
       name: serializer.fromJson<String>(json['name']),
-      identityKey: serializer.fromJson<Uint8List>(json['identityKey']),
+      identityKey: serializer.fromJson<i2.Uint8List>(json['identityKey']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -2186,7 +2187,7 @@ class SignalIdentityKeyStoresData extends DataClass
     return <String, dynamic>{
       'deviceId': serializer.toJson<int>(deviceId),
       'name': serializer.toJson<String>(name),
-      'identityKey': serializer.toJson<Uint8List>(identityKey),
+      'identityKey': serializer.toJson<i2.Uint8List>(identityKey),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -2194,7 +2195,7 @@ class SignalIdentityKeyStoresData extends DataClass
   SignalIdentityKeyStoresData copyWith(
           {int? deviceId,
           String? name,
-          Uint8List? identityKey,
+          i2.Uint8List? identityKey,
           DateTime? createdAt}) =>
       SignalIdentityKeyStoresData(
         deviceId: deviceId ?? this.deviceId,
@@ -2241,7 +2242,7 @@ class SignalIdentityKeyStoresCompanion
     extends UpdateCompanion<SignalIdentityKeyStoresData> {
   final Value<int> deviceId;
   final Value<String> name;
-  final Value<Uint8List> identityKey;
+  final Value<i2.Uint8List> identityKey;
   final Value<DateTime> createdAt;
   final Value<int> rowid;
   const SignalIdentityKeyStoresCompanion({
@@ -2254,7 +2255,7 @@ class SignalIdentityKeyStoresCompanion
   SignalIdentityKeyStoresCompanion.insert({
     required int deviceId,
     required String name,
-    required Uint8List identityKey,
+    required i2.Uint8List identityKey,
     this.createdAt = const Value.absent(),
     this.rowid = const Value.absent(),
   })  : deviceId = Value(deviceId),
@@ -2263,7 +2264,7 @@ class SignalIdentityKeyStoresCompanion
   static Insertable<SignalIdentityKeyStoresData> custom({
     Expression<int>? deviceId,
     Expression<String>? name,
-    Expression<Uint8List>? identityKey,
+    Expression<i2.Uint8List>? identityKey,
     Expression<DateTime>? createdAt,
     Expression<int>? rowid,
   }) {
@@ -2279,7 +2280,7 @@ class SignalIdentityKeyStoresCompanion
   SignalIdentityKeyStoresCompanion copyWith(
       {Value<int>? deviceId,
       Value<String>? name,
-      Value<Uint8List>? identityKey,
+      Value<i2.Uint8List>? identityKey,
       Value<DateTime>? createdAt,
       Value<int>? rowid}) {
     return SignalIdentityKeyStoresCompanion(
@@ -2301,7 +2302,7 @@ class SignalIdentityKeyStoresCompanion
       map['name'] = Variable<String>(name.value);
     }
     if (identityKey.present) {
-      map['identity_key'] = Variable<Uint8List>(identityKey.value);
+      map['identity_key'] = Variable<i2.Uint8List>(identityKey.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -2334,9 +2335,9 @@ class SignalPreKeyStores extends Table
   late final GeneratedColumn<int> preKeyId = GeneratedColumn<int>(
       'pre_key_id', aliasedName, false,
       type: DriftSqlType.int, requiredDuringInsert: false);
-  late final GeneratedColumn<Uint8List> preKey = GeneratedColumn<Uint8List>(
+  late final GeneratedColumn<i2.Uint8List> preKey =
-      'pre_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('pre_key', aliasedName, false,
-      type: DriftSqlType.blob, requiredDuringInsert: true);
+          type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
       type: DriftSqlType.dateTime,
@@ -2374,7 +2375,7 @@ class SignalPreKeyStores extends Table
 class SignalPreKeyStoresData extends DataClass
     implements Insertable<SignalPreKeyStoresData> {
   final int preKeyId;
-  final Uint8List preKey;
+  final i2.Uint8List preKey;
   final DateTime createdAt;
   const SignalPreKeyStoresData(
       {required this.preKeyId, required this.preKey, required this.createdAt});
@@ -2382,7 +2383,7 @@ class SignalPreKeyStoresData extends DataClass
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
     map['pre_key_id'] = Variable<int>(preKeyId);
-    map['pre_key'] = Variable<Uint8List>(preKey);
+    map['pre_key'] = Variable<i2.Uint8List>(preKey);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -2400,7 +2401,7 @@ class SignalPreKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return SignalPreKeyStoresData(
       preKeyId: serializer.fromJson<int>(json['preKeyId']),
-      preKey: serializer.fromJson<Uint8List>(json['preKey']),
+      preKey: serializer.fromJson<i2.Uint8List>(json['preKey']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -2409,13 +2410,13 @@ class SignalPreKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return <String, dynamic>{
       'preKeyId': serializer.toJson<int>(preKeyId),
-      'preKey': serializer.toJson<Uint8List>(preKey),
+      'preKey': serializer.toJson<i2.Uint8List>(preKey),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
 
   SignalPreKeyStoresData copyWith(
-          {int? preKeyId, Uint8List? preKey, DateTime? createdAt}) =>
+          {int? preKeyId, i2.Uint8List? preKey, DateTime? createdAt}) =>
       SignalPreKeyStoresData(
         preKeyId: preKeyId ?? this.preKeyId,
         preKey: preKey ?? this.preKey,
@@ -2454,7 +2455,7 @@ class SignalPreKeyStoresData extends DataClass
 class SignalPreKeyStoresCompanion
     extends UpdateCompanion<SignalPreKeyStoresData> {
   final Value<int> preKeyId;
-  final Value<Uint8List> preKey;
+  final Value<i2.Uint8List> preKey;
   final Value<DateTime> createdAt;
   const SignalPreKeyStoresCompanion({
     this.preKeyId = const Value.absent(),
@@ -2463,12 +2464,12 @@ class SignalPreKeyStoresCompanion
   });
   SignalPreKeyStoresCompanion.insert({
     this.preKeyId = const Value.absent(),
-    required Uint8List preKey,
+    required i2.Uint8List preKey,
     this.createdAt = const Value.absent(),
   }) : preKey = Value(preKey);
   static Insertable<SignalPreKeyStoresData> custom({
     Expression<int>? preKeyId,
-    Expression<Uint8List>? preKey,
+    Expression<i2.Uint8List>? preKey,
     Expression<DateTime>? createdAt,
   }) {
     return RawValuesInsertable({
@@ -2480,7 +2481,7 @@ class SignalPreKeyStoresCompanion
 
   SignalPreKeyStoresCompanion copyWith(
       {Value<int>? preKeyId,
-      Value<Uint8List>? preKey,
+      Value<i2.Uint8List>? preKey,
       Value<DateTime>? createdAt}) {
     return SignalPreKeyStoresCompanion(
       preKeyId: preKeyId ?? this.preKeyId,
@@ -2496,7 +2497,7 @@ class SignalPreKeyStoresCompanion
       map['pre_key_id'] = Variable<int>(preKeyId.value);
     }
     if (preKey.present) {
-      map['pre_key'] = Variable<Uint8List>(preKey.value);
+      map['pre_key'] = Variable<i2.Uint8List>(preKey.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
@@ -2524,9 +2525,9 @@ class SignalSenderKeyStores extends Table
   late final GeneratedColumn<String> senderKeyName = GeneratedColumn<String>(
       'sender_key_name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> senderKey = GeneratedColumn<Uint8List>(
+  late final GeneratedColumn<i2.Uint8List> senderKey =
-      'sender_key', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('sender_key', aliasedName, false,
-      type: DriftSqlType.blob, requiredDuringInsert: true);
+          type: DriftSqlType.blob, requiredDuringInsert: true);
   @override
   List<GeneratedColumn> get $columns => [senderKeyName, senderKey];
   @override
@@ -2557,14 +2558,14 @@ class SignalSenderKeyStores extends Table
 class SignalSenderKeyStoresData extends DataClass
     implements Insertable<SignalSenderKeyStoresData> {
   final String senderKeyName;
-  final Uint8List senderKey;
+  final i2.Uint8List senderKey;
   const SignalSenderKeyStoresData(
       {required this.senderKeyName, required this.senderKey});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
     map['sender_key_name'] = Variable<String>(senderKeyName);
-    map['sender_key'] = Variable<Uint8List>(senderKey);
+    map['sender_key'] = Variable<i2.Uint8List>(senderKey);
     return map;
   }
 
@@ -2580,7 +2581,7 @@ class SignalSenderKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return SignalSenderKeyStoresData(
       senderKeyName: serializer.fromJson<String>(json['senderKeyName']),
-      senderKey: serializer.fromJson<Uint8List>(json['senderKey']),
+      senderKey: serializer.fromJson<i2.Uint8List>(json['senderKey']),
     );
   }
   @override
@@ -2588,12 +2589,12 @@ class SignalSenderKeyStoresData extends DataClass
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return <String, dynamic>{
       'senderKeyName': serializer.toJson<String>(senderKeyName),
-      'senderKey': serializer.toJson<Uint8List>(senderKey),
+      'senderKey': serializer.toJson<i2.Uint8List>(senderKey),
     };
   }
 
   SignalSenderKeyStoresData copyWith(
-          {String? senderKeyName, Uint8List? senderKey}) =>
+          {String? senderKeyName, i2.Uint8List? senderKey}) =>
       SignalSenderKeyStoresData(
         senderKeyName: senderKeyName ?? this.senderKeyName,
         senderKey: senderKey ?? this.senderKey,
@@ -2631,7 +2632,7 @@ class SignalSenderKeyStoresData extends DataClass
 class SignalSenderKeyStoresCompanion
     extends UpdateCompanion<SignalSenderKeyStoresData> {
   final Value<String> senderKeyName;
-  final Value<Uint8List> senderKey;
+  final Value<i2.Uint8List> senderKey;
   final Value<int> rowid;
   const SignalSenderKeyStoresCompanion({
     this.senderKeyName = const Value.absent(),
@@ -2640,13 +2641,13 @@ class SignalSenderKeyStoresCompanion
   });
   SignalSenderKeyStoresCompanion.insert({
     required String senderKeyName,
-    required Uint8List senderKey,
+    required i2.Uint8List senderKey,
     this.rowid = const Value.absent(),
   })  : senderKeyName = Value(senderKeyName),
         senderKey = Value(senderKey);
   static Insertable<SignalSenderKeyStoresData> custom({
     Expression<String>? senderKeyName,
-    Expression<Uint8List>? senderKey,
+    Expression<i2.Uint8List>? senderKey,
     Expression<int>? rowid,
   }) {
     return RawValuesInsertable({
@@ -2658,7 +2659,7 @@ class SignalSenderKeyStoresCompanion
 
   SignalSenderKeyStoresCompanion copyWith(
       {Value<String>? senderKeyName,
-      Value<Uint8List>? senderKey,
+      Value<i2.Uint8List>? senderKey,
       Value<int>? rowid}) {
     return SignalSenderKeyStoresCompanion(
       senderKeyName: senderKeyName ?? this.senderKeyName,
@@ -2674,7 +2675,7 @@ class SignalSenderKeyStoresCompanion
       map['sender_key_name'] = Variable<String>(senderKeyName.value);
     }
     if (senderKey.present) {
-      map['sender_key'] = Variable<Uint8List>(senderKey.value);
+      map['sender_key'] = Variable<i2.Uint8List>(senderKey.value);
     }
     if (rowid.present) {
       map['rowid'] = Variable<int>(rowid.value);
@@ -2705,8 +2706,8 @@ class SignalSessionStores extends Table
   late final GeneratedColumn<String> name = GeneratedColumn<String>(
       'name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<Uint8List> sessionRecord =
+  late final GeneratedColumn<i2.Uint8List> sessionRecord =
-      GeneratedColumn<Uint8List>('session_record', aliasedName, false,
+      GeneratedColumn<i2.Uint8List>('session_record', aliasedName, false,
           type: DriftSqlType.blob, requiredDuringInsert: true);
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
       'created_at', aliasedName, false,
@@ -2750,7 +2751,7 @@ class SignalSessionStoresData extends DataClass
     implements Insertable<SignalSessionStoresData> {
   final int deviceId;
   final String name;
-  final Uint8List sessionRecord;
+  final i2.Uint8List sessionRecord;
   final DateTime createdAt;
   const SignalSessionStoresData(
       {required this.deviceId,
@@ -2762,7 +2763,7 @@ class SignalSessionStoresData extends DataClass
     final map = <String, Expression>{};
     map['device_id'] = Variable<int>(deviceId);
     map['name'] = Variable<String>(name);
-    map['session_record'] = Variable<Uint8List>(sessionRecord);
+    map['session_record'] = Variable<i2.Uint8List>(sessionRecord);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
@@ -2782,7 +2783,7 @@ class SignalSessionStoresData extends DataClass
     return SignalSessionStoresData(
       deviceId: serializer.fromJson<int>(json['deviceId']),
       name: serializer.fromJson<String>(json['name']),
-      sessionRecord: serializer.fromJson<Uint8List>(json['sessionRecord']),
+      sessionRecord: serializer.fromJson<i2.Uint8List>(json['sessionRecord']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -2792,7 +2793,7 @@ class SignalSessionStoresData extends DataClass
     return <String, dynamic>{
       'deviceId': serializer.toJson<int>(deviceId),
       'name': serializer.toJson<String>(name),
-      'sessionRecord': serializer.toJson<Uint8List>(sessionRecord),
+      'sessionRecord': serializer.toJson<i2.Uint8List>(sessionRecord),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
@@ -2800,7 +2801,7 @@ class SignalSessionStoresData extends DataClass
   SignalSessionStoresData copyWith(
           {int? deviceId,
           String? name,
-          Uint8List? sessionRecord,
+          i2.Uint8List? sessionRecord,
           DateTime? createdAt}) =>
       SignalSessionStoresData(
         deviceId: deviceId ?? this.deviceId,
@@ -2847,7 +2848,7 @@ class SignalSessionStoresCompanion
     extends UpdateCompanion<SignalSessionStoresData> {
   final Value<int> deviceId;
   final Value<String> name;
-  final Value<Uint8List> sessionRecord;
+  final Value<i2.Uint8List> sessionRecord;
   final Value<DateTime> createdAt;
   final Value<int> rowid;
   const SignalSessionStoresCompanion({
@@ -2860,7 +2861,7 @@ class SignalSessionStoresCompanion
   SignalSessionStoresCompanion.insert({
     required int deviceId,
     required String name,
-    required Uint8List sessionRecord,
+    required i2.Uint8List sessionRecord,
     this.createdAt = const Value.absent(),
     this.rowid = const Value.absent(),
   })  : deviceId = Value(deviceId),
@@ -2869,7 +2870,7 @@ class SignalSessionStoresCompanion
   static Insertable<SignalSessionStoresData> custom({
     Expression<int>? deviceId,
     Expression<String>? name,
-    Expression<Uint8List>? sessionRecord,
+    Expression<i2.Uint8List>? sessionRecord,
     Expression<DateTime>? createdAt,
     Expression<int>? rowid,
   }) {
@@ -2885,7 +2886,7 @@ class SignalSessionStoresCompanion
   SignalSessionStoresCompanion copyWith(
       {Value<int>? deviceId,
       Value<String>? name,
-      Value<Uint8List>? sessionRecord,
+      Value<i2.Uint8List>? sessionRecord,
       Value<DateTime>? createdAt,
       Value<int>? rowid}) {
     return SignalSessionStoresCompanion(
@@ -2907,7 +2908,7 @@ class SignalSessionStoresCompanion
       map['name'] = Variable<String>(name.value);
     }
     if (sessionRecord.present) {
-      map['session_record'] = Variable<Uint8List>(sessionRecord.value);
+      map['session_record'] = Variable<i2.Uint8List>(sessionRecord.value);
     }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);